Merge branch 'master' into openstreetbugs

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

diff --git a/public/potlatch2/map_features/amenities.xml b/public/potlatch2/map_features/amenities.xml
index abf8c9f754192b074ae1f3e486cbb8e9a2d2c497..3dbd64a9d91a6673541ea560fd3da3b279af947e 100644 (file)
--- a/public/potlatch2/map_features/amenities.xml
+++ b/public/potlatch2/map_features/amenities.xml
@@ -45,7 +45,7 @@
     <area/>
     <tag k="amenity" v="hospital"/>
     <inputSet ref="simpleName"/>
     <area/>
     <tag k="amenity" v="hospital"/>
     <inputSet ref="simpleName"/>

-    <input type="choice" presence="always" category="Hospital" name="Emergency treatment available" key="emergency" description="Are there accident and emergency facilities at this hospital?">
+    <input type="choice" presence="always" category="Details" name="Emergency treatment available" key="emergency" description="Are there accident and emergency facilities at this hospital?">

       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>


@@ -60,7 +60,7 @@
     <point/>
     <tag k="amenity" v="place_of_worship"/>
     <inputSet ref="simpleName" />
     <point/>
     <tag k="amenity" v="place_of_worship"/>
     <inputSet ref="simpleName" />

-    <input type="choice" presence="always" category="" name="Religion" key="religion" description="The religion worshipped here.">
+    <input type="choice" presence="always" category="Details" name="Religion" key="religion" description="The religion worshipped here.">

       <choice value="christian" text="Christianity (church)"/>
       <choice value="jewish" text="Judaism (synagogue)"/>
       <choice value="muslim" text="Islam (mosque)"/>
       <choice value="christian" text="Christianity (church)"/>
       <choice value="jewish" text="Judaism (synagogue)"/>
       <choice value="muslim" text="Islam (mosque)"/>


@@ -70,7 +70,7 @@
       <choice value="shinto" text="Shinto (shrine)"/>
     </input>
 
       <choice value="shinto" text="Shinto (shrine)"/>
     </input>
 

-    <input type="freetext" presence="always" category="" name="denomination" key="denomination" description="The denomination of the religion worshiped here." priority="low"/>
+    <input type="freetext" presence="always" category="Details" name="denomination" key="denomination" description="The denomination of the religion worshiped here." priority="low"/>

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


@@ -81,8 +81,8 @@
     <help>http://wiki.openstreetmap.org/wiki/Atm</help>
     <point/>
     <tag k="amenity" v="atm"/>
     <help>http://wiki.openstreetmap.org/wiki/Atm</help>
     <point/>
     <tag k="amenity" v="atm"/>

-    <input type="freetext" presence="always" category="Banking" name="Operator" key="operator" description="The organisation that provides this ATM" priority="low"/>
-    <input type="freetext" presence="always" category="Banking" name="Fee" key="fee" description="Is there a charge for using this ATM? If so how much?"/>
+    <input type="freetext" presence="always" category="Details" name="Operator" key="operator" description="The organisation that provides this ATM" priority="low"/>
+    <input type="freetext" presence="always" category="Details" name="Fee" key="fee" description="Is there a charge for using this ATM? If so how much?"/>

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


@@ -97,7 +97,7 @@
     <tag k="amenity" v="bank"/>
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress"/>
     <tag k="amenity" v="bank"/>
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress"/>

-    <input type="choice" presence="always" category="Bank" name="Public ATM available" key="atm" description="Is there a public ATM available?">
+    <input type="choice" presence="always" category="Details" name="Public ATM available" key="atm" description="Is there a public ATM available?">

       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>


@@ -113,98 +113,97 @@
     <area/>
     <tag k="amenity" v="recycling"/>
     <inputSet ref="simpleName"/>
     <area/>
     <tag k="amenity" v="recycling"/>
     <inputSet ref="simpleName"/>

-    <input type="choice" presence="always" category="Recycling" name="Type of facility" key="recycling_type" description="Is this containers in a rural area or at an manned facility?" priority="high">
+    <input type="choice" presence="always" category="Details" name="Type of facility" key="recycling_type" description="Is this containers in a rural area or at an manned facility?" priority="high">

       <choice value="container" text="Container"/>
       <choice value="centre" text="Recycling centre"/>
     </input>
       <choice value="container" text="Container"/>
       <choice value="centre" text="Recycling centre"/>
     </input>

-    <input type="choice" presence="onTagMatch" category="Recycling" name="Batteries" key="recycling:batteries" description="Small batteries for household appliances" priority="low">
+    <input type="choice" presence="onTagMatch" category="Details" name="Batteries" key="recycling:batteries" description="Small batteries for household appliances" priority="low">

       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>

-    <input type="choice" presence="onTagMatch" category="Recycling" name="Books" key="recycling:books" description="" priority="low">
+    <input type="choice" presence="onTagMatch" category="Details" name="Books" key="recycling:books" description="" priority="low">

       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>

