Cafe feature+add name for rendering. Cuisine set.

diff --git a/resources/map_features.xml b/resources/map_features.xml
index b2cdd826500019778f7f914a964b5bed06679f7d..544c6c5b5f5e65508a986a15277fe70f42b737db 100644 (file)
--- a/resources/map_features.xml
+++ b/resources/map_features.xml
@@ -132,7 +132,18 @@
     <input type="freetext" presence="onTagMatch" category="Address" description="The name of the house, e.g. Riverbank Cottage" name="Building Name" key="name"/>
     <input type="freetext" presence="onTagMatch" category="Address" description="The Street Name (optional)" name="Street Name" key="addr:street"/>
     <input type="freetext" presence="onTagMatch" category="Address" description="The postcode" name="Postcode" key="addr:postcode"/>
     <input type="freetext" presence="onTagMatch" category="Address" description="The name of the house, e.g. Riverbank Cottage" name="Building Name" key="name"/>
     <input type="freetext" presence="onTagMatch" category="Address" description="The Street Name (optional)" name="Street Name" key="addr:street"/>
     <input type="freetext" presence="onTagMatch" category="Address" description="The postcode" name="Postcode" key="addr:postcode"/>

-  </inputSet> 
+  </inputSet>
+  
+  <inputSet id="cuisine">
+    <input type="choice" presence="always" name="Cuisine" category="Eating" description="The type of food that they serve" key="cuisine">
+      <choice value="pizza" text="Pizza"/>
+      <choice value="chinese" text="Chinese"/>
+      <choice value="burger" text="Burger"/>
+      <choice value="sea_food" text="Sea Food"/>
+      <choice value="sandwich" text="Sandwich"/>
+      <help>http://wiki.openstreetmap.org/wiki/Key:cuisine</help>
+    </input>
+  </inputSet>

   
   <inputSet id="naptan">
     <input type="freetext" presence="onTagMatch" category="Naptan" description="12 character internal Naptan ID" name="Atco Code" key="naptan:AtcoCode" />
   
   <inputSet id="naptan">
     <input type="freetext" presence="onTagMatch" category="Naptan" description="12 character internal Naptan ID" name="Atco Code" key="naptan:AtcoCode" />


@@ -642,7 +653,21 @@
     <point />
     <tag k="amenity" v="restaurant"/>
     <inputSet ref="names"/>
     <point />
     <tag k="amenity" v="restaurant"/>
     <inputSet ref="names"/>

-    <inputSet ref="buildingAddress" />
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="cuisine"/>
+  </feature>
+  
+  <feature name="Cafe">
+    <category>entertainment</category>
+    <icon image="icons/cafe.png">
+      ${name}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcafe</help>
+    <point />
+    <tag k="amenity" v="cafe"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="cuisine"/>

   </feature>
 
   <feature name="Post Box">
   </feature>
 
   <feature name="Post Box">

diff --git a/resources/potlatch.css b/resources/potlatch.css
index cad3c0e559249359c54a2bcb01b6de78a0058dd3..20e2476b45a51e00d8700c14dc926c99cc39da19 100644 (file)
--- a/resources/potlatch.css
+++ b/resources/potlatch.css
@@ -81,14 +81,14 @@ node[railway=station] { icon-image: icons/station.png; text-offset: 13; font-fam
 node[aeroway=aerodrome] { icon-image: icons/airport.png; text-offset: 13; font-family: DejaVu; text: name; font-size: 10; }
 node[amenity=atm] { icon-image: icons/atm.png; }
 node[highway=bus_stop] { icon-image: icons/bus_stop.png; }
 node[aeroway=aerodrome] { icon-image: icons/airport.png; text-offset: 13; font-family: DejaVu; text: name; font-size: 10; }
 node[amenity=atm] { icon-image: icons/atm.png; }
 node[highway=bus_stop] { icon-image: icons/bus_stop.png; }

-node[amenity=cafe] { icon-image: icons/cafe.png; }
+node[amenity=cafe] { icon-image: icons/cafe.png; text-offset: 15; text: name; }

 node[shop=convenience] { icon-image: icons/convenience.png; }
 node[amenity=fast_food] { icon-image: icons/fast_food.png; }
 node[amenity=fire_station] { icon-image: icons/fire_station.png; }
 node[amenity=hospital] { icon-image: icons/hospital.png; }
 node[tourism=hotel] { icon-image: icons/hotel.png; }
 node[amenity=parking] { icon-image: icons/parking.png; }
 node[shop=convenience] { icon-image: icons/convenience.png; }
 node[amenity=fast_food] { icon-image: icons/fast_food.png; }
 node[amenity=fire_station] { icon-image: icons/fire_station.png; }
 node[amenity=hospital] { icon-image: icons/hospital.png; }
 node[tourism=hotel] { icon-image: icons/hotel.png; }
 node[amenity=parking] { icon-image: icons/parking.png; }

-node[amenity=bicycle_parking] { icon-image: icons/parking_cycle.png; text: capacity; text-offset: 15; }
+node[amenity=bicycle_parking] { icon-image: icons/parking_cycle.png; text-offset: 15; text: capacity; }

 node[amenity=pharmacy] { icon-image: icons/pharmacy.png; }
 node[amenity=pharmacy][dispensing=yes] { icon-image: icons/pharmacy_dispensing.png; }
 node[amenity=police] { icon-image: icons/police.png; }
 node[amenity=pharmacy] { icon-image: icons/pharmacy.png; }
 node[amenity=pharmacy][dispensing=yes] { icon-image: icons/pharmacy_dispensing.png; }
 node[amenity=police] { icon-image: icons/police.png; }