Changeset 19887 in osm for applications/editors/josm/plugins/slippymap/src

Timestamp:

2010-02-06T13:17:41+01:00 (15 years ago)

Author:

daviddean

Message:

Slippymap plugin can now accept custom_tile_sources with non-standard tilepaths. (For example NearMap uses &z=%z&x=%x&y=%y instead of /%z/%x/%y)
Just specify the path in slippymap.custom_tile_source_*.path using %z,%x and %y to show where the numbers go.

File:

• applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java (modified) (5 diffs)

applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java

@@ -299 +299 @@
 
     public static class Custom extends OsmTileSource.AbstractOsmTileSource {
+
+        String extension;
+        String path;
+
         public Custom(String name, String url) {
             super(name, url);
@@ -306 +310 @@
             this.extension = extension;
         }
-        String extension;
+        public Custom(String name, String url, String extension, String path) {
+            super(name, url);
+            this.extension = extension;
+            this.path = path;
+        }
+
         @Override
         public String getExtension() {
@@ -313 +322 @@
             return extension;
         }
+
+        @Override
+        public int getMaxZoom() {
+            return 21;
+        }
+
+        @Override
+        public String getTilePath(int zoom, int tilex, int tiley) {
+            if (path == null)
+                return super.getTilePath(zoom,tilex,tiley);
+            String tilepath = path;
+            tilepath=tilepath.replaceAll("%z",String.valueOf(zoom));
+            tilepath=tilepath.replaceAll("%x",String.valueOf(tilex));
+            tilepath=tilepath.replaceAll("%y",String.valueOf(tiley));
+            return tilepath;
+        }
+
         public TileUpdate getTileUpdate() {
             return TileUpdate.IfNoneMatch;
@@ -327 +353 @@
             // slippymap.custom_tile_source_1.url=http://a.ooc.openstreetmap.org/npe
             // slippymap.custom_tile_source_1.ext=png
+            // slippymap.custom_tile_source_1.path=/%z/%x/%y
 
             if (!(short_key.endsWith("name")))
@@ -332 +359 @@
             String url_key = short_key.replaceFirst("name","url");
             String ext_key = short_key.replaceFirst("name","ext");
+            String path_key = short_key.replaceFirst("name","path");
             String name = customSources.get(key);
             String url = customSources.get(PREFERENCE_TILE_CUSTOM_SOURCE + url_key);
             String ext = customSources.get(PREFERENCE_TILE_CUSTOM_SOURCE + ext_key);
-            // ext may be null, but that's OK
-            System.out.println("found new tile source: '" +name+"' url:'"+url+"'"+"' ext:'"+ext+"'");
-            ret.add(new Custom(name, url, ext));
+            String path = customSources.get(PREFERENCE_TILE_CUSTOM_SOURCE + path_key);
+            // ext and path may be null, but that's OK
+            System.out.println("found new tile source: '" +name+"' url:'"+url+"'"+"' ext:'"+ext+"' path:'"+path+"'");
+            ret.add(new Custom(name, url, ext, path));
         }
         return ret;