Ticket #5574: unconnected-ways-amenity-patch.txt

File unconnected-ways-amenity-patch.txt, 1.7 KB (added by julianladisch, 16 years ago)

some code cleanup and amenity patch

Line 
1Index: src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java
2===================================================================
3--- src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java (Revision 23733)
4+++ src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java (Arbeitskopie)
5@@ -98,17 +98,14 @@
6 for(Node en : s.nearbyNodes(mindist)) {
7 if (en == null)
8 continue;
9- //if("turning_circle".equals(en.get("highway")) ||
10- // (isexit != null && isexit) || en.get("barrier") != null)
11- // c4++;
12 if(!s.highway)
13 continue;
14 if (!endnodes_highway.contains(en))
15 continue;
16- Boolean isexit = OsmUtils.getOsmBoolean(en.get("noexit"));
17- if("turning_circle".equals(en.get("highway")) ||
18- "bus_stop".equals(en.get("highway")) ||
19- (isexit != null && isexit) || en.get("barrier") != null)
20+ if ("turning_circle".equals(en.get("highway"))
21+ || "bus_stop".equals(en.get("highway"))
22+ || OsmUtils.isTrue(en.get("noexit"))
23+ || en.get("barrier") != null)
24 continue;
25 // There's a small false-positive here. Imagine an intersection
26 // like a 't'. If the top part of the 't' is short enough, it
27@@ -327,6 +324,7 @@
28 public boolean isArea() {
29 return w.get("landuse") != null
30 || w.get("leisure") != null
31+ || w.get("amenity") != null
32 || w.get("building") != null;
33 }
34 }