Changeset 32024 in osm for applications/viewer

Timestamp:

2016-01-24T22:52:12+01:00 (9 years ago)

Author:

wiktorn

Message:

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

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

Location:

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources

Files:

• AbstractTMSTileSource.java (modified) (3 diffs)
• TileSourceInfo.java (modified) (2 diffs)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTMSTileSource.java

@@ -50 +50 @@
         this.metadataHeaders = info.getMetadataHeaders();
         this.tileSize = info.getTileSize();
-        this.osmMercator = new OsmMercator(this.tileSize);
+        this.osmMercator = new OsmMercator(this.getTileSize());
     }
 
@@ -161 +161 @@
     public TileXY latLonToTileXY(double lat, double lon, int zoom) {
         return new TileXY(
-                osmMercator.lonToX(lon, zoom) / tileSize,
-                osmMercator.latToY(lat, zoom) / tileSize
+                osmMercator.lonToX(lon, zoom) / getTileSize(),
+                osmMercator.latToY(lat, zoom) / getTileSize()
                 );
     }
@@ -184 +184 @@
     public ICoordinate tileXYToLatLon(int x, int y, int zoom) {
         return new Coordinate(
-                osmMercator.yToLat(y * tileSize, zoom),
-                osmMercator.xToLon(x * tileSize, zoom)
+                osmMercator.yToLat(y * getTileSize(), zoom),
+                osmMercator.xToLon(x * getTileSize(), zoom)
                 );
     }

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TileSourceInfo.java

@@ -4 +4 @@
 import java.util.List;
 import java.util.Map;
-
-import org.openstreetmap.gui.jmapviewer.OsmMercator;
 
 /**
@@ -38 +36 @@
 
     /** tile size of the displayed tiles */
-    private int tileSize = OsmMercator.DEFAUL_TILE_SIZE; // FIXME: set to -1 for next release
+    private int tileSize = -1;
 
     /** mapping <header key, metadata key> */