Update collectionsCRS84 to allow identification of CRS84 through HTTP…

… URI Fixes #100
opengeospatial · May 23, 2022 · 3a0dbdd · 3a0dbdd
1 parent 6bba360
commit 3a0dbdd
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/src/main/java/org/opengis/cite/ogcapiedr10/queries/AreaQueryProcessor.java b/src/main/java/org/opengis/cite/ogcapiedr10/queries/AreaQueryProcessor.java
@@ -73,8 +73,7 @@ public String validateAreaQueryUsingParameters(Set<String> collectionIds, String
                     if (crsList.get(q).equals("CRS:84") || 
                     		crsList.get(q).equals("CRS84") || 
                     		crsList.get(q).equals("EPSG:4326") || 
-                    		crsList.get(q).equals("http://www.opengis.net/def/crs/OGC/1.3/CRS84") || 
-                    		crsList.get(q).equals("https://www.opengis.net/def/crs/OGC/1.3/CRS84")) {
+                    		crsList.get(q).contains("www.opengis.net/def/crs/OGC/1.3/CRS84")) {
                         supportedCRS = crsList.get(q);
                     }
                 }

diff --git a/src/main/java/org/opengis/cite/ogcapiedr10/queries/CorridorQueryProcessor.java b/src/main/java/org/opengis/cite/ogcapiedr10/queries/CorridorQueryProcessor.java
@@ -81,8 +81,7 @@ public String validateCorridorQueryUsingParameters(Set<String> collectionIds, St
                     if (crsList.get(q).equals("CRS:84") || 
                     		crsList.get(q).equals("CRS84") || 
                     		crsList.get(q).equals("EPSG:4326") || 
-                    		crsList.get(q).equals("http://www.opengis.net/def/crs/OGC/1.3/CRS84") || 
-                    		crsList.get(q).equals("https://www.opengis.net/def/crs/OGC/1.3/CRS84")) {
+                    		crsList.get(q).contains("www.opengis.net/def/crs/OGC/1.3/CRS84")) {
                         supportedCRS = crsList.get(q);
                     }
                 }

diff --git a/src/main/java/org/opengis/cite/ogcapiedr10/queries/PositionQueryProcessor.java b/src/main/java/org/opengis/cite/ogcapiedr10/queries/PositionQueryProcessor.java
@@ -75,8 +75,7 @@ public String validatePositionQueryUsingParameters(Set<String> collectionIds, St
                     if (crsList.get(q).equals("CRS:84") || 
                     		crsList.get(q).equals("CRS84") || 
                     		crsList.get(q).equals("EPSG:4326") || 
-                    		crsList.get(q).equals("http://www.opengis.net/def/crs/OGC/1.3/CRS84") || 
-                    		crsList.get(q).equals("https://www.opengis.net/def/crs/OGC/1.3/CRS84")) {
+                    		crsList.get(q).contains("www.opengis.net/def/crs/OGC/1.3/CRS84")) {
                         supportedCRS = crsList.get(q);
                     }
                 }

diff --git a/src/main/java/org/opengis/cite/ogcapiedr10/queries/TrajectoryQueryProcessor.java b/src/main/java/org/opengis/cite/ogcapiedr10/queries/TrajectoryQueryProcessor.java
@@ -78,8 +78,7 @@ public String validateTrajectoryQueryUsingParameters(Set<String> collectionIds,
                     if (crsList.get(q).equals("CRS:84") || 
                     		crsList.get(q).equals("CRS84") || 
                     		crsList.get(q).equals("EPSG:4326") || 
-                    		crsList.get(q).equals("http://www.opengis.net/def/crs/OGC/1.3/CRS84") || 
-                    		crsList.get(q).equals("https://www.opengis.net/def/crs/OGC/1.3/CRS84")) {
+                    		crsList.get(q).contains("www.opengis.net/def/crs/OGC/1.3/CRS84")) {
                         supportedCRS = crsList.get(q);
                     }
                 }