Changeset 6793 in josm for trunk/src

Timestamp:

2014-01-31T14:44:15+01:00 (11 years ago)

Author:

xeen

Message:

[build fix] classes that use JMapViewer shoudn't use OsmMercator directly (fixes #9654, patch by glebius)

Location:

trunk/src/org/openstreetmap/josm/gui/bbox

Files:

• SlippyMapBBoxChooser.java (modified) (2 diffs)
• TileSelectionBBoxChooser.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java

@@ -26 +26 @@
 import org.openstreetmap.gui.jmapviewer.MapMarkerDot;
 import org.openstreetmap.gui.jmapviewer.MemoryTileCache;
-import org.openstreetmap.gui.jmapviewer.OsmMercator;
 import org.openstreetmap.gui.jmapviewer.OsmTileLoader;
 import org.openstreetmap.gui.jmapviewer.interfaces.MapMarker;
@@ -329 +328 @@
         }
 
-        int y1 = OsmMercator.LatToY(bbox.getMinLat(), MAX_ZOOM);
-        int y2 = OsmMercator.LatToY(bbox.getMaxLat(), MAX_ZOOM);
-        int x1 = OsmMercator.LonToX(minLon, MAX_ZOOM);
-        int x2 = OsmMercator.LonToX(maxLon, MAX_ZOOM);
+        int y1 = tileSource.LatToY(bbox.getMinLat(), MAX_ZOOM);
+        int y2 = tileSource.LatToY(bbox.getMaxLat(), MAX_ZOOM);
+        int x1 = tileSource.LonToX(minLon, MAX_ZOOM);
+        int x2 = tileSource.LonToX(maxLon, MAX_ZOOM);
 
         iSelectionRectStart = new Point(Math.min(x1, x2), Math.min(y1, y2));

trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java

@@ -42 +42 @@
 import org.openstreetmap.gui.jmapviewer.JMapViewer;
 import org.openstreetmap.gui.jmapviewer.MapMarkerDot;
-import org.openstreetmap.gui.jmapviewer.OsmMercator;
 import org.openstreetmap.gui.jmapviewer.OsmTileLoader;
 import org.openstreetmap.gui.jmapviewer.interfaces.MapMarker;
@@ -681 +680 @@
                 max = null;
             } else {
-                int y1 = OsmMercator.LatToY(bbox.getMinLat(), MAX_ZOOM);
-                int y2 = OsmMercator.LatToY(bbox.getMaxLat(), MAX_ZOOM);
-                int x1 = OsmMercator.LonToX(bbox.getMinLon(), MAX_ZOOM);
-                int x2 = OsmMercator.LonToX(bbox.getMaxLon(), MAX_ZOOM);
+                int y1 = tileSource.LatToY(bbox.getMinLat(), MAX_ZOOM);
+                int y2 = tileSource.LatToY(bbox.getMaxLat(), MAX_ZOOM);
+                int x1 = tileSource.LonToX(bbox.getMinLon(), MAX_ZOOM);
+                int x2 = tileSource.LonToX(bbox.getMaxLon(), MAX_ZOOM);
 
                 min = new Point(Math.min(x1, x2), Math.min(y1, y2));