Changeset 13721 in josm

Timestamp:

2018-05-08T21:54:48+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #16264, see #16188, see #16189 - reduce validator false positives:

• increase tolerance of buildings with almost right angle to 1 degree
• detect crossing residential areas only with themselves and buildings
• fix crossing railways messages

Location:

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

Files:

• CrossingWays.java (modified) (7 diffs)
• RightAngleBuildingTest.java (modified) (1 diff)

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

@@ -42 +42 @@
      */
     private enum WayType {
-        BUILDING, HIGHWAY, RESIDENTIAL_AREA, WATERWAY, WAY;
+        BUILDING, HIGHWAY, RAILWAY, RESIDENTIAL_AREA, WATERWAY, WAY;
 
         static WayType of(Way w) {
@@ -49 +49 @@
             else if (w.hasKey(CrossingWays.HIGHWAY))
                 return HIGHWAY;
+            else if (isRailway(w))
+                return RAILWAY;
             else if (isResidentialArea(w))
                 return RESIDENTIAL_AREA;
@@ -101 +103 @@
                 return true;
             }
-            if ((w1.hasKey(HIGHWAY) && isResidentialArea(w2))
-             || (w2.hasKey(HIGHWAY) && isResidentialArea(w1)))
+            if ((w1.hasKey(HIGHWAY, RAILWAY, WATERWAY) && isResidentialArea(w2))
+             || (w2.hasKey(HIGHWAY, RAILWAY, WATERWAY) && isResidentialArea(w1)))
                 return true;
             if (isSubwayOrTramOrRazed(w2)) {
@@ -128 +130 @@
                     case HIGHWAY:
                         return tr("Crossing highways");
+                    case RAILWAY:
+                        return tr("Crossing railways");
                     case RESIDENTIAL_AREA:
                         return tr("Crossing residential areas");
@@ -142 +146 @@
                             case HIGHWAY:
                                 return tr("Crossing building/highway");
+                            case RAILWAY:
+                                return tr("Crossing building/railway");
                             case RESIDENTIAL_AREA:
                                 return tr("Crossing building/residential area");
@@ -152 +158 @@
                     case HIGHWAY:
                         switch (types[1]) {
-                            case RESIDENTIAL_AREA:
-                                return tr("Crossing highway/residential area");
+                            case RAILWAY:
+                                return tr("Crossing highway/railway");
                             case WATERWAY:
                                 return tr("Crossing highway/waterway");
@@ -160 +166 @@
                                 return tr("Crossing highway/way");
                         }
+                    case RAILWAY:
+                        switch (types[1]) {
+                            case WATERWAY:
+                                return tr("Crossing railway/waterway");
+                            case WAY:
+                            default:
+                                return tr("Crossing railway/way");
+                        }
                     case RESIDENTIAL_AREA:
                         switch (types[1]) {
-                            case WATERWAY:
-                                return tr("Crossing residential area/waterway");
                             case WAY:
                             default:

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

@@ -70 +70 @@
         super.startTest(monitor);
         maxAngleDelta = Config.getPref().getDouble("validator.RightAngleBuilding.maximumDelta", 10.0);
-        minAngleDelta = Config.getPref().getDouble("validator.RightAngleBuilding.minimumDelta", 0.25);
+        minAngleDelta = Config.getPref().getDouble("validator.RightAngleBuilding.minimumDelta", 1.0);
     }