Changeset 13733 in josm for trunk/src/org/openstreetmap/josm/data/imagery/AbstractWMSTileSource.java

Timestamp:

2018-05-12T14:18:57+02:00 (6 years ago)

Author:

wiktorn

Message:

Imagery definition refactor

Extend imagery definitions by:

• allowing setting default layers for WMS_ENDPOINT and WMTS
• allowing setting minimum expires time for tile for this imagery
• allowing setting custom headers that will be sent for all requests

(get map, get capabilities) for this imagery

Additional changes in code:

• use TileJobOptions to pass miscellaneous options to loaders
• refactor WMSImagery to use SAX parser

See: #15981, #7953, #16224, #15940, #16249

File:

• trunk/src/org/openstreetmap/josm/data/imagery/AbstractWMSTileSource.java (modified) (3 diffs)

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

@@ -3 +3 @@
 
 import java.awt.Point;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.text.NumberFormat;
+import java.util.Locale;
 
 import org.openstreetmap.gui.jmapviewer.Projected;
@@ -24 +28 @@
 public abstract class AbstractWMSTileSource extends TMSTileSource {
 
+    static final NumberFormat LATLON_FORMAT = new DecimalFormat("###0.0000000", new DecimalFormatSymbols(Locale.US));
+
     private EastNorth anchorPosition;
     private int[] tileXMin;
@@ -209 +215 @@
         return this.tileProjection.toCode();
     }
+
+    protected String getBbox(int zoom, int tilex, int tiley, boolean switchLatLon) {
+        EastNorth nw = getTileEastNorth(tilex, tiley, zoom);
+        EastNorth se = getTileEastNorth(tilex + 1, tiley + 1, zoom);
+
+        double w = nw.getX();
+        double n = nw.getY();
+
+        double s = se.getY();
+        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))
+
+                );
+    }
 }