Changeset 12604 in josm for trunk/src

Timestamp:

2017-08-14T14:42:13+02:00 (7 years ago)

Author:

bastiK

Message:

fixed #14524 - save imagery layer zoom level to session (if needed)

Location:

trunk/src/org/openstreetmap/josm

Files:

• io/session/ImagerySessionExporter.java (modified) (2 diffs)
• io/session/ImagerySessionImporter.java (modified) (3 diffs)
• tools/Utils.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/session/ImagerySessionExporter.java

@@ -85 +85 @@
         ImageryPreferenceEntry e = new ImageryPreferenceEntry(layer.getInfo());
         Map<String, String> data = new LinkedHashMap<>(Preferences.serializeStruct(e, ImageryPreferenceEntry.class));
-        if (layer instanceof AbstractTileSourceLayer) {
-            data.putAll(((AbstractTileSourceLayer<?>) layer).getDisplaySettings().toPropertiesMap());
-        }
+        Utils.instanceOfThen(layer, AbstractTileSourceLayer.class, tsLayer -> {
+            data.putAll(tsLayer.getDisplaySettings().toPropertiesMap());
+            if (!tsLayer.getDisplaySettings().isAutoZoom()) {
+                data.put("zoom-level", Integer.toString(tsLayer.getZoomLevel()));
+            }
+        });
         addAttributes(layerElem, data, support);
-        if (layer instanceof AbstractTileSourceLayer) {
-            OffsetBookmark offset = ((AbstractTileSourceLayer<?>) layer).getDisplaySettings().getOffsetBookmark();
+        Utils.instanceOfThen(layer, AbstractTileSourceLayer.class, tsLayer -> {
+            OffsetBookmark offset = tsLayer.getDisplaySettings().getOffsetBookmark();
             if (offset != null) {
                 Map<String, String> offsetProps = offset.toPropertiesMap();
@@ -97 +100 @@
                 addAttributes(offsetEl, offsetProps, support);
             }
-        }
+        });
         ImageryFilterSettings filters = layer.getFilterSettings();
         if (filters != null) {

trunk/src/org/openstreetmap/josm/io/session/ImagerySessionImporter.java

@@ -8 +8 @@
 import java.util.Map;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
@@ -44 +45 @@
         ImageryInfo info = new ImageryInfo(prefEntry);
         ImageryLayer layer = ImageryLayer.create(info);
-        if (layer instanceof AbstractTileSourceLayer) {
-            AbstractTileSourceLayer<?> tsLayer = (AbstractTileSourceLayer<?>) layer;
+        Utils.instanceOfThen(layer, AbstractTileSourceLayer.class, tsLayer -> {
             tsLayer.getDisplaySettings().applyFromPropertiesMap(attributes);
+            if (!tsLayer.getDisplaySettings().isAutoZoom()) {
+                String zoomStr = attributes.get("zoom-level");
+                if (zoomStr != null) {
+                        support.addPostLayersTask(() -> {
+                            try {
+                                tsLayer.setZoomLevel(Integer.parseInt(zoomStr));
+                            } catch (NumberFormatException e) {
+                                Main.warn(e);
+                            }
+                        });
+                }
+            }
             Element offsetEl = getFirstElementByTagName(elem, "offset");
             if (offsetEl != null) {
@@ -53 +65 @@
                 tsLayer.getDisplaySettings().setOffsetBookmark(offset);
             }
-        }
+        });
         Element filtersEl = getFirstElementByTagName(elem, "filters");
         if (filtersEl != null) {

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -51 +51 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -675 +676 @@
                 return new Iterator<B>() {
 
-                    private Iterator<? extends A> it = c.iterator();
+                    private final Iterator<? extends A> it = c.iterator();
 
                     @Override
@@ -1702 +1703 @@
      * @param klass the class U
      * @return function converting an object to a singleton stream or null
+     * @since 12594
      */
     public static <T, U> Function<T, Stream<U>> castToStream(Class<U> klass) {
         return x -> klass.isInstance(x) ? Stream.of(klass.cast(x)) : null;
     }
+
+    /**
+     * Helper method to replace the "<code>instanceof</code>-check and cast" pattern.
+     * Checks if an object is instance of class T and performs an action if that
+     * is the case.
+     * Syntactic sugar to avoid typing the class name two times, when one time
+     * would suffice.
+     * @param <T> the type for the instanceof check and cast
+     * @param o the object to check and cast
+     * @param klass the class T
+     * @param consumer action to take when o is and instance of T
+     * @since 12604
+     */
+    public static <T> void instanceOfThen(Object o, Class<T> klass, Consumer<? super T> consumer) {
+        if (klass.isInstance(o)) {
+            consumer.accept((T) o);
+        }
+    }
 }