Merge branch 'master' into icons2
authorAndy Allan <andy@gravitystorm.co.uk>
Sun, 3 Apr 2011 13:39:09 +0000 (14:39 +0100)
committerAndy Allan <andy@gravitystorm.co.uk>
Sun, 3 Apr 2011 13:39:09 +0000 (14:39 +0100)
resources/features/pois/transport_car_wash.n.24.png [new file with mode: 0644]
resources/icons/accommodation_blank.png [deleted file]
resources/icons/transport_car_wash.n.16.png [new file with mode: 0644]
resources/map_features/buildings.xml
resources/map_features/transport.xml
resources/stylesheets/core_pois.css

diff --git a/resources/features/pois/transport_car_wash.n.24.png b/resources/features/pois/transport_car_wash.n.24.png
new file mode 100644 (file)
index 0000000..1c173e2
Binary files /dev/null and b/resources/features/pois/transport_car_wash.n.24.png differ
diff --git a/resources/icons/accommodation_blank.png b/resources/icons/accommodation_blank.png
deleted file mode 100644 (file)
index d12f23e..0000000
Binary files a/resources/icons/accommodation_blank.png and /dev/null differ
diff --git a/resources/icons/transport_car_wash.n.16.png b/resources/icons/transport_car_wash.n.16.png
new file mode 100644 (file)
index 0000000..07acd4e
Binary files /dev/null and b/resources/icons/transport_car_wash.n.16.png differ
index dc6dc3c255b7d7680c2eabb6e25729c3a8d57c81..d05720c587674d92bc7087c13d960588fd4a2cdb 100644 (file)
       ${addr:housenumber} ${addr:street} ${addr:postcode}\r
     </icon>\r
 \r
-    <area/>\r
+    <area/>
+    <point/>\r
     <!-- This should catch all the "building=*" tags in use: yes, hut, house, residential, entrance, apartments, garage, industrial,  garages, service, manufacture, collapsed... \r
          Is this possible? -->\r
     <!-- <tag k="building" v="*"/> -->\r
index a039e0ad8d9732e2f10c9085dd0fef09f3715100..7c0bad00b0d6e2f7f8cd14ae1447a75813923839 100644 (file)
         <inputSet ref="common"/>
       </feature>
     
+  <feature name="Car Wash">
+    <category>transport</category>
+    <icon image="features/pois/transport_car_wash.n.24.png">
+      ${name}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcar_wash</help>
+    <point/>
+    <area/>
+    <tag k="amenity" v="car_wash"/>
+    <inputSet ref="names"/>
+    <input type="freetext" presence="onTagMatch" category="Naming" name="Operator" key="operator" description="The company/organisation that runs the car wash" priority="low"/>
+    <input type="freetext" presence="onTagMatch" category="Operation" name="Opening hours" key="opening_hours" priority="normal"/>
+    <input type="choice" presence="onTagMatch" category="Operation" name="Self service" key="self_service" priority="low">
+       <choice value="yes" text="Yes" />
+       <choice value="no" text="No" />
+    </input>
+    <input type="choice" presence="onTagMatch" category="Operation" name="Automated" key="automated" priority="low">
+       <choice value="yes" text="Yes" />
+       <choice value="no" text="No" />
+    </input>
+    
+    <inputSet ref="common"/>
+  </feature>
     
       <feature name="Bus station">
         <category>transport</category>
index 158096d622c901f154ba50903c100fa7519fa286..b172f33456de8a814d620f1870c9bc131a185821 100644 (file)
@@ -70,6 +70,7 @@ node[aeroway=aerodrome] { icon-image: icons/transport_aerodrome.n.16.png; z-inde
 node[amenity=bus_station] { icon-image: icons/transport_bus_station.n.16.png; z-index: 20; }
 node[highway=bus_stop] { icon-image: icons/transport_bus_stop2.n.16.png; z-index: 20; }
 node[amenity=fuel] { icon-image: icons/transport_fuel.n.16.png; z-index: 20; }
+node[amenity=car_wash] { icon-image: icons/transport_car_wash.n.16.png; z-index: 20; }
 node[amenity=bicycle_parking] { icon-image: icons/transport_parking_bicycle.n.16.png; text-offset: 15; text: capacity; z-index: 20; }
 node[amenity=parking] { icon-image: icons/transport_parking_car.n.16.png; z-index: 20; }
 node[amenity=ferry_terminal] { icon-image: icons/transport_port.n.16.png; z-index: 20; }