[GEOS-3223] EPSG:WGS84(DD) is not a valid SRS

geoserver · Feb 25, 2017 · 952dd20 · 952dd20
1 parent 727e856
commit 952dd20
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 5 deletions.
diff --git a/src/wms/src/main/java/org/geoserver/wms/capabilities/Capabilities_1_3_0_Transformer.java b/src/wms/src/main/java/org/geoserver/wms/capabilities/Capabilities_1_3_0_Transformer.java
@@ -760,8 +760,11 @@ private void handleRootCrsList(final Set<String> epsgCodes) {
                 String currentSRS;
 
                 while (it.hasNext()) {
-                    currentSRS = qualifySRS(it.next());
-                    element("CRS", currentSRS);
+                    String code = it.next();
+                    if(!"WGS84(DD)".equals(code)) {
+                        currentSRS = qualifySRS(code);
+                        element("CRS", currentSRS);
+                    }
                 }
             } catch (Exception e) {
                 LOGGER.log(Level.WARNING, e.getLocalizedMessage(), e);

diff --git a/src/wms/src/main/java/org/geoserver/wms/capabilities/GetCapabilitiesTransformer.java b/src/wms/src/main/java/org/geoserver/wms/capabilities/GetCapabilitiesTransformer.java
@@ -764,8 +764,11 @@ private void handleRootCrsList(final Set<String> epsgCodes) {
                 String currentSRS;
 
                 while (it.hasNext()) {
-                    currentSRS = qualifySRS(it.next());
-                    element("SRS", currentSRS);
+                    String code = it.next();
+                    if(!"WGS84(DD)".equals(code)) {
+                        currentSRS = qualifySRS(code);
+                        element("SRS", currentSRS);
+                    }
                 }
             } catch (Exception e) {
                 LOGGER.log(Level.WARNING, e.getLocalizedMessage(), e);

diff --git a/src/wms/src/test/java/org/geoserver/wms/capabilities/GetCapabilitiesTransformerTest.java b/src/wms/src/test/java/org/geoserver/wms/capabilities/GetCapabilitiesTransformerTest.java
@@ -319,7 +319,7 @@ public void testCRSList() throws Exception {
         supportedCodes.addAll(CRS.getSupportedCodes("AUTO"));
         NodeList allCrsCodes = XPATH.getMatchingNodes("/WMT_MS_Capabilities/Capability/Layer/SRS",
                 dom);
-        assertEquals(supportedCodes.size(), allCrsCodes.getLength());
+        assertEquals(supportedCodes.size() - 1 /* WGS84(DD) */, allCrsCodes.getLength());
     }
 
     @Test

diff --git a/src/wms/src/test/java/org/geoserver/wms/wms_1_1_1/CapabilitiesTest.java b/src/wms/src/test/java/org/geoserver/wms/wms_1_1_1/CapabilitiesTest.java
@@ -16,6 +16,7 @@
 import java.io.InputStream;
 import java.util.List;
 
+import org.custommonkey.xmlunit.XMLAssert;
 import org.custommonkey.xmlunit.XMLUnit;
 import org.custommonkey.xmlunit.XpathEngine;
 import org.geoserver.catalog.AttributionInfo;
@@ -93,6 +94,13 @@ public void testCapabilities() throws Exception {
         Element e = dom.getDocumentElement();
         assertEquals("WMT_MS_Capabilities", e.getLocalName());
     }
+
+    @org.junit.Test 
+    public void testCapabilitiesNoWGS84DD() throws Exception {
+        Document dom = dom(get("wms?request=getCapabilities&version=1.1.1"), false);
+        // print(dom);
+        XMLAssert.assertXpathNotExists("//SRS[text() = 'EPSG:WGS84(DD)']", dom);
+    }
 
     @Test
     /**

diff --git a/src/wms/src/test/java/org/geoserver/wms/wms_1_3/CapabilitiesIntegrationTest.java b/src/wms/src/test/java/org/geoserver/wms/wms_1_3/CapabilitiesIntegrationTest.java
@@ -16,6 +16,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.custommonkey.xmlunit.XMLAssert;
 import org.custommonkey.xmlunit.XMLUnit;
 import org.custommonkey.xmlunit.XpathEngine;
 import org.geoserver.catalog.AttributionInfo;
@@ -110,6 +111,13 @@ public void testCapabilities() throws Exception {
         Element e = dom.getDocumentElement();
         assertEquals("WMS_Capabilities", e.getLocalName());
     }
+
+    @org.junit.Test 
+    public void testCapabilitiesNoWGS84DD() throws Exception {
+        Document dom = dom(get("wms?request=getCapabilities&version=1.3.0"), false);
+        // print(dom);
+        XMLAssert.assertXpathNotExists("//wms:CRS[text() = 'EPSG:WGS84(DD)']", dom);
+    }
 
     @org.junit.Test 
     public void testGetCapsContainsNoDisabledTypes() throws Exception {