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

Timestamp:

2015-02-22T23:58:28+01:00 (9 years ago)

Author:

stoecker

Message:

fix #10581 - rewrite old URL's to JOSM server

File:

• trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -1675 +1675 @@
      */
     public void removeObsolete() {
-        /* update the data with old consumer key*/
-        if(getInteger("josm.version", Version.getInstance().getVersion()) < 6076) {
-            if(!get("oauth.access-token.key").isEmpty() && get("oauth.settings.consumer-key").isEmpty()) {
-                put("oauth.settings.consumer-key", "AdCRxTpvnbmfV8aPqrTLyA");
-                put("oauth.settings.consumer-secret", "XmYOiGY9hApytcBC3xCec3e28QBqOWz5g6DSb5UpE");
+        // drop this block end of 2015
+        // update old style JOSM server links to use zip now, see #10581
+        // actually also cache and mirror entries should be cleared
+        if(getInteger("josm.version", Version.getInstance().getVersion()) < 8099) {
+            for(String key: new String[]{"mappaint.style.entries", "taggingpreset.entries"}) {
+                Collection<Map<String, String>> data = getListOfStructs(key, (Collection<Map<String, String>>) null);
+                if (data != null) {
+                    List<Map<String, String>> newlist = new ArrayList<Map<String, String>>();
+                    boolean modified = false;
+                    for(Map<String, String> map : data)
+                    {
+                         Map<String, String> newmap = new LinkedHashMap<String, String>();
+                         for (Entry<String, String> entry : map.entrySet()) {
+                             String val = entry.getValue();
+                             String mkey = entry.getKey();
+                             if ("url".equals(mkey) && val.contains("josm.openstreetmap.de/josmfile") && !val.contains("zip=1")) {
+                                 val += "&zip=1";
+                                 modified = true;
+                                 
+                             }
+                             newmap.put(mkey, val);
+                         }
+                         newlist.add(newmap);
+                    }
+                    if (modified) {
+                        putListOfStructs(key, newlist);
+                    }
+                }
             }
         }