-    <input type="choice" presence="onTagMatch" category="Recycling" name="Cans" key="recycling:cans" description="Metal cans and other small metal packaging" priority="low">
+    <input type="choice" presence="onTagMatch" category="Details" name="Cans" key="recycling:cans" description="Metal cans and other small metal packaging" priority="low">

       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>

-    <input type="choice" presence="onTagMatch" category="Recycling" name="Cardboard" key="recycling:cardboard" description="I.e. large pieces of packaging" priority="low">
+    <input type="choice" presence="onTagMatch" category="Details" name="Cardboard" key="recycling:cardboard" description="I.e. large pieces of packaging" priority="low">

       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>

-    <input type="choice" presence="onTagMatch" category="Recycling" name="Cartons" key="recycling:cartons" description="Packaging for groceries, i.e. milk cartons" priority="low">
+    <input type="choice" presence="onTagMatch" category="Details" name="Cartons" key="recycling:cartons" description="Packaging for groceries, i.e. milk cartons" priority="low">

       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>

-    <input type="choice" presence="onTagMatch" category="Recycling" name="Clothes" key="recycling:clothes" description="Clothes, including shoes" priority="low">
+    <input type="choice" presence="onTagMatch" category="Details" name="Clothes" key="recycling:clothes" description="Clothes, including shoes" priority="low">

       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>

-    <input type="choice" presence="onTagMatch" category="Recycling" name="Electrical appliances" key="recycling:electrical_appliances" description="Larger electrical items, i.e. refrigerators, freezers, dishwashers" priority="low">
+    <input type="choice" presence="onTagMatch" category="Details" name="Electrical appliances" key="recycling:electrical_appliances" description="Larger electrical items, i.e. refrigerators, freezers, dishwashers" priority="low">

       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>

-    <input type="choice" presence="onTagMatch" category="Recycling" name="Glass" key="recycling:glass" description="I.e glass sheets" priority="low">
+    <input type="choice" presence="onTagMatch" category="Details" name="Glass" key="recycling:glass" description="I.e glass sheets" priority="low">

       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>

-    <input type="choice" presence="onTagMatch" category="Recycling" name="Glass bottles" key="recycling:glass_bottles" description="" priority="low">
+    <input type="choice" presence="onTagMatch" category="Details" name="Glass bottles" key="recycling:glass_bottles" description="" priority="low">

       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>

-    <input type="choice" presence="onTagMatch" category="Recycling" name="Green waste" key="recycling:green_waste" description="" priority="low">
+    <input type="choice" presence="onTagMatch" category="Details" name="Green waste" key="recycling:green_waste" description="" priority="low">

       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>

-    <input type="choice" presence="onTagMatch" category="Recycling" name="Magazines" key="recycling:magazines" description="Magazines (glossy pages)" priority="low">
+    <input type="choice" presence="onTagMatch" category="Details" name="Magazines" key="recycling:magazines" description="Magazines (glossy pages)" priority="low">

       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>

-    <input type="choice" presence="onTagMatch" category="Recycling" name="Newspaper" key="recycling:newspaper" description="" priority="low">
+    <input type="choice" presence="onTagMatch" category="Details" name="Newspaper" key="recycling:newspaper" description="" priority="low">

       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>

-    <input type="choice" presence="onTagMatch" category="Recycling" name="Paper" key="recycling:paper" description="" priority="low">
+    <input type="choice" presence="onTagMatch" category="Details" name="Paper" key="recycling:paper" description="" priority="low">

       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>

-    <input type="choice" presence="onTagMatch" category="Recycling" name="Paper packaging" key="recycling:paper_packaging" description="" priority="low">
+    <input type="choice" presence="onTagMatch" category="Details" name="Paper packaging" key="recycling:paper_packaging" description="" priority="low">

       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>

-    <input type="choice" presence="onTagMatch" category="Recycling" name="Plastic" key="recycling:plastic" description="" priority="low">
+    <input type="choice" presence="onTagMatch" category="Details" name="Plastic" key="recycling:plastic" description="" priority="low">

       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>

-    <input type="choice" presence="onTagMatch" category="Recycling" name="Plastic bottles" key="recycling:plastic_bottles" description="" priority="low">
+    <input type="choice" presence="onTagMatch" category="Details" name="Plastic bottles" key="recycling:plastic_bottles" description="" priority="low">

       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>

-    <input type="choice" presence="onTagMatch" category="Recycling" name="Plastic packaging" key="recycling:plastic_packaging" description="" priority="low">
+    <input type="choice" presence="onTagMatch" category="Details" name="Plastic packaging" key="recycling:plastic_packaging" description="" priority="low">

       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>

-    <input type="choice" presence="onTagMatch" category="Recycling" name="Scrap metal" key="recycling:scrap_metal" description="" priority="low">
+    <input type="choice" presence="onTagMatch" category="Details" name="Scrap metal" key="recycling:scrap_metal" description="" priority="low">

       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>

