Skip to content

Commit 402fb02

Browse files
jwteaguejwteague
committed
Ticket not ready for deployment with 1.223.x`
Revert "CMR-9025 Adding in changed grid schema and example record. (#1887)" This reverts commit 79542b5.
1 parent 68475f4 commit 402fb02

File tree

2 files changed

+32
-36
lines changed

2 files changed

+32
-36
lines changed

‎schemas/resources/schemas/grid/v0.0.1/metadata.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"GridDefinition": {
1212
"CoordinateReferenceSystemID": {
1313
"Type": "EPSG",
14-
"Code": "EPSG:4326",
14+
"Code": "EPSG:4326",
1515
"Title": "WGS84 - World Geodetic System 1984, used in GPS - EPSG:4326",
1616
"URL": "https://epsg.io/4326"
1717
},
@@ -33,25 +33,25 @@
3333
"SouthBoundingCoordinate": -90.0,
3434
"WestBoundingCoordinate": 90.0,
3535
"SpatialResolution": {
36-
"Unit": "Degree",
37-
"LongitudeResolution": "359.009",
38-
"LatitudeResolution": "89.1"
36+
"Unit": "Meter",
37+
"LongitudeResolution": "10.0001",
38+
"LatitudeResolution": "14.0001"
3939
}
4040
},
4141
"DimensionScale": {
42-
"0_360_DegreeProjection": true,
42+
"0_360_DegreeProjection": false,
4343
"X":
4444
{
45-
"Minimum": "-359-00-00.009",
46-
"Maximum": "359-00-00.009",
47-
"Unit": "Degrees-Minutes-Seconds",
45+
"Minimum": 98.0330,
46+
"Maximum": 98.0330,
47+
"Unit": "Meter",
4848
"Resolution": 0.125
4949
},
5050
"Y":
5151
{
52-
"Minimum": "-89-00-00.1",
53-
"Maximum": "89-00-00.1",
54-
"Unit": "Degrees-Minutes-Seconds",
52+
"Minimum": 98.0330,
53+
"Maximum": 98.0330,
54+
"Unit": "Meter",
5555
"Resolution": 0.5
5656
},
5757
"Time":
@@ -115,4 +115,4 @@
115115
"Description": "Sample",
116116
"DataType": "STRING"
117117
}
118-
}
118+
}

‎schemas/resources/schemas/grid/v0.0.1/schema.json

+20-24
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198
"type": "string",
199199
"minLength": 1,
200200
"maxLength": 1024
201-
}
201+
}
202202
}
203203
}
204204
},
@@ -671,24 +671,20 @@
671671

672672

673673
"DimensionScaleDegreeMinMaxTrueConditionX": {
674-
"$comment": "Checks if the DimensionScale's Unit element value is Degree then sets the minimum and maximum values for Minimum and Maximum sub-elements for X.",
675-
"if": {"properties": {"0_360_DegreeProjection": {"const": true},
676-
"X": {"properties": {"Unit": {"const": "Degree"}}}}},
677-
"then": {"properties": {"X": {"properties": {"Minimum": {"minimum": 0, "maximum": 360},
678-
"Maximum": {"minimum": 0, "maximum": 360}}}}},
679-
"else": {"properties": {"X": {"properties": {"Minimum": {"minimum": -180, "maximum": 180},
680-
"Maximum": {"minimum": -180, "maximum": 180}}}}}
674+
"$comment": "Checks if the DimensionScale's Unit element value is Degree then sets the minimum and maximum values for Minimum and Maximum sub-elements for X.",
675+
"if": {"properties": {"X": {"properties": {"Unit": {"const": "Degree"},
676+
"0_360_DegreeProjection": {"const": true}}}}},
677+
"then": {"properties": {"X": {"properties": {"Minimum": {"minimum": 0, "maximum": 360},
678+
"Maximum": {"minimum": 0, "maximum": 360}}}}}
681679
},
682680

683681

684682
"DimensionScaleDegreeMinMaxTrueConditionY": {
685-
"$comment": "Checks if the DimensionScale's Unit element value is Degree then sets the minimum and maximum values for Minimum and Maximum sub-elements for X.",
686-
"if": {"properties": {"0_360_DegreeProjection": {"const": true},
687-
"Y": {"properties": {"Unit": {"const": "Degree"}}}}},
688-
"then": {"properties": {"Y": {"properties": {"Minimum": {"minimum": -90, "maximum": 360},
689-
"Maximum": {"minimum": -90, "maximum": 360}}}}},
690-
"else": {"properties": {"Y": {"properties": {"Minimum": {"minimum": -90, "maximum": 90},
691-
"Maximum": {"minimum": -90, "maximum": 90}}}}}
683+
"$comment": "Checks if the DimensionScale's Unit element value is Degree then sets the minimum and maximum values for Minimum and Maximum sub-elements for Y.",
684+
"if": {"properties": {"Y": {"properties": {"Unit": {"const": "Degree"},
685+
"0_360_DegreeProjection": {"const": true}}}}},
686+
"then": {"properties": {"Y": {"properties": {"Minimum": {"minimum": 0, "maximum": 360},
687+
"Maximum": {"minimum": 0, "maximum": 360}}}}}
692688
},
693689

694690
"DimensionScaleHourMinMaxPatternConditionTime": {
@@ -737,22 +733,22 @@
737733
"DimensionScaleXUnitPatternDMS": {
738734
"$comment": "Checks the DimensionScale's Unit element values pattern for Degrees-Minutes-Seconds. The value's format ##-##-##.### and Milliseconds are optional.",
739735
"if": {"properties": {"X": {"properties": {"Unit": {"enum": ["Degrees-Minutes-Seconds"]}}}}},
740-
"then": {"properties": {"X": {"properties": {"Minimum": {"pattern": "^-?(360-00-00\\.?[0]*)$|-?(3[0-5][0-9]-[0-9]{2}-[0-9]{2}\\.?\\d*)$|[0-2][0-9][0-9]-[0-9]{2}-[0-9]{2}\\.?\\d*?$"},
741-
"Maximum": {"pattern": "^-?(360-00-00\\.?[0]*)$|-?(3[0-5][0-9]-[0-9]{2}-[0-9]{2}\\.?\\d*)$|[0-2][0-9][0-9]-[0-9]{2}-[0-9]{2}\\.?\\d*?$"}}}}}
736+
"then": {"properties": {"X": {"properties": {"Minimum": {"pattern": "^[0-9]{2}-[0-9]{2}-[0-9]{2}\\.?\\d*?$"},
737+
"Maximum": {"pattern": "^[0-9]{2}-[0-9]{2}-[0-9]{2}\\.?\\d*?$"}}}}}
742738
},
743739

744740
"DimensionScaleYUnitPatternDMS": {
745741
"$comment": "Checks the DimensionScale's Unit element values pattern for Degrees-Minutes-Seconds. The value's format ##-##-##.### and Milliseconds are optional.",
746742
"if": {"properties": {"Y": {"properties": {"Unit": {"enum": ["Degrees-Minutes-Seconds"]}}}}},
747-
"then": {"properties": {"Y": {"properties": {"Minimum": {"pattern": "^-?(90-00-00\\.?[0]*)$|[0-8][0-9]-[0-9]{2}-[0-9]{2}\\.?\\d*?$"},
748-
"Maximum": {"pattern": "^-?(90-00-00\\.?[0]*)$|[0-8][0-9]-[0-9]{2}-[0-9]{2}\\.?\\d*?$"}}}}}
743+
"then": {"properties": {"Y": {"properties": {"Minimum": {"pattern": "^[0-9]{2}-[0-9]{2}-[0-9]{2}\\.?\\d*?$"},
744+
"Maximum": {"pattern": "^[0-9]{2}-[0-9]{2}-[0-9]{2}\\.?\\d*?$"}}}}}
749745
},
750746

751747
"SpatialResolutionUnitPatternDMS": {
752748
"$comment": "Checks the SpatialResolution Unit element values pattern for Degrees-Minutes-Seconds. The value's format ##-##-##.### and Milliseconds are optional.",
753749
"if": {"properties": {"Unit": {"const": "Degrees-Minutes-Seconds"}}},
754-
"then": {"properties": {"LongitudeResolution": {"pattern": "^-?(360-00-00\\.?[0]*)$|-?(3[0-5][0-9]-[0-9]{2}-[0-9]{2}\\.?\\d*)$|[0-2][0-9][0-9]-[0-9]{2}-[0-9]{2}\\.?\\d*?$"},
755-
"LatitudeResolution": {"pattern": "^-?(90-00-00\\.?[0]*)$|[0-8][0-9]-[0-9]{2}-[0-9]{2}\\.?\\d*?$"}}}
750+
"then": {"properties": {"LongitudeResolution": {"pattern": "^[0-9]{2}-[0-9]{2}-[0-9]{2}\\.?\\d*?$"},
751+
"LatitudeResolution": {"pattern": "^[0-9]{2}-[0-9]{2}-[0-9]{2}\\.?\\d*?$"}}}
756752
},
757753

758754
"SpatialResolutionUnitPatternMinute": {
@@ -772,8 +768,8 @@
772768
"SpatialResolutionUnitPatternDeg": {
773769
"$comment": "Checks the SpatialResolution Unit element values pattern for Degrees.",
774770
"if": {"properties": {"Unit": {"const": "Degree"}}},
775-
"then": {"properties": {"LongitudeResolution": {"pattern": "^-?(360\\.?[0]*$|-?3[0-5][0-9]\\.?\\d*$|-?[0-2]{0,}[0-9]{0,}[0-9]{1,}\\.?\\d*$)"},
776-
"LatitudeResolution": {"pattern": "^-?(90\\.?[0]*$|-?[0-8][0-9])\\.?\\d*?$"}}}
771+
"then": {"properties": {"LongitudeResolution": {"pattern": "^(360|3[0-5][0-9]|[12][0-9]{1,2}|[1-9][0-9]|[0-9])\\.?\\d*?$"},
772+
"LatitudeResolution": {"pattern": "^(180|1[0-7][0-9]|[1-9][0-9]|[0-9])\\.?\\d*?$"}}}
777773
},
778774

779775
"SpatialResolutionUnitPatternKM": {
@@ -813,4 +809,4 @@
813809
"if": {"properties": {"X": {"properties": {"Unit": {"const": "Degree"}}}}},
814810
"then": {"properties": {"Y": {"properties": {"Unit": {"const": "Degree"}}}}}}
815811
}
816-
}
812+
}

0 commit comments

Comments
 (0)