Ticket #8973: josm_8973_v2.diff

File josm_8973_v2.diff, 4.0 KB (added by skyper, 8 years ago)

patch version 2

  • data/defaultpresets.xml

     
    10341034                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=traffic_signals"
    10351035                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=traffic_signals"
    10361036                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=traffic_signals" />
     1037            <label text="Edit Traffic Signal" />
     1038            <space />
    10371039            <key key="highway" value="traffic_signals" />
    1038             <optional>
     1040            <label text="Optional crossing attributes:" />
     1041            <space />
    10391042                 <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
    1040                  <check key="horse" text="Cross on horseback" default="off" />
    1041                  <check key="bicycle" text="Cross by bicycle" default="off" />
    1042                  <check key="supervised" text="Crossing attendant" default="off" />
    10431043                 <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" />
    1044             </optional>
     1044                 <check key="supervised" text="Crossing attendant" default="off" />
     1045                 <check key="bicycle" text="Cross by bicycle" default="off" />
     1046                 <check key="horse" text="Cross on horseback" default="off" />
    10451047        </item>
    10461048        <item name="Stop" icon="presets/Stop.png" type="node">
    10471049            <key key="highway" value="stop" />
     
    10571059                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=mini_roundabout"
    10581060                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=mini_roundabout" />
    10591061            <key key="highway" value="mini_roundabout" />
     1062            <label text="Edit Mini-Roundabout" />
     1063            <space />
    10601064            <combo key="direction" text="Direction" values="clockwise" />
    10611065        </item>
    10621066        <item name="Pedestrian Crossing" icon="styles/standard/vehicle/zebra_crossing.png" type="node">
     
    10671071                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:crossing"
    10681072                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:crossing"
    10691073                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:crossing" />
    1070             <label text="Edit Crossing" />
     1074            <label text="Edit Pedestrian Crossing" />
     1075            <space />
    10711076            <key key="highway" value="crossing" />
    1072             <combo key="crossing" text="Type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
     1077            <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
     1078            <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" />
     1079            <check key="supervised" text="Crossing attendant" default="off" />
    10731080            <check key="bicycle" text="Cross by bicycle" default="off" />
    10741081            <check key="horse" text="Cross on horseback" default="off" />
    1075             <check key="supervised" text="Crossing attendant" default="off" />
    1076             <combo key="crossing_ref" text="Type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" />
    10771082        </item>
    10781083        <item name="Traffic Calming" icon="presets/chicane.png" type="node,way">
    10791084            <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"
     
    10851090                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:traffic_calming"
    10861091                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:traffic_calming"/>
    10871092            <label text="Edit Traffic Calming" />
     1093            <space />
    10881094            <combo key="traffic_calming" text="Type" values="yes,bump,chicane,choker,cushion,hump,island,rumble_strip,table" match="key" />
    10891095        </item>
    10901096        <item name="Passing Place" icon="presets/passingplace.png" type="node">