Changeset 11703 in josm

Timestamp:

2017-03-08T23:10:19+01:00 (7 years ago)

Author:

stoecker

Message:

see #14470 - don't drop old layers when there was an maps load error

File:

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

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

@@ -121 +121 @@
         private ImageryReader reader;
         private boolean canceled;
+        private boolean loadError;
 
         DefaultEntryLoader(boolean clearCache, boolean fastFail) {
@@ -161 +162 @@
                 newLayers.addAll(result);
             } catch (IOException ex) {
+                loadError = true;
                 Main.error(ex, false);
             } catch (SAXException ex) {
+                loadError = true;
                 Main.error(ex);
             }
@@ -184 +187 @@
             updateEntriesFromDefaults();
             buildIdMap(layers, layerIds);
-            dropOldEntries();
+            if (!loadError && !defaultLayerIds.isEmpty()) {
+                dropOldEntries();
+            }
         }
     }
@@ -273 +278 @@
         List<String> drop = new ArrayList<>();
 
-        if (defaultLayerIds.isEmpty()) {
-            return;
-        }
-        
         for (Map.Entry<String, ImageryInfo> info : layerIds.entrySet()) {
             if (!defaultLayerIds.containsKey(info.getKey())) {