Changeset 18211 in osm

Timestamp:

2009-10-18T21:02:12+02:00 (15 years ago)

Author:

dhansen

Message:

We need some more information out of the tiles other than the error
image that the tile loading has errored out. This should do it.

Refactor the map sources code to make it easier to make more of these.

Location:

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

Files:

• OsmTileLoader.java (modified) (1 diff)
• OsmTileSource.java (modified) (9 diffs)
• Tile.java (modified) (2 diffs)

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

@@ -57 +57 @@
                 } catch (Exception e) {
                     tile.setImage(Tile.ERROR_IMAGE);
+                    tile.error = true;
                     listener.tileLoadingFinished(tile, false);
                     if (input == null)

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

@@ -6 +6 @@
 
     public static final String MAP_MAPNIK = "http://tile.openstreetmap.org";
-    public static final String MAP_OSMA = "http://tah.openstreetmap.org/Tiles/tile";
+    public static final String MAP_OSMA = "http://tah.openstreetmap.org/Tiles";
 
-    protected static abstract class AbstractOsmTileSource implements TileSource {
+    public static abstract class AbstractOsmTileSource implements TileSource {
+        protected String NAME;
+        protected String BASE_URL;
+        public AbstractOsmTileSource(String name, String base_url)
+        {
+            NAME = name;
+            BASE_URL = base_url;
+        }
+
+        public String getName() {
+            return NAME;
+        }
 
         public int getMaxZoom() {
@@ -18 +29 @@
         }
 
+        public String getTilePath(int zoom, int tilex, int tiley) {
+            return "/" + zoom + "/" + tilex + "/" + tiley + ".png";
+        }
+
+        public String getBaseUrl() {
+            return this.BASE_URL;
+        }
+
         public String getTileUrl(int zoom, int tilex, int tiley) {
-            return "/" + zoom + "/" + tilex + "/" + tiley + ".png";
+            return this.getBaseUrl() + getTilePath(zoom, tilex, tiley);
         }
 
@@ -34 +53 @@
 
     public static class Mapnik extends AbstractOsmTileSource {
-
-        public static String NAME = "Mapnik";
-
-        public String getName() {
-            return NAME;
-        }
-
-        @Override
-        public String getTileUrl(int zoom, int tilex, int tiley) {
-            return MAP_MAPNIK + super.getTileUrl(zoom, tilex, tiley);
+        public Mapnik() {
+            super("Mapnik", MAP_MAPNIK);
         }
 
@@ -54 +65 @@
     public static class CycleMap extends AbstractOsmTileSource {
 
-        private static final String PATTERN = "http://%s.andy.sandbox.cloudmade.com/tiles/cycle/%d/%d/%d.png";
-        public static String NAME = "OSM Cycle Map";
+        private static final String PATTERN = "http://%s.andy.sandbox.cloudmade.com/tiles/cycle";
 
         private static final String[] SERVER = { "a", "b", "c" };
@@ -61 +71 @@
         private int SERVER_NUM = 0;
 
+        public CycleMap() {
+            super("OSM Cycle Map", PATTERN);
+        }
+
         @Override
-        public String getTileUrl(int zoom, int tilex, int tiley) {
-            String url = String.format(PATTERN, new Object[] { SERVER[SERVER_NUM], zoom, tilex, tiley });
+        public String getBaseUrl() {
+            String url = String.format(this.BASE_URL, new Object[] { SERVER[SERVER_NUM] });
             SERVER_NUM = (SERVER_NUM + 1) % SERVER.length;
             return url;
@@ -72 +86 @@
         }
 
-        public String getName() {
-            return NAME;
-        }
-
         public TileUpdate getTileUpdate() {
             return TileUpdate.LastModified;
@@ -82 +92 @@
     }
 
-    public static class TilesAtHome extends AbstractOsmTileSource {
-
-        public static String NAME = "TilesAtHome";
+    public static abstract class OsmaSource extends AbstractOsmTileSource {
+        String osmaSuffix;
+        public OsmaSource(String name, String osmaSuffix) {
+            super(name, MAP_OSMA);
+            this.osmaSuffix = osmaSuffix;
+        }
 
         public int getMaxZoom() {
@@ -90 +103 @@
         }
 
-        public String getName() {
-            return NAME;
-        }
-
         @Override
-        public String getTileUrl(int zoom, int tilex, int tiley) {
-            return MAP_OSMA + super.getTileUrl(zoom, tilex, tiley);
+        public String getBaseUrl() {
+            return MAP_OSMA + "/" + osmaSuffix;
         }
 
@@ -103 +112 @@
         }
     }
+    public static class TilesAtHome extends OsmaSource {
+        public TilesAtHome() {
+            super("TilesAtHome", "tile");
+        }
+    }
+    public static class Maplint extends OsmaSource {
+        public Maplint() {
+            super("Maplint", "maplint");
+        }
+    }
 }

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

@@ -47 +47 @@
     protected boolean loaded = false;
     protected boolean loading = false;
+    protected boolean error = false;
     public static final int SIZE = 256;
 
@@ -225 +226 @@
         if (this.loaded)
             status = "loaded";
+        if (this.error)
+            status = "error";
         return status;
     }
+    public boolean hasError() {
+        return error;
+    }
 
 }