Changeset 29845 in osm for applications/viewer

Timestamp:

2013-08-19T11:01:29+02:00 (11 years ago)

Author:

donvip

Message:

see #josm8980 - fix osm attribution (remove old cc-by-sa mention)

Location:

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

Files:

• AbstractOsmTileSource.java (modified) (2 diffs)
• MapQuestOsmTileSource.java (modified) (1 diff)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractOsmTileSource.java

@@ -5 +5 @@
 
 import java.awt.Image;
-import java.io.IOException;
-
-import javax.swing.ImageIcon;
 
 import org.openstreetmap.gui.jmapviewer.Coordinate;
-import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
 
 public abstract class AbstractOsmTileSource extends AbstractTMSTileSource {
+    
+    /**
+     * The OSM attribution. Must be always in line with <a href="http://www.openstreetmap.org/copyright/en">http://www.openstreetmap.org/copyright/en</a>
+     */
+    public static final String DEFAULT_OSM_ATTRIBUTION = "\u00a9 OpenStreetMap contributors";
+    
     public AbstractOsmTileSource(String name, String base_url) {
         super(name, base_url);
@@ -28 +30 @@
     @Override
     public String getAttributionText(int zoom, Coordinate topLeft, Coordinate botRight) {
-        return "\u00a9 OpenStreetMap contributors, CC-BY-SA ";
+        return DEFAULT_OSM_ATTRIBUTION;
     }
 

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/MapQuestOsmTileSource.java

@@ -14 +14 @@
     public String getAttributionText(int zoom, Coordinate topLeft,
             Coordinate botRight) {
-        return super.getAttributionText(zoom, topLeft, botRight)+"- "+MAPQUEST_ATTRIBUTION;
+        return super.getAttributionText(zoom, topLeft, botRight)+" - "+MAPQUEST_ATTRIBUTION;
     }
 }