Changeset 23854 in osm for applications/editors

Timestamp:

2010-10-26T21:55:38+02:00 (14 years ago)

Author:

oliverw

Message:

Added some utils to check if two ways are connected.

Location:

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit

Files:

• AddressEditContainer.java (modified) (1 diff)
• StreetNode.java (modified) (2 diffs)
• WayUtils.java (added)

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/AddressEditContainer.java

@@ -139 +139 @@
                         
                         if (sNode != null) {
-                                // TODO: Check if sgemnt really belongs to the street, even if the
-                                // names are the same.
+                                // TODO: Check if segment really belongs to the street, even if the
+                                // names are the same. Then the streets should be split up...
                                 sNode.addStreetSegment(newSegment);
+                                if (sNode.hasDisconnectedSegments()) {
+                                        System.out.println("Warnig: Disconnected street: " + sNode.getName());
+                                }
                         } else {
                                 throw new RuntimeException("Street node is null!");

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/StreetNode.java

@@ -19 +19 @@
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Way;
 
 /**
@@ -136 +137 @@
         }
         
+        /**
+         * Returns true, if the street node contains disconnected segments. This is usually
+         * an indication, that the data set contains two streets with same name, but e. g. in 
+         * different cities.
+         * @return
+         */
+        public boolean hasDisconnectedSegments() {
+                for (INodeEntity ne1 : children) {
+                        if (!(ne1 instanceof StreetSegmentNode)) continue;
+                        Way w1 = (Way)ne1.getOsmObject();
+                        for (INodeEntity ne2 : children) {
+                                if (!(ne2 instanceof StreetSegmentNode) || ne1 == ne2) continue;
+                                
+                                Way w2 = (Way)ne1.getOsmObject();
+                                if (!WayUtils.areWaysConnected(w1, w2)) {
+                                        return true;
+                                }
+                        }
+                }
+                
+                return false;
+        }
+        
         /* (non-Javadoc)
          * @see org.openstreetmap.josm.plugins.addressEdit.NodeEntityBase#toString()