Changeset 9946 in josm for trunk/src/org

Timestamp:

2016-03-07T19:10:03+01:00 (9 years ago)

Author:

wiktorn

Message:

Fix NPE's when unsupported projection used with WMTS

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• NavigatableComponent.java (modified) (2 diffs)
• layer/WMTSLayer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -203 +203 @@
         if (nativeScaleLayer != null) {
             ScaleList scaleList = nativeScaleLayer.getNativeScales();
-            if (PROP_ZOOM_INTERMEDIATE_STEPS.get()) {
-                scaleList = scaleList.withIntermediateSteps(PROP_ZOOM_RATIO.get());
-            }
-            Scale s = scaleList.scaleZoomTimes(getScale(), PROP_ZOOM_RATIO.get(), times);
-            return s != null ? s.getScale() : 0;
-        } else {
-            return getScale() * Math.pow(PROP_ZOOM_RATIO.get(), times);
-        }
+            if (scaleList != null) {
+                if ( PROP_ZOOM_INTERMEDIATE_STEPS.get()) {
+                    scaleList = scaleList.withIntermediateSteps(PROP_ZOOM_RATIO.get());
+                }
+                Scale s = scaleList.scaleZoomTimes(getScale(), PROP_ZOOM_RATIO.get(), times);
+                return s != null ? s.getScale() : 0;
+            }
+        }
+        return getScale() * Math.pow(PROP_ZOOM_RATIO.get(), times);
     }
 
@@ -244 +245 @@
         if (nativeScaleLayer != null) {
             ScaleList scaleList = nativeScaleLayer.getNativeScales();
-            Scale snapscale = scaleList.getSnapScale(scale, PROP_ZOOM_RATIO.get(), floor);
-            return snapscale != null ? snapscale.getScale() : scale;
-        } else {
-            return scale;
-        }
+            if (scaleList != null) {
+                Scale snapscale = scaleList.getSnapScale(scale, PROP_ZOOM_RATIO.get(), floor);
+                return snapscale != null ? snapscale.getScale() : scale;
+            }
+        }
+        return scale;
     }
 

trunk/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java

@@ -62 +62 @@
         if (!Main.isDisplayingMapView())
             return 0;
-        Scale snap = getNativeScales().getSnapScale(Main.map.mapView.getScale(), false);
+        ScaleList scaleList = getNativeScales();
+        Scale snap = null;
+        if (scaleList == null) {
+            return getMaxZoomLvl();
+        }
+        snap = scaleList.getSnapScale(Main.map.mapView.getScale(), false);
         return Math.max(
                 getMinZoomLvl(),