Changeset 6164 in osm

Timestamp:

2007-12-26T23:48:57+01:00 (17 years ago)

Author:

christofd

Message:

do not use RawGpsLayer but GpxLayer now (add wpt to gpx, so markers do not need to be saved anymore)

Location:

applications/editors/josm/plugins/surveyor

Files:

• build.xml (modified) (1 diff)
• src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java (modified) (1 diff)
• src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsAndMarkerLayerTimeTask.java (deleted)
• src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java (modified) (3 diffs)
• src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java (modified) (8 diffs)
• src/at/dallermassl/josm/plugin/surveyor/util/LayerUtil.java (added)

applications/editors/josm/plugins/surveyor/build.xml

@@ -21 +21 @@
   
   <!-- plugin meta data (enter new version number if anything changed!) -->
-  <property name="plugin.version" value="1.3.3"/>
+  <property name="plugin.version" value="1.4"/>
   <property name="plugin.description" value="Allow adding markers/nodes on current gps positions (V${plugin.version})."/>
   <property name="plugin.stage" value="60"/>

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

@@ -57 +57 @@
             
             String gpxFilename = MessageFormat.format(GPS_FILE_NAME_PATTERN, new Date());
-            task = new AutoSaveGpsAndMarkerLayerTimeTask(gpxFilename, 
-                LiveGpsLayer.LAYER_NAME, SetWaypointAction.MARKER_LAYER_NAME);
+            task = new AutoSaveGpsLayerTimerTask(gpxFilename, LiveGpsLayer.LAYER_NAME);
             gpsDataTimer.schedule(task, 1000, AUTO_SAVE_PERIOD_SEC * 1000);
             

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

@@ -7 +7 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileOutputStream;
+import java.io.FileWriter;
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.util.TimerTask;
 
@@ -17 +19 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.layer.Layer;
-import org.openstreetmap.josm.gui.layer.RawGpsLayer;
+import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.io.GpxWriter;
-import org.openstreetmap.josm.io.XmlWriter;
+
+import at.dallermassl.josm.plugin.surveyor.util.LayerUtil;
 
 /**
- * TimerTask that writes the data of a {@link RawGpsLayer} to a gpx file.
+ * TimerTask that writes the data of a {@link GpxLayer} to a gpx file.
  * Every time the task is run, the layer is retrieved from the map view so it even works
  * if the layer does not exist at the start of the timer task. If the layer does not exist,
@@ -61 +63 @@
 
         try {            
-            XmlWriter.OsmWriterInterface writer = getXmlWriter();
-            if(writer != null) {
-                // write to temporary file, on success, rename tmp file to target file:
-                File tmpFile = new File(file.getAbsoluteFile()+".tmp");
-                System.out.println("AutoSaving data to file " + file.getAbsolutePath());
-                // synchronize on layer to prevent concurrent adding of data to the layer
-                // quite a hack, but no other object to sync available :-(
-                // @see LiveGpsLayer
-                synchronized(LiveGpsLock.class) {
-                    XmlWriter.output(new FileOutputStream(tmpFile), writer);
-                }   
-                tmpFile.renameTo(file);
+
+            GpxLayer gpsLayer = LayerUtil.findGpsLayer(gpsLayerName, GpxLayer.class);
+            if(gpsLayer == null) {
+                return;
             }
-        } catch (IOException x) {
-            x.printStackTrace();
+            // write to temporary file, on success, rename tmp file to target file:
+            File tmpFile = new File(file.getAbsoluteFile()+".tmp");
+            System.out.println("AutoSaving data to file " + file.getAbsolutePath());
+            // synchronize on layer to prevent concurrent adding of data to the layer
+            // quite a hack, but no other object to sync available :-(
+            // @see LiveGpsLayer
+            PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(tmpFile)));
+            GpxWriter gpxWriter = new GpxWriter(out);
+            synchronized(LiveGpsLock.class) {
+                gpxWriter.write(gpsLayer.data);
+            }   
+            tmpFile.renameTo(file);
+        } catch (IOException ioExc) {
+            ioExc.printStackTrace();
             JOptionPane.showMessageDialog(Main.parent, 
-                tr("Error while exporting {0}: {1}", file.getAbsoluteFile(), x.getMessage()), 
+                tr("Error while exporting {0}: {1}", file.getAbsoluteFile(), ioExc.getMessage()), 
                 tr("Error"), 
                 JOptionPane.ERROR_MESSAGE);
         }       
     }
-    
-    /**
-     * Returns the layer with the given name and type from the map view or <code>null</code>.
-     * @param <LayerType> the type of the layer.
-     * @param layerName the name of the layer.
-     * @param layerType the type of the layer.
-     * @return the layer or <code>null</code>.
-     */
-    public <LayerType extends Layer> LayerType findGpsLayer(String layerName, Class<LayerType> layerType) {
-        LayerType result = null;
-        if(Main.map != null && Main.map.mapView != null) {
-            for(Layer layer : Main.map.mapView.getAllLayers()) {
-                if(layerName.equals(layer.name) && layerType.isAssignableFrom(layer.getClass())) {
-                    result = (LayerType) layer;
-                    break;
-                }
-            }
-        }
-        return result;
-    }
-    
-    
-    /**
-     * Returns the writer that writes the data. Override this method, if another type
-     * of writer should be used.
-     * @return the writer.
-     */
-    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) {
-            return null;
-        }
-        return new GpxWriter.Trk(gpsLayer.data);
-        */
-    }
-
-
 }

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

