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

Timestamp:

2015-10-04T19:24:48+02:00 (9 years ago)

Author:

wiktorn

Message:

When looking for similar imageries look only within the imageries of the same type.

• fixes problems when user wants to have wms_endpoint imagery starting with the same URL as default one

File:

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

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

@@ -238 +238 @@
 
     private boolean isSimilar(ImageryInfo iiA, ImageryInfo iiB) {
+        if (iiA == null)
+            return false;
+        if (!iiA.getImageryType().equals(iiB.getImageryType()))
+            return false;
         if (iiA.getId() != null && iiB.getId() != null) return iiA.getId().equals(iiB.getId());
         return isSimilar(iiA.getUrl(), iiB.getUrl());