Changeset 3718 in josm for trunk/src/org/openstreetmap/josm/data/imagery

Timestamp:

2010-12-12T12:55:57+01:00 (13 years ago)

Author:

Upliner

Message:

Add WMSPlugin/SlippyMap settings migration dialog, fixes #5732

File:

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

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

@@ -15 +15 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
 import org.openstreetmap.josm.io.MirroredInputStream;
 
@@ -68 +69 @@
                             if(!defaults.contains(url)) {
                                 for(ImageryInfo i : layers) {
-                                    if(url.equals(i.url)) {
+                                    if ((i.getImageryType() == ImageryType.WMS && url.equals(i.getURL()))
+                                            || url.equals(i.getFullURL())) {
                                         force = false;
                                     }