Changeset 24706 in osm for applications/viewer/jmapviewer

Timestamp:

2010-12-12T01:35:34+01:00 (15 years ago)

Author:

upliner

Message:

prepare to include imagery into JOSM and Bing into jmapviewer

Location:

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

Files:

• BingAerialTileSource.java (added)
• JMapViewer.java (modified) (2 diffs)
• OsmTileSource.java (modified) (2 diffs)
• TMSTileSource.java (added)
• TemplatedTMSTileSource.java (added)
• images/bing_maps.png (added)
• interfaces/TileSource.java (modified) (3 diffs)

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

@@ -32 +32 @@
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoaderListener;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
-import org.openstreetmap.josm.data.coor.LatLon;
 
 /**
@@ -774 +773 @@
         Coordinate topLeft = getPosition(0,0);
         Coordinate bottomRight = getPosition(getWidth(),getHeight());
-        String attributionText = tileSource.getAttributionText(zoom,
-                new LatLon(topLeft.getLat(),topLeft.getLon()),
-                new LatLon(bottomRight.getLat(),bottomRight.getLon()));
+        String attributionText = tileSource.getAttributionText(zoom, topLeft, bottomRight);
         Rectangle2D stringBounds = g.getFontMetrics().getStringBounds(attributionText, g);
         {

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

@@ -6 +6 @@
 
 import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
-import org.openstreetmap.josm.data.coor.LatLon;
 
 public class OsmTileSource {
@@ -85 +84 @@
         }
 
-        public String getAttributionText(int zoom, LatLon topLeft, LatLon botRight) {
+        public String getAttributionText(int zoom, Coordinate topLeft, Coordinate botRight) {
             return "CC-BY-SA OpenStreetMap and Contributors";
         }

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

@@ -3 +3 @@
 import java.awt.Image;
 
+import org.openstreetmap.gui.jmapviewer.Coordinate;
 import org.openstreetmap.gui.jmapviewer.JMapViewer;
-import org.openstreetmap.josm.data.coor.LatLon;
 
 //License: GPL. Copyright 2008 by Jan Peter Stotz
@@ -101 +101 @@
     public boolean requiresAttribution();
 
-    // FIXME: JMapViewer shouldn't reference JOSM classes.
     /**
      * @param zoom The optional zoom level for the view.
@@ -108 +107 @@
      * @return Attribution text for the image source.
      */
-    public String getAttributionText(int zoom, LatLon topLeft, LatLon botRight);
+    public String getAttributionText(int zoom, Coordinate topLeft, Coordinate botRight);
 
     /**