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

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

Location:

branch/0.5/src/org/openstreetmap/josm/gui/layer

Files:

• OsmDataLayer.java (modified) (6 diffs)
• RawGpsLayer.java (modified) (2 diffs)

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

@@ -34 +34 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DataSource;
+import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Segment;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
@@ -60 +60 @@
                 public final int[] normal = new int[3];         
                 public final int[] deleted = new int[3];
-                public final String[] names = {"node", "segment", "way"};
+                public final String[] names = {"node", "way", "relation"};
 
                 private void inc(final OsmPrimitive osm, final int i) {
@@ -72 +72 @@
                 }
 
-                public void visit(final Segment ls) {
-                        inc(ls, 1);
-                }
-
                 public void visit(final Way w) {
+                        inc(w, 1);
+                }
+                public void visit(final Relation w) {
                         inc(w, 2);
                 }
@@ -133 +132 @@
          * Draw all primitives in this layer but do not draw modified ones (they
          * are drawn by the edit layer).
-         * Draw nodes last to overlap the segments they belong to.
+         * Draw nodes last to overlap the ways they belong to.
          */
         @Override public void paint(final Graphics g, final MapView mv) {
@@ -163 +162 @@
                 String tool = "";
                 tool += undeletedSize(data.nodes)+" "+trn("node", "nodes", undeletedSize(data.nodes))+", ";
-                tool += undeletedSize(data.segments)+" "+trn("segment", "segments", undeletedSize(data.segments))+", ";
                 tool += undeletedSize(data.ways)+" "+trn("way", "ways", undeletedSize(data.ways));
                 if (associatedFile != null)
@@ -222 +220 @@
                         for (final Iterator<Node> it = data.nodes.iterator(); it.hasNext();)
                                 cleanIterator(it, processedSet);
-                        for (final Iterator<Segment> it = data.segments.iterator(); it.hasNext();)
-                                cleanIterator(it, processedSet);
                         for (final Iterator<Way> it = data.ways.iterator(); it.hasNext();)
                                 cleanIterator(it, processedSet);

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);