Merge branch 'master' into issue#131

opengeospatial · Oct 21, 2024 · 9a625c0 · 9a625c0
2 parents d8e87bb + 70214e6
commit 9a625c0
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 62 deletions.
diff --git a/src/main/java/org/opengis/cite/ogcapiedr10/encodings/edrgeojson/EDRGeoJSONEncoding.java b/src/main/java/org/opengis/cite/ogcapiedr10/encodings/edrgeojson/EDRGeoJSONEncoding.java
@@ -79,7 +79,7 @@ public void validateResponseForEDRGeoJSON(ITestContext testContext) {
                 String supportedFormat = null;
 
                 for (int f = 0; f < outputFormatList.size(); f++) {
-                    if (outputFormatList.get(f).equals("GeoJSON")) {
+                    if (outputFormatList.get(f).equalsIgnoreCase("GeoJSON")) {
                         supportedFormat = outputFormatList.get(f);
                     }
                 }
@@ -228,7 +228,7 @@ else if(bboxEnv.get(0).getClass().toString().contains("java.util.ArrayList")) {
 
                 try {
                     if(supportedFormat!=null && supportedCRS!=null) {
-	                    if(supportedFormat.equals("GeoJSON") && 
+	                    if(supportedFormat.equalsIgnoreCase("GeoJSON") && 
 
 	                    		(supportedCRS.equals("CRS84") || 
 	                    				supportedCRS.equals("CRS:84") || 

diff --git a/src/main/java/org/opengis/cite/ogcapiedr10/encodings/geojson/GeoJSONEncoding.java b/src/main/java/org/opengis/cite/ogcapiedr10/encodings/geojson/GeoJSONEncoding.java
@@ -64,7 +64,7 @@ public void validateResponseForGeoJSON(ITestContext testContext) {
                 ArrayList<String> outputFormatList = (ArrayList<String>) variables.get("output_formats");
                 String supportedFormat = null;
                 for (int f = 0; f < outputFormatList.size(); f++) {
-                    if (outputFormatList.get(f).equals("GeoJSON")) {
+                    if (outputFormatList.get(f).equalsIgnoreCase("GeoJSON")) {
                         supportedFormat = outputFormatList.get(f);
                     }
                 }

diff --git a/src/main/java/org/opengis/cite/ogcapiedr10/queries/AbstractProcessor.java b/src/main/java/org/opengis/cite/ogcapiedr10/queries/AbstractProcessor.java
@@ -3,6 +3,7 @@
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.net.URL;
+import java.util.List;
 
 public abstract class AbstractProcessor {
 
@@ -29,5 +30,27 @@ public String readStringFromURL(String urlString,int limit) throws Exception
 
 	        return response.toString();
 	    }
+
+
+	   int getMaximum(int noOfCollections, int collectionsListSize) {	        
+	        //if noOfCollections is -1 (meaning check box 'Test all collections' was checked)
+	        //use all collections. Otherwise use the specified noOfCollections
+	        int maximum = noOfCollections == -1 ? collectionsListSize : noOfCollections;
+	        maximum = noOfCollections > collectionsListSize ? collectionsListSize : noOfCollections;
+	        return maximum;
+	   }
+
+	   String getSupportedFormat(List<String> outputFormatList) {
+	       String supportedFormat = "";
+               for (int f = 0; f < outputFormatList.size(); f++) {
+                   if (outputFormatList.get(f).equalsIgnoreCase("CoverageJSON") || outputFormatList.get(f).toLowerCase().contains("CoverageJSON".toLowerCase())) {  //preference for CoverageJSON if supported
+                       supportedFormat = outputFormatList.get(f);
+                   }
+                   else if (outputFormatList.get(f).equalsIgnoreCase("GeoJSON")) {
+                       supportedFormat = outputFormatList.get(f);
+                   }
+               }
+               return supportedFormat;
+	   }
 
 }
diff --git a/src/main/java/org/opengis/cite/ogcapiedr10/queries/AreaQueryProcessor.java b/src/main/java/org/opengis/cite/ogcapiedr10/queries/AreaQueryProcessor.java
@@ -16,11 +16,10 @@ public String validateAreaQueryUsingParameters(Set<String> collectionIds, String
         StringBuffer sb = new StringBuffer();
 
         ArrayList<String> collectionsList = new ArrayList<String>();
-        collectionsList.addAll(collectionIds);
-
-        //if noOfCollections is -1 (meaning check box 'Test all collections' was checked)
-        //use all collections. Otherwise use the specified noOfCollections
-        int maximum = noOfCollections == -1 ? collectionsList.size() : noOfCollections;
+        collectionsList.addAll(collectionIds);        
+
+        //fix setting of maximum, see https://github.com/opengeospatial/ets-ogcapi-edr10/issues/133
+        int maximum = getMaximum(noOfCollections, collectionsList.size());
 
         for (int c = 0; c < maximum; c++) {
 
@@ -85,16 +84,8 @@ public String validateAreaQueryUsingParameters(Set<String> collectionIds, String
                 HashMap link = (HashMap) areaQuery.get("link");
                 HashMap variables = (HashMap) link.get("variables");
                 ArrayList<String> outputFormatList = (ArrayList<String>) variables.get("output_formats");
-                String supportedFormat = null;
-                for (int f = 0; f < outputFormatList.size(); f++) {
-                    if (outputFormatList.get(f).equals("CoverageJSON") || outputFormatList.get(f).contains("CoverageJSON")) {  //preference for CoverageJSON if supported
-                        supportedFormat = outputFormatList.get(f);
-                    }
-                    else if (outputFormatList.get(f).equals("GeoJSON")) {
-                        supportedFormat = outputFormatList.get(f);
-                    }
-                }
-
+                String supportedFormat = getSupportedFormat(outputFormatList);
+
                 double medianx = 0d;
                 double mediany = 0d;
                 double lminx = 0d; //lens
@@ -173,8 +164,10 @@ else if(bboxEnv.get(0).getClass().toString().contains("java.util.ArrayList")) {
                 try {
                     sampleParamaterNameSafe = URLEncoder.encode(sampleParamaterName,"UTF8");
                 }
-                catch(Exception ex) {ex.printStackTrace();}
-
+                catch(Exception ex) { 
+                    ex.printStackTrace();
+                    sb.append(ex.getMessage() + " \n");
+                }
 
                 String sampleDateTime = null;
                 if (extent.containsKey("temporal")) {
@@ -236,7 +229,10 @@ else if(intervalEnv.get(0).getClass().toString().contains("java.util.ArrayList")
                     pageContent = readStringFromURL(constructedURL,10);  //you can use Integer.MAX_VALUE for no limit
 
                 }
-                catch(Exception ex) { ex.printStackTrace();}
+                catch(Exception ex) { 
+                    ex.printStackTrace();
+                    sb.append(ex.getMessage() + " \n");
+                }
 
                 if(pageContent!=null) {
 

diff --git a/src/main/java/org/opengis/cite/ogcapiedr10/queries/CorridorQueryProcessor.java b/src/main/java/org/opengis/cite/ogcapiedr10/queries/CorridorQueryProcessor.java
@@ -24,9 +24,8 @@ public String validateCorridorQueryUsingParameters(Set<String> collectionIds, St
 
         int numberOfCollectionsWithCorridorSupport = 0;
 
-        //if noOfCollections is -1 (meaning check box 'Test all collections' was checked)
-        //use all collections. Otherwise use the specified noOfCollections
-        int maximum = noOfCollections == -1 ? collectionsList.size() : noOfCollections;
+        //fix setting of maximum, see https://github.com/opengeospatial/ets-ogcapi-edr10/issues/133
+        int maximum = getMaximum(noOfCollections, collectionsList.size());
 
         for (int c = 0; c < maximum; c++) {
 
@@ -93,15 +92,7 @@ public String validateCorridorQueryUsingParameters(Set<String> collectionIds, St
                 HashMap link = (HashMap) corridorQuery.get("link");
                 HashMap variables = (HashMap) link.get("variables");
                 ArrayList<String> outputFormatList = (ArrayList<String>) variables.get("output_formats");
-                String supportedFormat = null;
-                for (int f = 0; f < outputFormatList.size(); f++) {
-                    if (outputFormatList.get(f).equals("CoverageJSON") || outputFormatList.get(f).contains("CoverageJSON")) {  //preference for CoverageJSON if supported
-                        supportedFormat = outputFormatList.get(f);
-                    }
-                    else if (outputFormatList.get(f).equals("GeoJSON")) {
-                        supportedFormat = outputFormatList.get(f);
-                    }
-                }
+                String supportedFormat = getSupportedFormat(outputFormatList);
 
                 double medianx = 0d;
                 double mediany = 0d;
@@ -236,7 +227,10 @@ else if(intervalEnv.get(0).getClass().toString().contains("java.util.ArrayList")
                     pageContent = readStringFromURL(constructedURL,10);  //you can use Integer.MAX_VALUE for no limit
 
                     }
-                catch(Exception ex) { ex.printStackTrace();}
+                catch(Exception ex) { 
+                    ex.printStackTrace();
+                    sb.append(ex.getMessage() + " \n");
+                }
 
                 if(pageContent!=null) {
 

diff --git a/src/main/java/org/opengis/cite/ogcapiedr10/queries/PositionQueryProcessor.java b/src/main/java/org/opengis/cite/ogcapiedr10/queries/PositionQueryProcessor.java
@@ -14,10 +14,9 @@ public String validatePositionQueryUsingParameters(Set<String> collectionIds, St
         StringBuffer sb = new StringBuffer();
         ArrayList<String> collectionsList = new ArrayList<String>();
         collectionsList.addAll(collectionIds);
-
-        //if noOfCollections is -1 (meaning check box 'Test all collections' was checked)
-        //use all collections. Otherwise use the specified noOfCollections
-        int maximum = noOfCollections == -1 ? collectionsList.size() : noOfCollections;
+
+        //fix setting of maximum, see https://github.com/opengeospatial/ets-ogcapi-edr10/issues/133
+        int maximum = getMaximum(noOfCollections, collectionsList.size());
 
         for (int c = 0; c < maximum; c++) {
 
@@ -87,14 +86,7 @@ public String validatePositionQueryUsingParameters(Set<String> collectionIds, St
                         sb.append(" The variables element is missing from the collection "+collectionId+" .");
                 } else {
                     ArrayList<String> outputFormatList = (ArrayList<String>) variables.get("output_formats");
-                    for (int f = 0; f < outputFormatList.size(); f++) {
-                        if (outputFormatList.get(f).equals("CoverageJSON") || outputFormatList.get(f).contains("CoverageJSON")) {  //preference for CoverageJSON if supported
-                            supportedFormat = outputFormatList.get(f);
-                        }
-                        else if (outputFormatList.get(f).equals("GeoJSON")) {
-                            supportedFormat = outputFormatList.get(f);
-                        }
-                    }
+                    supportedFormat = getSupportedFormat(outputFormatList);
                 }
 
                 double medianx = 0d;
@@ -216,7 +208,11 @@ else if(intervalEnv.get(0).getClass().toString().contains("java.util.ArrayList")
                     pageContent = readStringFromURL(constructedURL,10);  //you can use Integer.MAX_VALUE for no limit
 
                 }
-                catch(Exception ex) {ex.printStackTrace();}
+                catch(Exception ex) {
+                    ex.printStackTrace();
+                    sb.append(ex.getMessage() + " \n");
+                }
+
 
                 if(pageContent!=null) {
 

diff --git a/src/main/java/org/opengis/cite/ogcapiedr10/queries/QueryCollections.java b/src/main/java/org/opengis/cite/ogcapiedr10/queries/QueryCollections.java
@@ -92,6 +92,7 @@ public void validateNoQueryParameters(Object collectionIdentifiers) {
 		//if noOfCollections is -1 (meaning check box 'Test all collections' was checked)
 		//use all collections. Otherwise, use the specified noOfCollections
 		int maximum = this.noOfCollections == -1 ? collectionsList.size() : this.noOfCollections;
+                maximum = this.noOfCollections > collectionsList.size() ? collectionsList.size() : this.noOfCollections;
 
 		for (int c = 0; c < maximum; c++) {
 
@@ -181,6 +182,7 @@ public void validateCoordsQueryParameters(Object collectionIdentifiers) {
 		//if noOfCollections is -1 (meaning check box 'Test all collections' was checked)
 		//use all collections. Otherwise, use the specified noOfCollections
 		int maximum = this.noOfCollections == -1 ? collectionsList.size() : this.noOfCollections;
+                maximum = this.noOfCollections > collectionsList.size() ? collectionsList.size() : this.noOfCollections;
 
 		for (int c = 0; c < maximum; c++) {
 

diff --git a/src/main/java/org/opengis/cite/ogcapiedr10/queries/TrajectoryQueryProcessor.java b/src/main/java/org/opengis/cite/ogcapiedr10/queries/TrajectoryQueryProcessor.java
@@ -21,9 +21,8 @@ public String validateTrajectoryQueryUsingParameters(Set<String> collectionIds,
 
         int numberOfCollectionsWithTrajectorySupport = 0;
 
-        //if noOfCollections is -1 (meaning check box 'Test all collections' was checked)
-        //use all collections. Otherwise use the specified noOfCollections
-        int maximum = noOfCollections == -1 ? collectionsList.size() : noOfCollections;
+        //fix setting of maximum, see https://github.com/opengeospatial/ets-ogcapi-edr10/issues/133
+        int maximum = getMaximum(noOfCollections, collectionsList.size());
 
         for (int c = 0; c <maximum; c++) {
 
@@ -88,15 +87,7 @@ public String validateTrajectoryQueryUsingParameters(Set<String> collectionIds,
                 HashMap link = (HashMap) trajectoryQuery.get("link");
                 HashMap variables = (HashMap) link.get("variables");
                 ArrayList<String> outputFormatList = (ArrayList<String>) variables.get("output_formats");
-                String supportedFormat = null;
-                for (int f = 0; f < outputFormatList.size(); f++) {
-                    if (outputFormatList.get(f).equals("CoverageJSON") || outputFormatList.get(f).contains("CoverageJSON")) {  //preference for CoverageJSON if supported
-                        supportedFormat = outputFormatList.get(f);
-                    }
-                    else if (outputFormatList.get(f).equals("GeoJSON")) {
-                        supportedFormat = outputFormatList.get(f);
-                    }
-                }
+                String supportedFormat = getSupportedFormat(outputFormatList);
 
                 double medianx = 0d;
                 double mediany = 0d;
@@ -172,8 +163,10 @@ else if(bboxEnv.get(0).getClass().toString().contains("java.util.ArrayList")) {
                 try {
                     sampleParamaterNameSafe = URLEncoder.encode(sampleParamaterName,"UTF8");
                 }
-                catch(Exception ex) {ex.printStackTrace();}
-
+                catch(Exception ex) { 
+                    ex.printStackTrace();
+                    sb.append(ex.getMessage() + " \n");
+                }
 
                 String sampleDateTime = null;
                 if (extent.containsKey("temporal")) {
@@ -233,7 +226,10 @@ else if(intervalEnv.get(0).getClass().toString().contains("java.util.ArrayList")
                     pageContent = readStringFromURL(constructedURL,10);  //you can use Integer.MAX_VALUE for no limit
 
                 }
-                catch(Exception ex) { ex.printStackTrace();}
+                catch(Exception ex) { 
+                    ex.printStackTrace();
+                    sb.append(ex.getMessage() + " \n");
+                }
 
                 if(pageContent!=null) {