Changeset 5662 in josm

Timestamp:

2013-01-04T01:49:12+01:00 (12 years ago)

Author:

Don-vip

Message:

fix #8314 for good - Validator: handle of addr:interpolation and incomplete houses in associatedStreet relations

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (1 diff)
• src/org/openstreetmap/josm/data/validation/tests/Addresses.java (modified) (4 diffs)

trunk/data/defaultpresets.xml

@@ -5929 +5929 @@
             <roles>
                 <role key="street" text="street" requisite="required" type="way,closedway" member_expression="highway" />
-                <role key="house" text="house" requisite="required" type="node,closedway,relation" member_expression="&quot;addr:housenumber&quot;" />
+                <role key="house" text="house" requisite="required" type="node,way,closedway,relation" 
+                    member_expression="&quot;addr:housenumber&quot; | &quot;addr:interpolation&quot;" />
             </roles>
         </item>

trunk/src/org/openstreetmap/josm/data/validation/tests/Addresses.java

@@ -41 +41 @@
     protected static final int HOUSE_NUMBER_ON_NON_BUILDING_AREA = 2606;
     
-    protected static final String ADDR_HOUSE_NUMBER = "addr:housenumber";
-    protected static final String ADDR_STREET       = "addr:street";
-    protected static final String ASSOCIATED_STREET = "associatedStreet";
+    protected static final String ADDR_HOUSE_NUMBER  = "addr:housenumber";
+    protected static final String ADDR_INTERPOLATION = "addr:interpolation";
+    protected static final String ADDR_STREET        = "addr:street";
+    protected static final String ASSOCIATED_STREET  = "associatedStreet";
     
     protected class AddressError extends TestError {
@@ -143 +144 @@
             }
             // Report duplicate house numbers
-            String description_en = marktr("House number '{0}' duplicated");
+            String description_en = marktr("House number ''{0}'' duplicated");
             for (String key : map.keySet()) {
                 List<OsmPrimitive> list = map.get(key);
@@ -159 +160 @@
             if (!street.isEmpty()) {
                 for (OsmPrimitive house : houses) {
-                    checkDistance(house, street);
+                    if (house.isUsable()) {
+                        checkDistance(house, street);
+                    }
                 }
             }
@@ -170 +173 @@
             centroid = ((Node) house).getEastNorth();
         } else if (house instanceof Way) {
-            centroid = Geometry.getCentroid(((Way)house).getNodes());
+            List<Node> nodes = ((Way)house).getNodes();
+            if (house.hasKey(ADDR_INTERPOLATION)) {
+                for (Node n : nodes) {
+                    if (n.hasKey(ADDR_HOUSE_NUMBER)) {
+                        checkDistance(n, street);
+                    }
+                }
+                return;
+            }
+            centroid = Geometry.getCentroid(nodes);
         } else {
             return; // TODO handle multipolygon houses ?