@crossbind/port-proj-wasm 2.0.0-beta.56 → 2.0.0-beta.60
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/prebuilt/wasm-wasm32-mt-release/crossbind-source.fingerprint +1 -1
- package/dist/prebuilt/wasm-wasm32-mt-release/include/proj/coordinateoperation.hpp +9 -0
- package/dist/prebuilt/wasm-wasm32-mt-release/include/proj/coordinatesystem.hpp +19 -2
- package/dist/prebuilt/wasm-wasm32-mt-release/include/proj/io.hpp +13 -2
- package/dist/prebuilt/wasm-wasm32-mt-release/include/proj.h +21 -2
- package/dist/prebuilt/wasm-wasm32-mt-release/include/proj_constants.h +63 -0
- package/dist/prebuilt/wasm-wasm32-mt-release/include/proj_symbol_rename.h +1 -0
- package/dist/prebuilt/wasm-wasm32-mt-release/lib/cmake/proj/proj-config-version.cmake +3 -3
- package/dist/prebuilt/wasm-wasm32-mt-release/lib/cmake/proj/proj-config.cmake +0 -8
- package/dist/prebuilt/wasm-wasm32-mt-release/lib/cmake/proj/proj-targets.cmake +1 -0
- package/dist/prebuilt/wasm-wasm32-mt-release/lib/cmake/proj/proj4-targets.cmake +1 -0
- package/dist/prebuilt/wasm-wasm32-mt-release/lib/cmake/proj4/proj-targets.cmake +1 -0
- package/dist/prebuilt/wasm-wasm32-mt-release/lib/cmake/proj4/proj4-config-version.cmake +3 -3
- package/dist/prebuilt/wasm-wasm32-mt-release/lib/cmake/proj4/proj4-config.cmake +0 -8
- package/dist/prebuilt/wasm-wasm32-mt-release/lib/cmake/proj4/proj4-targets.cmake +1 -0
- package/dist/prebuilt/wasm-wasm32-mt-release/lib/libproj.a +0 -0
- package/dist/prebuilt/wasm-wasm32-mt-release/lib/pkgconfig/proj.pc +1 -1
- package/dist/prebuilt/wasm-wasm32-mt-release/share/doc/proj/NEWS.md +62 -2
- package/dist/prebuilt/wasm-wasm32-mt-release/share/man/man1/cct.1 +23 -23
- package/dist/prebuilt/wasm-wasm32-mt-release/share/man/man1/cs2cs.1 +29 -29
- package/dist/prebuilt/wasm-wasm32-mt-release/share/man/man1/geod.1 +21 -21
- package/dist/prebuilt/wasm-wasm32-mt-release/share/man/man1/gie.1 +46 -46
- package/dist/prebuilt/wasm-wasm32-mt-release/share/man/man1/proj.1 +20 -20
- package/dist/prebuilt/wasm-wasm32-mt-release/share/man/man1/projinfo.1 +75 -52
- package/dist/prebuilt/wasm-wasm32-mt-release/share/man/man1/projsync.1 +20 -20
- package/dist/prebuilt/wasm-wasm32-mt-release/share/proj/proj.db +0 -0
- package/dist/prebuilt/wasm-wasm32-st-release/crossbind-source.fingerprint +1 -1
- package/dist/prebuilt/wasm-wasm32-st-release/include/proj/coordinateoperation.hpp +9 -0
- package/dist/prebuilt/wasm-wasm32-st-release/include/proj/coordinatesystem.hpp +19 -2
- package/dist/prebuilt/wasm-wasm32-st-release/include/proj/io.hpp +13 -2
- package/dist/prebuilt/wasm-wasm32-st-release/include/proj.h +21 -2
- package/dist/prebuilt/wasm-wasm32-st-release/include/proj_constants.h +63 -0
- package/dist/prebuilt/wasm-wasm32-st-release/include/proj_symbol_rename.h +1 -0
- package/dist/prebuilt/wasm-wasm32-st-release/lib/cmake/proj/proj-config-version.cmake +3 -3
- package/dist/prebuilt/wasm-wasm32-st-release/lib/cmake/proj/proj-config.cmake +0 -8
- package/dist/prebuilt/wasm-wasm32-st-release/lib/cmake/proj/proj-targets.cmake +1 -0
- package/dist/prebuilt/wasm-wasm32-st-release/lib/cmake/proj/proj4-targets.cmake +1 -0
- package/dist/prebuilt/wasm-wasm32-st-release/lib/cmake/proj4/proj-targets.cmake +1 -0
- package/dist/prebuilt/wasm-wasm32-st-release/lib/cmake/proj4/proj4-config-version.cmake +3 -3
- package/dist/prebuilt/wasm-wasm32-st-release/lib/cmake/proj4/proj4-config.cmake +0 -8
- package/dist/prebuilt/wasm-wasm32-st-release/lib/cmake/proj4/proj4-targets.cmake +1 -0
- package/dist/prebuilt/wasm-wasm32-st-release/lib/libproj.a +0 -0
- package/dist/prebuilt/wasm-wasm32-st-release/lib/pkgconfig/proj.pc +1 -1
- package/dist/prebuilt/wasm-wasm32-st-release/share/doc/proj/NEWS.md +62 -2
- package/dist/prebuilt/wasm-wasm32-st-release/share/man/man1/cct.1 +23 -23
- package/dist/prebuilt/wasm-wasm32-st-release/share/man/man1/cs2cs.1 +29 -29
- package/dist/prebuilt/wasm-wasm32-st-release/share/man/man1/geod.1 +21 -21
- package/dist/prebuilt/wasm-wasm32-st-release/share/man/man1/gie.1 +46 -46
- package/dist/prebuilt/wasm-wasm32-st-release/share/man/man1/proj.1 +20 -20
- package/dist/prebuilt/wasm-wasm32-st-release/share/man/man1/projinfo.1 +75 -52
- package/dist/prebuilt/wasm-wasm32-st-release/share/man/man1/projsync.1 +20 -20
- package/dist/prebuilt/wasm-wasm32-st-release/share/proj/proj.db +0 -0
- package/package.json +6 -6
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
0d7c72014b0e221d3f1192f7e5a3a869e096025f943baab2f8fa8c710445d552
|
|
@@ -1500,6 +1500,15 @@ class PROJ_GCC_DLL Conversion : public SingleOperation {
|
|
|
1500
1500
|
const common::Scale &A2, const common::Measure &B0,
|
|
1501
1501
|
const common::Scale &B1, const common::Scale &B2);
|
|
1502
1502
|
|
|
1503
|
+
PROJ_DLL static ConversionNNPtr
|
|
1504
|
+
createAffineParametric(const util::PropertyMap &properties,
|
|
1505
|
+
const common::Measure &A0, const common::Scale &A1,
|
|
1506
|
+
const common::Scale &A2, const common::Scale &A3,
|
|
1507
|
+
const common::Measure &B0, const common::Scale &B1,
|
|
1508
|
+
const common::Scale &B2, const common::Scale &B3,
|
|
1509
|
+
const common::Measure &C0, const common::Scale &C1,
|
|
1510
|
+
const common::Scale &C2, const common::Scale &C3);
|
|
1511
|
+
|
|
1503
1512
|
PROJ_DLL ConversionPtr convertToOtherMethod(int targetEPSGCode) const;
|
|
1504
1513
|
|
|
1505
1514
|
PROJ_PRIVATE :
|
|
@@ -48,6 +48,23 @@ namespace cs {
|
|
|
48
48
|
|
|
49
49
|
// ---------------------------------------------------------------------------
|
|
50
50
|
|
|
51
|
+
/** \brief Exception that can be thrown when an invalid coordinate system is
|
|
52
|
+
* attempted to be constructed.
|
|
53
|
+
*
|
|
54
|
+
* @since 9.9
|
|
55
|
+
*/
|
|
56
|
+
class PROJ_GCC_DLL InvalidCoordinateSystem : public util::Exception {
|
|
57
|
+
public:
|
|
58
|
+
//! @cond Doxygen_Suppress
|
|
59
|
+
PROJ_INTERNAL explicit InvalidCoordinateSystem(const char *message);
|
|
60
|
+
PROJ_INTERNAL explicit InvalidCoordinateSystem(const std::string &message);
|
|
61
|
+
PROJ_DLL InvalidCoordinateSystem(const InvalidCoordinateSystem &other);
|
|
62
|
+
PROJ_DLL ~InvalidCoordinateSystem() override;
|
|
63
|
+
//! @endcond
|
|
64
|
+
};
|
|
65
|
+
|
|
66
|
+
// ---------------------------------------------------------------------------
|
|
67
|
+
|
|
51
68
|
/** \brief The direction of positive increase in the coordinate value for a
|
|
52
69
|
* coordinate system axis.
|
|
53
70
|
*
|
|
@@ -549,12 +566,12 @@ class PROJ_GCC_DLL CartesianCS final : public CoordinateSystem {
|
|
|
549
566
|
PROJ_DLL static CartesianCSNNPtr
|
|
550
567
|
create(const util::PropertyMap &properties,
|
|
551
568
|
const CoordinateSystemAxisNNPtr &axis1,
|
|
552
|
-
const CoordinateSystemAxisNNPtr &axis2);
|
|
569
|
+
const CoordinateSystemAxisNNPtr &axis2, bool enforceSameUnit = true);
|
|
553
570
|
PROJ_DLL static CartesianCSNNPtr
|
|
554
571
|
create(const util::PropertyMap &properties,
|
|
555
572
|
const CoordinateSystemAxisNNPtr &axis1,
|
|
556
573
|
const CoordinateSystemAxisNNPtr &axis2,
|
|
557
|
-
const CoordinateSystemAxisNNPtr &axis3);
|
|
574
|
+
const CoordinateSystemAxisNNPtr &axis3, bool enforceSameUnit = true);
|
|
558
575
|
|
|
559
576
|
PROJ_DLL static CartesianCSNNPtr
|
|
560
577
|
createEastingNorthing(const common::UnitOfMeasure &unit);
|
|
@@ -117,6 +117,10 @@ class ProjectedCRS;
|
|
|
117
117
|
using ProjectedCRSPtr = std::shared_ptr<ProjectedCRS>;
|
|
118
118
|
using ProjectedCRSNNPtr = util::nn<ProjectedCRSPtr>;
|
|
119
119
|
|
|
120
|
+
class DerivedProjectedCRS;
|
|
121
|
+
using DerivedProjectedCRSPtr = std::shared_ptr<DerivedProjectedCRS>;
|
|
122
|
+
using DerivedProjectedCRSNNPtr = util::nn<DerivedProjectedCRSPtr>;
|
|
123
|
+
|
|
120
124
|
class CompoundCRS;
|
|
121
125
|
using CompoundCRSPtr = std::shared_ptr<CompoundCRS>;
|
|
122
126
|
using CompoundCRSNNPtr = util::nn<CompoundCRSPtr>;
|
|
@@ -1066,6 +1070,9 @@ class PROJ_GCC_DLL AuthorityFactory {
|
|
|
1066
1070
|
PROJ_DLL crs::ProjectedCRSNNPtr
|
|
1067
1071
|
createProjectedCRS(const std::string &code) const;
|
|
1068
1072
|
|
|
1073
|
+
PROJ_DLL crs::DerivedProjectedCRSNNPtr
|
|
1074
|
+
createDerivedProjectedCRS(const std::string &code) const;
|
|
1075
|
+
|
|
1069
1076
|
PROJ_DLL crs::CompoundCRSNNPtr
|
|
1070
1077
|
createCompoundCRS(const std::string &code) const;
|
|
1071
1078
|
|
|
@@ -1125,6 +1132,8 @@ class PROJ_GCC_DLL AuthorityFactory {
|
|
|
1125
1132
|
ENGINEERING_CRS,
|
|
1126
1133
|
/** Object of type crs::EngineeringCRS */
|
|
1127
1134
|
COMPOUND_CRS,
|
|
1135
|
+
/** Object of type crs::DerivedProjectedCRS */
|
|
1136
|
+
DERIVED_PROJECTED_CRS,
|
|
1128
1137
|
/** Object of type operation::CoordinateOperation (and derived
|
|
1129
1138
|
classes) */
|
|
1130
1139
|
COORDINATE_OPERATION,
|
|
@@ -1259,7 +1268,8 @@ class PROJ_GCC_DLL AuthorityFactory {
|
|
|
1259
1268
|
const std::vector<std::string> &allowedAuthorities =
|
|
1260
1269
|
std::vector<std::string>(),
|
|
1261
1270
|
const metadata::ExtentPtr &intersectingExtent1 = nullptr,
|
|
1262
|
-
const metadata::ExtentPtr &intersectingExtent2 = nullptr
|
|
1271
|
+
const metadata::ExtentPtr &intersectingExtent2 = nullptr,
|
|
1272
|
+
bool skipIntermediateExtentIntersection = false) const;
|
|
1263
1273
|
|
|
1264
1274
|
PROJ_DLL std::string getOfficialNameFromAlias(
|
|
1265
1275
|
const std::string &aliasedName, const std::string &tableName,
|
|
@@ -1326,7 +1336,8 @@ class PROJ_GCC_DLL AuthorityFactory {
|
|
|
1326
1336
|
bool considerKnownGridsAsAvailable, bool discardSuperseded,
|
|
1327
1337
|
const std::vector<std::string> &allowedAuthorities,
|
|
1328
1338
|
const metadata::ExtentPtr &intersectingExtent1,
|
|
1329
|
-
const metadata::ExtentPtr &intersectingExtent2
|
|
1339
|
+
const metadata::ExtentPtr &intersectingExtent2,
|
|
1340
|
+
bool skipIntermediateExtentIntersection = false) const;
|
|
1330
1341
|
|
|
1331
1342
|
typedef std::pair<common::IdentifiedObjectNNPtr, std::string>
|
|
1332
1343
|
PairObjectName;
|
|
@@ -174,8 +174,8 @@ extern "C" {
|
|
|
174
174
|
|
|
175
175
|
/* The version numbers should be updated with every release! **/
|
|
176
176
|
#define PROJ_VERSION_MAJOR 9
|
|
177
|
-
#define PROJ_VERSION_MINOR
|
|
178
|
-
#define PROJ_VERSION_PATCH
|
|
177
|
+
#define PROJ_VERSION_MINOR 9
|
|
178
|
+
#define PROJ_VERSION_PATCH 0
|
|
179
179
|
|
|
180
180
|
/* Note: the following 3 defines have been introduced in PROJ 8.0.1 */
|
|
181
181
|
/* Macro to compute a PROJ version number from its components */
|
|
@@ -1432,6 +1432,8 @@ int PROJ_DLL proj_get_suggested_operation(PJ_CONTEXT *ctx,
|
|
|
1432
1432
|
|
|
1433
1433
|
int PROJ_DLL proj_crs_is_derived(PJ_CONTEXT *ctx, const PJ *crs);
|
|
1434
1434
|
|
|
1435
|
+
int PROJ_DLL proj_crs_is_dynamic(PJ_CONTEXT *ctx, const PJ *crs);
|
|
1436
|
+
|
|
1435
1437
|
PJ PROJ_DLL *proj_crs_get_geodetic_crs(PJ_CONTEXT *ctx, const PJ *crs);
|
|
1436
1438
|
|
|
1437
1439
|
PJ PROJ_DLL *proj_crs_get_horizontal_datum(PJ_CONTEXT *ctx, const PJ *crs);
|
|
@@ -1799,6 +1801,23 @@ PJ PROJ_DLL *proj_create_linear_affine_parametric_conversion(
|
|
|
1799
1801
|
double B2, const char *B2_unit_name, double B2_unit_conv_factor);
|
|
1800
1802
|
/* clang-format on */
|
|
1801
1803
|
|
|
1804
|
+
/* clang-format off */
|
|
1805
|
+
PJ PROJ_DLL *proj_create_linear_3D_affine_parametric_conversion(
|
|
1806
|
+
PJ_CONTEXT *ctx, const char* name,
|
|
1807
|
+
double A0, const char *A0_unit_name, double A0_unit_conv_factor,
|
|
1808
|
+
double A1, const char *A1_unit_name, double A1_unit_conv_factor,
|
|
1809
|
+
double A2, const char *A2_unit_name, double A2_unit_conv_factor,
|
|
1810
|
+
double A3, const char *A3_unit_name, double A3_unit_conv_factor,
|
|
1811
|
+
double B0, const char *B0_unit_name, double B0_unit_conv_factor,
|
|
1812
|
+
double B1, const char *B1_unit_name, double B1_unit_conv_factor,
|
|
1813
|
+
double B2, const char *B2_unit_name, double B2_unit_conv_factor,
|
|
1814
|
+
double B3, const char *B3_unit_name, double B3_unit_conv_factor,
|
|
1815
|
+
double C0, const char *C0_unit_name, double C0_unit_conv_factor,
|
|
1816
|
+
double C1, const char *C1_unit_name, double C1_unit_conv_factor,
|
|
1817
|
+
double C2, const char *C2_unit_name, double C2_unit_conv_factor,
|
|
1818
|
+
double C3, const char *C3_unit_name, double C3_unit_conv_factor);
|
|
1819
|
+
/* clang-format on */
|
|
1820
|
+
|
|
1802
1821
|
PJ PROJ_DLL *proj_create_transformation(
|
|
1803
1822
|
PJ_CONTEXT *ctx, const char *name, const char *auth_name, const char *code,
|
|
1804
1823
|
const PJ *source_crs, const PJ *target_crs, const PJ *interpolation_crs,
|
|
@@ -281,6 +281,10 @@
|
|
|
281
281
|
#define PROJ_WKT2_NAME_METHOD_PEIRCE_QUINCUNCIAL_DIAMOND \
|
|
282
282
|
"Peirce Quincuncial (Diamond)"
|
|
283
283
|
|
|
284
|
+
#define EPSG_NAME_METHOD_TRANSVERSE_MERCATOR_ZONED_GRID_SYSTEM \
|
|
285
|
+
"Transverse Mercator Zoned Grid System"
|
|
286
|
+
#define EPSG_CODE_METHOD_TRANSVERSE_MERCATOR_ZONED_GRID_SYSTEM 9824
|
|
287
|
+
|
|
284
288
|
/* ------------------------------------------------------------------------ */
|
|
285
289
|
|
|
286
290
|
/* Projection parameters */
|
|
@@ -402,6 +406,12 @@
|
|
|
402
406
|
"Projection plane origin height"
|
|
403
407
|
#define EPSG_CODE_PARAMETER_PROJECTION_PLANE_ORIGIN_HEIGHT 1039
|
|
404
408
|
|
|
409
|
+
#define EPSG_NAME_PARAMETER_INITIAL_LONGITUDE "Initial longitude"
|
|
410
|
+
#define EPSG_CODE_PARAMETER_INITIAL_LONGITUDE 8830
|
|
411
|
+
|
|
412
|
+
#define EPSG_NAME_PARAMETER_ZONE_WIDTH "Zone width"
|
|
413
|
+
#define EPSG_CODE_PARAMETER_ZONE_WIDTH 8831
|
|
414
|
+
|
|
405
415
|
/* ------------------------------------------------------------------------ */
|
|
406
416
|
|
|
407
417
|
/* Other conversions and transformations */
|
|
@@ -909,6 +919,16 @@
|
|
|
909
919
|
#define EPSG_NAME_PARAMETER_B2 "B2"
|
|
910
920
|
#define EPSG_CODE_PARAMETER_B2 8641
|
|
911
921
|
|
|
922
|
+
#define PROJ_WKT2_NAME_METHOD_3D_AFFINE_PARAMETRIC_TRANSFORMATION \
|
|
923
|
+
"3D Affine parametric transformation"
|
|
924
|
+
|
|
925
|
+
#define PROJ_WKT2_NAME_PARAMETER_A3 "A3"
|
|
926
|
+
#define PROJ_WKT2_NAME_PARAMETER_B3 "B3"
|
|
927
|
+
#define PROJ_WKT2_NAME_PARAMETER_C0 "C0"
|
|
928
|
+
#define PROJ_WKT2_NAME_PARAMETER_C1 "C1"
|
|
929
|
+
#define PROJ_WKT2_NAME_PARAMETER_C2 "C2"
|
|
930
|
+
#define PROJ_WKT2_NAME_PARAMETER_C3 "C3"
|
|
931
|
+
|
|
912
932
|
/* ------------------------------------------------------------------------ */
|
|
913
933
|
|
|
914
934
|
#define EPSG_CODE_METHOD_SIMILARITY_TRANSFORMATION 9621
|
|
@@ -932,6 +952,49 @@
|
|
|
932
952
|
|
|
933
953
|
/* ------------------------------------------------------------------------ */
|
|
934
954
|
|
|
955
|
+
#define EPSG_CODE_METHOD_SEISMIC_BIN_GRID_I_EQ_J_PLUS_90 9666
|
|
956
|
+
#define EPSG_NAME_METHOD_SEISMIC_BIN_GRID_I_EQ_J_PLUS_90 \
|
|
957
|
+
"P6 I=J+90 seismic bin grid coordinate operation"
|
|
958
|
+
|
|
959
|
+
#define EPSG_CODE_METHOD_SEISMIC_BIN_GRID_I_EQ_J_MINUS_90 1049
|
|
960
|
+
#define EPSG_NAME_METHOD_SEISMIC_BIN_GRID_I_EQ_J_MINUS_90 \
|
|
961
|
+
"P6 I=J-90 seismic bin grid coordinate operation"
|
|
962
|
+
|
|
963
|
+
#define EPSG_NAME_PARAMETER_BIN_GRID_ORIGIN_I "Bin grid origin I"
|
|
964
|
+
#define EPSG_CODE_PARAMETER_BIN_GRID_ORIGIN_I 8733
|
|
965
|
+
|
|
966
|
+
#define EPSG_NAME_PARAMETER_BIN_GRID_ORIGIN_J "Bin grid origin J"
|
|
967
|
+
#define EPSG_CODE_PARAMETER_BIN_GRID_ORIGIN_J 8734
|
|
968
|
+
|
|
969
|
+
#define EPSG_NAME_PARAMETER_BIN_GRID_ORIGIN_EASTING "Bin grid origin Easting"
|
|
970
|
+
#define EPSG_CODE_PARAMETER_BIN_GRID_ORIGIN_EASTING 8735
|
|
971
|
+
|
|
972
|
+
#define EPSG_NAME_PARAMETER_BIN_GRID_ORIGIN_NORTHING "Bin grid origin Northing"
|
|
973
|
+
#define EPSG_CODE_PARAMETER_BIN_GRID_ORIGIN_NORTHING 8736
|
|
974
|
+
|
|
975
|
+
#define EPSG_NAME_PARAMETER_SCALE_FACTOR_OF_BIN_GRID "Scale factor of bin grid"
|
|
976
|
+
#define EPSG_CODE_PARAMETER_SCALE_FACTOR_OF_BIN_GRID 8737
|
|
977
|
+
|
|
978
|
+
#define EPSG_NAME_PARAMETER_BIN_WIDTH_ON_I_AXIS "Bin width on I-axis"
|
|
979
|
+
#define EPSG_CODE_PARAMETER_BIN_WIDTH_ON_I_AXIS 8738
|
|
980
|
+
|
|
981
|
+
#define EPSG_NAME_PARAMETER_BIN_WIDTH_ON_J_AXIS "Bin width on J-axis"
|
|
982
|
+
#define EPSG_CODE_PARAMETER_BIN_WIDTH_ON_J_AXIS 8739
|
|
983
|
+
|
|
984
|
+
#define EPSG_NAME_PARAMETER_MAP_GRID_BEARING_OF_BIN_GRID_J_AXIS \
|
|
985
|
+
"Map grid bearing of bin grid J-axis"
|
|
986
|
+
#define EPSG_CODE_PARAMETER_MAP_GRID_BEARING_OF_BIN_GRID_J_AXIS 8740
|
|
987
|
+
|
|
988
|
+
#define EPSG_NAME_PARAMETER_BIN_NODE_INCREMENT_ON_I_AXIS \
|
|
989
|
+
"Bin node increment on I-axis"
|
|
990
|
+
#define EPSG_CODE_PARAMETER_BIN_NODE_INCREMENT_ON_I_AXIS 8741
|
|
991
|
+
|
|
992
|
+
#define EPSG_NAME_PARAMETER_BIN_NODE_INCREMENT_ON_J_AXIS \
|
|
993
|
+
"Bin node increment on J-axis"
|
|
994
|
+
#define EPSG_CODE_PARAMETER_BIN_NODE_INCREMENT_ON_J_AXIS 8742
|
|
995
|
+
|
|
996
|
+
/* ------------------------------------------------------------------------ */
|
|
997
|
+
|
|
935
998
|
#define EPSG_CODE_METHOD_AXIS_ORDER_REVERSAL_2D 9843
|
|
936
999
|
#define EPSG_NAME_METHOD_AXIS_ORDER_REVERSAL_2D "Axis Order Reversal (2D)"
|
|
937
1000
|
|
|
@@ -171,6 +171,7 @@
|
|
|
171
171
|
#define proj_create_geocentric_crs_from_datum internal_proj_create_geocentric_crs_from_datum
|
|
172
172
|
#define proj_create_geographic_crs internal_proj_create_geographic_crs
|
|
173
173
|
#define proj_create_geographic_crs_from_datum internal_proj_create_geographic_crs_from_datum
|
|
174
|
+
#define proj_create_linear_3D_affine_parametric_conversion internal_proj_create_linear_3D_affine_parametric_conversion
|
|
174
175
|
#define proj_create_linear_affine_parametric_conversion internal_proj_create_linear_affine_parametric_conversion
|
|
175
176
|
#define proj_create_operation_factory_context internal_proj_create_operation_factory_context
|
|
176
177
|
#define proj_create_operations internal_proj_create_operations
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
# Version checking for PROJ
|
|
2
2
|
|
|
3
|
-
set (PACKAGE_VERSION "9.
|
|
3
|
+
set (PACKAGE_VERSION "9.9.0")
|
|
4
4
|
set (PACKAGE_VERSION_MAJOR "9")
|
|
5
|
-
set (PACKAGE_VERSION_MINOR "
|
|
6
|
-
set (PACKAGE_VERSION_PATCH "
|
|
5
|
+
set (PACKAGE_VERSION_MINOR "9")
|
|
6
|
+
set (PACKAGE_VERSION_PATCH "0")
|
|
7
7
|
|
|
8
8
|
# These variable definitions parallel those in PROJ's
|
|
9
9
|
# cmake/CMakeLists.txt.
|
|
@@ -36,14 +36,6 @@ endif()
|
|
|
36
36
|
if(DEFINED PROJ_CONFIG_FIND_CURL_DEP)
|
|
37
37
|
# Chainload CURL usage requirements
|
|
38
38
|
find_dependency(CURL)
|
|
39
|
-
# Target CURL::libcurl only defined since CMake 3.12
|
|
40
|
-
if(NOT TARGET CURL::libcurl)
|
|
41
|
-
add_library(CURL::libcurl INTERFACE IMPORTED)
|
|
42
|
-
set_target_properties(CURL::libcurl PROPERTIES
|
|
43
|
-
INTERFACE_INCLUDE_DIRECTORIES "${CURL_INCLUDE_DIRS}"
|
|
44
|
-
INTERFACE_LINK_LIBRARIES "${CURL_LIBRARIES}"
|
|
45
|
-
)
|
|
46
|
-
endif()
|
|
47
39
|
endif()
|
|
48
40
|
|
|
49
41
|
function(set_variable_from_rel_or_absolute_path var root rel_or_abs_path)
|
|
@@ -60,6 +60,7 @@ add_library(PROJ::proj STATIC IMPORTED)
|
|
|
60
60
|
|
|
61
61
|
set_target_properties(PROJ::proj PROPERTIES
|
|
62
62
|
INTERFACE_COMPILE_DEFINITIONS "PROJ_DLL="
|
|
63
|
+
INTERFACE_COMPILE_FEATURES "c_std_99;cxx_std_17"
|
|
63
64
|
INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
|
|
64
65
|
INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:SQLite::SQLite3>;\$<LINK_ONLY:TIFF::TIFF>"
|
|
65
66
|
)
|
|
@@ -60,6 +60,7 @@ add_library(PROJ4::proj STATIC IMPORTED)
|
|
|
60
60
|
|
|
61
61
|
set_target_properties(PROJ4::proj PROPERTIES
|
|
62
62
|
INTERFACE_COMPILE_DEFINITIONS "PROJ_DLL="
|
|
63
|
+
INTERFACE_COMPILE_FEATURES "c_std_99;cxx_std_17"
|
|
63
64
|
INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
|
|
64
65
|
INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:SQLite::SQLite3>;\$<LINK_ONLY:TIFF::TIFF>"
|
|
65
66
|
)
|
|
@@ -60,6 +60,7 @@ add_library(PROJ::proj STATIC IMPORTED)
|
|
|
60
60
|
|
|
61
61
|
set_target_properties(PROJ::proj PROPERTIES
|
|
62
62
|
INTERFACE_COMPILE_DEFINITIONS "PROJ_DLL="
|
|
63
|
+
INTERFACE_COMPILE_FEATURES "c_std_99;cxx_std_17"
|
|
63
64
|
INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
|
|
64
65
|
INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:SQLite::SQLite3>;\$<LINK_ONLY:TIFF::TIFF>"
|
|
65
66
|
)
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
# Version checking for PROJ4
|
|
2
2
|
|
|
3
|
-
set (PACKAGE_VERSION "9.
|
|
3
|
+
set (PACKAGE_VERSION "9.9.0")
|
|
4
4
|
set (PACKAGE_VERSION_MAJOR "9")
|
|
5
|
-
set (PACKAGE_VERSION_MINOR "
|
|
6
|
-
set (PACKAGE_VERSION_PATCH "
|
|
5
|
+
set (PACKAGE_VERSION_MINOR "9")
|
|
6
|
+
set (PACKAGE_VERSION_PATCH "0")
|
|
7
7
|
|
|
8
8
|
# These variable definitions parallel those in PROJ's
|
|
9
9
|
# cmake/CMakeLists.txt.
|
|
@@ -36,14 +36,6 @@ endif()
|
|
|
36
36
|
if(DEFINED PROJ_CONFIG_FIND_CURL_DEP)
|
|
37
37
|
# Chainload CURL usage requirements
|
|
38
38
|
find_dependency(CURL)
|
|
39
|
-
# Target CURL::libcurl only defined since CMake 3.12
|
|
40
|
-
if(NOT TARGET CURL::libcurl)
|
|
41
|
-
add_library(CURL::libcurl INTERFACE IMPORTED)
|
|
42
|
-
set_target_properties(CURL::libcurl PROPERTIES
|
|
43
|
-
INTERFACE_INCLUDE_DIRECTORIES "${CURL_INCLUDE_DIRS}"
|
|
44
|
-
INTERFACE_LINK_LIBRARIES "${CURL_LIBRARIES}"
|
|
45
|
-
)
|
|
46
|
-
endif()
|
|
47
39
|
endif()
|
|
48
40
|
|
|
49
41
|
function(set_variable_from_rel_or_absolute_path var root rel_or_abs_path)
|
|
@@ -60,6 +60,7 @@ add_library(PROJ4::proj STATIC IMPORTED)
|
|
|
60
60
|
|
|
61
61
|
set_target_properties(PROJ4::proj PROPERTIES
|
|
62
62
|
INTERFACE_COMPILE_DEFINITIONS "PROJ_DLL="
|
|
63
|
+
INTERFACE_COMPILE_FEATURES "c_std_99;cxx_std_17"
|
|
63
64
|
INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
|
|
64
65
|
INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:SQLite::SQLite3>;\$<LINK_ONLY:TIFF::TIFF>"
|
|
65
66
|
)
|
|
Binary file
|
|
@@ -1,5 +1,65 @@
|
|
|
1
1
|
# PROJ Release Notes
|
|
2
2
|
|
|
3
|
+
## 9.9.0
|
|
4
|
+
|
|
5
|
+
### Updates
|
|
6
|
+
|
|
7
|
+
#### Operations
|
|
8
|
+
|
|
9
|
+
* `tinshift`: support TIN GeoPackage files (#4603)
|
|
10
|
+
|
|
11
|
+
* Optimize `+step +proj=helmert +inv +x=X +y=Y +z=Z +step +proj=helmert +inv +x=-X +y=-Y +z=-Z` as `+proj=noop` (#4775)
|
|
12
|
+
|
|
13
|
+
* Optimization: replace iterative Aitoff inverse with closed-form inverse (#4796)
|
|
14
|
+
|
|
15
|
+
* Adds implementation of Transverse Mercator Zoned Grid System (supporting EPSG:32600 and EPSG:32700) (#4805)
|
|
16
|
+
|
|
17
|
+
* Add seismic bin grid operation methods (EPSG:9666 and EPSG:1049) (#4807)
|
|
18
|
+
|
|
19
|
+
* IVEA: DSEA projection onto icosahedron net (#4817)
|
|
20
|
+
|
|
21
|
+
#### API
|
|
22
|
+
|
|
23
|
+
* Add `proj_create_linear_3D_affine_parametric_conversion()` (#4682)
|
|
24
|
+
|
|
25
|
+
* Optimize `fwd_prepare()` (#4712)
|
|
26
|
+
|
|
27
|
+
* Add support for `DerivedProjectedCRS` registration (#4727)
|
|
28
|
+
|
|
29
|
+
* C++ API: CartesianCS::create(): by default check that all axis have the same unit (#4728)
|
|
30
|
+
|
|
31
|
+
* `createOperations()`: tune `geod_crs_of_datum_ensemble` <--> `geod_crs_of_another_datum` (#4773)
|
|
32
|
+
|
|
33
|
+
* add `proj_crs_is_dynamic()`, and `cs2cs`: warn when source/destination CRS is dynamic, but no epoch is provided (#4792)
|
|
34
|
+
|
|
35
|
+
* `createOperations()`: add heuristics to make BD72 + Ostend height to Amersfoort + NAP height lead to optimal result again (#4821)
|
|
36
|
+
|
|
37
|
+
* Make sure that WKT2 export of CRS imported from PROJ.4 strings or WKT1 is identical (#4844)
|
|
38
|
+
|
|
39
|
+
#### CMake
|
|
40
|
+
|
|
41
|
+
* Only add CPack related options when PROJ is the top level project. (#4722)
|
|
42
|
+
|
|
43
|
+
* Increase CMake minimum version from 3.16 to 3.22.1 (#4824)
|
|
44
|
+
|
|
45
|
+
* Replace PROJ_DATA_PATH with ${CMAKE_INSTALL_DATADIR}/proj (#4843)
|
|
46
|
+
|
|
47
|
+
* Define `target_compile_features` with C/C++ standards (#4847)
|
|
48
|
+
|
|
49
|
+
#### Database
|
|
50
|
+
|
|
51
|
+
* Database: update to EPSG v13.102 (#4829)
|
|
52
|
+
|
|
53
|
+
|
|
54
|
+
### Bug Fixes
|
|
55
|
+
|
|
56
|
+
* Refactor time parsing with thread-safe localtime and leap year fix (#4692)
|
|
57
|
+
|
|
58
|
+
* Make sure `projinfo --crs-extent-use none` works as expected (#4699)
|
|
59
|
+
|
|
60
|
+
* Fix SQLite3 version check so it is done by `find_package` (#4753)
|
|
61
|
+
|
|
62
|
+
|
|
3
63
|
## 9.8.1
|
|
4
64
|
|
|
5
65
|
### Warning
|
|
@@ -146,7 +206,7 @@ longer available in PROJ 9.8.1.
|
|
|
146
206
|
|
|
147
207
|
* WKT importer: better error message when `BBOX` is invalid (e.g south_lat > north_lat) (#4525)
|
|
148
208
|
|
|
149
|
-
* Added `proj_geod_direct` for PJ
|
|
209
|
+
* Added `proj_geod_direct` for PJ transformation object (#4532)
|
|
150
210
|
|
|
151
211
|
* Support exporting Mercator (Spherical) on a sphere as `Mercator_1SP` in WKT1 (#4555)
|
|
152
212
|
|
|
@@ -168,7 +228,7 @@ longer available in PROJ 9.8.1.
|
|
|
168
228
|
|
|
169
229
|
* `gie`: fix memory leak on non existing input file (#4531)
|
|
170
230
|
|
|
171
|
-
* Database:
|
|
231
|
+
* Database: reference `nl_nsgi_nllat2018.tif` and `nl_nsgi_bongeo2004.tif` grids (#4534)
|
|
172
232
|
|
|
173
233
|
* Fixes related to WKT import/export of `DerivedGeodetic/GeographicCRS` (#4536)
|
|
174
234
|
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
.\" Man page generated from reStructuredText
|
|
2
|
-
.\" by the Docutils 0.22.4 manpage writer.
|
|
1
|
+
.\" Man page generated from reStructuredText.
|
|
3
2
|
.
|
|
4
3
|
.
|
|
5
4
|
.nr rst2man-indent-level 0
|
|
@@ -28,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
|
|
|
28
27
|
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
|
|
29
28
|
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
|
|
30
29
|
..
|
|
31
|
-
.TH "CCT" "1" "
|
|
30
|
+
.TH "CCT" "1" "15 Sep 2026" "9.9" "PROJ"
|
|
32
31
|
.SH NAME
|
|
33
32
|
cct \- Coordinate Conversion and Transformation
|
|
34
33
|
.SH SYNOPSIS
|
|
@@ -46,7 +45,7 @@ or
|
|
|
46
45
|
.UNINDENT
|
|
47
46
|
.sp
|
|
48
47
|
Where {object_definition}\ is one of the possibilities accepted
|
|
49
|
-
by \
|
|
48
|
+
by \fI\%proj_create()\fP, provided it expresses a coordinate operation
|
|
50
49
|
.INDENT 0.0
|
|
51
50
|
.INDENT 3.5
|
|
52
51
|
.INDENT 0.0
|
|
@@ -61,19 +60,19 @@ an object name. e.g. \(dqITRF2014 to ETRF2014 (1)\(dq. In that case as
|
|
|
61
60
|
uniqueness is not guaranteed, heuristics are applied to determine the appropriate best match.
|
|
62
61
|
.IP \(bu 2
|
|
63
62
|
a OGC URN combining references for concatenated operations
|
|
64
|
-
(e.g. \(dq
|
|
63
|
+
(e.g. \(dq\fI\%urn:ogc:def:coordinateOperation,coordinateOperation:EPSG::3895,coordinateOperation:EPSG::1618\fP\(dq)
|
|
65
64
|
.IP \(bu 2
|
|
66
|
-
a PROJJSON string. The jsonschema is at
|
|
65
|
+
a PROJJSON string. The jsonschema is at \X'tty: link https://proj.org/schemas/v0.4/projjson.schema.json'\fI\%https://proj.org/schemas/v0.4/projjson.schema.json\fP\X'tty: link'
|
|
67
66
|
.UNINDENT
|
|
68
67
|
.sp
|
|
69
68
|
Added in version 8.0.0.
|
|
70
69
|
|
|
71
70
|
.sp
|
|
72
|
-
\
|
|
71
|
+
\fBNOTE:\fP
|
|
73
72
|
.INDENT 0.0
|
|
74
73
|
.INDENT 3.5
|
|
75
74
|
Before version 8.0.0 only proj\-strings could be used to instantiate
|
|
76
|
-
operations in cct\&.
|
|
75
|
+
operations in \fI\%cct\fP\&.
|
|
77
76
|
.UNINDENT
|
|
78
77
|
.UNINDENT
|
|
79
78
|
.UNINDENT
|
|
@@ -97,12 +96,12 @@ Added in version 8.0.0.
|
|
|
97
96
|
.UNINDENT
|
|
98
97
|
.SH DESCRIPTION
|
|
99
98
|
.sp
|
|
100
|
-
cct is a 4D equivalent to the proj
|
|
99
|
+
\fI\%cct\fP is a 4D equivalent to the \fI\%proj\fP projection program,
|
|
101
100
|
performs transformation coordinate systems on a set of input points. The
|
|
102
101
|
coordinate system transformation can include translation between projected
|
|
103
102
|
and geographic coordinates as well as the application of datum shifts.
|
|
104
103
|
.sp
|
|
105
|
-
Note however that unlike the proj
|
|
104
|
+
Note however that unlike the \fI\%proj\fP, angular input must be in decimal degrees.
|
|
106
105
|
Any minutes and seconds given will be silently dropped.
|
|
107
106
|
.sp
|
|
108
107
|
The following control parameters can appear in any order:
|
|
@@ -163,7 +162,7 @@ Print version number.
|
|
|
163
162
|
The \fI+opt\fP arguments are associated with coordinate operation parameters.
|
|
164
163
|
Usage varies with operation.
|
|
165
164
|
.sp
|
|
166
|
-
cct is an acronym meaning \fICoordinate Conversion and Transformation\fP\&.
|
|
165
|
+
\fI\%cct\fP is an acronym meaning \fICoordinate Conversion and Transformation\fP\&.
|
|
167
166
|
.sp
|
|
168
167
|
The acronym refers to definitions given in the OGC 08\-015r2/ISO\-19111
|
|
169
168
|
standard \(dqGeographical Information \-\- Spatial Referencing by Coordinates\(dq,
|
|
@@ -180,15 +179,15 @@ input and output datums differ (e.g. change of reference frame).
|
|
|
180
179
|
Added in version 7.0.0.
|
|
181
180
|
|
|
182
181
|
.sp
|
|
183
|
-
If the \
|
|
184
|
-
cct will attempt to use remote grids stored on CDN (Content
|
|
182
|
+
If the \fI\%PROJ_NETWORK\fP environment variable is set to \fBON\fP,
|
|
183
|
+
\fI\%cct\fP will attempt to use remote grids stored on CDN (Content
|
|
185
184
|
Delivery Network) storage, when they are not available locally.
|
|
186
185
|
.sp
|
|
187
|
-
More details are available in the Network capabilities
|
|
186
|
+
More details are available in the \fI\%Network capabilities\fP section.
|
|
188
187
|
.SH EXAMPLES
|
|
189
188
|
.INDENT 0.0
|
|
190
189
|
.IP 1. 3
|
|
191
|
-
The operator specs describe the action to be performed by cct\&. So
|
|
190
|
+
The operator specs describe the action to be performed by \fI\%cct\fP\&. So
|
|
192
191
|
the following script
|
|
193
192
|
.UNINDENT
|
|
194
193
|
.INDENT 0.0
|
|
@@ -211,7 +210,7 @@ echo 12 55 | cct \-z0 \-t0 +proj=utm +zone=32 +ellps=GRS80
|
|
|
211
210
|
.UNINDENT
|
|
212
211
|
.UNINDENT
|
|
213
212
|
.sp
|
|
214
|
-
Should give results comparable to the classic proj
|
|
213
|
+
Should give results comparable to the classic \fI\%proj\fP command
|
|
215
214
|
.INDENT 0.0
|
|
216
215
|
.INDENT 3.5
|
|
217
216
|
.sp
|
|
@@ -311,7 +310,7 @@ $ echo 3541657.3778 948984.2343 5201383.5231 2020.5 | cct \(dqITRF2014 to ETRF20
|
|
|
311
310
|
.UNINDENT
|
|
312
311
|
.SH BACKGROUND
|
|
313
312
|
.sp
|
|
314
|
-
cct also refers to Carl Christian Tscherning (1942\-\-2014),
|
|
313
|
+
\fI\%cct\fP also refers to Carl Christian Tscherning (1942\-\-2014),
|
|
315
314
|
professor of Geodesy at the University of Copenhagen, mentor and advisor
|
|
316
315
|
for a generation of Danish geodesists, colleague and collaborator for
|
|
317
316
|
two generations of global geodesists, Secretary General for the
|
|
@@ -332,19 +331,20 @@ modest Unix style transformation filter, hinting at the tireless aspect
|
|
|
332
331
|
of his personality, which was certainly one of the reasons he accomplished
|
|
333
332
|
so much, and meant so much to so many people.
|
|
334
333
|
.sp
|
|
335
|
-
Hence, in honour of \fIcct\fP (the geodesist) this is cct (the program).
|
|
334
|
+
Hence, in honour of \fIcct\fP (the geodesist) this is \fI\%cct\fP (the program).
|
|
336
335
|
.SH SEE ALSO
|
|
337
336
|
.sp
|
|
338
337
|
\fBproj(1)\fP, \fBcs2cs(1)\fP, \fBgeod(1)\fP, \fBgie(1)\fP, \fBprojinfo(1)\fP, \fBprojsync(1)\fP
|
|
339
338
|
.SH BUGS
|
|
340
339
|
.sp
|
|
341
|
-
A list of known bugs can be found at
|
|
340
|
+
A list of known bugs can be found at \X'tty: link https://github.com/OSGeo/PROJ/issues'\fI\%https://github.com/OSGeo/PROJ/issues\fP\X'tty: link'
|
|
342
341
|
where new bug reports can be submitted to.
|
|
343
342
|
.SH HOME PAGE
|
|
344
343
|
.sp
|
|
345
|
-
|
|
346
|
-
.SH
|
|
344
|
+
\X'tty: link https://proj.org/'\fI\%https://proj.org/\fP\X'tty: link'
|
|
345
|
+
.SH AUTHOR
|
|
347
346
|
Thomas Knudsen
|
|
348
|
-
.SH
|
|
347
|
+
.SH COPYRIGHT
|
|
349
348
|
1983-2026, PROJ contributors
|
|
350
|
-
.\"
|
|
349
|
+
.\" Generated by docutils manpage writer.
|
|
350
|
+
.
|