Update Potlatch 2 to 2.3-224-g2df4b28 build

[rails.git] / public / potlatch2 / map_features / landuse.xml

diff --git a/public/potlatch2/map_features/landuse.xml b/public/potlatch2/map_features/landuse.xml
index 5c308c114f4d872a6c2a4ec125fc5e492f5e87b7..915a6dce67bde6bf61e2fe89024193528938952a 100644 (file)
--- a/public/potlatch2/map_features/landuse.xml
+++ b/public/potlatch2/map_features/landuse.xml
@@ -176,45 +176,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 +190,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 +282,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 +302,7 @@
 
     <area/>
     <tag k="landuse" v="meadow"/>
+    <inputSet ref="simpleName"/>
     <inputSet ref="common"/>
   </feature>
-
-
-</featureGroup>
\ No newline at end of file
+</featureGroup>