Changeset 4678 in josm for trunk/src/org

Timestamp:

2011-12-21T10:14:42+01:00 (12 years ago)

Author:

simon04

Message:

fix #3736 - Split Crossing Ways test into Crossing Ways and Crossing Waterways

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java (modified) (1 diff)

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

@@ -120 +120 @@
                         highlight.add(es2.ws);
 
+                        String message;
+                        if (isBuilding) {
+                            message = tr("Crossing buildings");
+                        } else if ((es1.waterway != null && es2.ws.way.get("highway") != null)
+                                || (es2.waterway != null && es1.ws.way.get("highway") != null)) {
+                            message = tr("Crossing waterway/highway");
+                        } else {
+                            message = tr("Crossing ways");
+                        }
+
                         errors.add(new TestError(this, Severity.WARNING,
-                            isBuilding ? tr("Crossing buildings") : tr("Crossing ways"),
+                            message,
                             CROSSING_WAYS,
                             prims,