Changeset 329 in josm for branch/0.5/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java

Timestamp:

2007-09-24T01:36:24+02:00 (17 years ago)

Author:

framm

Message:

This commit is a manual merge of all changes that have been made to
the intermediate "core_0.5" branch on the main OSM repository,
bevore JOSM was moved to openstreetmap.de.

Changes incorporated here:

r4464@svn.openstreetmap.org
r4466@svn.openstreetmap.org
r4468@svn.openstreetmap.org
r4469@svn.openstreetmap.org
r4479@svn.openstreetmap.org

File:

• branch/0.5/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java (modified) (2 diffs)

branch/0.5/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java

@@ -38 +38 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.Segment;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
@@ -71 +70 @@
                         for (Collection<GpsPoint> c : data) {
                                 Way w = new Way();
-                                Node start = null;
                                 for (GpsPoint p : c) {
-                                        Node end = new Node(p.latlon);
-                                        ds.nodes.add(end);
-                                        if (start != null) {
-                                                Segment segment = new Segment(start,end);
-                                                w.segments.add(segment);
-                                                ds.segments.add(segment);
-                                        }
-                                        start = end;
+                                        Node n = new Node(p.latlon);
+                                        ds.nodes.add(n);
+                                        w.nodes.add(n);
                                 }
                                 ds.ways.add(w);