Changes between Version 16 and Version 17 of Presets/LaneAttributes


Ignore:
Timestamp:
2014-10-14T18:00:30+02:00 (12 years ago)
Author:
skyper
Comment:

added match=*

Legend:

Unmodified
Added
Removed
Modified

  • Presets/LaneAttributes

    v16 v17  
    5252      <check key="oneway" text="Oneway" default="on" />
    5353      <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="2" />
    54       <combo key="turn:lanes" text="Turn lanes" values="reverse;left|through|right,left|through;right,none|right,reverse;left|through|through;right,merge_to_right|merge_to_left,sharp_left|slight_left|through|slight_right|sharp_right" />
    55       <combo key="change:lanes" text="Change lanes" values="yes|not_right|no,yes|not_left,not_left|yes,not_left|not_right,no|no" />
    56       <text key="destination:lanes" text="Lane destinations" />
    57       <text key="destination:ref:lanes" text="Lane destination refs" />
    58       <text key="destination:symbol:lanes" text="Lane destination symbol" />
    59       <combo key="placement" text="Placement" values="left_of:1,left_of:2,middle_of:1,middle_of:2,right_of:1,right_of:2,transition" />
     54      <combo key="turn:lanes" text="Turn lanes" values="reverse;left|through|right,left|through;right,none|right,reverse;left|through|through;right,merge_to_right|merge_to_left,sharp_left|slight_left|through|slight_right|sharp_right" match="key" />
     55      <combo key="change:lanes" text="Change lanes" values="yes|not_right|no,yes|not_left,not_left|yes,not_left|not_right,no|no" match="key" />
     56      <text key="destination:lanes" text="Lane destinations" match="key" />
     57      <text key="destination:ref:lanes" text="Lane destination refs" match="key" />
     58      <text key="destination:symbol:lanes" text="Lane destination symbol" match="key" />
     59      <combo key="placement" text="Placement" values="left_of:1,left_of:2,middle_of:1,middle_of:2,right_of:1,right_of:2,transition" match="key" />
    6060      <text key="maxspeed" text="Maxspeed in kilometer (km)" />
    61       <text key="maxspeed:lanes" text="Maxspeed per lane in kilometer (km)" />
     61      <text key="maxspeed:lanes" text="Maxspeed per lane in kilometer (km)" match="key" />
    6262      <text key="width" text="Width in meter (m)" />
    63       <text key="width:lanes" text="Lane width in meter (m)" />
     63      <text key="width:lanes" text="Lane width in meter (m)" match="key" />
    6464      <reference ref="surface" />
    65       <combo key="surface:lanes" text="Lane surface" values="asphalt|cobblestone,asphalt|asphalt|cobblestone,paved|unpaved" />
     65      <combo key="surface:lanes" text="Lane surface" values="asphalt|cobblestone,asphalt|asphalt|cobblestone,paved|unpaved" match="key" />
    6666      <space/>
    6767      <reference ref="OnewayLanesAccess" />
    … …  
    7171      <reference ref="LanesWiki" />
    7272      <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="2" />
    73       <combo key="lanes:forward" text="Lanes forward" values="1,2,3,4,5" length="2" />
    74       <combo key="lanes:backward" text="Lanes backward" values="1,2,3,4,5" length="2" />
     73      <combo key="lanes:forward" text="Lanes forward" values="1,2,3,4,5" length="2" match="key" />
     74      <combo key="lanes:backward" text="Lanes backward" values="1,2,3,4,5" length="2" match="key" />
    7575      <combo key="lanes:both_ways" text="Lanes for both directions" values="1,2,3,4,5" length="2" />
    76       <combo key="turn:lanes:forward" text="Turn lanes forward" values="reverse;left|through|right,left|through;right,none|right,reverse;left|through|through;right,merge_to_right|merge_to_left,sharp_left|slight_left|through|slight_right|sharp_right" />
    77       <combo key="turn:lanes:backward" text="Turn lanes backward" values="reverse;left|through|right,left|through;right,none|right,reverse;left|through|through;right,merge_to_right|merge_to_left,sharp_left|slight_left|through|slight_right|sharp_right" />
    78       <combo key="turn:lanes:both_ways" text="Turn lanes both directions" values="reverse;left|through|right,left|through;right,none|right,reverse;left|through|through;right,merge_to_right|merge_to_left,sharp_left|slight_left|through|slight_right|sharp_right" />
    79       <combo key="change:lanes:forward" text="Change lanes forward" values="yes|not_right|no,yes|not_left,not_left|yes,not_left|not_right,no|no" />
    80       <combo key="change:lanes:backward" text="Change lanes backward" values="yes|not_right|no,yes|not_left,not_left|yes,not_left|not_right,no|no" />
    81       <text key="destination:lanes:forward" text="Lane destinations forward" />
    82       <text key="destination:lanes:backward" text="Lane destinations backward" />
    83       <text key="destination:ref:lanes:forward" text="Lane destination refs forward" />
    84       <text key="destination:ref:lanes:backward" text="Lane destination refs backward" />
    85       <text key="destination:symbol:lanes:forward" text="Lane destination symbol forward" />
    86       <text key="destination:symbol:lanes:backward" text="Lane destination symbol backward" />
    87       <combo key="placement:forward" text="Placement forward" values="left_of:1,left_of:2,middle_of:1,middle_of:2,right_of:1,right_of:2,transition" />
    88       <combo key="placement:backward" text="Placement backward" values="left_of:1,left_of:2,middle_of:1,middle_of:2,right_of:1,right_of:2,transition" />
     76      <combo key="turn:lanes:forward" text="Turn lanes forward" values="reverse;left|through|right,left|through;right,none|right,reverse;left|through|through;right,merge_to_right|merge_to_left,sharp_left|slight_left|through|slight_right|sharp_right" match="key" />
     77      <combo key="turn:lanes:backward" text="Turn lanes backward" values="reverse;left|through|right,left|through;right,none|right,reverse;left|through|through;right,merge_to_right|merge_to_left,sharp_left|slight_left|through|slight_right|sharp_right" match="key" />
     78      <combo key="turn:lanes:both_ways" text="Turn lanes both directions" values="reverse;left|through|right,left|through;right,none|right,reverse;left|through|through;right,merge_to_right|merge_to_left,sharp_left|slight_left|through|slight_right|sharp_right" match="key" />
     79      <combo key="change:lanes:forward" text="Change lanes forward" values="yes|not_right|no,yes|not_left,not_left|yes,not_left|not_right,no|no" match="key" />
     80      <combo key="change:lanes:backward" text="Change lanes backward" values="yes|not_right|no,yes|not_left,not_left|yes,not_left|not_right,no|no" match="key" />
     81      <text key="destination:lanes:forward" text="Lane destinations forward" match="key" />
     82      <text key="destination:lanes:backward" text="Lane destinations backward" match="key" />
     83      <text key="destination:ref:lanes:forward" text="Lane destination refs forward" match="key" />
     84      <text key="destination:ref:lanes:backward" text="Lane destination refs backward" match="key" />
     85      <text key="destination:symbol:lanes:forward" text="Lane destination symbol forward" match="key" />
     86      <text key="destination:symbol:lanes:backward" text="Lane destination symbol backward" match="key" />
     87      <combo key="placement:forward" text="Placement forward" values="left_of:1,left_of:2,middle_of:1,middle_of:2,right_of:1,right_of:2,transition" match="key" />
     88      <combo key="placement:backward" text="Placement backward" values="left_of:1,left_of:2,middle_of:1,middle_of:2,right_of:1,right_of:2,transition" match="key" />
    8989      <text key="maxspeed" text="Maxspeed in kilometer (km)" />
    90       <text key="maxspeed:lanes:forward" text="Maxspeed per forward lane in kilometer (km)" />
    91       <text key="maxspeed:lanes:backward" text="Maxspeed per backward lane in kilometer (km)" />
     90      <text key="maxspeed:lanes:forward" text="Maxspeed per forward lane in kilometer (km)" match="key" />
     91      <text key="maxspeed:lanes:backward" text="Maxspeed per backward lane in kilometer (km)" match="key" />
    9292      <text key="width" text="Width in meter (m)" />
    93       <text key="width:lanes:forward" text="Lane width forward in meter (m)" />
    94       <text key="width:lanes:backward" text="Lane width backward in meter (m)" />
     93      <text key="width:lanes:forward" text="Lane width forward in meter (m)" match="key" />
     94      <text key="width:lanes:backward" text="Lane width backward in meter (m)" match="key" />
    9595      <reference ref="surface" />
    96       <combo key="surface:lanes:forward" text="Lane surface forward" values="asphalt|cobblestone,asphalt|asphalt|cobblestone,paved|unpaved" />
    97       <combo key="surface:lanes:backward" text="Lane surface backward" values="asphalt|cobblestone,asphalt|asphalt|cobblestone,paved|unpaved" />
     96      <combo key="surface:lanes:forward" text="Lane surface forward" values="asphalt|cobblestone,asphalt|asphalt|cobblestone,paved|unpaved" match="key" />
     97      <combo key="surface:lanes:backward" text="Lane surface backward" values="asphalt|cobblestone,asphalt|asphalt|cobblestone,paved|unpaved" match="key" />
    9898      <space/>
    9999      <reference ref="TwowayLanesAccess" />
    … …  
    104104      <check key="oneway" text="Oneway" default="on" />
    105105      <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="2" />
    106       <multiselect key="turn" text="Turn" values="reverse;sharp_left;left;slight_left;through;sharp_right;right;slight_right" />
    107       <text key="destination" text="Destination" />
    108       <text key="destination:ref" text="Destination ref" />
    109       <text key="destination:symbol" text="Destination symbol" />
     106      <multiselect key="turn" text="Turn" values="reverse;sharp_left;left;slight_left;through;sharp_right;right;slight_right" match="key" />
     107      <text key="destination" text="Destination" match="key" />
     108      <text key="destination:ref" text="Destination ref" match="key" />
     109      <text key="destination:symbol" text="Destination symbol" match="key" />
    110110      <text key="maxspeed" text="Maxspeed in kilometer (km)" />
    111111      <text key="width" text="Width in meter (m)" />
    … …  
    116116      <reference ref="LanesWiki" />
    117117      <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="2" />
    118       <multiselect key="turn:forward" text="Turn forward" values="reverse;sharp_left;left;slight_left;through;sharp_right;right;slight_right" />
    119       <multiselect key="turn:backward" text="Turn backward" values="reverse;sharp_left;left;slight_left;through;sharp_right;right;slight_right" />
    120       <combo key="change:forward" text="Change forward" values="yes,no" />
    121       <combo key="change:backward" text="Change backward" values="yes,no" />
    122       <text key="destination::forward" text="Destinations forward" />
    123       <text key="destination::backward" text="Destinations backward" />
    124       <text key="destination:ref:forward" text="Destination refs forward" />
    125       <text key="destination:ref:backward" text="Destination refs backward" />
    126       <text key="destination:symbol:forward" text="Destination symbol forward" />
    127       <text key="destination:symbol:backward" text="Destination symbol backward" />
     118      <multiselect key="turn:forward" text="Turn forward" values="reverse;sharp_left;left;slight_left;through;sharp_right;right;slight_right" match="key" />
     119      <multiselect key="turn:backward" text="Turn backward" values="reverse;sharp_left;left;slight_left;through;sharp_right;right;slight_right" match="key" />
     120      <combo key="change:forward" text="Change forward" values="yes,no" match="key" />
     121      <combo key="change:backward" text="Change backward" values="yes,no" match="key" />
     122      <text key="destination:forward" text="Destinations forward" match="key" />
     123      <text key="destination:backward" text="Destinations backward" match="key" />
     124      <text key="destination:ref:forward" text="Destination refs forward" match="key" />
     125      <text key="destination:ref:backward" text="Destination refs backward" match="key" />
     126      <text key="destination:symbol:forward" text="Destination symbol forward" match="key" />
     127      <text key="destination:symbol:backward" text="Destination symbol backward" match="key" />
    128128      <text key="maxspeed" text="Maxspeed in kilometer (km)" />
    129       <text key="maxspeed:forward" text="Maxspeed forward in kilometer (km)" />
    130       <text key="maxspeed:backward" text="Maxspeed backward in kilometer (km)" />
     129      <text key="maxspeed:forward" text="Maxspeed forward in kilometer (km)" match="key" />
     130      <text key="maxspeed:backward" text="Maxspeed backward in kilometer (km)" match="key" />
    131131      <text key="width" text="Width in meter (m)" />
    132       <text key="width:forward" text="Lane width forward in meter (m)" />
    133       <text key="width:backward" text="Lane width backward in meter (m)" />
     132      <text key="width:forward" text="Lane width forward in meter (m)" match="key" />
     133      <text key="width:backward" text="Lane width backward in meter (m)" match="key" />
    134134      <reference ref="surface" />
    135135    </item>
    … …  
    137137
    138138    <item name="Access lanes (oneway)" type="way,closedway" preset_name_label="true">
    139       <combo key="access:lanes" text="Access lanes" values="yes|no,yes|yes|no,yes|yes|yes|no,no|yes|yes|no,no|no,no|no|no" />
    140       <combo key="bicycle:lanes" text="Bicycles lanes" values="yes|designated,yes|yes|designated,yes|yes|yes|designated,yes|yes|designated|yes,yes|yes|designated|no,no|yes" />
    141       <combo key="bus:lanes" text="Bus lanes" values="yes|designated,yes|yes|designated,yes|no|designated,yes|yes|designated|yes,yes|yes|no|designated," />
    142       <combo key="hgv:lanes" text="Heavy good vehicle lanes" values="yes|designated,yes|yes|designated,yes|yes|designated|yes,no|yes" />
    143       <combo key="psv:lanes" text="Public transport lanes" values="yes|designated,yes|yes|designated,yes|yes|designated|yes,no|yes" />
    144       <combo key="taxi:lanes" text="Taxi lanes" values="yes|designated,yes|yes|designated,yes|yes|designated|yes,no|yes" />
    145       <combo key="hov:lanes" text="High-occupancy lanes" values="designated|yes|yes|yes|yes,designated|yes|yes|designated,yes|yes|designated" />
     139      <combo key="access:lanes" text="Access lanes" values="yes|no,yes|yes|no,yes|yes|yes|no,no|yes|yes|no,no|no,no|no|no" match="key" />
     140      <combo key="bicycle:lanes" text="Bicycles lanes" values="yes|designated,yes|yes|designated,yes|yes|yes|designated,yes|yes|designated|yes,yes|yes|designated|no,no|yes" match="key" />
     141      <combo key="bus:lanes" text="Bus lanes" values="yes|designated,yes|yes|designated,yes|no|designated,yes|yes|designated|yes,yes|yes|no|designated," match="key" />
     142      <combo key="hgv:lanes" text="Heavy good vehicle lanes" values="yes|designated,yes|yes|designated,yes|yes|designated|yes,no|yes" match="key" />
     143      <combo key="psv:lanes" text="Public transport lanes" values="yes|designated,yes|yes|designated,yes|yes|designated|yes,no|yes" match="key" />
     144      <combo key="taxi:lanes" text="Taxi lanes" values="yes|designated,yes|yes|designated,yes|yes|designated|yes,no|yes" match="key" />
     145      <combo key="hov:lanes" text="High-occupancy lanes" values="designated|yes|yes|yes|yes,designated|yes|yes|designated,yes|yes|designated" match="key" />
    146146      <combo key="hov:minimum" text="High-occupancy minimum" values="2,3,4" length="1" />
    147       <combo key="railway:lanes" text="Railway lanes" values="tram|no,rail|no,tram|tram|no,no|tram|no,no|tram,no|no|tram,rail|rail|no,no|rail|no,no|rail,no|no|rail" />
    148       <combo key="train:lanes" text="Train access lanes" values="yes|no,yes|no|no,yes|yes|no,yes|yes|yes|no,no|yes|yes|no,no|yes,no|no,no|no|yes" />
     147      <combo key="railway:lanes" text="Railway lanes" values="tram|no,rail|no,tram|tram|no,no|tram|no,no|tram,no|no|tram,rail|rail|no,no|rail|no,no|rail,no|no|rail" match="key" />
     148      <combo key="train:lanes" text="Train access lanes" values="yes|no,yes|no|no,yes|yes|no,yes|yes|yes|no,no|yes|yes|no,no|yes,no|no,no|no|yes" match="key" />
    149149    </item>
    150150
    151151    <item name="Access lanes (dualway)" type="way,closedway" preset_name_label="true">
    152       <combo key="access:lanes:forward" text="Access lanes forward" values="yes|no,yes|yes|no,yes|yes|yes|no,no|yes|yes|no,no|no,no|no|no" />
    153       <combo key="access:lanes:backward" text="Access lanes backward" values="yes|no,yes|yes|no,no|yes|yes|no,no|no" />
    154       <combo key="bicycle:lanes:forward" text="Bicycles lanes forward" values="yes|designated,yes|yes|designated,yes|yes|yes|designated,yes|yes|designated|yes,yes|yes|designated|no,no|yes" />
    155       <combo key="bicycle:lanes:backward" text="Bicycles lanes backward" values="yes|designated,yes|yes|designated,yes|yes|yes|designated,yes|yes|designated|yes,yes|yes|designated|no,no|yes" />
    156       <combo key="bus:lanes:forward" text="Bus lanes forward" values="yes|designated,yes|yes|designated,yes|no|designated,yes|yes|designated|yes,yes|yes|no|designated," />
    157       <combo key="bus:lanes:backward" text="Bus lanes backward" values="yes|designated,yes|yes|designated,yes|no|designated,yes|yes|designated|yes,yes|yes|no|designated," />
    158       <combo key="hgv:lanes:forward" text="Heavy good vehicle lanes forward" values="yes|designated,yes|yes|designated,yes|yes|designated|yes" />
    159       <combo key="hgv:lanes:backward" text="Heavy good vehicle lanes backward" values="yes|designated,yes|yes|designated,yes|yes|designated|yes,no|yes" />
    160       <combo key="psv:lanes:forward" text="Public transport lanes forward" values="yes|designated,yes|yes|designated,yes|yes|designated|yes,no|yes" />
    161       <combo key="psv:lanes:backward" text="Public transport lanes backward" values="yes|designated,yes|yes|designated,yes|yes|designated|yes,no|yes" />
    162       <combo key="taxi:lanes:forward" text="Taxi lanes forward" values="yes|designated,yes|yes|designated,yes|yes|designated|yes,no|yes" />
    163       <combo key="taxi:lanes:backward" text="Taxi lanes backward" values="yes|designated,yes|yes|designated,yes|yes|designated|yes,no|yes" />
    164       <combo key="hov:lanes:forward" text="High-occupancy lanes forward" values="designated|yes|yes|yes|yes,designated|yes|yes|designated,yes|yes|designated" />
    165       <combo key="hov:lanes:backward" text="High-occupancy lanes backward" values="designated|yes|yes|yes|yes,designated|yes|yes|designated,yes|yes|designated" />
     152      <combo key="access:lanes:forward" text="Access lanes forward" values="yes|no,yes|yes|no,yes|yes|yes|no,no|yes|yes|no,no|no,no|no|no" match="key" />
     153      <combo key="access:lanes:backward" text="Access lanes backward" values="yes|no,yes|yes|no,no|yes|yes|no,no|no" match="key" />
     154      <combo key="bicycle:lanes:forward" text="Bicycles lanes forward" values="yes|designated,yes|yes|designated,yes|yes|yes|designated,yes|yes|designated|yes,yes|yes|designated|no,no|yes" match="key" />
     155      <combo key="bicycle:lanes:backward" text="Bicycles lanes backward" values="yes|designated,yes|yes|designated,yes|yes|yes|designated,yes|yes|designated|yes,yes|yes|designated|no,no|yes" match="key" />
     156      <combo key="bus:lanes:forward" text="Bus lanes forward" values="yes|designated,yes|yes|designated,yes|no|designated,yes|yes|designated|yes,yes|yes|no|designated," match="key" />
     157      <combo key="bus:lanes:backward" text="Bus lanes backward" values="yes|designated,yes|yes|designated,yes|no|designated,yes|yes|designated|yes,yes|yes|no|designated," match="key" />
     158      <combo key="hgv:lanes:forward" text="Heavy good vehicle lanes forward" values="yes|designated,yes|yes|designated,yes|yes|designated|yes" match="key" />
     159      <combo key="hgv:lanes:backward" text="Heavy good vehicle lanes backward" values="yes|designated,yes|yes|designated,yes|yes|designated|yes,no|yes" match="key" />
     160      <combo key="psv:lanes:forward" text="Public transport lanes forward" values="yes|designated,yes|yes|designated,yes|yes|designated|yes,no|yes" match="key" />
     161      <combo key="psv:lanes:backward" text="Public transport lanes backward" values="yes|designated,yes|yes|designated,yes|yes|designated|yes,no|yes" match="key" />
     162      <combo key="taxi:lanes:forward" text="Taxi lanes forward" values="yes|designated,yes|yes|designated,yes|yes|designated|yes,no|yes" match="key" />
     163      <combo key="taxi:lanes:backward" text="Taxi lanes backward" values="yes|designated,yes|yes|designated,yes|yes|designated|yes,no|yes" match="key" />
     164      <combo key="hov:lanes:forward" text="High-occupancy lanes forward" values="designated|yes|yes|yes|yes,designated|yes|yes|designated,yes|yes|designated" match="key" />
     165      <combo key="hov:lanes:backward" text="High-occupancy lanes backward" values="designated|yes|yes|yes|yes,designated|yes|yes|designated,yes|yes|designated" match="key" />
    166166      <combo key="hov:minimum" text="High-occupancy minimum" values="2,3,4" length="1" />
    167167      <space/>
    168       <combo key="railway:lanes:forward" text="Railway lanes forward" values="tram|no,rail|no,tram|tram|no,no|tram|no,no|tram,no|no|tram,rail|rail|no,no|rail|no,no|rail,no|no|rail" />
    169       <combo key="railway:lanes:backward" text="Railway lanes backward" values="tram|no,rail|no,tram|tram|no,no|tram|no,no|tram,no|no|tram,rail|rail|no,no|rail|no,no|rail,no|no|rail" />
    170       <combo key="train:lanes:forward" text="Train access lanes forward" values="yes|no,yes|no|no,yes|yes|no,yes|yes|yes|no,no|yes|yes|no,no|yes,no|no,no|no|yes" />
    171       <combo key="train:lanes:backward" text="Train access lanes backward" values="yes|no,yes|no|no,yes|yes|no,yes|yes|yes|no,no|yes|yes|no,no|yes,no|no,no|no|yes" />
     168      <combo key="railway:lanes:forward" text="Railway lanes forward" values="tram|no,rail|no,tram|tram|no,no|tram|no,no|tram,no|no|tram,rail|rail|no,no|rail|no,no|rail,no|no|rail" match="key" />
     169      <combo key="railway:lanes:backward" text="Railway lanes backward" values="tram|no,rail|no,tram|tram|no,no|tram|no,no|tram,no|no|tram,rail|rail|no,no|rail|no,no|rail,no|no|rail" match="key" />
     170      <combo key="train:lanes:forward" text="Train access lanes forward" values="yes|no,yes|no|no,yes|yes|no,yes|yes|yes|no,no|yes|yes|no,no|yes,no|no,no|no|yes" match="key" />
     171      <combo key="train:lanes:backward" text="Train access lanes backward" values="yes|no,yes|no|no,yes|yes|no,yes|yes|yes|no,no|yes|yes|no,no|yes,no|no,no|no|yes" match="key" />
    172172    </item>
    173173  </group>