AUS-4069 - removed AUS-4265 changes

AuScope · Nov 18, 2024 · d4fb59d · d4fb59d
1 parent 9c6b27b
commit d4fb59d
Show file tree

Hide file tree

Showing 5 changed files with 1,326 additions and 9 deletions.
diff --git a/src/main/java/org/auscope/portal/server/web/controllers/IRISController.java b/src/main/java/org/auscope/portal/server/web/controllers/IRISController.java
@@ -201,7 +201,9 @@ public ModelAndView getIRISStations(
             }
             kml.append("</Document></kml>");
 
-            return generateJSONResponseMAV(true, "gml", kml.toString(), null);
+            // & character needs to be escaped i.e. &amp
+            String irisResponse = kml.toString().replaceAll("&(?!amp;|apos;|quot;|lt;|gt;)", "&amp;");
+            return generateJSONResponseMAV(true, "gml", irisResponse, null);
         } catch (Exception e) {
             return generateJSONResponseMAV(false, e.getMessage(), "Failed.");
         }

diff --git a/src/main/resources/layers.yaml b/src/main/resources/layers.yaml
@@ -508,14 +508,14 @@
         iris:
                selector: [ "1F","https://auspass.edu.au" ]
 # Removed until AUS-4069 is fixed
-#"seismology-minq":
-#        name: "MINQ: Mount Isa Northern Queensland"
-#        description: "The MINQ seismic array feed from AusPass: the Australian Passive Seismic Server."
-#        group: "Passive Seismic"
-#        proxyUrl: "getIRISStations.do"
-#        order: "263"
-#        iris:
-#               selector: [ "ZR","https://auspass.edu.au" ]
+"seismology-minq":
+        name: "MINQ: Mount Isa Northern Queensland"
+        description: "The MINQ seismic array feed from AusPass: the Australian Passive Seismic Server."
+        group: "Passive Seismic"
+        proxyUrl: "getIRISStations.do"
+        order: "263"
+        iris:
+               selector: [ "ZR","https://auspass.edu.au" ]
 "seismology-eal1":
         name: "EAL1: Eastern Australia Linkage"
         description: "The EAL1 seismic array feed from AusPass: the Australian Passive Seismic Server."

diff --git a/src/test/java/org/auscope/portal/server/web/controllers/TestIRISController.java b/src/test/java/org/auscope/portal/server/web/controllers/TestIRISController.java
@@ -69,4 +69,24 @@ public void getStationChannels_channelResponseBadXML_ResultantModelHasSuccessSet
         // Assert
         Assert.assertFalse((Boolean) result.getModel().get("success"));
     }
+
+    @Test
+    public void getIRISStations_stationResponseUnescapedAmbersandXML_ResultantModelHasSuccessSetToTrue() {
+        // Act
+        // e.g. unescaped &  -  <Name>Burke & Wills Roadhouse, Stokes, QLD</Name>
+        ModelAndView result = this.controller.getIRISStations("org/auscope/portal/iris/StationNameContainsUnescapedSpecialCharacter.xml", "");
+
+        // Assert
+        Assert.assertTrue((Boolean) result.getModel().get("success"));
+    }
+
+    @Test
+    public void getIRISStations_stationResponseEscapedAmbersandXML_ResultantModelHasSuccessSetToTrue() {
+        // Act
+        // e.g. unescaped &  -  <Name>Burke & Wills Roadhouse, Stokes, QLD</Name>
+        ModelAndView result = this.controller.getIRISStations("org/auscope/portal/iris/StationNameContainsEscapedSpecialCharacter.xml", "");
+
+        // Assert
+        Assert.assertTrue((Boolean) result.getModel().get("success"));
+    }
 }