Changeset 5270 in osm for applications/editors/josm/plugins/surveyor/src/at/dallermassl

Timestamp:

2007-11-01T09:05:28+01:00 (17 years ago)

Author:

frederik

Message:

temporary changes to support new gpx handling in JOSM; CAUTION: autosave currently disabled!

Location:

applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor

Files:

• AutoSaveGpsLayerTimerTask.java (modified) (2 diffs)
• action/SetWaypointAction.java (modified) (2 diffs)

applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java

@@ -110 +110 @@
      */
     public XmlWriter.OsmWriterInterface getXmlWriter() {
+        return null;
+
+        /*
+         * FIXME! this disables auto-save. need to work with new GPX writing code in JOSM.
+         *
         RawGpsLayer gpsLayer = findGpsLayer(gpsLayerName, RawGpsLayer.class);
         if(gpsLayer == null) {
@@ -115 +120 @@
         }
         return new GpxWriter.Trk(gpsLayer.data);
+        */
     }
 

applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java

@@ -16 +16 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.markerlayer.Marker;
@@ -90 +91 @@
             // not found:
             if(markerLayer == null) {
-                markerLayer = new MarkerLayer(new ArrayList<Marker>(), MARKER_LAYER_NAME, null);
+                markerLayer = new MarkerLayer(new GpxData(), MARKER_LAYER_NAME, null);
                 Main.main.addLayer(markerLayer);
             }