Changeset 3878 in josm for trunk/src

Timestamp:

2011-02-09T13:01:08+01:00 (13 years ago)

Author:

Upliner

Message:

Add support for ScanEx IRS tilesource (patch by glebius)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AddImageryLayerAction.java (modified) (1 diff)
• data/imagery/ImageryInfo.java (modified) (1 diff)
• gui/bbox/SlippyMapBBoxChooser.java (modified) (1 diff)
• gui/layer/ImageryLayer.java (modified) (1 diff)
• gui/layer/TMSLayer.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

@@ -33 +33 @@
         if (info.isBlacklisted()) {
             setEnabled(false);
-        } else if (info.getImageryType() == ImageryType.TMS || info.getImageryType() == ImageryType.BING) {
+        } else if (info.getImageryType() == ImageryType.TMS || info.getImageryType() == ImageryType.BING || info.getImageryType() == ImageryType.SCANEX) {
             setEnabled(true);
         } else if (Main.map != null && Main.map.mapView != null && !Main.map.mapView.getAllLayers().isEmpty()) {

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

@@ -16 +16 @@
         TMS("tms"),
         HTML("html"),
-        BING("bing");
+        BING("bing"),
+        SCANEX("scanex");
 
         private String urlString;

trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java

@@ -80 +80 @@
 
         @Override public String getTermsOfUseURL() { return source.getTermsOfUseURL(); }
+
+        @Override public double latToTileY(double lat, int zoom) { return source.latToTileY(lat,zoom); }
+
+        @Override public double lonToTileX(double lon, int zoom) { return source.lonToTileX(lon,zoom); }
+
+        @Override public double tileYToLat(int y, int zoom) { return tileYToLat(y, zoom); }
+
+        @Override public double tileXToLon(int x, int zoom) { return tileXToLon(x, zoom); }
     }
 

trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java

@@ -131 +131 @@
         if (info.getImageryType() == ImageryType.WMS || info.getImageryType() == ImageryType.HTML)
             return new WMSLayer(info);
-        else if (info.getImageryType() == ImageryType.TMS || info.getImageryType() == ImageryType.BING)
+        else if (info.getImageryType() == ImageryType.TMS || info.getImageryType() == ImageryType.BING || info.getImageryType() == ImageryType.SCANEX)
             return new TMSLayer(info);
         else throw new AssertionError();

trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java

@@ -43 +43 @@
 import org.openstreetmap.gui.jmapviewer.OsmFileCacheTileLoader;
 import org.openstreetmap.gui.jmapviewer.OsmTileLoader;
+import org.openstreetmap.gui.jmapviewer.ScanexIRSTileSource;
 import org.openstreetmap.gui.jmapviewer.TMSTileSource;
 import org.openstreetmap.gui.jmapviewer.TemplatedTMSTileSource;
@@ -238 +239 @@
         } else if (info.getImageryType() == ImageryType.BING)
             return new BingAerialTileSource();
+        else if (info.getImageryType() == ImageryType.SCANEX)
+            return new ScanexIRSTileSource();
         return null;
     }
@@ -286 +289 @@
         LatLon topLeft = mv.getLatLon(0, 0);
         LatLon botRight = mv.getLatLon(mv.getWidth(), mv.getHeight());
-        double x1 = lonToTileX(topLeft.lon(), zoom);
-        double y1 = latToTileY(topLeft.lat(), zoom);
-        double x2 = lonToTileX(botRight.lon(), zoom);
-        double y2 = latToTileY(botRight.lat(), zoom);
+        double x1 = tileSource.lonToTileX(topLeft.lon(), zoom);
+        double y1 = tileSource.latToTileY(topLeft.lat(), zoom);
+        double x2 = tileSource.lonToTileX(botRight.lon(), zoom);
+        double y2 = tileSource.latToTileY(botRight.lat(), zoom);
 
         int screenPixels = mv.getWidth()*mv.getHeight();
@@ -677 +680 @@
     {
         int zoom = t.getZoom();
-        return new LatLon(tileYToLat(t.getYtile(), zoom),
-                tileXToLon(t.getXtile(), zoom));
+        return new LatLon(tileSource.tileYToLat(t.getYtile(), zoom),
+                tileSource.tileXToLon(t.getXtile(), zoom));
     }
 
@@ -866 +869 @@
     }
     private Point pixelPos(Tile t) {
-        double lon = tileXToLon(t.getXtile(), t.getZoom());
-        LatLon tmpLL = new LatLon(tileYToLat(t.getYtile(), t.getZoom()), lon);
+        double lon = tileSource.tileXToLon(t.getXtile(), t.getZoom());
+        LatLon tmpLL = new LatLon(tileSource.tileYToLat(t.getYtile(), t.getZoom()), lon);
         return pixelPos(tmpLL);
     }
@@ -898 +901 @@
                 return;
 
-            x0 = (int)lonToTileX(topLeft.lon(),  zoom);
-            y0 = (int)latToTileY(topLeft.lat(),  zoom);
-            x1 = (int)lonToTileX(botRight.lon(), zoom);
-            y1 = (int)latToTileY(botRight.lat(), zoom);
+            x0 = (int)tileSource.lonToTileX(topLeft.lon(),  zoom);
+            y0 = (int)tileSource.latToTileY(topLeft.lat(),  zoom);
+            x1 = (int)tileSource.lonToTileX(botRight.lon(), zoom);
+            y1 = (int)tileSource.latToTileY(botRight.lat(), zoom);
             if (x0 > x1) {
                 int tmp = x0;
@@ -1303 +1306 @@
         return needRedraw;
     }
-
-    private static double latToTileY(double lat, int zoom) {
-        double l = lat / 180 * Math.PI;
-        double pf = Math.log(Math.tan(l) + (1 / Math.cos(l)));
-        return Math.pow(2.0, zoom - 1) * (Math.PI - pf) / Math.PI;
-    }
-
-    private static double lonToTileX(double lon, int zoom) {
-        return Math.pow(2.0, zoom - 3) * (lon + 180.0) / 45.0;
-    }
-
-    private static double tileYToLat(int y, int zoom) {
-        return Math.atan(Math.sinh(Math.PI
-                - (Math.PI * y / Math.pow(2.0, zoom - 1))))
-                * 180 / Math.PI;
-    }
-
-    private static double tileXToLon(int x, int zoom) {
-        return x * 45.0 / Math.pow(2.0, zoom - 3) - 180.0;
-    }
 }