-    <input type="choice" presence="onTagMatch" category="Recycling" name="Small appliances" key="recycling:small_appliances" description="Small electrical appliances, i.e. walkman, power adapter, remote control" priority="low">
+    <input type="choice" presence="onTagMatch" category="Details" name="Small appliances" key="recycling:small_appliances" description="Small electrical appliances, i.e. walkman, power adapter, remote control" priority="low">

       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>

-    <input type="choice" presence="onTagMatch" category="Recycling" name="Waste" key="recycling:waste" description="General waste (black bags)" priority="low">
+    <input type="choice" presence="onTagMatch" category="Details" name="Waste" key="recycling:waste" description="General waste (black bags)" priority="low">

       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>

-    <input type="choice" presence="onTagMatch" category="Recycling" name="Wood" key="recycling:wood" description="" priority="low">
+    <input type="choice" presence="onTagMatch" category="Details" name="Wood" key="recycling:wood" description="" priority="low">

       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
     <inputSet ref="common"/>
   </feature>
 
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
     <inputSet ref="common"/>
   </feature>
 

-

   <feature name="School">
     <category>amenity</category>
     <icon image="features/pois/education_school.n.24.png">
   <feature name="School">
     <category>amenity</category>
     <icon image="features/pois/education_school.n.24.png">


@@ -254,8 +253,8 @@
     <help>http://wiki.openstreetmap.org/wiki/Post_box</help>
     <point/>
     <tag k="amenity" v="post_box"/>
     <help>http://wiki.openstreetmap.org/wiki/Post_box</help>
     <point/>
     <tag k="amenity" v="post_box"/>

-    <input type="freetext" presence="always" category="Naming" name="Ref" key="ref" description="Reference number of the post box"/>
-    <input type="freetext" presence="always" category="Naming" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>
+    <input type="freetext" presence="always" category="Details" name="Ref" key="ref" description="Reference number of the post box"/>
+    <input type="freetext" presence="always" category="Details" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>

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


@@ -269,8 +268,8 @@
     <point/>
     <area/>
     <tag k="amenity" v="post_office"/>
     <point/>
     <area/>
     <tag k="amenity" v="post_office"/>

-    <input type="freetext" presence="always" category="Naming" name="Ref" key="ref" description="Reference number of the post office"/>
-    <input type="freetext" presence="always" category="Naming" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>
+    <input type="freetext" presence="always" category="Details" name="Ref" key="ref" description="Reference number of the post office"/>
+    <input type="freetext" presence="always" category="Details" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>

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


@@ -316,12 +315,12 @@
     <point/>
     <area/>
     <tag k="amenity" v="shelter"/>
     <point/>
     <area/>
     <tag k="amenity" v="shelter"/>

-    <input type="choice" presence="always" name="Type of shelter" key="shelter_type" description="The intended use of the shelter.">
-      <choice value="picnic_shelter" text="Picnic shelter"/>
-      <choice value="public_transport" text="Public transport"/>
-      <choice value="weather_shelter" text="Weather shelter"/>
-      <choice value="wildlife_hide" text="Wildlife hide"/>
-    </input>
+      <input type="choice" presence="always" name="Type of shelter" key="shelter_type" description="The intended use of the shelter.">
+        <choice value="picnic_shelter" text="Picnic shelter"/>
+        <choice value="public_transport" text="Public transport"/>
+        <choice value="weather_shelter" text="Weather shelter"/>
+        <choice value="wildlife_hide" text="Wildlife hide"/>
+      </input>

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


@@ -369,7 +368,7 @@
     <point/>
     <tag k="amenity" v="emergency_phone"/>
     <inputSet ref="common"/>
     <point/>
     <tag k="amenity" v="emergency_phone"/>
     <inputSet ref="common"/>

-    <input type="freetext" presence="always" category="Naming" name="Ref" key="ref" description="Reference number of emergency phone."/>    
+    <input type="freetext" presence="always" category="Details" name="Ref" key="ref" description="Reference number of emergency phone."/>    

   </feature>
 
 
   </feature>
 
 


@@ -408,7 +407,7 @@
     <inputSet ref="common"/>
     <inputSet ref="simpleName"/>
     <input type="freetext" presence="always" name="Product" key="vending" description="What is being sold: tickets, food, maps..."/>
     <inputSet ref="common"/>
     <inputSet ref="simpleName"/>
     <input type="freetext" presence="always" name="Product" key="vending" description="What is being sold: tickets, food, maps..."/>

-    <inputSet ref="simpleOperator"/>
+    <inputSet ref="simpleOperator" />

   </feature>
 
   <!-- ========= Entertainment ========= -->
   </feature>
 
   <!-- ========= Entertainment ========= -->


@@ -491,4 +490,4 @@
     <inputSet ref="common"/>
   </feature>
 
     <inputSet ref="common"/>
   </feature>
 

-</featureGroup>
+</featureGroup>
\ No newline at end of file