Changeset 4506 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

08.10.2011 13:04:58 (8 months ago)

Author:

bastiK

Message:

fixed #6816 - attribution for wmslayer (see ​[o26806])

File:

• trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.imagery;
 
+import java.awt.Image;
 import java.util.Arrays;
 import java.util.ArrayList;
@@ -18 +19 @@
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.gui.jmapviewer.Coordinate;
+import org.openstreetmap.gui.jmapviewer.interfaces.Attributed;
 import org.openstreetmap.gui.jmapviewer.tilesources.OsmTileSource.Mapnik;
-import org.openstreetmap.gui.jmapviewer.tilesources.TMSTileSource;
+import org.openstreetmap.gui.jmapviewer.tilesources.AbstractTileSource;
 
 /**
@@ -26 +29 @@
  * @author Frederik Ramm <frederik@remote.org>
  */
-public class ImageryInfo implements Comparable<ImageryInfo> {
+public class ImageryInfo implements Comparable<ImageryInfo>, Attributed {
 
     public enum ImageryType {
@@ -325 +328 @@
     }
 
-    public String getAttributionText() {
+    @Override
+    public boolean requiresAttribution() {
+        return attributionText != null || attributionImage != null || termsOfUseText != null || termsOfUseURL != null;
+    }
+
+    @Override
+    public String getAttributionText(int zoom, Coordinate topLeft, Coordinate botRight) {
         return attributionText;
+    }
+
+    @Override
+    public String getAttributionLinkURL() {
+        return attributionLinkURL;
+    }
+
+    @Override
+    public Image getAttributionImage() {
+        ImageIcon i = ImageProvider.getIfAvailable(attributionImage);
+        if (i != null) {
+            return i.getImage();
+        }
+        return null;
+    }
+
+    @Override
+    public String getAttributionImageURL() {
+        return attributionImageURL;
+    }
+
+    @Override
+    public String getTermsOfUseText() {
+        return termsOfUseText;
+    }
+
+    @Override
+    public String getTermsOfUseURL() {
+        return termsOfUseURL;
     }
 
@@ -333 +371 @@
     }
 
+    public void setAttributionImageURL(String text) {
+        attributionImageURL = text;
+    }
+
     public void setAttributionImage(String text) {
         attributionImage = text;
     }
 
-    public void setAttributionImageURL(String text) {
-        attributionImageURL = text;
-    }
-
-    public String getAttributionLinkURL() {
-        return attributionLinkURL;
-    }
-
     public void setAttributionLinkURL(String text) {
         attributionLinkURL = text;
@@ -351 +385 @@
     public void setTermsOfUseText(String text) {
         termsOfUseText = text;
-    }
-
-    public String getTermsOfUseURL() {
-        return termsOfUseURL;
     }
 
@@ -542 +572 @@
      * Applies the attribution from this object to a TMSTileSource.
      */
-    public void setAttribution(TMSTileSource s) {
+    public void setAttribution(AbstractTileSource s) {
         if (attributionText != null) {
             if (attributionText.equals("osm")) {