X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3eac3cd6e2313e7f9085d2c455b87b32731cc3f1..4c612f6f4d646213e72fc70b8082089c3bf9eb22:/public/potlatch2/map_features/buildings.xml?ds=sidebyside

diff --git a/public/potlatch2/map_features/buildings.xml b/public/potlatch2/map_features/buildings.xml
index 28775a92e..e82502689 100644
--- a/public/potlatch2/map_features/buildings.xml
+++ b/public/potlatch2/map_features/buildings.xml
@@ -234,6 +234,8 @@
   </feature>
 
 
+  <!-- Generic building. Should be last in the entire xml chain -->
+  <!-- When user changes feature to some amenity, building tag is cleared. This should not be. -->
   <feature name="Building">
     <category>buildings</category>
     <icon image="features/pois/building_generic.png">
@@ -243,30 +245,10 @@
 
     <area/>
     <point/>
-    <!-- This should catch all the "building=*" tags in use: yes, hut, house, residential, entrance, apartments, garage, industrial,  garages, service, manufacture, collapsed... 
-         Is this possible? -->
-    <!-- <tag k="building" v="*"/> -->
-    <tag k="building" v="yes"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Sports centre">
-    <category>buildings</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"/>
+    <tag k="building" v="yes" vmatch="*"/>
+    <inputSet ref="isBuilding"/>
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress"/>
-    <inputSet ref="pitchSport"/>
-    <inputSet ref="isBuilding"/>
     <inputSet ref="common"/>
   </feature>
 </featureGroup>