Changeset 11707 in josm for trunk/src/org/openstreetmap

Timestamp:

2017-03-09T10:03:42+01:00 (8 years ago)

Author:

stoecker

Message:

only allow defaults with ID

File:

• trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java (modified) (3 diffs)

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

@@ -231 +231 @@
                 boolean isKnownDefault = false;
                 for (String entry : knownDefaults) {
-                    if (isSimilar(entry, def.getId())) {
+                    if (entry.equals(def.getId())) {
                         isKnownDefault = true;
                         newKnownDefaults.add(entry);
@@ -238 +238 @@
                     } else if (isSimilar(entry, def.getUrl())) {
                         isKnownDefault = true;
-                        newKnownDefaults.add(def.getId());
+                        if (def.getId() != null) {
+                            newKnownDefaults.add(def.getId());
+                        }
                         knownDefaults.remove(entry);
                         break;
@@ -247 +249 @@
                     if (def.getId() != null) {
                         newKnownDefaults.add(def.getId());
+                        for (ImageryInfo i : layers) {
+                            if (isSimilar(def, i)) {
+                                isInUserList = true;
+                                break;
+                            }
+                        }
                     } else {
-                        newKnownDefaults.add(def.getUrl());
-                    }
-                    for (ImageryInfo i : layers) {
-                        if (isSimilar(def, i)) {
-                            isInUserList = true;
-                            break;
-                        }
+                        Main.error("Default imagery ''{0}'' has no id. Skipping.", def.getName());
                     }
                 }