Changeset 12469 in josm for trunk/src/org/openstreetmap/josm/io/imagery

Timestamp:

2017-07-12T21:41:19+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #15012 - Support WMS endpoint in Imagery -> Rectified Image

File:

• trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java

@@ -345 +345 @@
             bboxElem = getChild(element, "LatLonBoundingBox");
             if (bboxElem != null) {
-                double left = Double.parseDouble(bboxElem.getAttribute("minx"));
-                double top = Double.parseDouble(bboxElem.getAttribute("maxy"));
-                double right = Double.parseDouble(bboxElem.getAttribute("maxx"));
-                double bot = Double.parseDouble(bboxElem.getAttribute("miny"));
+                double left = getDecimalDegree(bboxElem ,"minx");
+                double top = getDecimalDegree(bboxElem, "maxy");
+                double right = getDecimalDegree(bboxElem, "maxx");
+                double bot = getDecimalDegree(bboxElem, "miny");
                 bounds = new Bounds(bot, left, top, right);
             }
@@ -357 +357 @@
 
         return new LayerDetails(name, ident, crsList, josmSupportsThisLayer, bounds, childLayers);
+    }
+
+    private static double getDecimalDegree(Element elem, String attr) {
+        // Some real-world WMS servers use a comma instead of a dot as decimal separator (seen in Polish WMS server)
+        return Double.parseDouble(elem.getAttribute(attr).replace(',', '.'));
     }