Changeset 15371 in josm

Timestamp:

2019-09-24T17:50:54+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #18160 - Ask layers for source, don't hardcode source for layer types (patch by taylor.smock)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapView.java (modified) (4 diffs)
• layer/GpxLayer.java (modified) (1 diff)
• layer/ImageryLayer.java (modified) (1 diff)
• layer/Layer.java (modified) (1 diff)
• layer/geoimage/GeoImageLayer.java (modified) (1 diff)

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

@@ -29 +29 @@
 import java.util.List;
 import java.util.Set;
-import java.util.TreeSet;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
 
 import javax.swing.AbstractButton;
@@ -51 +51 @@
 import org.openstreetmap.josm.gui.autofilter.AutoFilterManager;
 import org.openstreetmap.josm.gui.datatransfer.OsmTransferHandler;
-import org.openstreetmap.josm.gui.layer.GpxLayer;
-import org.openstreetmap.josm.gui.layer.ImageryLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.LayerManager;
@@ -67 +65 @@
 import org.openstreetmap.josm.gui.layer.MapViewPaintable.PaintableInvalidationListener;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.gui.layer.geoimage.GeoImageLayer;
 import org.openstreetmap.josm.gui.layer.markerlayer.PlayHeadMarker;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
@@ -819 +816 @@
      */
     public String getLayerInformationForSourceTag() {
-        final Set<String> layerInfo = new TreeSet<>();
-        if (!layerManager.getLayersOfType(GpxLayer.class).isEmpty()) {
-            // no i18n for international values
-            layerInfo.add("survey");
-        }
-        for (final GeoImageLayer i : layerManager.getLayersOfType(GeoImageLayer.class)) {
-            if (i.isVisible()) {
-                layerInfo.add(i.getName());
-            }
-        }
-        for (final ImageryLayer i : layerManager.getLayersOfType(ImageryLayer.class)) {
-            if (i.isVisible()) {
-                layerInfo.add(i.getInfo().getSourceName());
-            }
-        }
+        final Set<String> layerInfo = layerManager.getVisibleLayersInZOrder().stream()
+                .filter(layer -> layer.getChangesetSourceTag() != null && !layer.getChangesetSourceTag().trim().isEmpty())
+                .map(layer -> layer.getChangesetSourceTag().trim()).distinct().collect(Collectors.toSet());
         return Utils.join("; ", layerInfo);
     }

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

@@ -474 +474 @@
         this.isExpertMode = isExpert;
     }
+
+    @Override
+    public String getChangesetSourceTag() {
+        // no i18n for international values
+        return "survey";
+    }
 }

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

@@ -355 +355 @@
         return getClass().getSimpleName() + " [info=" + info + ']';
     }
+
+    @Override
+    public String getChangesetSourceTag() {
+        return getInfo().getSourceName();
+    }
 }

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

@@ -675 +675 @@
     }
 
+    /**
+     * Get the source for the layer
+     * @return The string for the changeset source tag or {@code null}
+     * @since 15371
+     */
+    public String getChangesetSourceTag() {
+        return null;
+    }
+
     @Override
     public String toString() {

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -1011 +1011 @@
         updateBufferAndRepaint();
     }
+
+    @Override
+    public String getChangesetSourceTag() {
+        return getName();
+    }
 }