Changeset 8584 in josm for trunk/src/org

Timestamp:

2015-07-08T20:59:09+02:00 (9 years ago)

Author:

wiktorn

Message:

• added axis definition to ESPG projections definition, where it's not default (i.e. North/East)
• added switchXY boolean in Projection interface
• WMTS and WMS (1.3.0) uses now switchXY when doing requests against servers
• better error reporting when there are problems with parsing the WMTS TileSource

Addresses: #10623

Now ​http://webgis.linz.at/WMTS/1.0.0/getCapabilities.xml should work.

Wallonie services still being debugged.

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/TemplatedWMSTileSource.java (modified) (1 diff)
• data/imagery/WMTSTileSource.java (modified) (9 diffs)
• data/projection/CustomProjection.java (modified) (4 diffs)
• data/projection/Projection.java (modified) (1 diff)
• gui/layer/WMTSLayer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java

@@ -139 +139 @@
         if (baseUrl.toLowerCase().contains("crs=epsg:4326")) {
             switchLatLon = true;
-        } else if (baseUrl.toLowerCase().contains("crs=") && "EPSG:4326".equals(myProjCode)) {
-            switchLatLon = true;
+        } else if (baseUrl.toLowerCase().contains("crs=")) {
+            // assume WMS 1.3.0
+            switchLatLon = Main.getProjection().switchXY();
         }
         String bbox;

trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java

@@ -47 +47 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.io.CachedFile;
@@ -66 +67 @@
     private static final String PATTERN_HEADER  = "\\{header\\(([^,]+),([^}]+)\\)\\}";
 
-    private static final String URL_GET_ENCODING_PARAMS = "SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER={layer}&STYLE={style}&"
+    private static final String URL_GET_ENCODING_PARAMS = "SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER={layer}&STYLE={Style}&"
             + "FORMAT={format}&tileMatrixSet={TileMatrixSet}&tileMatrix={TileMatrix}&tileRow={TileRow}&tileCol={TileCol}";
 
@@ -229 +230 @@
 
         } catch (Exception e) {
-            Main.error(e);
-        }
-        return null;
+            throw new IllegalArgumentException(e);
+        }
     }
 
@@ -268 +268 @@
             matrixSet.crs = crsToCode(getStringByXpath(matrixSetNode, "SupportedCRS"));
             NodeList tileMatrixList = getByXpath(matrixSetNode, "TileMatrix");
+            Projection matrixProj = Projections.getProjectionByCode(matrixSet.crs);
+            if (matrixProj == null) {
+                // use current projection if none found. Maybe user is using custom string
+                matrixProj = Main.getProjection();
+            }
             for (int matrixId = 0; matrixId < tileMatrixList.getLength(); matrixId++) {
                 Node tileMatrixNode = tileMatrixList.item(matrixId);
@@ -274 +279 @@
                 tileMatrix.scaleDenominator = Double.parseDouble(getStringByXpath(tileMatrixNode, "ScaleDenominator"));
                 String[] topLeftCorner = getStringByXpath(tileMatrixNode, "TopLeftCorner").split(" ");
-                tileMatrix.topLeftCorner = new EastNorth(Double.parseDouble(topLeftCorner[1]), Double.parseDouble(topLeftCorner[0]));
+
+                if(matrixProj.switchXY()) {
+                    tileMatrix.topLeftCorner = new EastNorth(Double.parseDouble(topLeftCorner[1]), Double.parseDouble(topLeftCorner[0]));
+                } else {
+                    tileMatrix.topLeftCorner = new EastNorth(Double.parseDouble(topLeftCorner[0]), Double.parseDouble(topLeftCorner[1]));
+                }
                 tileMatrix.tileHeight = Integer.parseInt(getStringByXpath(tileMatrixNode, "TileHeight"));
                 tileMatrix.tileWidth = Integer.parseInt(getStringByXpath(tileMatrixNode, "TileHeight"));
@@ -291 +301 @@
     private static String crsToCode(String crsIdentifier) {
         if (crsIdentifier.startsWith("urn:ogc:def:crs:")) {
-            return crsIdentifier.replaceFirst("urn:ogc:def:crs:([^:]*):[^:]*:(.*)$", "$1:$2");
+            return crsIdentifier.replaceFirst("urn:ogc:def:crs:([^:]*):.*:(.*)$", "$1:$2");
         }
         return crsIdentifier;
@@ -439 +449 @@
         }
         double scale = matrix.scaleDenominator * this.crsScale;
-        EastNorth ret = new EastNorth(matrix.topLeftCorner.getX() + x * scale, matrix.topLeftCorner.getY() - y * scale);
+        EastNorth ret = new EastNorth(matrix.topLeftCorner.east() + x * scale, matrix.topLeftCorner.north() - y * scale);
         return Main.getProjection().eastNorth2latlon(ret).toCoordinate();
     }
@@ -589 +599 @@
         EastNorth min = proj.latlon2eastNorth(bounds.getMin());
         EastNorth max = proj.latlon2eastNorth(bounds.getMax());
-        return (int) Math.ceil(Math.abs(max.getY() - min.getY()) / scale);
+        return (int) Math.ceil(Math.abs(max.north() - min.north()) / scale);
     }
 
@@ -601 +611 @@
         EastNorth min = proj.latlon2eastNorth(bounds.getMin());
         EastNorth max = proj.latlon2eastNorth(bounds.getMax());
-        return (int) Math.ceil(Math.abs(max.getX() - min.getX()) / scale);
+        return (int) Math.ceil(Math.abs(max.east() - min.east()) / scale);
     }
 }

trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java

@@ -50 +50 @@
     protected Bounds bounds;
     private double metersPerUnit = METER_PER_UNIT_DEGREE; // default to degrees
+    private String axis = "enu"; // default axis orientation is East, North, Up
 
     /**
@@ -98 +99 @@
         no_defs("no_defs", false),
         init("init", true),
+        /** crs units to meter multiplier */
         to_meter("to_meter", true),
+        /** definition of axis for projection */
+        axis("axis", true),
         // JOSM extensions, not present in PROJ.4
         wmssrs("wmssrs", true),
@@ -212 +216 @@
             if (s != null) {
                 this.metersPerUnit = parseDouble(s, Param.to_meter.key);
+            }
+            s = parameters.get(Param.axis.key);
+            if (s != null) {
+                this.axis  = s;
             }
         }
@@ -548 +556 @@
     }
 
+    @Override
+    public boolean switchXY() {
+        // TODO: support for other axis orientation such as West South, and Up Down
+        return this.axis.startsWith("ne");
+    }
+
     private static Map<String, Double> getUnitsToMeters() {
         Map<String, Double> ret = new ConcurrentHashMap<>();

trunk/src/org/openstreetmap/josm/data/projection/Projection.java

@@ -79 +79 @@
      */
     double getMetersPerUnit();
+
+    /**
+     * Does this projection natural order of coordinates is North East,
+     * instead of East North
+     *
+     * @return true if natural order of coordinates is North East, false if East North
+     */
+    boolean switchXY();
 }

trunk/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java

@@ -69 +69 @@
                 return tileSource;
             }
-        } catch (Exception e) {
-            Main.warn("Could not create imagery layer:");
+            return null;
+        } catch (IOException e) {
             Main.warn(e);
+            throw new IllegalArgumentException(e);
         }
-        return null;
     }