Changeset 16158 in osm for applications/editors/josm

Timestamp:

2009-06-26T21:44:57+02:00 (15 years ago)

Author:

lvarga

Message:

Another three patches, look previous logs.

HashMap doesn't support concurrent modification. Hashtable
is already fully synchronized, so use it instead.

These just encapsulate a few common operations. They also make sure
that we don't do things like try and download the same tile from two
threads concurrently.

A Tile is just a container for x,y values. It has one helper
to convert from those x,y to a pixel position.
TileSets are a set of tiles at a certain zoom. They encapsulate
all the old z12x0, z12x1, z12y0, z12y1 functionality and allow
for multiple zoom calculations to be made at the same time and
at zooms other than currentZoomLevel.

File:

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

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

@@ -12 +12 @@
 import java.awt.event.MouseEvent;
 import java.awt.image.ImageObserver;
+import java.util.ArrayList;
 import java.util.Comparator;
-import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.List;
 import java.util.TreeSet;
 
@@ -50 +52 @@
      */
     public int currentZoomLevel = SlippyMapPreferences.getMinZoomLvl();
-    private HashMap<SlippyMapKey, SlippyMapTile> tileStorage = null;
+    private Hashtable<SlippyMapKey, SlippyMapTile> tileStorage = null;
 
     Point[][] pixelpos = new Point[21][21];
@@ -209 +211 @@
         // the setting isnt saved yet.
         int maxZoom = 30; // SlippyMapPreferences.getMaxZoomLvl();
-        tileStorage = new HashMap<SlippyMapKey, SlippyMapTile>();
+        tileStorage = new Hashtable<SlippyMapKey, SlippyMapTile>();
 
         checkTileStorage();
@@ -266 +268 @@
     }
 
+    synchronized SlippyMapTile getTile(int x, int y, int zoom) {
+                SlippyMapKey key = new SlippyMapKey(x, y, zoom);
+                if (!key.valid) {
+                        key = null;
+                }
+                return tileStorage.get(key);
+        }
+
+        synchronized SlippyMapTile putTile(SlippyMapTile tile, int x, int y, int zoom) {
+                SlippyMapKey key = new SlippyMapKey(x, y, zoom);
+                if (!key.valid) {
+                        key = null;
+                }
+                return tileStorage.put(key, tile);
+        }
+
+        synchronized SlippyMapTile getOrCreateTile(int x, int y, int zoom) {
+                SlippyMapTile tile = getTile(x, y, zoom);
+                if (tile != null) {
+                        return tile;
+                }
+                tile = new SlippyMapTile(x, y, zoom);
+                putTile(tile, x, y, zoom);
+                return tile;
+        }
+    
     void loadAllTiles() {
         MapView mv = Main.map.mapView;
@@ -356 +384 @@
     }
 
+        private class Tile {
+                public int x;
+                public int y;
+
+                Tile(int x, int y) {
+                        this.x = x;
+                        this.y = y;
+                }
+
+                public Point pixelPos(int zoom) {
+                        double lon = tileXToLon(this.x, zoom);
+                        LatLon tmpLL = new LatLon(tileYToLat(this.y, zoom), lon);
+                        MapView mv = Main.map.mapView;
+                        return mv.getPoint(Main.proj.latlon2eastNorth(tmpLL));
+                }
+        }
+
+        private class TileSet {
+                int z12x0, z12x1, z12y0, z12y1;
+                int zoom;
+
+                TileSet(LatLon topLeft, LatLon botRight, int zoom) {
+                        this.zoom = zoom;
+                        z12x0 = lonToTileX(topLeft.lon(), zoom);
+                        z12x1 = lonToTileX(botRight.lon(), zoom);
+                        z12y0 = latToTileY(topLeft.lat(), zoom);
+                        z12y1 = latToTileY(botRight.lat(), zoom);
+                        if (z12x0 > z12x1) {
+                                int tmp = z12x0;
+                                z12x0 = z12x1;
+                                z12x1 = tmp;
+                        }
+                        if (z12y0 > z12y1) {
+                                int tmp = z12y0;
+                                z12y0 = z12y1;
+                                z12y1 = tmp;
+                        }
+                }
+
+                int tilesSpanned() {
+                        int x_span = z12x1 - z12x0;
+                        int y_span = z12y1 - z12y0;
+                        return x_span * y_span;
+                }
+
+                /*
+                 * This is pretty silly. Should probably just be implemented as an
+                 * iterator to keep from having to instantiate all these tiles.
+                 */
+                List<Tile> allTiles()
+        {
+            List<Tile> ret = new ArrayList<Tile>();
+            for (int x = z12x0 - 1; x <= z12x1 + 1; x++) {
+                if (x < 0)
+                    continue;
+                for (int y = z12y0 - 1; y <= z12y1 + 1; y++) {
+                    if (y < 0)
+                        continue;
+                    Tile t = new Tile(x, y);
+                    ret.add(t);
+                }
+            }
+            return ret;
+        }
+
+                boolean topTile(Tile t) {
+                        if (t.y == z12y0 - 1)
+                                return true;
+                        return false;
+                }
+
+                boolean leftTile(Tile t) {
+                        if (t.x == z12x0 - 1)
+                                return true;
+                        return false;
+                }
+        }
+        
     /**
      */