Changeset 66 in josm for src/org/openstreetmap/josm/data/osm/visitor/SelectionComponentVisitor.java

Timestamp:

2006-03-22T19:13:05+01:00 (20 years ago)

Author:

imi

Message:

fixed "segment completly out of map" - problem

File:

• src/org/openstreetmap/josm/data/osm/visitor/SelectionComponentVisitor.java (modified) (4 diffs)

src/org/openstreetmap/josm/data/osm/visitor/SelectionComponentVisitor.java

@@ -3 +3 @@
 
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
 
@@ -36 +35 @@
          */
         public void visit(LineSegment ls) {
-                String name = getName(ls.keys);
+                name = ls.get("name");
+                if (name == null && ls.incomplete)
+                        name = ""+ls.id;
                 if (name == null)
-                        name = "("+ls.start.coor.lat+","+ls.start.coor.lon+") -> ("+ls.end.coor.lat+","+ls.end.coor.lon+")";
-                        
-                this.name = name;
+                        name = "("+ls.from.coor.lat+","+ls.from.coor.lon+") -> ("+ls.to.coor.lat+","+ls.to.coor.lon+")";
                 icon = ImageProvider.get("data", "linesegment");
         }
@@ -49 +48 @@
          */
         public void visit(Node n) {
-                String name = getName(n.keys);
+                name = n.get("name");
                 if (name == null)
                         name = "("+n.coor.lat+","+n.coor.lon+")";
-                
-                this.name = name;
                 icon = ImageProvider.get("data", "node");
         }
@@ -61 +58 @@
          * is displayed with x beeing the number of nodes in the way.
          */
-        public void visit(Way t) {
-                String name = getName(t.keys);
+        public void visit(Way w) {
+                name = w.get("name");
                 if (name == null) {
                         Set<Node> nodes = new HashSet<Node>();
-                        for (LineSegment ls : t.segments) {
-                                nodes.add(ls.start);
-                                nodes.add(ls.end);
+                        for (LineSegment ls : w.segments) {
+                                if (!ls.incomplete) {
+                                        nodes.add(ls.from);
+                                        nodes.add(ls.to);
+                                }
                         }
                         name = "("+nodes.size()+" nodes)";
                 }
-                
-                this.name = name;
                 icon = ImageProvider.get("data", "way");
         }
-
-        
-        /**
-         * Try to read a name from the given properties.
-         * @param keys The properties to search for a name. Can be <code>null</code>.
-         * @return If a name could be found, return it here.
-         */
-        public String getName(Map<String, String> keys) {
-                String name = null;
-                if (keys != null) {
-                        name = keys.get("name");
-                        if (name == null)
-                                name = keys.get("id");
-                }
-                return name;
-        }
-        
 }