Changeset 32025 in osm for applications/viewer/jmapviewer/src/org/openstreetmap/gui

Timestamp:

2016-01-24T23:10:45+01:00 (9 years ago)

Author:

wiktorn

Message:

Refactor structure of TMS based classes.

Move OsmMercator initialization to TMSTileSource and switch all TMS
based TileSource so they extend TMSTileSource.

Now WMTSTileSource will not create OsmMercator object that it will not
use anyhow.

AbstractTMSTileSource could be named now AbstractTileBasedTileSource,
but I did not the name change, to maintain history.

Location:

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

Files:

• AbstractOsmTileSource.java (modified) (1 diff)
• AbstractTMSTileSource.java (modified) (6 diffs)
• BingAerialTileSource.java (modified) (1 diff)
• TMSTileSource.java (modified) (4 diffs)

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

@@ -9 +9 @@
  * Abstract class for OSM Tile sources
  */
-public abstract class AbstractOsmTileSource extends AbstractTMSTileSource {
-    
+public abstract class AbstractOsmTileSource extends TMSTileSource {
+
     /**
-     * The OSM attribution. Must be always in line with 
+     * The OSM attribution. Must be always in line with
      * <a href="https://www.openstreetmap.org/copyright/en">https://www.openstreetmap.org/copyright/en</a>
      */
     public static final String DEFAULT_OSM_ATTRIBUTION = "\u00a9 OpenStreetMap contributors";
-    
+
     /**
      * Constructs a new OSM tile source

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

@@ -11 +11 @@
 import java.util.Map.Entry;
 
-import org.openstreetmap.gui.jmapviewer.Coordinate;
 import org.openstreetmap.gui.jmapviewer.OsmMercator;
 import org.openstreetmap.gui.jmapviewer.Tile;
@@ -32 +31 @@
     private final Map<String, String> metadataHeaders;
     protected int tileSize;
-    protected OsmMercator osmMercator;
 
     /**
@@ -50 +48 @@
         this.metadataHeaders = info.getMetadataHeaders();
         this.tileSize = info.getTileSize();
-        this.osmMercator = new OsmMercator(this.getTileSize());
     }
 
@@ -128 +125 @@
 
     @Override
-    public double getDistance(double lat1, double lon1, double lat2, double lon2) {
-        return osmMercator.getDistance(lat1, lon1, lat2, lon2);
-    }
-
-    @Override
-    public Point latLonToXY(double lat, double lon, int zoom) {
-        return new Point(
-                (int) osmMercator.lonToX(lon, zoom),
-                (int) osmMercator.latToY(lat, zoom)
-                );
-    }
-
-    @Override
     public Point latLonToXY(ICoordinate point, int zoom) {
         return latLonToXY(point.getLat(), point.getLon(), zoom);
@@ -151 +135 @@
 
     @Override
-    public ICoordinate xyToLatLon(int x, int y, int zoom) {
-        return new Coordinate(
-                osmMercator.yToLat(y, zoom),
-                osmMercator.xToLon(x, zoom)
-                );
-    }
-
-    @Override
-    public TileXY latLonToTileXY(double lat, double lon, int zoom) {
-        return new TileXY(
-                osmMercator.lonToX(lon, zoom) / getTileSize(),
-                osmMercator.latToY(lat, zoom) / getTileSize()
-                );
-    }
-
-    @Override
     public TileXY latLonToTileXY(ICoordinate point, int zoom) {
         return latLonToTileXY(point.getLat(), point.getLon(), zoom);
@@ -179 +147 @@
     public ICoordinate tileXYToLatLon(Tile tile) {
         return tileXYToLatLon(tile.getXtile(), tile.getYtile(), tile.getZoom());
-    }
-
-    @Override
-    public ICoordinate tileXYToLatLon(int x, int y, int zoom) {
-        return new Coordinate(
-                osmMercator.yToLat(y * getTileSize(), zoom),
-                osmMercator.xToLon(x * getTileSize(), zoom)
-                );
     }
 

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

@@ -37 +37 @@
 import org.xml.sax.SAXException;
 
-public class BingAerialTileSource extends AbstractTMSTileSource {
+public class BingAerialTileSource extends TMSTileSource {
 
     private static final String API_KEY = "Arzdiw4nlOJzRwOz__qailc8NiR31Tt51dN2D7cm57NrnceZnCpgOkmJhNpGoppU";

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

@@ -1 +1 @@
 // License: GPL. For details, see Readme.txt file.
 package org.openstreetmap.gui.jmapviewer.tilesources;
+
+import java.awt.Point;
+
+import org.openstreetmap.gui.jmapviewer.Coordinate;
+import org.openstreetmap.gui.jmapviewer.OsmMercator;
+import org.openstreetmap.gui.jmapviewer.TileXY;
+import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
 
 public class TMSTileSource extends AbstractTMSTileSource {
@@ -6 +13 @@
     protected int maxZoom;
     protected int minZoom;
+    protected OsmMercator osmMercator;
 
     public TMSTileSource(TileSourceInfo info) {
@@ -11 +19 @@
         minZoom = info.getMinZoom();
         maxZoom = info.getMaxZoom();
+        this.osmMercator = new OsmMercator(this.getTileSize());
     }
 
@@ -22 +31 @@
         return (maxZoom == 0) ? super.getMaxZoom() : maxZoom;
     }
+    @Override
+    public double getDistance(double lat1, double lon1, double lat2, double lon2) {
+        return osmMercator.getDistance(lat1, lon1, lat2, lon2);
+    }
+
+    @Override
+    public Point latLonToXY(double lat, double lon, int zoom) {
+        return new Point(
+                (int) osmMercator.lonToX(lon, zoom),
+                (int) osmMercator.latToY(lat, zoom)
+                );
+    }
+
+    @Override
+    public ICoordinate xyToLatLon(int x, int y, int zoom) {
+        return new Coordinate(
+                osmMercator.yToLat(y, zoom),
+                osmMercator.xToLon(x, zoom)
+                );
+    }
+
+    @Override
+    public TileXY latLonToTileXY(double lat, double lon, int zoom) {
+        return new TileXY(
+                osmMercator.lonToX(lon, zoom) / getTileSize(),
+                osmMercator.latToY(lat, zoom) / getTileSize()
+                );
+    }
+
+    @Override
+    public ICoordinate tileXYToLatLon(int x, int y, int zoom) {
+        return new Coordinate(
+                osmMercator.yToLat(y * getTileSize(), zoom),
+                osmMercator.xToLon(x * getTileSize(), zoom)
+                );
+    }
 }