Changeset 16461 in osm for applications/editors/josm/plugins

Timestamp:

2009-07-12T20:30:29+02:00 (16 years ago)

Author:

dhansen

Message:

I noticed that some of the debugging lines were not getting
drawn directly. There were a few cases where the TileSet
didn't quite cover tiles on the edegs of the view area.

This creates a TileSet::tileMax variable which we can use
to determine when we hit the edges of valid tile numbers.
It also pads the tile searches by one to make sure that we
don't miss any tiles. The tileMax will keep us from going
out of bounds here.

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

@@ -495 +495 @@
                 int z12x0, z12x1, z12y0, z12y1;
                 int zoom;
-
+                int tileMax;
                 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);
+                        z12x0 = lonToTileX(topLeft.lon(), zoom) - 1;
+                        z12y0 = latToTileY(topLeft.lat(),  zoom) - 1;
+                        z12x1 = lonToTileX(botRight.lon(), zoom) + 1;
+                        z12y1 = latToTileY(botRight.lat(), zoom) + 1;
                         if (z12x0 > z12x1) {
                                 int tmp = z12x0;
@@ -512 +512 @@
                                 z12y1 = tmp;
                         }
+                        tileMax = (int)Math.pow(2.0, zoom);
+                        if (z12x0 < 0) z12x0 = 0;
+                        if (z12y0 < 0) z12y0 = 0;
+                        if (z12x1 > tileMax) z12x1 = tileMax;
+                        if (z12y1 > tileMax) z12y1 = tileMax;
                 }
 
@@ -527 +532 @@
         {
             List<Tile> ret = new ArrayList<Tile>();
-                        int tileMax = (int)Math.pow(2.0, zoom);
-            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;
+            for (int x = z12x0; x <= z12x1; x++) {
+                for (int y = z12y0; y <= z12y1; y++) {
                     Tile t = new Tile(x % tileMax, y % tileMax);
                     ret.add(t);
@@ -542 +542 @@
 
                 boolean topTile(Tile t) {
-                        if (t.y == z12y0 - 1)
+                        if (t.y == z12y0 )
                                 return true;
                         return false;
@@ -548 +548 @@
 
                 boolean leftTile(Tile t) {
-                        if (t.x == z12x0 - 1)
+                        if (t.x == z12x0 )
                                 return true;
                         return false;