Changeset 30854 in osm for applications/viewer/jmapviewer

Timestamp:

2014-12-18T22:56:22+01:00 (10 years ago)

Author:

bastik

Message:

see #josm5309 - rework cache directory structure so you don't have too many files in in one directory
New cache is implemented in TMSFileCacheTileLoader. Old cache in OsmFileCacheTileLoader should work
as before.

Location:

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

Files:

• OsmFileCacheTileLoader.java (modified) (2 diffs)
• TMSFileCacheTileLoader.java (added)
• interfaces/TileSource.java (modified) (1 diff)
• tilesources/AbstractMapQuestTileSource.java (modified) (1 diff)
• tilesources/AbstractOsmTileSource.java (modified) (1 diff)
• tilesources/AbstractTMSTileSource.java (modified) (3 diffs)
• tilesources/BingAerialTileSource.java (modified) (1 diff)
• tilesources/MapQuestOpenAerialTileSource.java (modified) (1 diff)
• tilesources/MapQuestOsmTileSource.java (modified) (1 diff)
• tilesources/OsmTileSource.java (modified) (2 diffs)
• tilesources/ScanexTileSource.java (modified) (1 diff)
• tilesources/TMSTileSource.java (modified) (1 diff)
• tilesources/TemplatedTMSTileSource.java (modified) (1 diff)

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

@@ -45 +45 @@
     private static final Logger log = FeatureAdapter.getLogger(OsmFileCacheTileLoader.class.getName());
 
-    private static final String TAGS_FILE_EXT = ".tags";
+    protected static final String TAGS_FILE_EXT = "tags";
 
     private static final Charset TAGS_CHARSET = Charset.forName("UTF-8");
@@ -392 +392 @@
 
         protected File getTagsFile() {
-            return new File(tileCacheDir + "/" + tile.getZoom() + "_" + tile.getXtile() + "_" + tile.getYtile()
+            return new File(tileCacheDir + "/" + tile.getZoom() + "_" + tile.getXtile() + "_" + tile.getYtile() + "."
                     + TAGS_FILE_EXT);
         }
 
         protected void saveTileToFile(byte[] rawData) {
+            File file = getTileFile();
+            file.getParentFile().mkdirs();
             try (
-                FileOutputStream f = new FileOutputStream(tileCacheDir + "/" + tile.getZoom() + "_" + tile.getXtile()
-                        + "_" + tile.getYtile() + "." + tile.getSource().getTileType())
+                FileOutputStream f = new FileOutputStream(file)
             ) {
                 f.write(rawData);

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java

@@ -63 +63 @@
 
     /**
-     * A tile layer name has to be unique and has to consist only of characters
-     * valid for filenames.
+     * A tile layer name as displayed to the user.
      *
      * @return Name of the tile layer
      */
     String getName();
+
+    /**
+     * A unique id for this tile source.
+     * 
+     * Unlike the name it has to be unique and has to consist only of characters
+     * valid for filenames.
+     * 
+     * @return the id
+     */
+    String getId();
 
     /**

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

@@ -31 +31 @@
     private int SERVER_NUM = 1;
 
-    public AbstractMapQuestTileSource(String name, String base_url) {
-        super(name, base_url);
+    public AbstractMapQuestTileSource(String name, String base_url, String id) {
+        super(name, base_url, id);
     }
 

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

@@ -20 +20 @@
      * @param name Source name as displayed in GUI
      * @param base_url Source URL
+     * @param id unique id for the tile source; contains only characters that
+     * are safe for file names; can be null
      */
-    public AbstractOsmTileSource(String name, String base_url) {
-        super(name, base_url);
+    public AbstractOsmTileSource(String name, String base_url, String id) {
+        super(name, base_url, id);
     }
 

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

@@ -10 +10 @@
     protected String name;
     protected String baseUrl;
+    protected String id;
 
-    public AbstractTMSTileSource(String name, String base_url) {
+    public AbstractTMSTileSource(String name, String base_url, String id) {
         this.name = name;
         this.baseUrl = base_url;
@@ -17 +18 @@
             baseUrl = baseUrl.substring(0,baseUrl.length()-1);
         }
+        this.id = id;
     }
 
@@ -22 +24 @@
     public String getName() {
         return name;
+    }
+
+    @Override
+    public String getId() {
+        return id;
     }
 

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

@@ -52 +52 @@
      * Constructs a new {@code BingAerialTileSource}.
      */
-    public BingAerialTileSource() {
-        super("Bing Aerial Maps", "http://example.com/");
+    public BingAerialTileSource(String id) {
+        super("Bing Aerial Maps", "http://example.com/", id);
     }
 

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

@@ -9 +9 @@
 
     public MapQuestOpenAerialTileSource() {
-        super("MapQuest Open Aerial", PATTERN);
+        super("MapQuest Open Aerial", PATTERN, "mapquest-oa");
     }
 

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

@@ -9 +9 @@
 
     public MapQuestOsmTileSource() {
-        super("MapQuest-OSM", PATTERN);
+        super("MapQuest-OSM", PATTERN, "mapquest-osm");
     }
     

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

@@ -22 +22 @@
          */
         public Mapnik() {
-            super("Mapnik", PATTERN);
+            super("Mapnik", PATTERN, "MAPNIK");
         }
 
@@ -57 +57 @@
          */
         public CycleMap() {
-            super("Cyclemap", PATTERN);
+            super("Cyclemap", PATTERN, "opencylemap");
         }
 

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

@@ -46 +46 @@
     private ScanexLayer Layer = ScanexLayer.IRS;
 
-    public ScanexTileSource(String name, String url, int maxZoom) {
-        super(name, url, maxZoom);
+    public ScanexTileSource(String name, String url, String id, int maxZoom) {
+        super(name, url, id, maxZoom);
 
         for (ScanexLayer layer : ScanexLayer.values()) {

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

@@ -7 +7 @@
     protected int minZoom = 0;
 
-    public TMSTileSource(String name, String url, int maxZoom) {
-        super(name, url);
+    public TMSTileSource(String name, String url, String id, int maxZoom) {
+        super(name, url, id);
         this.maxZoom = maxZoom;
     }
 
-    public TMSTileSource(String name, String url, int minZoom, int maxZoom) {
-        super(name, url);
+    public TMSTileSource(String name, String url, String id, int minZoom, int maxZoom) {
+        super(name, url, id);
         this.minZoom = minZoom;
         this.maxZoom = maxZoom;

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

@@ -27 +27 @@
     };
 
-    public TemplatedTMSTileSource(String name, String url, int maxZoom) {
-        super(name, url, maxZoom);
+    public TemplatedTMSTileSource(String name, String url, String id, int maxZoom) {
+        super(name, url, id, maxZoom);
         handleTemplate();
     }
 
-    public TemplatedTMSTileSource(String name, String url, int minZoom, int maxZoom) {
-        super(name, url, minZoom, maxZoom);
+    public TemplatedTMSTileSource(String name, String url, String id, int minZoom, int maxZoom) {
+        super(name, url, id, minZoom, maxZoom);
         handleTemplate();
     }