Changeset 31973 in osm for applications/editors/josm

Timestamp:

2016-01-11T23:05:18+01:00 (9 years ago)

Author:

floscher

Message:

[mapillary] No longer activate mapillary layer on creation of the layer

Only successive calls of the MapillaryDownloadAction toggle between the osm-data layer and the mapillary layer.
This issue was mentioned at ​http://wiki.openstreetmap.org/w/index.php?title=Talk:JOSM/Plugins/Mapillary&oldid=1260860#layer_active.2Finactive

File:

• applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryDownloadAction.java (modified) (1 diff)

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryDownloadAction.java

@@ -42 +42 @@
   @Override
   public void actionPerformed(ActionEvent arg0) {
-    MapillaryLayer.getInstance();
-    if (Main.map.mapView.getActiveLayer() == MapillaryLayer.getInstance()) {
-      Main.map.mapView.setActiveLayer(Main.map.mapView.getEditLayer());
-    } else {
-      Main.map.mapView.setActiveLayer(MapillaryLayer.getInstance());
+    if (!MapillaryLayer.hasInstance()) {
+      // A new mapillary layer is created, so the active layer is not changed
+      MapillaryLayer.getInstance();
+      return;
     }
+    // Successive calls to this action toggle the active layer between the OSM data layer and the mapillary layer
+    Main.map.mapView.setActiveLayer(
+        Main.map.mapView.getActiveLayer() == MapillaryLayer.getInstance()
+          ? Main.map.mapView.getEditLayer()
+          : MapillaryLayer.getInstance()
+    );
   }
 }