[Patch] Keep OSM layer activated when loading GPX layer

[josm@…]

What steps will reproduce the problem?

1. Load a region into JOSM

2. Open a GPX with a track file. (It's not necessary that this tracks overlaps the downloaded area.)

What is the expected result?

The OSM data can be edited in JOSM as usual.

What happens instead?

The OSM ways are grey and not editable. Deactiviating the GPX layer via the eye symbol does NOT help, the GPX track vanishes but the OSM ways are still grey and not editable. After deleting the GPX layer via the trash symbol the OSM ways immediately get their colours back and the ways are editable again.

Please provide any additional information below. Attach a screenshot if possible.

JOSM1.png: The normal and expected state. No GPX file loaded
JOSM2.png: GPX file loaded. The elements are grey and not editable.

I did this many times in the past: Loading GPX files from several sources (Garmin satnav device, several smartphones, GPX files from various other sources, GPX files created by GPSBabel and other tools) and it has always worked until some JOSM version. I noticed this behavior with at least JOSM version.

URL:https://josm.openstreetmap.de/svn/trunk
Repository:UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b
Last:Changed Date: 2022-03-06 10:38:55 +0100 (Sun, 06 Mar 2022)
Build-Date:2022-03-07 02:31:09
Revision:18387
Relative:URL: ^/trunk

Identification: JOSM/1.5 (18387 de) Windows 8.1 64-Bit
OS Build number: Windows 8.1 Pro (9600)
Memory Usage: 205 MB / 455 MB (68 MB allocated, but free)
Java version: 1.8.0_311-b11, Oracle Corporation, Java HotSpot(TM) 64-Bit Server VM
Look and Feel: com.sun.java.swing.plaf.windows.WindowsLookAndFeel
Screen: \Display0 1920×1200 (scaling 1.00×1.00)
Maximum Screen Size: 1920×1200
Best cursor sizes: 16×16→32×32, 32×32→32×32
System property file.encoding: Cp1252
System property sun.jnu.encoding: Cp1252
Locale info: de_DE
Numbers with default locale: 1234567890 -> 1234567890

Plugins:
+ FixAddresses (35893)
+ buildings_tools (35916)
+ continuosDownload (99)
+ fieldpapers (v0.5.0)
+ openqa (0.2.2)
+ utilsplugin2 (35893)

Last errors/warnings:
- 00005.243 W: Unable to request certificate of https://grca.nat.gov.tw
- 00005.482 W: Unable to request certificate of https://grca.nat.gov.tw

[josm@…]

Screenshot of working JOSM, without a loaded GPX file

[josm@…]

Screenshot of "grey" JOSM, with a loaded GPX file

[skyper]

JOSM always activates new data and gpx layers. In order to edit a layer you need to activate it (), see Help/Dialog/LayerList.

[josm@…]

Okay, this way it works for me, too, so it's not a bug. However, up to a few months ago I didn't have to click the green "check" symbol after loading a GPX file in order to edit the map - has this behaviour changed recently?

[skyper]

Indeed, the behavior changed. With r18193 the gpx layer is not activated but with r18303 it is.
Are there any reasons for the change in behavior?

[GerdP]

Don't know why it was changed, I think the old behaviour was better.

[Bjoeni]

Looks like I introduced that with r18287.

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

@@ -16 +16 @@
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 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;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -139 +141 @@
     public static void addLayers(final GpxImporterData data) {
         // 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();
         });

[GerdP]

In 18422/josm:

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

[GerdP]

Thanks for the patch!