Changeset 25266 in osm for applications

Timestamp:

2011-02-10T11:07:19+01:00 (14 years ago)

Author:

upliner

Message:

Add support for ScanEx Spot support (patch by glebius)

File:

• applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/ScanexTileSource.java (moved) (moved from applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/ScanexIRSTileSource.java ) (4 diffs)

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

@@ -1 +1 @@
 package org.openstreetmap.gui.jmapviewer;
 
-import java.awt.Image;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
+public class ScanexTileSource extends OsmTileSource.AbstractOsmTileSource {
+    private static String API_KEY = "4018C5A9AECAD8868ED5DEB2E41D09F7";
 
-import javax.imageio.ImageIO;
+    private enum ScanexLayer {
+        IRS("irs", "/TileSender.ashx?ModeKey=tile&MapName=F7B8CF651682420FA1749D894C8AD0F6&LayerName=BAC78D764F0443BD9AF93E7A998C9F5B"),
+        SPOT("spot", "/TileSender.ashx?ModeKey=tile&MapName=F7B8CF651682420FA1749D894C8AD0F6&LayerName=F51CE95441284AF6B2FC319B609C7DEC");
 
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.DefaultHandler;
-import org.xml.sax.helpers.XMLReaderFactory;
+        private String name;
+        private String uri;
 
-public class ScanexIRSTileSource extends OsmTileSource.AbstractOsmTileSource {
-    private static String API_KEY = "4018C5A9AECAD8868ED5DEB2E41D09F7";
-    private static String BASE_URI = "/TileSender.ashx?ModeKey=tile&MapName=F7B8CF651682420FA1749D894C8AD0F6&LayerName=BAC78D764F0443BD9AF93E7A998C9F5B";
+        ScanexLayer(String name, String uri) {
+            this.name = name;
+            this.uri = uri;
+        }
+        public String getName() {
+            return name;
+        }
+        public String getUri() {
+            return uri;
+        }
+    }
 
-    public ScanexIRSTileSource() {
-        super("IRS satellite imagery", "http://maps.kosmosnimki.ru");
+    /* IRS by default */
+    private ScanexLayer Layer = ScanexLayer.IRS;
+
+    public ScanexTileSource(String url) {
+        super("Scanex" + url, "http://maps.kosmosnimki.ru");
+
+        for (ScanexLayer layer : ScanexLayer.values()) {
+            if (url.equalsIgnoreCase(layer.getName())) {
+                this.Layer = layer;
+                break;
+            }
+        }
     }
 
@@ -41 +49 @@
     @Override
     public String getTilePath(int zoom, int tilex, int tiley) {
-        int tmp = (int)Math.pow(2.0, zoom - 1);
+        int tmp = (int)Math.pow(2.0, zoom - 1);
 
-        tilex = tilex - tmp;
-        tiley = tmp - tiley - 1;
+        tilex = tilex - tmp;
+        tiley = tmp - tiley - 1;
 
-        return BASE_URI + "&apikey=" + API_KEY + "&x=" + tilex + "&y=" + tiley + "&z=" + zoom;
+        return this.Layer.getUri() + "&apikey=" + API_KEY + "&x=" + tilex + "&y=" + tiley + "&z=" + zoom;
     }
 
@@ -62 +70 @@
         double pow = Math.pow(Math.tan(Math.PI/4 + Math.asin(E * Math.sin(Math.toRadians(lat)))/2), E);
 
-        return (EQUATOR/2 - (RADIUS_E * Math.log(tmp/pow))) * Math.pow(2.0, zoom) / EQUATOR;
+        return (EQUATOR/2 - (RADIUS_E * Math.log(tmp/pow))) * Math.pow(2.0, zoom) / EQUATOR;
     }
 
     @Override
     public double lonToTileX(double lon, int zoom) {
-        return (RADIUS_E * lon * Math.PI / (90*EQUATOR) + 1) * Math.pow(2.0, zoom - 1);
+        return (RADIUS_E * lon * Math.PI / (90*EQUATOR) + 1) * Math.pow(2.0, zoom - 1);
     }
 
@@ -77 +85 @@
     @Override
     public double tileYToLat(int y, int zoom) {
-        double lat = 0;
-        double minl = OsmMercator.MIN_LAT;
-        double maxl = OsmMercator.MAX_LAT;
-        double c;
+        double lat = 0;
+        double minl = OsmMercator.MIN_LAT;
+        double maxl = OsmMercator.MAX_LAT;
+        double c;
 
-        for (int i=0; i < 60; i++) {
-                c = latToTileY(lat, zoom);
-                if (c < y) {
-                        maxl = lat;
-                        lat -= (lat - minl)/2;
-                } else {
-                        minl = lat;
-                        lat += (maxl - lat)/2;
-                }
-        }
+        for (int i=0; i < 60; i++) {
+            c = latToTileY(lat, zoom);
+            if (c < y) {
+                maxl = lat;
+                lat -= (lat - minl)/2;
+            } else {
+                minl = lat;
+                lat += (maxl - lat)/2;
+            }
+        }
 
-        return lat;
+        return lat;
     }