X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/27809a2c548a73785b33e108a15d81ff2963ed63..4c612f6f4d646213e72fc70b8082089c3bf9eb22:/public/potlatch2/map_features/landuse.xml

diff --git a/public/potlatch2/map_features/landuse.xml b/public/potlatch2/map_features/landuse.xml
index 20ad351d8..e2e51d845 100644
--- a/public/potlatch2/map_features/landuse.xml
+++ b/public/potlatch2/map_features/landuse.xml
@@ -61,7 +61,7 @@
     <category>shopping</category>
     <point />
     <area/>
-    <icon image="features/pois/shopping_greengrocer.n.24.png">
+    <icon image="features/pois/shopping_marketplace.n.24.png">
       <b>${name}</b>
     </icon>
     <tag k="amenity" v="marketplace"/>
@@ -123,6 +123,28 @@
     <inputSet ref="common"/>
   </feature>
 
+  <feature name="Beach">
+    <category>natural</category>
+    <icon image="features/natural__beach.png"/>
+    <area/>
+    <tag k="natural" v="beach"/>
+    <input type="choice" presence="always" category="Details" name="Beach surface" key="surface" description="What material is the ground mostly?">
+      <choice value="sand" text="Sand"/>
+      <choice value="pebbles" text="Pebbles"/>
+      <choice value="stone" text="Pebbles"/>
+      <choice value="rocky" text="Rocky"/>
+    </input>
+    <input type="choice" presence="always" category="Details" name="Access" key="access" description="Accessible to the public?">
+      <choice value="yes" text="Public access"/>
+      <choice value="permissive" text="Privately owned, but publicly accessible"/>
+      <choice value="private" text="Private access only"/>
+    </input>
+    <input type="freetext" presence="always" category="Details" name="Operator" key="Operator" description="Organisation that manages or owns the beach.">
+    </input>
+    
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
 
 
 
@@ -176,45 +198,6 @@
     <inputSet ref="common"/>
   </feature>
 
-
-  <inputSet id="pitchSport">
-    <input name="Sport" presence="always" category="Sport" key="sport" type="choice" description="The sport that is predominantly played here.">
-      <choice value="9pin" text="9 pin bowling"/>
-      <choice value="10pin" text="10 pin bowling"/>
-      <choice value="american_football" text="American football"/>
-      <choice value="archery" text="Archery"/>
-      <choice value="athletics" text="Athletics"/>
-      <choice value="australian_football" text="Australian Rules Football"/>
-      <choice value="baseball" text="Baseball"/>
-      <choice value="basketball" text="Basketball"/>
-      <choice value="beachvolleyball" text="Beach volleyball"/>
-      <choice value="boules" text="Boules/petanque/bocci"/>
-      <choice value="bowls" text="Lawn bowls"/>
-      <choice value="canadian_football" text="Canadian football"/>
-      <choice value="chess" text="Chess"/>
-      <choice value="cricket" text="Cricket"/>
-      <choice value="cricket_nets" text="Cricket nets"/>
-      <choice value="croquet" text="Croquet"/>
-      <choice value="equestrian" text="Equestrian"/>
-      <choice value="gaelic_football" text="Gaelic football"/>
-      <choice value="gymnastics" text="Gymnastics"/>
-      <choice value="team_handball" text="(Team) handball"/>
-      <choice value="hockey" text="(Field) hockey"/>
-      <choice value="korfball" text="Korball"/>
-      <choice value="pelota" text="Pelota"/>
-      <choice value="rugby_league" text="Rugby league"/>
-      <choice value="rugby_union" text="Rugby union"/>
-      <choice value="shooting" text="Shooting"/>
-      <choice value="skating" text="Ice skating"/>
-      <choice value="skateboard" text="Skateboarding"/>
-      <choice value="soccer" text="Soccer/football"/>
-      <choice value="swimming" text="Swimming"/>
-      <choice value="table_tennis" text="Table tennis"/>
-      <choice value="tennis" text="Tennis"/>
-      <choice value="volleyball" text="Volleyball"/>
-    </input>
-  </inputSet>
-
   <feature name="Sports track">
     <category>sport</category>
     <area/>
@@ -229,6 +212,24 @@
     <inputSet ref="common"/>
   </feature>
 
+  <feature name="Sports centre">
+    <category>sport</category>
+    <icon image="features/pois/sport_leisure_centre.n.24.png">
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <point/>
+    <tag k="leisure" v="sports_centre"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="pitchSport"/>
+    <inputSet ref="isBuilding"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
   <!-- **************** Agriculture *************** -->
   <feature name="Farm">
     <category>agriculture</category>
@@ -303,15 +304,17 @@
 
     <area/>
     <tag k="leisure" v="park"/>
+    <inputSet ref="simpleName"/>
     <inputSet ref="common"/>
   </feature>
 
   <feature name="Forest">
     <category>natural</category>
-    <icon image="/features/pois/landuse_coniferous.n.24.png"/>
+    <icon image="features/pois/landuse_coniferous.n.24.png"/>
 
     <area/>
     <tag k="landuse" v="forest"/>
+    <inputSet ref="simpleName"/>
     <inputSet ref="common"/>
   </feature>
 
@@ -321,8 +324,7 @@
 
     <area/>
     <tag k="landuse" v="meadow"/>
+    <inputSet ref="simpleName"/>
     <inputSet ref="common"/>
   </feature>
-
-
-</featureGroup>
\ No newline at end of file
+</featureGroup>