Changeset 10540 in josm

Timestamp:

2016-07-16T23:13:41+02:00 (8 years ago)

Author:

Klumbumbus

Message:

fix #13076 - add preset for railway=funicular; fix #13081 - add translation context to electrified; add vending=milk

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (3 diffs)
• styles/standard/elemstyles.mapcss (modified) (1 diff)

trunk/data/defaultpresets.xml

@@ -73 +73 @@
     </chunk>
     <chunk id="railway_electrified">
-        <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
+        <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" values_context="electrified" />
         <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
         <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
@@ -2535 +2535 @@
             </optional>
         </item> <!-- Tram -->
+        <item name="Funicular" icon="styles/standard/transport/railway/funicular.svg" type="way" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=funicular" />
+            <key key="railway" value="funicular" />
+            <optional>
+                <reference ref="railway_service_gauge_electrified" />
+            </optional>
+        </item> <!-- Funicular -->
         <item name="Bus Guideway" icon="styles/standard/transport/railway/bus_guideway.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway"
@@ -8173 +8180 @@
         <space />
         <key key="amenity" value="vending_machine" />
-        <multiselect key="vending" text="Vending products" values="animal_food;bicycle_tube;cigarettes;condoms;drinks;excrement_bags;food;newspapers;parking_tickets;photos;public_transport_plans;public_transport_tickets;SIM_cards;stamps;sweets;tampons;telephone_vouchers;toys;vouchers" values_searchable="true" />
+        <multiselect key="vending" text="Vending products" values="animal_food;bicycle_tube;cigarettes;condoms;drinks;excrement_bags;food;milk;newspapers;parking_tickets;photos;public_transport_plans;public_transport_tickets;SIM_cards;stamps;sweets;tampons;telephone_vouchers;toys;vouchers" values_searchable="true" />
         <text key="operator" text="Operator" />
         <text key="ref" text="Reference number" />

trunk/styles/standard/elemstyles.mapcss

@@ -3661 +3661 @@
 }
 node[public_transport=stop_position][funicular=yes] {
-    icon-image: "transport/funicular.svg";
+    icon-image: "transport/railway/funicular.svg";
     set icon_z17;
 }