Ticket #9679: 0002-Add-lanes-to-conditional-parsing.patch

File 0002-Add-lanes-to-conditional-parsing.patch, 1.7 KB (added by alv, 11 years ago)

  • src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java 

    From d2cfbb6032d7fd584b5e8cb8109a3f1eb372d5c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= <ilpo.jarvinen@helsinki.fi>
Date: Mon, 3 Feb 2014 14:51:06 +0200
Subject: [PATCH 2/2] Add :lanes: to conditional parsing

---
 .../data/validation/tests/ConditionalKeys.java     |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java b/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java
index 195798c..ce28963 100644
    a b public class ConditionalKeys extends Test.TagTest {  
    5858        return "forward".equals(part) || "backward".equals(part);
    5959    }
    6060
     61    public static boolean isLanes(String part) {
     62        return "lanes".equals(part);
     63    }
     64
    6165    public boolean isKeyValid(String key) {
    62         // <restriction-type>[:<transportation mode>][:<direction>]:conditional
    63         // -- or --            <transportation mode> [:<direction>]:conditional
     66        // <restriction-type>[:<transportation mode>][:lanes][:<direction>]:conditional
     67        // -- or --            <transportation mode> [:lanes][:<direction>]:conditional
    6468        if (!key.endsWith(":conditional")) {
    6569            return false;
    6670        }
    … … public class ConditionalKeys extends Test.TagTest {  
    7175                idx++;
    7276        if (isTransportationMode(parts[idx]))
    7377                idx++;
     78        if (idx > 0 && isLanes(parts[idx]))
     79                idx++;
    7480        if (idx > 0 && isDirection(parts[idx]))
    7581                idx++;
    7682        return (idx > 0 && idx == parts.length);