Changeset 9619 in josm

Timestamp:

2016-01-24T22:53:29+01:00 (9 years ago)

Author:

wiktorn

Message:

Finish removal of tile-size workaround code started in [9617].

Now WMTS TileSources with other than 256px tile size should work properly.
See #12437, #12186

Fix name of "valid-georeference", so it will be properly loaded from preferences

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/ImageryInfo.java (modified) (2 diffs)
• data/imagery/WMTSTileSource.java (modified) (3 diffs)
• io/imagery/ImageryReader.java (modified) (1 diff)

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

@@ -19 +19 @@
 import javax.swing.ImageIcon;
 
-import org.openstreetmap.gui.jmapviewer.OsmMercator;
 import org.openstreetmap.gui.jmapviewer.interfaces.Attributed;
 import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
@@ -221 +220 @@
         @pref Map<String, List<String>> noTileHeaders;
         @pref Map<String, List<String>> noTileChecksums;
-        @pref int tileSize = OsmMercator.DEFAUL_TILE_SIZE;
+        @pref int tileSize = -1;
         @pref Map<String, String> metadataHeaders;
         @pref boolean valid_georeference;

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

@@ -594 +594 @@
      */
     public void initProjection(Projection proj) {
-        String layerName = null;
-        if (currentLayer != null) {
-            layerName = currentLayer.name;
-        }
-        Collection<Layer> candidates = getLayers(layerName, proj.toCode());
+        // getLayers will return only layers matching the name, if the user already choose the layer
+        // so we will not ask the user again to chose the layer, if he just changes projection
+        Collection<Layer> candidates = getLayers(currentLayer != null ? currentLayer.name : null, proj.toCode());
         if (!candidates.isEmpty()) {
             Layer newLayer = userSelectLayer(candidates);
@@ -610 +608 @@
     }
 
+    /**
+     *
+     * @param name of the layer to match
+     * @param projectionCode projection code to match
+     * @return Collection of layers matching the name of the layer and projection, or only projection if name is not provided
+     */
     private Collection<Layer> getLayers(String name, String projectionCode) {
         Collection<Layer> ret = new ArrayList<>();
-        for (Layer layer: this.layers) {
-            if ((name == null || name.equals(layer.name)) && (projectionCode == null || projectionCode.equals(layer.tileMatrixSet.crs))) {
-                ret.add(layer);
+        if (this.layers != null) {
+            for (Layer layer: this.layers) {
+                if ((name == null || name.equals(layer.name)) && (projectionCode == null || projectionCode.equals(layer.tileMatrixSet.crs))) {
+                    ret.add(layer);
+                }
             }
         }
@@ -621 +627 @@
 
     @Override
-    public int getDefaultTileSize() {
-        return getTileSize();
+    public int getTileSize() {
+        // no support for non-square tiles (tileHeight != tileWidth)
+        // and for different tile sizes at different zoom levels
+        Collection<Layer> layers = getLayers(null, Main.getProjection().toCode());
+        if (!layers.isEmpty()) {
+            return layers.iterator().next().tileMatrixSet.tileMatrix.first().tileHeight;
+        }
+        // if no layers is found, fallback to default mercator tile size. Maybe it will work
+        Main.warn("WMTS: Could not determine tile size. Using default tile size of: {0}", getDefaultTileSize());
+        return getDefaultTileSize();
     }
 

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

@@ -152 +152 @@
                         "icon",
                         "tile-size",
-                        "validGeoreference",
+                        "valid-georeference",
                         "epsg4326to3857Supported",
                 }).contains(qName)) {