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

Timestamp:

2012-07-26T19:54:44+02:00 (12 years ago)

Author:

simon04

Message:

Suggest imagery layers for downloaded area based on <bounds>.

Location:

trunk/src/org/openstreetmap/josm/data/imagery

Files:

• ImageryInfo.java (modified) (3 diffs)
• ImageryLayerInfo.java (modified) (1 diff)

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

@@ -98 +98 @@
     private String countryCode = "";
     private String icon;
+    // when adding a field, also adapt the ImageryInfo(ImageryInfo) constructor
 
     /** auxiliary class to save an ImageryInfo object in the preferences */
@@ -246 +247 @@
 
     public ImageryInfo(ImageryInfo i) {
-        this.name=i.name;
-        this.url=i.url;
-        this.cookies=i.cookies;
-        this.imageryType=i.imageryType;
-        this.defaultMinZoom=i.defaultMinZoom;
-        this.defaultMaxZoom=i.defaultMaxZoom;
-        this.pixelPerDegree=i.pixelPerDegree;
+        this.name = i.name;
+        this.url = i.url;
+        this.defaultEntry = i.defaultEntry;
+        this.cookies = i.cookies;
         this.eulaAcceptanceRequired = null;
+        this.imageryType = i.imageryType;
+        this.pixelPerDegree = i.pixelPerDegree;
+        this.defaultMaxZoom = i.defaultMaxZoom;
+        this.defaultMinZoom = i.defaultMinZoom;
         this.bounds = i.bounds;
+        this.serverProjections = i.serverProjections;
         this.attributionText = i.attributionText;
         this.attributionLinkURL = i.attributionLinkURL;
@@ -261 +264 @@
         this.termsOfUseText = i.termsOfUseText;
         this.termsOfUseURL = i.termsOfUseURL;
-        this.serverProjections = i.serverProjections;
+        this.countryCode = i.countryCode;
         this.icon = i.icon;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        ImageryInfo that = (ImageryInfo) o;
+
+        if (imageryType != that.imageryType) return false;
+        if (url != null ? !url.equals(that.url) : that.url != null) return false;
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = url != null ? url.hashCode() : 0;
+        result = 31 * result + (imageryType != null ? imageryType.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "ImageryInfo{" +
+                "name='" + name + '\'' +
+                ", countryCode='" + countryCode + '\'' +
+                ", url='" + url + '\'' +
+                ", imageryType=" + imageryType +
+                '}';
     }
 

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

@@ -150 +150 @@
         Main.main.menu.imageryMenu.refreshImageryMenu();
     }
+
+    public static void addLayers(Collection<ImageryInfo> infos) {
+        for (ImageryInfo i : infos) {
+            instance.add(i);
+        }
+        instance.save();
+        Collections.sort(instance.layers);
+        Main.main.menu.imageryMenu.refreshImageryMenu();
+    }
 }