Changeset 18422 in josm for trunk

Timestamp:

2022-03-29T08:02:07+02:00 (2 years ago)

Author:

GerdP

Message:

fix #21967: Keep OSM layer activated when loading GPX layer
Patch by Bjoeni

File:

• trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxImporter.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxImporter.java

@@ -17 +17 @@
 import org.openstreetmap.josm.gui.layer.GpxRouteLayer;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
+import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.MainLayerManager;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
@@ -140 +142 @@
         // FIXME: remove UI stuff from the IO subsystem
         GuiHelper.runInEDT(() -> {
+            MainLayerManager manager = MainApplication.getLayerManager();
             if (data.markerLayer != null) {
-                MainApplication.getLayerManager().addLayer(data.markerLayer);
+                manager.addLayer(data.markerLayer);
             }
             if (data.gpxRouteLayer != null) {
-                MainApplication.getLayerManager().addLayer(data.gpxRouteLayer);
+                manager.addLayer(data.gpxRouteLayer);
             }
             if (data.gpxLayer != null) {
-                MainApplication.getLayerManager().addLayer(data.gpxLayer);
-                MainApplication.getLayerManager().setActiveLayer(data.gpxLayer);
+                manager.addLayer(data.gpxLayer);
+                Layer activeLayer = manager.getActiveLayer();
+                if (activeLayer == null || activeLayer instanceof GpxLayer || activeLayer instanceof MarkerLayer) {
+                    manager.setActiveLayer(data.gpxLayer);
+                }
             }
             data.postLayerTask.run();