diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-03-10 12:16:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-10 12:16:08 +0100 |
| commit | 4b606565b9e139600b20733084aedd46084146ff (patch) | |
| tree | 376011539440adbcae92f3b6b0263832cfc2f8d0 | |
| parent | 13782b19974ed8c99a8176692e688512c96e8481 (diff) | |
| parent | 746c8aa17a4d0e2cda1933b4c0bd79d494089f46 (diff) | |
| download | PROJ-4b606565b9e139600b20733084aedd46084146ff.tar.gz PROJ-4b606565b9e139600b20733084aedd46084146ff.zip | |
Merge pull request #2040 from rouault/esri_map_Transverse_Mercator_Complex
Map ESRI Transverse_Mercator_Complex to Transverse Mercator
| -rw-r--r-- | include/proj/internal/esri_projection_mappings.hpp | 16 | ||||
| -rw-r--r-- | scripts/build_esri_projection_mapping.py | 10 | ||||
| -rw-r--r-- | test/unit/test_io.cpp | 15 |
3 files changed, 40 insertions, 1 deletions
diff --git a/include/proj/internal/esri_projection_mappings.hpp b/include/proj/internal/esri_projection_mappings.hpp index 1fd3788c..bd1ccff9 100644 --- a/include/proj/internal/esri_projection_mappings.hpp +++ b/include/proj/internal/esri_projection_mappings.hpp @@ -114,6 +114,19 @@ static const ESRIParamMapping paramsESRI_Transverse_Mercator[] = { EPSG_CODE_PARAMETER_LATITUDE_OF_NATURAL_ORIGIN, "0.0", false}, {nullptr, nullptr, 0, "0.0", false}}; +static const ESRIParamMapping paramsESRI_Transverse_Mercator_Complex[] = { + {"False_Easting", EPSG_NAME_PARAMETER_FALSE_EASTING, + EPSG_CODE_PARAMETER_FALSE_EASTING, "0.0", false}, + {"False_Northing", EPSG_NAME_PARAMETER_FALSE_NORTHING, + EPSG_CODE_PARAMETER_FALSE_NORTHING, "0.0", false}, + {"Central_Meridian", EPSG_NAME_PARAMETER_LONGITUDE_OF_NATURAL_ORIGIN, + EPSG_CODE_PARAMETER_LONGITUDE_OF_NATURAL_ORIGIN, "0.0", false}, + {"Scale_Factor", EPSG_NAME_PARAMETER_SCALE_FACTOR_AT_NATURAL_ORIGIN, + EPSG_CODE_PARAMETER_SCALE_FACTOR_AT_NATURAL_ORIGIN, "0.0", false}, + {"Latitude_Of_Origin", EPSG_NAME_PARAMETER_LATITUDE_OF_NATURAL_ORIGIN, + EPSG_CODE_PARAMETER_LATITUDE_OF_NATURAL_ORIGIN, "0.0", false}, + {nullptr, nullptr, 0, "0.0", false}}; + static const ESRIParamMapping paramsESRI_Albers[] = { {"False_Easting", EPSG_NAME_PARAMETER_EASTING_FALSE_ORIGIN, EPSG_CODE_PARAMETER_EASTING_FALSE_ORIGIN, "0.0", false}, @@ -901,6 +914,9 @@ static const ESRIMethodMapping esriMappings[] = { EPSG_CODE_METHOD_TRANSVERSE_MERCATOR, paramsESRI_Gauss_Kruger}, {"Transverse_Mercator", EPSG_NAME_METHOD_TRANSVERSE_MERCATOR, EPSG_CODE_METHOD_TRANSVERSE_MERCATOR, paramsESRI_Transverse_Mercator}, + {"Transverse_Mercator_Complex", EPSG_NAME_METHOD_TRANSVERSE_MERCATOR, + EPSG_CODE_METHOD_TRANSVERSE_MERCATOR, + paramsESRI_Transverse_Mercator_Complex}, {"Albers", EPSG_NAME_METHOD_ALBERS_EQUAL_AREA, EPSG_CODE_METHOD_ALBERS_EQUAL_AREA, paramsESRI_Albers}, {"Sinusoidal", PROJ_WKT2_NAME_METHOD_SINUSOIDAL, 0, paramsESRI_Sinusoidal}, diff --git a/scripts/build_esri_projection_mapping.py b/scripts/build_esri_projection_mapping.py index 43b6a1ab..1fcc8008 100644 --- a/scripts/build_esri_projection_mapping.py +++ b/scripts/build_esri_projection_mapping.py @@ -86,6 +86,15 @@ config_str = """ - Scale_Factor: EPSG_NAME_PARAMETER_SCALE_FACTOR_AT_NATURAL_ORIGIN - Latitude_Of_Origin: EPSG_NAME_PARAMETER_LATITUDE_OF_NATURAL_ORIGIN +- Transverse_Mercator_Complex: # This is likely PROJ etmerc method + WKT2_name: EPSG_NAME_METHOD_TRANSVERSE_MERCATOR + Params: + - False_Easting: EPSG_NAME_PARAMETER_FALSE_EASTING + - False_Northing: EPSG_NAME_PARAMETER_FALSE_NORTHING + - Central_Meridian: EPSG_NAME_PARAMETER_LONGITUDE_OF_NATURAL_ORIGIN + - Scale_Factor: EPSG_NAME_PARAMETER_SCALE_FACTOR_AT_NATURAL_ORIGIN + - Latitude_Of_Origin: EPSG_NAME_PARAMETER_LATITUDE_OF_NATURAL_ORIGIN + - Albers: WKT2_name: EPSG_NAME_METHOD_ALBERS_EQUAL_AREA Params: @@ -680,7 +689,6 @@ config_str = """ # Fuller # Berghaus_Star # Cube -# Transverse_Mercator_Complex # Robinson_ARC_INFO # Local # Equidistant_Cylindrical_Auxiliary_Sphere diff --git a/test/unit/test_io.cpp b/test/unit/test_io.cpp index 767c39e9..8a2d1ad7 100644 --- a/test/unit/test_io.cpp +++ b/test/unit/test_io.cpp @@ -4344,6 +4344,21 @@ static const struct { {"False northing", 2}, }}, + {"Transverse_Mercator_Complex", + {{"False_Easting", 1}, + {"False_Northing", 2}, + {"Central_Meridian", 3}, + {"Scale_Factor", 4}, + {"Latitude_Of_Origin", 5}}, + "Transverse Mercator", + { + {"Latitude of natural origin", 5}, + {"Longitude of natural origin", 3}, + {"Scale factor at natural origin", 4}, + {"False easting", 1}, + {"False northing", 2}, + }}, + {"Albers", {{"False_Easting", 1}, {"False_Northing", 2}, |