Changes between Version 8 and Version 9 of Presets/LaneAttributes


Ignore:
Timestamp:
2014-05-20T21:25:55+02:00 (12 years ago)
Author:
skyper
Comment:

Update of preset including splitting in chunks

Legend:

Unmodified
Added
Removed
Modified

  • Presets/LaneAttributes

    v8 v9  
    2424  de.description="Ein Vorlage für (Abbiege-) Fahrspur Attribute">
    2525
     26  <chunk id="surface">
     27    <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground,sett" />
     28  </chunk>
     29
     30  <chunk id="OnewayLanesAccess">
     31    <preset_link preset_name="Access lanes (oneway)" />
     32  </chunk>
     33
     34  <chunk id="TwowayLanesAccess">
     35    <preset_link preset_name="Access lanes (dualway)" />
     36  </chunk>
     37
    2638  <group name="Lanes" de.name="Fahrspuren" >
    2739    <item name="Lanes (oneway)" de.name="Fahrspuren (Einbahnstraße)" type="way">
    … …  
    3244            ro.href="https://wiki.openstreetmap.org/wiki/Ro:Lanes"
    3345            ru.href="https://wiki.openstreetmap.org/wiki/RU:Lanes" />
    34       <label text="Edit lane attributes of a oneway highway" />
    3546      <check key="oneway" text="Oneway" default="on" />
    3647      <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="2" />
    … …  
    3950      <text key="destination:lanes" text="Lane destinations" />
    4051      <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" />
     52      <text key="maxspeed" text="Maxspeed in kilometer (km)" />
     53      <text key="maxspeed:lanes" text="Maxspeed per lane in kilometer (km)" />
    4154      <text key="width" text="Width in meter (m)" />
    4255      <text key="width:lanes" text="Lane width in meter (m)" />
     56      <reference ref="surface" />
    4357      <combo key="surface:lanes" text="Lane surface" values="asphalt|cobblestone,asphalt|asphalt|cobblestone,paved|unpaved" />
    4458      <space/>
    45       <label text="Special access lanes:" />
    46       <space/>
    47       <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" />
    48       <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" />
    49       <combo key="bus:lanes" text="Bus lanes" values="yes|designated,yes|yes|designated,yes|no|designated,yes|yes|designated|yes,yes|yes|no|designated," />
    50       <combo key="hgv:lanes" text="Heavy good vehicle lanes" values="yes|designated,yes|yes|designated,yes|yes|designated|yes,no|yes" />
    51       <combo key="psv:lanes" text="Public transport lanes" values="yes|designated,yes|yes|designated,yes|yes|designated|yes,no|yes" />
    52       <combo key="taxi:lanes" text="Taxi lanes" values="yes|designated,yes|yes|designated,yes|yes|designated|yes,no|yes" />
    53       <combo key="hov:lanes" text="High-occupancy lanes" values="designated|yes|yes|yes|yes,designated|yes|yes|designated,yes|yes|designated" />
    54       <combo key="hov:minimum" text="High-occupancy minimum" values="2,3,4" length="1" />
     59      <reference ref="OnewayLanesAccess" />
    5560    </item>
    5661
    … …  
    6267            ro.href="https://wiki.openstreetmap.org/wiki/Ro:Lanes"
    6368            ru.href="https://wiki.openstreetmap.org/wiki/RU:Lanes" />
    64       <label text="Edit lane attributes of a dualway highway" />
    6569      <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="2" />
    6670      <combo key="lanes:forward" text="Lanes forward" values="1,2,3,4,5" length="2" />
    6771      <combo key="lanes:backward" text="Lanes backward" values="1,2,3,4,5" length="2" />
     72      <combo key="lanes:both_ways" text="Lanes for both directions" values="1,2,3,4,5" length="2" />
    6873      <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" />
    6974      <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" />
    … …  
    7479      <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" />
    7580      <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" />
     81      <text key="maxspeed" text="Maxspeed in kilometer (km)" />
     82      <text key="maxspeed:lanes:forward " text="Maxspeed per forward lane in kilometer (km)" />
     83      <text key="maxspeed:lanes:backward " text="Maxspeed per backward lane in kilometer (km)" />
    7684      <text key="width" text="Width in meter (m)" />
    7785      <text key="width:lanes:forward" text="Lane width forward in meter (m)" />
    7886      <text key="width:lanes:backward" text="Lane width backward in meter (m)" />
     87      <reference ref="surface" />
    7988      <combo key="surface:lanes:forward" text="Lane surface forward" values="asphalt|cobblestone,asphalt|asphalt|cobblestone,paved|unpaved" />
    8089      <combo key="surface:lanes:backward" text="Lane surface backward" values="asphalt|cobblestone,asphalt|asphalt|cobblestone,paved|unpaved" />
    8190      <space/>
    82       <label text="Special access lanes:" />
    83       <space/>
     91      <reference ref="TwowayLanesAccess" />
     92    </item>
     93
     94    <item name="Access lanes (oneway)" type="way" preset_name_label="true">
     95      <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" />
     96      <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" />
     97      <combo key="bus:lanes" text="Bus lanes" values="yes|designated,yes|yes|designated,yes|no|designated,yes|yes|designated|yes,yes|yes|no|designated," />
     98      <combo key="hgv:lanes" text="Heavy good vehicle lanes" values="yes|designated,yes|yes|designated,yes|yes|designated|yes,no|yes" />
     99      <combo key="psv:lanes" text="Public transport lanes" values="yes|designated,yes|yes|designated,yes|yes|designated|yes,no|yes" />
     100      <combo key="taxi:lanes" text="Taxi lanes" values="yes|designated,yes|yes|designated,yes|yes|designated|yes,no|yes" />
     101      <combo key="hov:lanes" text="High-occupancy lanes" values="designated|yes|yes|yes|yes,designated|yes|yes|designated,yes|yes|designated" />
     102      <combo key="hov:minimum" text="High-occupancy minimum" values="2,3,4" length="1" />
     103      <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" />
     104      <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" />
     105    </item>
     106
     107    <item name="Access lanes (dualway)" type="way" preset_name_label="true">
    84108      <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" />
    85109      <combo key="access:lanes:backward" text="Access lanes backward" values="yes|no,yes|yes|no,no|yes|yes|no,no|no" />
    … …  
    97121      <combo key="hov:lanes:backward" text="High-occupancy lanes backward" values="designated|yes|yes|yes|yes,designated|yes|yes|designated,yes|yes|designated" />
    98122      <combo key="hov:minimum" text="High-occupancy minimum" values="2,3,4" length="1" />
     123      <space/>
     124      <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" />
     125      <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" />
     126      <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" />
     127      <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" />
    99128    </item>
    100129  </group>