@@ -7 +7 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.util.ArrayList;
 import java.util.Collection;
 
 import javax.swing.JToggleButton;
 
+import livegps.LiveGpsLayer;
 import livegps.LiveGpsLock;
 
@@ -17 +17 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
+import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.markerlayer.Marker;
@@ -24 +26 @@
 import at.dallermassl.josm.plugin.surveyor.SurveyorPlugin;
 import at.dallermassl.josm.plugin.surveyor.action.gui.WaypointDialog;
+import at.dallermassl.josm.plugin.surveyor.util.LayerUtil;
 
 /**
@@ -33 +36 @@
  */
 public class SetWaypointAction extends AbstractSurveyorAction {
+    private LiveGpsLayer liveGpsLayer;
     private MarkerLayer markerLayer;
     public static final String MARKER_LAYER_NAME = "surveyorwaypointlayer";
@@ -38 +42 @@
     
     /**
-     * Default Condstructor
+     * Default Constructor.
      */
     public SetWaypointAction() {
@@ -51 +55 @@
         LatLon coordinates = event.getCoordinates();
         System.out.println(getClass().getSimpleName() + " KOORD: " + coordinates.lat() + ", " + coordinates.lon());
-        MarkerLayer layer = getGpsLayer();
         String markerTitle = getParameters().get(0);
         Object source = event.getSource();
@@ -74 +77 @@
         
         String iconName = getParameters().size() > 1 ? getParameters().get(1) : null;
+        
+        // add the waypoint to the marker layer AND to the gpx layer 
+        // (easy export of data + waypoints):
+        MarkerLayer layer = getMarkerLayer();
+        GpxLayer gpsLayer = getGpxLayer();
+        WayPoint waypoint = new WayPoint(event.getCoordinates());
+        waypoint.attr.put("name", markerText);
+        waypoint.attr.put("sym", iconName);
         synchronized(LiveGpsLock.class) {
             layer.data.add(new Marker(event.getCoordinates(), markerText, iconName));
+            if(gpsLayer != null) {
+                gpsLayer.data.waypoints.add(waypoint);
+            }
         }
+        
         Main.map.repaint();
     }
     
-    public MarkerLayer getGpsLayer() {
+    /**
+     * Returns the marker layer with the name {@link #MARKER_LAYER_NAME}.
+     * @return the marker layer with the name {@link #MARKER_LAYER_NAME}.
+     */
+    public MarkerLayer getMarkerLayer() {
         if(markerLayer == null) {
-            Collection<Layer> layers = Main.map.mapView.getAllLayers();
-            for (Layer layer : layers) {
-                if(MARKER_LAYER_NAME.equals(layer.name)) {
-                    markerLayer = (MarkerLayer) layer;
-                    break;
-                }
-            }
-            // not found:
+            markerLayer = LayerUtil.findGpsLayer(MARKER_LAYER_NAME, MarkerLayer.class);
+           
             if(markerLayer == null) {
+                // not found, add a new one
                 markerLayer = new MarkerLayer(new GpxData(), MARKER_LAYER_NAME, null);
                 Main.main.addLayer(markerLayer);
@@ -97 +111 @@
         return markerLayer;
     }
+    
+    /**
+     * Returns the gpx layer that is filled by the live gps data.
+     * @return the gpx layer that is filled by the live gps data.
+     */
+    public GpxLayer getGpxLayer() {
+        if(liveGpsLayer == null) {
+            Collection<Layer> layers = Main.map.mapView.getAllLayers();
+            for (Layer layer : layers) {
+                if(layer instanceof LiveGpsLayer) {
+                    liveGpsLayer = (LiveGpsLayer) layer;
+                    break;
+                }
+            } 
+        }
+        return liveGpsLayer;
+    }
 
 }