Ticket #5911: JMapViewer_attribution.patch

src/org/openstreetmap/gui/jmapviewer/BingAerialTileSource.java

@@ -160 +160 @@
     @Override
     public Image getAttributionImage() {
         try {
-            return ImageIO.read(getClass().getResourceAsStream("/images/bing_maps.png"));
+            return ImageIO.read(getClass().getResourceAsStream("images/bing_maps.png"));
         } catch (IOException e) {
             return null;
         }

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

@@ -54 +54 @@
                 map.setDisplayToFitMapMarkers();
             }
         });
-        JComboBox tileSourceSelector = new JComboBox(new TileSource[] { new OsmTileSource.Mapnik(),
-                new OsmTileSource.TilesAtHome(), new OsmTileSource.CycleMap() });
+        JComboBox tileSourceSelector = new JComboBox(new TileSource[] {
+                new OsmTileSource.Mapnik(),
+                new OsmTileSource.TilesAtHome(),
+                new OsmTileSource.CycleMap(),
+                new BingAerialTileSource() });
         tileSourceSelector.addItemListener(new ItemListener() {
             public void itemStateChanged(ItemEvent e) {
                 map.setTileSource((TileSource) e.getItem());

build.xml

@@ -27 +27 @@
                 <delete file="JMapViewer.jar" />
                 <delete file="JMapViewer_src.jar" />
                 <jar destfile="JMapViewer.jar" filesetmanifest="mergewithoutmain">
-                        <fileset dir="bin" includes="**/jmapviewer/**">
-                        </fileset>
+                        <fileset dir="bin" includes="**/jmapviewer/**" />
                         <fileset dir="src" includes="**/jmapviewer/**" />
                 </jar>
                 <jar destfile="JMapViewer_src.jar" filesetmanifest="mergewithoutmain">
@@ -45 +44 @@
                                 <attribute name="Class-Path" value="." />
                         </manifest>
                         <fileset dir="bin" includes="**/jmapviewer/**" />
-                        <fileset dir="src" includes="**/jmapviewer/**/*.java" />
+            <fileset dir="src" includes="**/jmapviewer/**/*.java" />
                 </jar>
         </target>
 </project>

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

@@ -27 +27 @@
             NAME = name;
             BASE_URL = base_url;
             ATTR_IMG_URL = attr_img_url;
-            if(ATTR_IMG_URL == null) {
-                REQUIRES_ATTRIBUTION = false;
-            }
-        }
+        }
 
         public String getName() {
             return NAME;
@@ -88 +85 @@
         }
 
         public String getAttributionText(int zoom, Coordinate topLeft, Coordinate botRight) {
-            return "CC-BY-SA OpenStreetMap and Contributors";
+            return "© OpenStreetMap contributors, CC-BY-SA ";
         }
 
         public String getAttributionLinkURL() {
@@ -96 +93 @@
         }
 
         public String getTermsOfUseURL() {
-            return "http://openstreetmap.org/";
+            return "http://www.openstreetmap.org/copyright";
         }
 
         public double latToTileY(double lat, int zoom) {
@@ -182 +179 @@
             return TileUpdate.IfModifiedSince;
         }
     }
+
     public static class TilesAtHome extends OsmaSource {
         public TilesAtHome() {
             super("TilesAtHome", "tile");
         }
     }
+
     public static class Maplint extends OsmaSource {
         public Maplint() {
             super("Maplint", "maplint");