Changeset 21582 in osm for applications/editors/josm/plugins/editgpx/src/org/openstreetmap

Timestamp:

2010-06-04T20:42:35+02:00 (15 years ago)

Author:

stoecker

Message:

fix josm 5104

Location:

applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx

Files:

• EditGpxLayer.java (modified) (2 diffs)
• EditGpxMode.java (modified) (1 diff)
• GPXLayerImportAction.java (modified) (1 diff)
• data/EditGpxData.java (modified) (1 diff)

applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java

@@ -150 +150 @@
                         Main.main.addLayer(new GpxLayer(toGpxData(false), tr("Converted from: {0}", getName())));
                         Main.main.removeLayer(EditGpxLayer.this);
-                        Main.map.selectSelectTool(false);
+                        if(Main.map.mapMode instanceof EditGpxMode)
+                                Main.map.selectSelectTool(false);
                 }
         }
@@ -162 +163 @@
                         Main.main.addLayer(new GpxLayer(toGpxData(true), tr("Converted from: {0}", getName())));
                         Main.main.removeLayer(EditGpxLayer.this);
-                        Main.map.selectSelectTool(false);
+                        if(Main.map.mapMode instanceof EditGpxMode)
+                                Main.map.selectSelectTool(false);
                 }
         }

applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxMode.java

@@ -173 +173 @@
                 if (oldLayer instanceof EditGpxLayer) {
                         currentEditLayer = null;
+                        if(Main.map.mapMode instanceof EditGpxMode)
+                                Main.map.selectSelectTool(false);
                 }
         }

applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java

@@ -106 +106 @@
 
                         synchronized(importing) {
-                                this.data.load(gpx.data);
+                                this.data.load(gpx.data, dropFirst.isSelected());
                         }
                         Main.map.mapView.repaint();

applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxData.java

@@ -16 +16 @@
         private final List<WayPoint> waypoints = new ArrayList<WayPoint>();
 
-        public void load(GpxData data) {
-                tracks.clear();
+        public void load(GpxData data, boolean drop) {
+                if(drop)
+                        tracks.clear();
                 for (GpxTrack track: data.tracks) {
                         tracks.add(new EditGpxTrack(track));