Changeset 4198 in josm

Timestamp:

Jul 3, 2011 2:23:08 PM (23 months ago)

Author:

stoecker

Message:

fix #5911 - silently add attribution information also to old entries, may take some restarts to be done everywhere

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/ImageryInfo.java (modified) (2 diffs)
• data/imagery/ImageryLayerInfo.java (modified) (1 diff)
• gui/preferences/ImageryPreference.java (modified) (1 diff)

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

@@ -184 +184 @@
     public void setBounds(Bounds b) {
         this.bounds = b;
+    }
+
+    public Bounds getBounds() {
+        return bounds;
     }
 
@@ -285 +289 @@
     }
 
+    public boolean hasAttribution()
+    {
+        return attributionText != null;
+    }
+
+    public void copyAttribution(ImageryInfo i)
+    {
+        this.attributionImage = i.attributionImage;
+        this.attributionLinkURL = i.attributionLinkURL;
+        this.attributionText = i.attributionText;
+        this.termsOfUseURL = i.termsOfUseURL;
+    }
+
     public void setAttribution(TMSTileSource s)
     {

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

@@ -41 +41 @@
         for(Collection<String> c : Main.pref.getArray("imagery.layers",
                 Collections.<Collection<String>>emptySet())) {
-            add(new ImageryInfo(c));
+            ImageryInfo i = new ImageryInfo(c);
+            /* FIXME: Remove the attribution copy stuff end of 2011 */
+            if(!i.hasAttribution()) {
+                String url = i.getUrl();
+                for(ImageryInfo d : defaultLayers) {
+                    if(url.equals(d.getUrl())) {
+                        i.copyAttribution(d);
+                        i.setBounds(d.getBounds());
+                        break;
+                    }
+                }
+            }
+            add(i);
         }
         Collections.sort(layers);

trunk/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java

@@ -836 +836 @@
 
     public static void initialize() {
+        ImageryLayerInfo.instance.loadDefaults(false);
         ImageryLayerInfo.instance.load();
-        ImageryLayerInfo.instance.loadDefaults(false);
         OffsetBookmark.loadBookmarks();
         Main.main.menu.imageryMenu.refreshImageryMenu();