Changeset 100 in josm for src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java

Timestamp:

2006-04-28T01:32:03+02:00 (20 years ago)

Author:

imi

Message:

• fixed JOSM crash when importing GeoImages on layers without timestamp
• fixed merging: incomplete segments do not overwrite complete on ways
• fixed focus when entering the popups from PropertyDialog
• fixed broken "draw lines between gps points"
• added doubleclick on bookmarklist
• added background color configuration
• added GpxImport to import 1.0 and 1.1 GPX files

This is release JOSM 1.3

File:

• src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java (modified) (3 diffs)

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

@@ -43 +43 @@
                 if (name == null) {
                         if (ls.incomplete)
-                                name = ls.id == 0 ? "new" : ""+ls.id;
+                                name = ls.id == 0 ? "new" : ""+ls.id+" (unknown)";
                         else
                                 name = (ls.id==0?"":ls.id+" ")+"("+ls.from.coor.lat()+","+ls.from.coor.lon()+") -> ("+ls.to.coor.lat()+","+ls.to.coor.lon()+")";
@@ -71 +71 @@
                 if (name == null) {
                         AllNodesVisitor.getAllNodes(w.segments);
+                        boolean incomplete = false;
                         Set<Node> nodes = new HashSet<Node>();
                         for (Segment ls : w.segments) {
@@ -76 +77 @@
                                         nodes.add(ls.from);
                                         nodes.add(ls.to);
-                                }
+                                } else
+                                        incomplete = true;
                         }
-                        name = "("+nodes.size()+" nodes)";
+                        name = nodes.size()+" nodes";
+                        if (incomplete)
+                                name += " (incomplete)";
                 }
                 icon = ImageProvider.get("data", "way");