Changeset 19680 in osm for applications/editors/josm

Timestamp:

2010-01-30T20:06:10+01:00 (15 years ago)

Author:

jttt

Message:

Fixed #4450 LiveGPS sporadic errors, addapted to JOSM r2907

Location:

applications/editors/josm/plugins/livegps

Files:

• build.xml (modified) (1 diff)
• josm-livegps.launch (added)
• src/livegps/AppendableGpxTrackSegment.java (added)
• src/livegps/LiveGpsData.java (modified) (1 diff)
• src/livegps/LiveGpsLayer.java (modified) (8 diffs)
• src/livegps/LiveGpsLock.java (deleted)

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

@@ -28 +28 @@
 
         <property name="commit.message" value="Changed the constructor signature of the plugin main class" />
-        <property name="plugin.main.version" value="2830" />
+        <property name="plugin.main.version" value="2907" />
         
 

applications/editors/josm/plugins/livegps/src/livegps/LiveGpsData.java

@@ -9 +9 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Way;

applications/editors/josm/plugins/livegps/src/livegps/LiveGpsLayer.java

@@ -9 +9 @@
 import java.beans.PropertyChangeListener;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.openstreetmap.josm.Main;
@@ -18 +18 @@
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.data.gpx.GpxTrack;
+import org.openstreetmap.josm.data.gpx.SingleSegmentGpxTrack;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.gui.MapView;
@@ -27 +28 @@
         LatLon lastPos;
         WayPoint lastPoint;
-        GpxTrack trackBeingWritten;
-        Collection<WayPoint> trackSegment;
+        private final AppendableGpxTrackSegment trackSegment;
         float speed;
         float course;
@@ -35 +35 @@
         boolean autocenter;
         private SimpleDateFormat dateFormat = new SimpleDateFormat(
-                        "yyyy-MM-dd'T'HH:mm:ss.SSS");
+        "yyyy-MM-dd'T'HH:mm:ss.SSS");
 
         /**
@@ -44 +44 @@
         public LiveGpsLayer(GpxData data) {
                 super(data, LAYER_NAME);
-                trackBeingWritten = new GpxTrack();
-                trackBeingWritten.attr.put("desc", "josm live gps");
-                trackSegment = new ArrayList<WayPoint>();
-                trackBeingWritten.trackSegs.add(trackSegment);
+                trackSegment = new AppendableGpxTrackSegment();
+
+                Map<String, Object> attr = new HashMap<String, Object>();
+                attr.put("desc", "josm live gps");
+
+                GpxTrack trackBeingWritten = new SingleSegmentGpxTrack(trackSegment, attr);
                 data.tracks.add(trackBeingWritten);
         }
@@ -63 +65 @@
                 lastPoint = new WayPoint(thisPos);
                 lastPoint.attr.put("time", dateFormat.format(new Date()));
-                // synchronize when adding data, as otherwise the autosave action
-                // needs concurrent access and this results in an exception!
-                synchronized (LiveGpsLock.class) {
-                        trackSegment.add(lastPoint);
-                }
+                trackSegment.addWaypoint(lastPoint);
                 if (autocenter && allowRedraw()) {
                         center();
@@ -104 +102 @@
         public void paint(Graphics2D g, MapView mv, Bounds bounds) {
                 // System.out.println("in paint");
-                synchronized (LiveGpsLock.class) {
-                        // System.out.println("in synced paint");
-                        super.paint(g, mv, bounds);
-                        // int statusHeight = 50;
-                        // Rectangle mvs = mv.getBounds();
-                        // mvs.y = mvs.y + mvs.height - statusHeight;
-                        // mvs.height = statusHeight;
-                        // g.setColor(new Color(1.0f, 1.0f, 1.0f, 0.8f));
-                        // g.fillRect(mvs.x, mvs.y, mvs.width, mvs.height);
+                // System.out.println("in synced paint");
+                super.paint(g, mv, bounds);
+                // int statusHeight = 50;
+                // Rectangle mvs = mv.getBounds();
+                // mvs.y = mvs.y + mvs.height - statusHeight;
+                // mvs.height = statusHeight;
+                // g.setColor(new Color(1.0f, 1.0f, 1.0f, 0.8f));
+                // g.fillRect(mvs.x, mvs.y, mvs.width, mvs.height);
 
-                        if (lastPoint != null) {
-                                Point screen = mv.getPoint(lastPoint.getCoor());
-                                g.setColor(Main.pref.getColor(KEY_LIVEGPS_COLOR, Color.RED));
-                                g.drawOval(screen.x - 10, screen.y - 10, 20, 20);
-                                g.drawOval(screen.x - 9, screen.y - 9, 18, 18);
-                        }
+                if (lastPoint != null) {
+                        Point screen = mv.getPoint(lastPoint.getCoor());
+                        g.setColor(Main.pref.getColor(KEY_LIVEGPS_COLOR, Color.RED));
+                        g.drawOval(screen.x - 10, screen.y - 10, 20, 20);
+                        g.drawOval(screen.x - 9, screen.y - 9, 18, 18);
+                }
 
-                        // lbl.setText("gpsd: "+status+" Speed: " + speed +
-                        // " Course: "+course);
-                        // lbl.setBounds(0, 0, mvs.width-10, mvs.height-10);
-                        // Graphics sub = g.create(mvs.x+5, mvs.y+5, mvs.width-10,
-                        // mvs.height-10);
-                        // lbl.paint(sub);
+                // lbl.setText("gpsd: "+status+" Speed: " + speed +
+                // " Course: "+course);
+                // lbl.setBounds(0, 0, mvs.width-10, mvs.height-10);
+                // Graphics sub = g.create(mvs.x+5, mvs.y+5, mvs.width-10,
+                // mvs.height-10);
+                // lbl.paint(sub);
 
-                        // if(status != null) {
-                        // g.setColor(Color.WHITE);
-                        // g.drawString("gpsd: " + status, 5, mv.getBounds().height - 15);
-                        // // lower left corner
-                        // }
-                }
+                // if(status != null) {
+                // g.setColor(Color.WHITE);
+                // g.drawString("gpsd: " + status, 5, mv.getBounds().height - 15);
+                // // lower left corner
+                // }
         }
 
@@ -176 +172 @@
         /**
          * Check, if a redraw is currently allowed.
-         * 
-         * @return true, if a redraw is permitted, false, if a re-draw 
+         *
+         * @return true, if a redraw is permitted, false, if a re-draw
          * should be suppressed.
          */