Only use SystemTimer on MRI 1.8 as it is superfluous elsewhere

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

diff --git a/public/potlatch2/map_features/buildings.xml b/public/potlatch2/map_features/buildings.xml
index 451b1e7322ae60cb2da2e65fea13f705b9e50bd6..aa1b7da4bde8c218203f61c470236783d63e6139 100644 (file)
--- a/public/potlatch2/map_features/buildings.xml
+++ b/public/potlatch2/map_features/buildings.xml
@@ -74,7 +74,7 @@
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress"/>
     <!-- sorted in reverse order of popularity in taginfo. -->
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress"/>
     <!-- sorted in reverse order of popularity in taginfo. -->

-    <input type="choice" category="Religion" name="Religion" key="religion" description="The religion to which this place of worship belongs." presence="always">
+    <input type="choice" category="Details" name="Religion" key="religion" description="The religion to which this place of worship belongs." presence="always">

       <choice value="christian" text="Christianity (church)"/>
       <choice value="muslim" text="Islam (mosque)"/>
       <choice value="buddhist" text="Buddhist (temple)"/>
       <choice value="christian" text="Christianity (church)"/>
       <choice value="muslim" text="Islam (mosque)"/>
       <choice value="buddhist" text="Buddhist (temple)"/>


@@ -89,7 +89,7 @@
       <choice value="bahai" text="Bahai"/>
     </input>
     <!-- sorted in reverse order of popularity in taginfo. -->
       <choice value="bahai" text="Bahai"/>
     </input>
     <!-- sorted in reverse order of popularity in taginfo. -->

-    <input type="choice" category="Religion" name="Denomination" key="denomination" description="The denomination, or sub-branch of the main religion." presence="always">
+    <input type="choice" category="Details" name="Denomination" key="denomination" description="The denomination, or sub-branch of the main religion." presence="always">

       <choice value="catholic" text="Catholic"/>
       <choice value="baptist" text="Baptist"/>
       <choice value="methodist" text="Methodist"/>
       <choice value="catholic" text="Catholic"/>
       <choice value="baptist" text="Baptist"/>
       <choice value="methodist" text="Methodist"/>


@@ -234,39 +234,39 @@
   </feature>
 
 
   </feature>
 
 

-  <feature name="Building">
+  <feature name="Sports centre">

     <category>buildings</category>
     <category>buildings</category>

-    <icon image="features/pois/building_generic.png">
+    <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/>
       <b>${name} ${addr:housename}</b><br/>
       ${addr:housenumber} ${addr:street} ${addr:postcode}
     </icon>
 
     <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"/>
+    <tag k="leisure" v="sports_centre"/>

     <inputSet ref="names"/>
     <inputSet ref="buildingAddress"/>
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress"/>

+    <inputSet ref="pitchSport"/>
+    <inputSet ref="isBuilding"/>

     <inputSet ref="common"/>
   </feature>
 
 
     <inputSet ref="common"/>
   </feature>
 
 

-  <feature name="Sports centre">
+  <!-- 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>
     <category>buildings</category>

-    <icon image="features/pois/sport_leisure_centre.n.24.png">
+    <icon image="features/pois/building_generic.png">

       <b>${name} ${addr:housename}</b><br/>
       ${addr:housenumber} ${addr:street} ${addr:postcode}
     </icon>
 
     <area/>
     <point/>
       <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="names"/>
     <inputSet ref="buildingAddress"/>

-    <inputSet ref="pitchSport"/>
-    <inputSet ref="isBuilding"/>

     <inputSet ref="common"/>
   </feature>
 </featureGroup>
     <inputSet ref="common"/>
   </feature>
 </featureGroup>