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

Timestamp:

2014-06-01T12:38:10+02:00 (10 years ago)

Author:

bastiK

Message:

fixed #10088 - Can't use custom TMS layer anymore (see #9914)

Location:

trunk/src/org/openstreetmap/josm

Files:

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

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

@@ -11 +11 @@
 import java.util.List;
 import java.util.Objects;
+import java.util.TreeSet;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -485 +486 @@
         int i = countryCode.compareTo(in.countryCode);
         if (i == 0) {
-            i = name.compareTo(in.name);
+            i = name.toLowerCase().compareTo(in.name.toLowerCase());
         }
         if (i == 0) {
@@ -695 +696 @@
         this.id = id;
     }
+    
+    public void clearId() {
+        if (this.id != null) {
+            Collection<String> newAddedIds = new TreeSet<>(Main.pref.getCollection("imagery.layers.addedIds"));
+            newAddedIds.add(this.id);
+            Main.pref.putCollection("imagery.layers.addedIds", newAddedIds);
+        }
+        this.id = null;
+    }
 
     /**

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

@@ -178 +178 @@
             }
         }
-        Main.pref.putCollection("imagery.layers.migration.addedIds", newAddedIds);
+        Main.pref.putCollection("imagery.layers.addedIds", newAddedIds);
         
         // automatically update user entries with same id as a default entry

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

@@ -651 +651 @@
                 case 0:
                     info.setName((String) o);
+                    info.clearId();
                     break;
                 case 1:
                     info.setExtendedUrl((String)o);
+                    info.clearId();
                     break;
                 default: