Changeset 14399 in josm for trunk/src/org

Timestamp:

2018-11-02T00:07:28+01:00 (6 years ago)

Author:

wiktorn

Message:

GetTileUrl performance improvements for WMS

See: #16769

Location:

trunk/src/org/openstreetmap/josm/data/imagery

Files:

• AbstractWMSTileSource.java (modified) (1 diff)
• TemplatedWMSTileSource.java (modified) (4 diffs)
• WMSEndpointTileSource.java (modified) (2 diffs)

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

@@ -226 +226 @@
         double e = se.getX();
 
-        return (
-                switchLatLon ?
-                        String.format("%s,%s,%s,%s",
-                                LATLON_FORMAT.format(s), LATLON_FORMAT.format(w), LATLON_FORMAT.format(n), LATLON_FORMAT.format(e))
-                        :
-                        String.format("%s,%s,%s,%s",
-                                LATLON_FORMAT.format(w), LATLON_FORMAT.format(s), LATLON_FORMAT.format(e), LATLON_FORMAT.format(n))
-
-                );
+        return switchLatLon ?
+                getBboxstr(s, w, n, e)
+                : getBboxstr(w, s, e, n);
+    }
+
+    private final String getBboxstr(double x1, double x2, double x3, double x4) {
+        return new StringBuilder(64)
+                .append(LATLON_FORMAT.format(x1))
+                .append(',')
+                .append(LATLON_FORMAT.format(x2))
+                .append(',')
+                .append(LATLON_FORMAT.format(x3))
+                .append(',')
+                .append(LATLON_FORMAT.format(x4))
+                .toString();
     }
 }

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

@@ -51 +51 @@
     };
 
+    private final boolean switchLatLon;
     /**
      * Creates a tile source based on imagery info
@@ -62 +63 @@
         handleTemplate();
         initProjection();
+        // Bounding box coordinates have to be switched for WMS 1.3.0 EPSG:4326.
+        //
+        // Background:
+        //
+        // bbox=x_min,y_min,x_max,y_max
+        //
+        //      SRS=... is WMS 1.1.1
+        //      CRS=... is WMS 1.3.0
+        //
+        // The difference:
+        //      For SRS x is east-west and y is north-south
+        //      For CRS x and y are as specified by the EPSG
+        //          E.g. [1] lists lat as first coordinate axis and lot as second, so it is switched for EPSG:4326.
+        //          For most other EPSG code there seems to be no difference.
+        // CHECKSTYLE.OFF: LineLength
+        // [1] https://www.epsg-registry.org/report.htm?type=selection&entity=urn:ogc:def:crs:EPSG::4326&reportDetail=short&style=urn:uuid:report-style:default-with-code&style_name=OGP%20Default%20With%20Code&title=EPSG:4326
+        // CHECKSTYLE.ON: LineLength
+        if (baseUrl.toLowerCase(Locale.US).contains("crs=epsg:4326")) {
+            switchLatLon = true;
+        } else if (baseUrl.toLowerCase(Locale.US).contains("crs=")) {
+            // assume WMS 1.3.0
+            switchLatLon = ProjectionRegistry.getProjection().switchXY();
+        } else {
+            switchLatLon = false;
+        }
     }
 
@@ -86 +112 @@
         }
 
-        // Bounding box coordinates have to be switched for WMS 1.3.0 EPSG:4326.
-        //
-        // Background:
-        //
-        // bbox=x_min,y_min,x_max,y_max
-        //
-        //      SRS=... is WMS 1.1.1
-        //      CRS=... is WMS 1.3.0
-        //
-        // The difference:
-        //      For SRS x is east-west and y is north-south
-        //      For CRS x and y are as specified by the EPSG
-        //          E.g. [1] lists lat as first coordinate axis and lot as second, so it is switched for EPSG:4326.
-        //          For most other EPSG code there seems to be no difference.
-        // CHECKSTYLE.OFF: LineLength
-        // [1] https://www.epsg-registry.org/report.htm?type=selection&entity=urn:ogc:def:crs:EPSG::4326&reportDetail=short&style=urn:uuid:report-style:default-with-code&style_name=OGP%20Default%20With%20Code&title=EPSG:4326
-        // CHECKSTYLE.ON: LineLength
-        boolean switchLatLon = false;
-        if (baseUrl.toLowerCase(Locale.US).contains("crs=epsg:4326")) {
-            switchLatLon = true;
-        } else if (baseUrl.toLowerCase(Locale.US).contains("crs=")) {
-            // assume WMS 1.3.0
-            switchLatLon = ProjectionRegistry.getProjection().switchXY();
-        }
-        String bbox = getBbox(zoom, tilex, tiley, switchLatLon);
-
         // Using StringBuffer and generic PATTERN_PARAM matcher gives 2x performance improvement over replaceAll
         StringBuffer url = new StringBuffer(baseUrl.length());
@@ -125 +125 @@
                 break;
             case "bbox":
-                replacement = bbox;
+                replacement = getBbox(zoom, tilex, tiley, switchLatLon);
                 break;
             case "w":

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

@@ -60 +60 @@
     @Override
     public String getTileUrl(int zoom, int tilex, int tiley) {
-        String bbox = getBbox(zoom, tilex, tiley, !wmsi.belowWMS130() && getTileProjection().switchXY());
-
         // Using StringBuffer and generic PATTERN_PARAM matcher gives 2x performance improvement over replaceAll
         StringBuffer url = new StringBuffer(urlPattern.length());
@@ -72 +70 @@
                 break;
             case "bbox":
-                replacement = bbox;
+                replacement = getBbox(zoom, tilex, tiley, !wmsi.belowWMS130() && getTileProjection().switchXY());
                 break;
             case "width":