Changeset 33207 in osm for applications

Timestamp:

2017-04-03T15:00:12+02:00 (7 years ago)

Author:

bastik

Message:

see #josm7427 - add interface and class for projected coordinates; add several helper functions to TileSource interface

Location:

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

Files:

• Projected.java (added)
• TileRange.java (modified) (1 diff)
• interfaces/IProjected.java (added)
• interfaces/TileSource.java (modified) (2 diffs)
• tilesources/TMSTileSource.java (modified) (2 diffs)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/TileRange.java

@@ -15 +15 @@
     }
 
-    protected TileRange(TileXY t1, TileXY t2, int zoom) {
+    public TileRange(TileXY t1, TileXY t2, int zoom) {
         minX = (int) Math.floor(Math.min(t1.getX(), t2.getX()));
         minY = (int) Math.floor(Math.min(t1.getY(), t2.getY()));

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java

@@ -9 +9 @@
 import org.openstreetmap.gui.jmapviewer.JMapViewer;
 import org.openstreetmap.gui.jmapviewer.Tile;
+import org.openstreetmap.gui.jmapviewer.TileRange;
 import org.openstreetmap.gui.jmapviewer.TileXY;
 
@@ -210 +211 @@
      */
     Map<String, String> getMetadata(Map<String, List<String>> headers);
+
+    /**
+     * Convert tile indeces (x/y/zoom) into projected coordinates of the tile origin.
+     * @param x x tile index
+     * @param y z tile index
+     * @param zoom zoom level
+     * @return projected coordinates of the tile origin
+     */
+    IProjected tileXYtoProjected(int x, int y, int zoom);
+
+    /**
+     * Convert projected coordinates to tile indices.
+     * @param p projected coordinates
+     * @param zoom zoom level
+     * @return corresponding tile index x/y (floating point, truncate to integer
+     * for tile index)
+     */
+    TileXY projectedToTileXY(IProjected p, int zoom);
+
+    /**
+     * Check if one tile is inside another tile.
+     * @param inner the tile that is suspected to be inside the other tile
+     * @param outer the tile that might contain the first tile
+     * @return true if first tile is inside second tile (or both are identical),
+     * false otherwise
+     */
+    boolean isInside(Tile inner, Tile outer);
+
+    /**
+     * Returns a range of tiles, that cover a given tile, which is
+     * usually at a different zoom level.
+     *
+     * In standard tile layout, 4 tiles cover a tile one zoom lower, 16 tiles
+     * cover a tile 2 zoom levels below etc.
+     * If the zoom level of the covering tiles is greater or equal, a single
+     * tile suffices.
+     *
+     * @param tile the tile to cover
+     * @param newZoom zoom level of the covering tiles
+     * @return TileRange of all covering tiles at zoom <code>newZoom</code>
+     */
+    TileRange getCoveringTileRange(Tile tile, int newZoom);
+
+    /**
+     * Get content reference system for this tile source.
+     *
+     * E.g. "EPSG:3857" for Google-Mercator.
+     * @return code for the content reference system in use
+     */
+    String getServerCRS();
+
 }

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

@@ -6 +6 @@
 import org.openstreetmap.gui.jmapviewer.Coordinate;
 import org.openstreetmap.gui.jmapviewer.OsmMercator;
+import org.openstreetmap.gui.jmapviewer.Projected;
+import org.openstreetmap.gui.jmapviewer.Tile;
+import org.openstreetmap.gui.jmapviewer.TileRange;
 import org.openstreetmap.gui.jmapviewer.TileXY;
 import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
+import org.openstreetmap.gui.jmapviewer.interfaces.IProjected;
 
 /**
@@ -75 +79 @@
                 );
     }
+
+    @Override
+    public IProjected tileXYtoProjected(int x, int y, int zoom) {
+        double mercatorWidth = 2 * Math.PI * OsmMercator.EARTH_RADIUS;
+        double f = mercatorWidth * getTileSize() / osmMercator.getMaxPixels(zoom);
+        return new Projected(f * x - mercatorWidth / 2, -(f * y - mercatorWidth / 2));
+    }
+
+    @Override
+    public TileXY projectedToTileXY(IProjected p, int zoom) {
+        double mercatorWidth = 2 * Math.PI * OsmMercator.EARTH_RADIUS;
+        double f = mercatorWidth * getTileSize() / osmMercator.getMaxPixels(zoom);
+        return new TileXY((p.getEast() + mercatorWidth / 2) / f , (-p.getNorth() + mercatorWidth / 2) / f);
+    }
+
+    @Override
+    public boolean isInside(Tile inner, Tile outer) {
+        int dz = inner.getZoom() - outer.getZoom();
+        if (dz < 0) return false;
+        return outer.getXtile() == inner.getXtile() >> dz &&
+                outer.getYtile() == inner.getYtile() >> dz;
+    }
+
+    @Override
+    public TileRange getCoveringTileRange(Tile tile, int newZoom) {
+        if (newZoom <= tile.getZoom()) {
+            int dz = tile.getZoom() - newZoom;
+            TileXY xy = new TileXY(tile.getXtile() >> dz, tile.getYtile() >> dz);
+            return new TileRange(xy, xy, newZoom);
+        } else {
+            int dz = newZoom - tile.getZoom();
+            TileXY t1 = new TileXY(tile.getXtile() << dz, tile.getYtile() << dz);
+            TileXY t2 = new TileXY(t1.getX() + (1 << dz) - 1, t1.getY() + (1 << dz) - 1);
+            return new TileRange(t1, t2, newZoom);
+        }
+    }
+
+    @Override
+    public String getServerCRS() {
+        return "EPSG:3857";
+    }
 }