Changeset 15448 in josm

Timestamp:

2019-10-10T16:57:43+02:00 (5 years ago)

Author:

GerdP

Message:

fix #18127: 18127.14.patch with some simplifications

• ignore ways with tag via_ferrata_scale=*
• only create errors with Severity.OTHER if needed

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/SharpAngles.java (modified) (8 diffs)

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

@@ -6 +6 @@
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.TreeSet;
@@ -17 +14 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.WaySegment;
+import org.openstreetmap.josm.data.preferences.sources.ValidatorPrefHelper;
 import org.openstreetmap.josm.data.validation.Severity;
 import org.openstreetmap.josm.data.validation.Test;
@@ -36 +34 @@
     /** The length that at least one way segment must be shorter than */
     private double maxLength = 10.0; // meters
-    /** The stepping points for severity */
-    private Map<Double, Severity> severityBreakPoints = new LinkedHashMap<>();
     /** Specific highway types to ignore */
     private Collection<String> ignoreHighways = new TreeSet<>(
@@ -47 +43 @@
     public SharpAngles() {
         super(tr("Sharp angles"), tr("Check for sharp angles on roads"));
-        setBreakPoints();
     }
 
@@ -53 +48 @@
     public void visit(Way way) {
         if (!way.isUsable()) return;
-        if (way.hasKey("highway") && !way.hasTag("area", "yes") &&
-                    !ignoreHighways.contains(way.get("highway"))) {
+        if (shouldBeTestedForSharpAngles(way)) {
             try {
                 checkWayForSharpAngles(way);
@@ -61 +55 @@
             }
         }
+    }
+
+    /**
+     * Check whether or not a way should be checked for sharp angles
+     * @param way The way that needs to be checked
+     * @return {@code true} if the way should be checked.
+     */
+    public boolean shouldBeTestedForSharpAngles(Way way) {
+        return (way.hasKey("highway") && !way.hasTag("area", "yes") && !way.hasKey("via_ferrata_scale") &&
+                !ignoreHighways.contains(way.get("highway")));
     }
 
@@ -109 +113 @@
 
     private void createNearlyOverlappingError(double angle, Way way, OsmPrimitive primitive) {
-        TestError.Builder testError = TestError.builder(this, getSeverity(angle), SHARP_ANGLES)
-                .primitives(way)
-                .highlight(primitive)
-                .message(tr("Sharp angle"));
-        errors.add(testError.build());
+        Severity severity = getSeverity(angle);
+        if (severity != Severity.OTHER || (ValidatorPrefHelper.PREF_OTHER.get() || ValidatorPrefHelper.PREF_OTHER_UPLOAD.get())) {
+            int addCode = severity == Severity.OTHER ? 1 : 0;
+            TestError.Builder testError = TestError.builder(this, severity, SHARP_ANGLES + addCode)
+                    .primitives(way)
+                    .highlight(primitive)
+                    .message(tr("Sharp angle"));
+            errors.add(testError.build());
+        }
     }
 
     private Severity getSeverity(double angle) {
-        Severity rSeverity = Severity.OTHER;
-        for (Entry<Double, Severity> entry : severityBreakPoints.entrySet()) {
-            if (angle < entry.getKey()) {
-                rSeverity = entry.getValue();
-            }
-        }
-        return rSeverity;
+        return angle < maxAngle * 2 / 3 ? Severity.WARNING : Severity.OTHER;
     }
 
@@ -148 +150 @@
     public void setMaxAngle(double angle) {
         maxAngle = angle;
-        setBreakPoints();
-    }
-
-    /**
-     * Set the breakpoints for the test
-     */
-    private void setBreakPoints() {
-        severityBreakPoints.clear();
-        severityBreakPoints.put(maxAngle, Severity.OTHER);
-        severityBreakPoints.put(maxAngle * 2 / 3, Severity.WARNING);
     }