Changeset 30244 in osm for applications/viewer/jmapviewer/src

Timestamp:

2014-01-31T13:51:51+01:00 (11 years ago)

Author:

glebius

Message:

To match getPosition() and simplify code rename setDisplayPositionByLatLon()
into setDisplayPosition(Coordinate to, ...).

Location:

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

Files:

• Demo.java (modified) (1 diff)
• JMapViewer.java (modified) (4 diffs)

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

@@ -205 +205 @@
         map().addMapRectangle(new MapRectangleImpl(wales, "Wales", c(53.35,-4.57), c(51.64,-2.63)));
 
-        // map.setDisplayPositionByLatLon(49.807, 8.6, 11);
+        // map.setDisplayPosition(new Coordinate(49.807, 8.6), 11);
         // map.setTileGridVisible(true);
 

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

@@ -119 +119 @@
         setMinimumSize(new Dimension(tileSource.getTileSize(), tileSource.getTileSize()));
         setPreferredSize(new Dimension(400, 400));
-        setDisplayPositionByLatLon(50, 9, 3);
+        setDisplayPosition(new Coordinate(50, 9), 3);
         //setToolTipText("");
     }
@@ -190 +190 @@
      *            {@link #MIN_ZOOM} <= zoom level <= {@link #MAX_ZOOM}
      */
-    public void setDisplayPositionByLatLon(double lat, double lon, int zoom) {
-        setDisplayPositionByLatLon(new Point(getWidth() / 2, getHeight() / 2), lat, lon, zoom);
+    public void setDisplayPosition(Coordinate to, int zoom) {
+        setDisplayPosition(new Point(getWidth() / 2, getHeight() / 2), to, zoom);
     }
 
@@ -210 +210 @@
      *            {@link TileSource#getMaxZoom()}
      */
-    public void setDisplayPositionByLatLon(Point mapPoint, double lat, double lon, int zoom) {
-        int x = OsmMercator.LonToX(lon, zoom);
-        int y = OsmMercator.LatToY(lat, zoom);
+    public void setDisplayPosition(Point mapPoint, Coordinate to, int zoom) {
+        int x = OsmMercator.LonToX(to.getLon(), zoom);
+        int y = OsmMercator.LatToY(to.getLat(), zoom);
         setDisplayPosition(mapPoint, x, y, zoom);
     }
@@ -818 +818 @@
         tileController.cancelOutstandingJobs(); // Clearing outstanding load
         // requests
-        setDisplayPositionByLatLon(mapPoint, zoomPos.getLat(), zoomPos.getLon(), zoom);
+        setDisplayPosition(mapPoint, zoomPos, zoom);
 
         this.fireJMVEvent(new JMVCommandEvent(COMMAND.ZOOM, this));