Changeset 4448 in josm for trunk/src/org/openstreetmap/josm/data/validation

Timestamp:

2011-09-18T22:24:08+02:00 (13 years ago)

Author:

simon04

Message:

see #4582 - validator test for overlapping areas

Location:

trunk/src/org/openstreetmap/josm/data/validation

Files:

• OsmValidator.java (modified) (2 diffs)
• tests/OverlappingAreas.java (added)
• tests/OverlappingWays.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -37 +37 @@
 import org.openstreetmap.josm.data.validation.tests.NameMismatch;
 import org.openstreetmap.josm.data.validation.tests.NodesWithSameName;
+import org.openstreetmap.josm.data.validation.tests.OverlappingAreas;
 import org.openstreetmap.josm.data.validation.tests.OverlappingWays;
 import org.openstreetmap.josm.data.validation.tests.RelationChecker;
@@ -100 +101 @@
         BuildingInBuilding.class, // ID 2001 .. 2099
         DeprecatedTags.class, // ID 2101 .. 2199
+        OverlappingAreas.class, // ID 2201 .. 2299
     };
 

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

@@ -101 +101 @@
                     if (area > 0) {
                         if (ways == 0 || duplicated.size() == area) {
-                            errortype = tr("Overlapping areas");
-                            type = OVERLAPPING_AREA;
+                            continue;
                         } else if (highway == ways) {
                             errortype = tr("Overlapping highways (with area)");
@@ -127 +126 @@
                     errors.add(new TestError(this, 
                             type < OVERLAPPING_HIGHWAY_AREA ? Severity.WARNING : Severity.OTHER,
-                            tr(errortype), type, prims, duplicated));
+                            errortype, type, prims, duplicated));
                     ways_seen.put(current_ways, duplicated);
                 } else { /* way seen, mark highlight layer only */