Use Optional.ofNullable to avoid string length checks

JOSM · Jun 4, 2024 · dfcf644 · dfcf644
1 parent f618385
commit dfcf644
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/...map/josm/plugins/pt_assistant/actions/mendrelation/PublicTransportMendRelationAction.java b/...map/josm/plugins/pt_assistant/actions/mendrelation/PublicTransportMendRelationAction.java
@@ -1120,14 +1120,9 @@ boolean isRestricted(Way currentWay, Way previousWay, Node commonNode) {
             else if (rel.hasTag("type", "restriction") && rel.hasKey("restriction"))
                 return false;
             else {
-                String routeValue = relation.get("route");
+                final String routeValue = Optional.ofNullable(relation.get("route")).map(it -> "restriction:" + it).orElse("");
                 for (String s : restrictions) {
-                    if (s.length() <= 12)
-                        continue;
-                    String sub = s.substring(12);
-                    if (routeValue.equals(sub) && rel.hasTag("type", s))
-                        return false;
-                    else if (routeValue.equals(sub) && rel.hasKey("restriction:" + sub))
+                    if (routeValue.equals(s) && (rel.hasTag("type", s) || rel.hasKey(s)))
                         return false;
                 }
                 return true;