Changeset 13536 in josm for trunk/src/org/openstreetmap/josm/io/imagery

Timestamp:

2018-03-17T17:01:12+01:00 (6 years ago)

Author:

stoecker

Message:

add possibility to change map ids (see #14655), add overlay flag for imagery

File:

• trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java

@@ -85 +85 @@
         try {
             cachedFile = new CachedFile(source);
+            cachedFile.setParam(Utils.join(",", ImageryInfo.getActiveIds()));
             cachedFile.setFastFail(fastFail);
             try (BufferedReader in = cachedFile
@@ -168 +169 @@
                         entry.setBestMarked(true);
                     }
+                    String overlay = atts.getValue("overlay");
+                    if (TRUE.equals(overlay)) {
+                        entry.setOverlay(true);
+                    }
                 }
                 break;
@@ -174 +179 @@
                         "type",
                         "url",
+                        "id",
                         MIN_ZOOM,
                         MAX_ZOOM,
@@ -189 +195 @@
                         "name",
                         "id",
+                        "oldid",
                         "type",
                         "description",
@@ -328 +335 @@
                         }
                         break;
+                    case "id":
+                        mirrorEntry.setId(accumulator.toString());
+                        break;
                     case "url":
                         mirrorEntry.setUrl(accumulator.toString());
@@ -379 +389 @@
                 case "id":
                     entry.setId(accumulator.toString());
+                    break;
+                case "oldid":
+                    entry.addOldId(accumulator.toString());
                     break;
                 case "type":