Skip to content

Commit 3f863c4

Browse files
rhuijbenrhuijben
committed
Prepare next version
1 parent 68a27fb commit 3f863c4

8 files changed

+163
-4
lines changed

‎.github/workflows/msbuild.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
uses: lukka/run-vcpkg@v11
2727
with:
2828
vcpkgDirectory: '${{ github.workspace }}/vcpkg'
29-
vcpkgGitCommitId: ded9717095600a356b624cab03326e44764afed4
29+
vcpkgGitCommitId: d567b667adba0e72c5c3931ddbe745b66aa34b73
3030

3131
- name: Show VCPKG version directly
3232
run: ${{env.vcpkgExe}} --version

‎src/SharpProj/ProjContext.cpp

+11
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include <codecvt>
55
#include "ProjContext.h"
66
#include "ProjException.h"
7+
#include "ProjFactory.h"
78

89
using namespace SharpProj;
910
using namespace System::IO;
@@ -455,3 +456,13 @@ void ProjContext::OnLogMessage(ProjLogLevel level, String^ message)
455456

456457
OnLog(level, message);
457458
}
459+
460+
ProjFactory^ ProjContext::Factory::get()
461+
{
462+
if (!m_factory)
463+
{
464+
m_factory = gcnew ProjFactory(this);
465+
}
466+
467+
return m_factory;
468+
}

‎src/SharpProj/ProjContext.h

+13-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

33

