From f757daf3bdf291d04ef5caf095da548dcf4d353b Mon Sep 17 00:00:00 2001 From: Martin Desruisseaux Date: Fri, 22 Sep 2023 16:46:21 +0200 Subject: [PATCH] Move the requirement about map projection parameters from `ProjMethodGeoKey` to `ProjectionGeoKey`. Also rename `ProjectionMethodGeoKey` as `ProjMethodGeoKey` (seems to be a typo). --- .../Projection_Definition_GeoKeys/TEST_ProjectionGeoKey.adoc | 3 ++- .../abstract_tests/Requirements_Trace_Matrix.adoc | 3 +-- .../requirements_class_ProjMethodGeoKey.adoc | 2 +- .../requirements_class_ProjectionGeoKey.adoc | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/GeoTIFF_Standard/Detailed Test Suite/abstract_tests/Projection_Definition_GeoKeys/TEST_ProjectionGeoKey.adoc b/GeoTIFF_Standard/Detailed Test Suite/abstract_tests/Projection_Definition_GeoKeys/TEST_ProjectionGeoKey.adoc index e0206b5f..e841cda8 100644 --- a/GeoTIFF_Standard/Detailed Test Suite/abstract_tests/Projection_Definition_GeoKeys/TEST_ProjectionGeoKey.adoc +++ b/GeoTIFF_Standard/Detailed Test Suite/abstract_tests/Projection_Definition_GeoKeys/TEST_ProjectionGeoKey.adoc @@ -37,6 +37,7 @@ A value of 32767 is valid (User-defined) - IF value = 32767 THEN verify that there is a ProjectedCitationGeoKey (GeoKey 3073), ProjectionMethodGeoKey (GeoKey 3075) and ProjLinearUnitsGeoKey (GeoKey 3076) in the GeoTIFF file. + IF value = 32767 THEN verify that there is a ProjectedCitationGeoKey (GeoKey 3073), ProjMethodGeoKey (GeoKey 3075), ProjLinearUnitsGeoKey (GeoKey 3076) + and keys for each map projection parameter (coordinate operation parameter) appropriate to that method in the GeoTIFF file. Values of 32768 through 65535 are valid (private) diff --git a/GeoTIFF_Standard/Detailed Test Suite/abstract_tests/Requirements_Trace_Matrix.adoc b/GeoTIFF_Standard/Detailed Test Suite/abstract_tests/Requirements_Trace_Matrix.adoc index 9bee5919..4e76d41a 100644 --- a/GeoTIFF_Standard/Detailed Test Suite/abstract_tests/Requirements_Trace_Matrix.adoc +++ b/GeoTIFF_Standard/Detailed Test Suite/abstract_tests/Requirements_Trace_Matrix.adoc @@ -184,14 +184,13 @@ | The ProjectionGeoKey SHALL have type = SHORT |TIFF_Test/ShortParameters, Projection_Definition_GeoKey/ProjectionGeoKey | ProjectionGeoKey values in the range 1-1023 SHALL be reserved |Projection_Definition_GeoKey/ProjectionGeoKey | ProjectionGeoKey values in the range 1024-32766 SHALL be valid EPSG map projection (coordinate operation) codes |Projection_Definition_GeoKey/ProjectionGeoKey -| If the ProjectionGeoKey value is 32767 (User-Defined) then the ProjectedCitationGeoKey, ProjectionMethodGeoKey, and ProjLinearUnitsGeoKey SHALL be populated |Projection_Definition_GeoKey/ProjectionGeoKey +| If the ProjectionGeoKey value is 32767 (User-Defined) then the ProjectedCitationGeoKey, ProjMethodGeoKey, ProjLinearUnitsGeoKey and keys for each map projection parameter (coordinate operation parameter) appropriate to that method SHALL be populated |Projection_Definition_GeoKey/ProjectionGeoKey | ProjectionGeoKey values in the range 32768-65535 SHALL be private |Projection_Definition_GeoKey/ProjectionGeoKey ^| *requirements_class_ProjMethodGeoKey* | | The ProjMethodGeoKey SHALL have ID = 3075 |TIFF_Test/ShortParameters, Projection_Definition_GeoKey/ProjMethodGeoKey | The ProjMethodGeoKey SHALL have type = SHORT |TIFF_Test/ShortParameters, Projection_Definition_GeoKey/ProjMethodGeoKey | ProjMethodGeoKey values in the range 1-27 SHALL be GeoTIFF map projection method codes |Projection_Definition_GeoKey/ProjMethodGeoKey | ProjMethodGeoKey values in the range 28-32766 SHALL be reserved |Projection_Definition_GeoKey/ProjMethodGeoKey -| If the ProjectionMethodGeoKey value is 32767 (User-Defined) then the ProjectedCitationGeoKey and keys for each map projection parameter (coordinate operation parameter) appropriate to that method SHALL be populated. |Projection_Definition_GeoKey/ProjMethodGeoKey | ProjMethodGeoKey values in the range 32768-65535 SHALL be private |Projection_Definition_GeoKey/ProjMethodGeoKey ^| *requirements_class_ProjAngularParameters* | | The ProjStdParallel1GeoKey SHALL have ID = 3078 |TIFF_Test/DoubleParameters, Projection_Definition_GeoKeys/ProjAngularParameters diff --git a/GeoTIFF_Standard/standard/requirements/Projection_Definition_Keys/requirements_class_ProjMethodGeoKey.adoc b/GeoTIFF_Standard/standard/requirements/Projection_Definition_Keys/requirements_class_ProjMethodGeoKey.adoc index b6997c45..5bf69097 100644 --- a/GeoTIFF_Standard/standard/requirements/Projection_Definition_Keys/requirements_class_ProjMethodGeoKey.adoc +++ b/GeoTIFF_Standard/standard/requirements/Projection_Definition_Keys/requirements_class_ProjMethodGeoKey.adoc @@ -28,7 +28,7 @@ _ProjMethodGeoKey values in the range 28-32766 SHALL be reserved_ |Requirement 27.5 {set:cellbgcolor:#CACCCE} |http://www.opengis.net/spec/GeoTIFF/1.1/req/ProjMethodGeoKey.userdefined + -_If the ProjectionMethodGeoKey value is 32767 (User-Defined) then the ProjectedCitationGeoKey and keys for each map projection parameter (coordinate operation parameter) appropriate to that method SHALL be populated._ +_The ProjMethodGeoKey value SHOULD not be 32767 (User-Defined)._ {set:cellbgcolor:#FFFFFF} |Requirement 27.6 {set:cellbgcolor:#CACCCE} diff --git a/GeoTIFF_Standard/standard/requirements/Projection_Definition_Keys/requirements_class_ProjectionGeoKey.adoc b/GeoTIFF_Standard/standard/requirements/Projection_Definition_Keys/requirements_class_ProjectionGeoKey.adoc index 7c7cd9fd..73215d37 100644 --- a/GeoTIFF_Standard/standard/requirements/Projection_Definition_Keys/requirements_class_ProjectionGeoKey.adoc +++ b/GeoTIFF_Standard/standard/requirements/Projection_Definition_Keys/requirements_class_ProjectionGeoKey.adoc @@ -28,7 +28,8 @@ NOTE: In GeoTIFF v1.0 the range was 10000-19999. Several values in this range ha |Requirement 26.5 {set:cellbgcolor:#CACCCE} |http://www.opengis.net/spec/GeoTIFF/1.1/req/ProjectionGeoKey.userdefined + -_If the ProjectionGeoKey value is 32767 (User-Defined) then the ProjectedCitationGeoKey, ProjectionMethodGeoKey, and ProjLinearUnitsGeoKey SHALL be populated_ +_If the ProjectionGeoKey value is 32767 (User-Defined) then the ProjectedCitationGeoKey, ProjMethodGeoKey, ProjLinearUnitsGeoKey +and keys for each map projection parameter (coordinate operation parameter) appropriate to that method SHALL be populated._ {set:cellbgcolor:#FFFFFF} |Requirement 26.6 {set:cellbgcolor:#CACCCE}