Changeset 31339 in osm for applications/viewer/jmapviewer

Timestamp:

2015-07-04T22:52:49+02:00 (9 years ago)

Author:

wiktorn

Message:

Basic WMTS support.

• added information about units and to_meter to EPSG projection definitions (needed for WMTS)
• added WMTSTileSource and WMTSLayer classes
• a bit of cleanup of AbstractTileSourceLayer and align so it will work properly with WMTS tile definitions
• added Imagery Preferences panel for WMTS and icon for button
• added removal of wms: / tms: / wmts: prefix, if user will paste them into the field
• CachedFile - added possibility to send custom headers with request
• added support for unit and to_meter in CustomProjection
• AbstractTMSTileSource cleanups (change of Coordinate to ICoordinate)
• moved JCSCachedTileLoaderJob.read() to Utils

Addresses: #josm10623

Tested with Polish WMTS service proivders, Walonnie needs still some debugging, as it is not working right now.

Location:

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

Files:

• TileXY.java (modified) (1 diff)
• tilesources/AbstractTMSTileSource.java (modified) (2 diffs)

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

@@ -38 +38 @@
      */
     public int getYIndex() {
-        return y < 0 ? (int) Math.ceil(x) : (int) Math.floor(y);
+        return y < 0 ? (int) Math.ceil(y) : (int) Math.floor(y);
     }
 

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

@@ -161 +161 @@
 
     @Override
-    public Coordinate XYToLatLon(Point point, int zoom) {
+    public ICoordinate XYToLatLon(Point point, int zoom) {
         return XYToLatLon(point.x, point.y, zoom);
     }
 
     @Override
-    public Coordinate XYToLatLon(int x, int y, int zoom) {
+    public ICoordinate XYToLatLon(int x, int y, int zoom) {
         return new Coordinate(
                 osmMercator.YToLat(y, zoom),
@@ -207 +207 @@
 
     @Override
-    public Coordinate tileXYToLatLon(TileXY xy, int zoom) {
+    public ICoordinate tileXYToLatLon(TileXY xy, int zoom) {
         return tileXYToLatLon(xy.getXIndex(), xy.getYIndex(), zoom);
     }
 
     @Override
-    public Coordinate tileXYToLatLon(Tile tile) {
+    public ICoordinate tileXYToLatLon(Tile tile) {
         return tileXYToLatLon(tile.getXtile(), tile.getYtile(), tile.getZoom());
     }
 
     @Override
-    public Coordinate tileXYToLatLon(int x, int y, int zoom) {
+    public ICoordinate tileXYToLatLon(int x, int y, int zoom) {
         return new Coordinate(
                 osmMercator.YToLat(y * tileSize, zoom),