Changeset 10911 in josm

Timestamp:

2016-08-28T22:22:27+02:00 (8 years ago)

Author:

Klumbumbus

Message:

deprecate shop=souvenir; update vending values; remove mappaint of highway=ford and shop=car_dealer

Location:

trunk

Files:

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

trunk/data/defaultpresets.xml

@@ -8198 +8198 @@
         <space />
         <key key="amenity" value="vending_machine" />
-        <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" />
+        <multiselect key="vending" text="Vending products" values="admission_tickets;animal_feed;bicycle_tube;cigarettes;condoms;drinks;elongated_coin;excrement_bags;food;milk;newspapers;parking_tickets;parcel_pickup;parcel_mail_in;photos;public_transport_plans;public_transport_tickets;SIM_cards;stamps;sweets;telephone_vouchers;toys" values_searchable="true" />
         <text key="operator" text="Operator" />
         <text key="ref" text="Reference number" />

trunk/data/validator/deprecated.mapcss

@@ -891 +891 @@
   fixRemove: "landuse";
 }
+
+*[shop=souvenir],
+*[shop=souvenirs],
+*[shop=souveniers] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "shop=gift";
+  fixAdd: "shop=gift";
+}
+
+*[vending=animal_food] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "vending=animal_feed";
+  fixAdd: "vending=animal_feed";
+}

trunk/styles/standard/elemstyles.mapcss

@@ -745 +745 @@
     set icon_z17;
 }
-node[highway=ford], node[ford?] {
+node[ford?] {
     icon-image: "presets/vehicle/ford.svg";
     set icon_z17;
@@ -1841 +1841 @@
 area[shop=boutique],
 area[shop=car],
-area[shop=car_dealer],
 area[shop=car_repair],
 area[shop=tyres],
@@ -1968 +1967 @@
     set icon_z17;
 }
-node[shop=car],
-node[shop=car_dealer] {
+node[shop=car] {
     icon-image: "presets/shop/vehicle.svg";
     set icon_z17;