Changeset 17329 in josm

Timestamp:

2020-11-21T14:56:29+01:00 (4 years ago)

Author:

stoecker

Message:

also use oldid's for ELI checks

File:

• trunk/scripts/SyncEditorLayerIndex.java (modified) (2 diffs)

trunk/scripts/SyncEditorLayerIndex.java

@@ -580 +580 @@
                         if (ide.equals(idj) && Objects.equals(getType(j), getType(e))) {
                             if(getType(j).equals("wms") && unifyWMS(urle).equals(unifyWMS(urlj))) {
-                              myprintln("# WMS-URL for id "+idj+" modified: "+getDescription(j));
+                                myprintln("# WMS-URL for id "+idj+" modified: "+getDescription(j));
                             } else {
-                              myprintln("* URL for id "+idj+" differs ("+urle+"): "+getDescription(j));
+                                myprintln("* URL for id "+idj+" differs ("+urle+"): "+getDescription(j));
                             }
                             le.remove(urle);
@@ -590 +590 @@
                             eliUrls.put(urlj, e);
                             break;
+                        }
+                        Collection<String> old = ((ImageryInfo)j).getOldIds();
+                        if(old != null) {
+                            for (String oidj : old) {
+                                if (ide.equals(oidj) && Objects.equals(getType(j), getType(e))) {
+                                    if(getType(j).equals("wms") && unifyWMS(urle).equals(unifyWMS(urlj))) {
+                                        myprintln("# WMS-URL for oldid "+idj+" modified: "+getDescription(j));
+                                    } else {
+                                        myprintln("* URL for oldid "+idj+" differs ("+urle+"): "+getDescription(j));
+                                    }
+                                    le.remove(urle);
+                                    lj.remove(urlj);
+                                    // replace key for this entry with JOSM URL
+                                    eliUrls.remove(urle);
+                                    eliUrls.put(urlj, e);
+                                    break;
+                                }
+                            }
                         }
                     }