4-
#if 1
4+
#ifndef NETCORE
55
#define EMPTY_ARRAY(T) gcnew array<T> {}
66
#else
77
#define EMPTY_ARRAY(T) Array::Empty<T>()
@@ -14,9 +14,11 @@ namespace SharpProj {
1414
ref class CoordinateReferenceSystem;
1515

1616
namespace Proj {
17+
ref class ProjFactory;
1718
ref class ProjObject;
1819
ref class CoordinateReferenceSystemFilter;
1920
ref class CoordinateReferenceSystemInfo;
21+
ref class CoordinateSystem;
2022
ref class CelestialBodyInfo;
2123
ref class UnitOfMeasurement;
2224
ref class UnitOfMeasurementFilter;
@@ -102,7 +104,7 @@ namespace SharpProj {
102104

103105
return m_netRef->TryGetTarget(target);
104106
}
105-
107+
106108
void SetTarget(TNetCtx^ target)
107109
{
108110
m_netRef->SetTarget(target);
@@ -181,6 +183,8 @@ namespace SharpProj {
181183
bool m_disposed;
182184
[DebuggerBrowsable(DebuggerBrowsableState::Never)]
183185
bool m_enableNetwork; // not reset on filefinder, unlike proj inner setting
186+
[DebuggerBrowsable(DebuggerBrowsableState::Never)]
187+
ProjFactory^ m_factory;
184188
ProjContext(PJ_CONTEXT* ctx);
185189
void SetupNetworkHandling();
186190

@@ -284,7 +288,7 @@ namespace SharpProj {
284288
private:
285289
bool CanWriteFromResource(String^ file, String^ userDir, String^ resultFile);
286290
[DebuggerBrowsable(DebuggerBrowsableState::Never)]
287-
property System::Collections::Generic::IEnumerable<String^>^ ProjLibDirs
291+
property System::Collections::Generic::IEnumerable<String^>^ ProjLibDirs
288292
{
289293
System::Collections::Generic::IEnumerable<String^>^ get();
290294
}
@@ -439,6 +443,12 @@ namespace SharpProj {
439443
System::Version^ get();
440444
}
441445

446+
/// <summary>Gets the factory instance for this <see cref="ProjContext" /></summary>
447+
property ProjFactory^ Factory
448+
{
449+
ProjFactory^ get();
450+
}
451+
442452
/// <summary>
443453
/// Gets all <see cref="CoordinateReferenceSystem"/>s matching the filter
444454
/// </summary>

‎src/SharpProj/ProjFactory.cpp

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
#include "pch.h"
2+
#include "ProjFactory.h"
3+
4+
using namespace SharpProj;
5+
using namespace SharpProj::Proj;
6+
7+
CoordinateSystem^ ProjFactory::CreateCoordinateSystem(CoordinateSystemType type, int axisCount, array<AxisDefinition^>^ axis)
8+
{
9+
proj_create_cs; // TODO: Implement using this function
10+
throw gcnew NotImplementedException();
11+
}
12+
13+
CoordinateSystem^ ProjFactory::CreateCartesianCoordinateSystem(Cartesian2DType type, String^ unitName, double conversionFactor)
14+
{
15+
if (type < Cartesian2DType::EastingNorthing || type > Cartesian2DType::WestingSouthing)
16+
throw gcnew ArgumentOutOfRangeException(nameof(type));
17+
else if (String::IsNullOrEmpty(unitName))
18+
throw gcnew ArgumentNullException(nameof(unitName));
19+
20+
auto unit_name = utf8_string(unitName);
21+
22+
auto pj = proj_create_cartesian_2D_cs(this, (PJ_CARTESIAN_CS_2D_TYPE)type, unit_name.c_str(), conversionFactor);
23+
24+
if (pj)
25+
return gcnew CoordinateSystem(m_context, pj);
26+
else
27+
throw m_context->ConstructException("CreateCartesianCoordinateSystem");
28+
}
29+
30+
CoordinateSystem^ ProjFactory::CreateEllipsoidalCoordinateSystem(Ellipsoidal2DType type, String^ unitName, double conversionFactor)
31+
{
32+
if (type < Ellipsoidal2DType::LongitudeLatitude || type > Ellipsoidal2DType::LatitudeLongitude)
33+
throw gcnew ArgumentOutOfRangeException(nameof(type));
34+
else if (String::IsNullOrEmpty(unitName))
35+
throw gcnew ArgumentNullException(nameof(unitName));
36+
37+
auto unit_name = utf8_string(unitName);
38+
39+
auto pj = proj_create_ellipsoidal_2D_cs(this, (PJ_ELLIPSOIDAL_CS_2D_TYPE)type, unit_name.c_str(), conversionFactor);
40+
41+
if (pj)
42+
return gcnew CoordinateSystem(m_context, pj);
43+
else
44+
throw m_context->ConstructException("CreateEllipsoidalCoordinateSystem");
45+
}
46+
47+
CoordinateSystem^ ProjFactory::CreateEllipsoidalCoordinateSystem(Ellipsoidal3DType type, String^ horizontalUnitName, double horizontalConversionFactor, String^ verticalUnitName, double verticalConversionFactor)
48+
{
49+
if (type < Ellipsoidal3DType::LongitudeLatitudeHeight || type > Ellipsoidal3DType::LatitudeLongitudeHeight)
50+
throw gcnew ArgumentOutOfRangeException(nameof(type));
51+
else if (String::IsNullOrEmpty(horizontalUnitName))
52+
throw gcnew ArgumentNullException(nameof(horizontalUnitName));
53+
else if (String::IsNullOrEmpty(verticalUnitName))
54+
throw gcnew ArgumentNullException(nameof(verticallUnitName));
55+
56+
auto h_unit_name = utf8_string(horizontalUnitName);
57+
auto v_unit_name = utf8_string(verticalUnitName);
58+
59+
auto pj = proj_create_ellipsoidal_3D_cs(this, (PJ_ELLIPSOIDAL_CS_3D_TYPE)type,
60+
h_unit_name.c_str(), horizontalConversionFactor,
61+
v_unit_name.c_str(), verticalConversionFactor);
62+
63+
if (pj)
64+
return gcnew CoordinateSystem(m_context, pj);
65+
else
66+
throw m_context->ConstructException("CreateEllipsoidalCoordinateSystem");
67+
}

‎src/SharpProj/ProjFactory.h

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
#pragma once
2+
3+
#include "CoordinateSystem.h"
4+
5+
namespace SharpProj {
6+
namespace Proj {
7+
public ref class AxisDefinition {
8+
private:
9+
AxisDefinition() {}
10+
};
11+
12+
public enum class Cartesian2DType
13+
{
14+
EastingNorthing = PJ_CART2D_EASTING_NORTHING,
15+
NorthingEasting = PJ_CART2D_NORTHING_EASTING,
16+
NorthPoleEastingSouthNorthingSouth = PJ_CART2D_NORTH_POLE_EASTING_SOUTH_NORTHING_SOUTH,
17+
SouthPoleEastingNorthNorthingSouth = PJ_CART2D_SOUTH_POLE_EASTING_NORTH_NORTHING_NORTH,
18+
WestingSouthing = PJ_CART2D_WESTING_SOUTHING
19+
};
20+
21+
public enum class Ellipsoidal2DType
22+
{
23+
LongitudeLatitude = PJ_ELLPS2D_LONGITUDE_LATITUDE,
24+
LatitudeLongitude = PJ_ELLPS2D_LATITUDE_LONGITUDE,
25+
};
26+
27+
public enum class Ellipsoidal3DType
28+
{
29+
LongitudeLatitudeHeight = PJ_ELLPS3D_LONGITUDE_LATITUDE_HEIGHT,
30+
LatitudeLongitudeHeight = PJ_ELLPS3D_LATITUDE_LONGITUDE_HEIGHT,
31+
};
32+
33+
public ref class ProjFactory sealed
34+
{
35+
private:
36+
[DebuggerBrowsable(DebuggerBrowsableState::Never)]
37+
initonly ProjContext^ m_context;
38+
39+
internal:
40+
ProjFactory(ProjContext^ ctx)
41+
{
42+
if (!ctx)
43+
throw gcnew ArgumentNullException("ctx");
44+
45+
m_context = ctx;
46+
}
47+
48+
static operator PJ_CONTEXT* (ProjFactory^ me)
49+
{
50+
return me->m_context;
51+
}
52+
53+
public:
54+
CoordinateSystem^ CreateCoordinateSystem(CoordinateSystemType type, int axisCount, array<AxisDefinition^>^ axis);
55+
CoordinateSystem^ CreateCartesianCoordinateSystem(Cartesian2DType type, String^ unitName, double conversionFactor);
56+
CoordinateSystem^ CreateEllipsoidalCoordinateSystem(Ellipsoidal2DType type, String^ unitName, double conversionFactor);
57+
CoordinateSystem^ CreateEllipsoidalCoordinateSystem(Ellipsoidal3DType type, String^ horizontalUnitName, double horizontalConversionFactor, String^ verticalUnitName, double verticalConversionFactor);
58+
};
59+
60+
}
61+
}

‎src/SharpProj/SharpProj.vcxproj

+2
Original file line numberDiff line numberDiff line change
@@ -546,6 +546,7 @@
546546
<ClInclude Include="PrimeMeridian.h" />
547547
<ClInclude Include="CoordinateArea.h" />
548548
<ClInclude Include="Datum.h" />
549+
<ClInclude Include="ProjFactory.h" />
549550
<ClInclude Include="ProjIdentifier.h" />
550551
<ClInclude Include="ProjObject.h" />
551552
<ClInclude Include="ProjContext.h" />
@@ -586,6 +587,7 @@
586587
<ClCompile Include="PrimeMeridian.cpp" />
587588
<ClCompile Include="CoordinateArea.cpp" />
588589
<ClCompile Include="Datum.cpp" />
590+
<ClCompile Include="ProjFactory.cpp" />
589591
<ClCompile Include="ProjIdentifier.cpp" />
590592
<ClCompile Include="ProjNetworkHandler.cpp" />
591593
<ClCompile Include="ProjObject.cpp" />

‎src/SharpProj/SharpProj.vcxproj.filters

+6
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@
8686
<ClInclude Include="CoordinateMetadata.h">
8787
<Filter>Header Files</Filter>
8888
</ClInclude>
89+
<ClInclude Include="ProjFactory.h">
90+
<Filter>Header Files</Filter>
91+
</ClInclude>
8992
</ItemGroup>
9093
<ItemGroup>
9194
<ClCompile Include="AssemblyInfo.cpp">
@@ -166,6 +169,9 @@
166169
<ClCompile Include="CoordinateMetadata.cpp">
167170
<Filter>Source Files</Filter>
168171
</ClCompile>
172+
<ClCompile Include="ProjFactory.cpp">
173+
<Filter>Source Files</Filter>
174+
</ClCompile>
169175
</ItemGroup>
170176
<ItemGroup>
171177
<None Include="packages.config" />

‎src/SharpProj/pch.h

+2
Original file line numberDiff line numberDiff line change
@@ -97,4 +97,6 @@ void DisposeIfNotNull(T% what)
9797
}
9898
}
9999

100+
#define nameof(x) #x
101+
100102
#endif //PCH_H

0 commit comments

Comments
 (0)