diff options
| author | Nyall Dawson <nyall.dawson@gmail.com> | 2020-02-24 08:40:43 +1000 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2020-02-24 12:43:00 +0100 |
| commit | 004116f53a9f2e2afde9ffcfdadcbe1d1f4df2ac (patch) | |
| tree | 899c600d4526e4c43a5a7a62cbb9960f9d0aff50 /include | |
| parent | 25f8c03774bd639af9e07f616211caada9d307f0 (diff) | |
| download | PROJ-004116f53a9f2e2afde9ffcfdadcbe1d1f4df2ac.tar.gz PROJ-004116f53a9f2e2afde9ffcfdadcbe1d1f4df2ac.zip | |
Fix mapping of Vertical_Near_Side_Perspective (fixes #1965)
Diffstat (limited to 'include')
| -rw-r--r-- | include/proj/internal/coordinateoperation_constants.hpp | 5 | ||||
| -rw-r--r-- | include/proj/internal/esri_projection_mappings.hpp | 15 |
2 files changed, 10 insertions, 10 deletions
diff --git a/include/proj/internal/coordinateoperation_constants.hpp b/include/proj/internal/coordinateoperation_constants.hpp index bc8f1208..00434418 100644 --- a/include/proj/internal/coordinateoperation_constants.hpp +++ b/include/proj/internal/coordinateoperation_constants.hpp @@ -513,7 +513,7 @@ static const ParamMapping paramViewpointHeight = { static const ParamMapping *const paramsVerticalPerspective[] = { ¶mLatTopoOrigin, ¶mLonTopoOrigin, - ¶mHeightTopoOrigin, + ¶mHeightTopoOrigin, // unsupported by PROJ right now ¶mViewpointHeight, ¶mFalseEasting, // PROJ addition ¶mFalseNorthing, // PROJ addition @@ -747,9 +747,6 @@ static const MethodMapping projectionMethodMappings[] = { {PROJ_WKT2_NAME_METHOD_VAN_DER_GRINTEN, 0, "VanDerGrinten", "vandg", "R_A", paramsLonNatOrigin}, - {PROJ_WKT2_NAME_METHOD_VERTICAL_NEAR_SIDE_PERSPECTIVE, 0, - "Vertical_Near_Side_Perspective", "nsper", nullptr, paramsLonNatOrigin}, - {PROJ_WKT2_NAME_METHOD_WAGNER_I, 0, "Wagner_I", "wag1", nullptr, paramsLonNatOrigin}, diff --git a/include/proj/internal/esri_projection_mappings.hpp b/include/proj/internal/esri_projection_mappings.hpp index b916e0c2..707f9c47 100644 --- a/include/proj/internal/esri_projection_mappings.hpp +++ b/include/proj/internal/esri_projection_mappings.hpp @@ -630,8 +630,12 @@ static const ESRIParamMapping paramsESRI_Vertical_Near_Side_Perspective[] = { EPSG_CODE_PARAMETER_FALSE_EASTING, 0.0}, {"False_Northing", EPSG_NAME_PARAMETER_FALSE_NORTHING, EPSG_CODE_PARAMETER_FALSE_NORTHING, 0.0}, - {"Central_Meridian", EPSG_NAME_PARAMETER_LONGITUDE_OF_NATURAL_ORIGIN, - EPSG_CODE_PARAMETER_LONGITUDE_OF_NATURAL_ORIGIN, 0.0}, + {"Longitude_Of_Center", EPSG_NAME_PARAMETER_LONGITUDE_TOPOGRAPHIC_ORIGIN, + EPSG_CODE_PARAMETER_LONGITUDE_TOPOGRAPHIC_ORIGIN, 0.0}, + {"Latitude_Of_Center", EPSG_NAME_PARAMETER_LATITUDE_TOPOGRAPHIC_ORIGIN, + EPSG_CODE_PARAMETER_LATITUDE_TOPOGRAPHIC_ORIGIN, 0.0}, + {"Height", EPSG_NAME_PARAMETER_VIEWPOINT_HEIGHT, + EPSG_CODE_PARAMETER_VIEWPOINT_HEIGHT, 0.0}, {nullptr, nullptr, 0, 0.0}}; static const ESRIParamMapping paramsESRI_Stereographic_North_Pole[] = { @@ -924,8 +928,8 @@ static const ESRIMethodMapping esriMappings[] = { {"Craster_Parabolic", "Craster Parabolic", 0, paramsESRI_Craster_Parabolic}, {"Gnomonic", PROJ_WKT2_NAME_METHOD_GNOMONIC, 0, paramsESRI_Gnomonic}, {"Times", PROJ_WKT2_NAME_METHOD_TIMES, 0, paramsESRI_Times}, - {"Vertical_Near_Side_Perspective", - PROJ_WKT2_NAME_METHOD_VERTICAL_NEAR_SIDE_PERSPECTIVE, 0, + {"Vertical_Near_Side_Perspective", EPSG_NAME_METHOD_VERTICAL_PERSPECTIVE, + EPSG_CODE_METHOD_VERTICAL_PERSPECTIVE, paramsESRI_Vertical_Near_Side_Perspective}, {"Stereographic_North_Pole", EPSG_NAME_METHOD_POLAR_STEREOGRAPHIC_VARIANT_B, EPSG_CODE_METHOD_POLAR_STEREOGRAPHIC_VARIANT_B, @@ -972,8 +976,7 @@ static const ESRIMethodMapping esriMappings[] = { // --------------------------------------------------------------------------- -// end of anonymous namespace -} // namespace +} // namespace { //! @endcond |