Update Potlatch 2 to r24558 build

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

diff --git a/public/potlatch2/map_features.xml b/public/potlatch2/map_features.xml
index 3df4673d65cdce940a92181dc410b902d6a5b780..0829ac04ba2076d3ab4c506cb86d91d5476587ba 100644 (file)
--- a/public/potlatch2/map_features.xml
+++ b/public/potlatch2/map_features.xml
@@ -99,7 +99,7 @@ Quick documentation:
   <category name="Advanced" id="advanced">
   </category>
 
   <category name="Advanced" id="advanced">
   </category>
 

-  <category name="Misc" id="misc">
+  <category name="Places" id="places">

   </category>
 
   <!-- Common input sets -->
   </category>
 
   <!-- Common input sets -->


@@ -537,6 +537,24 @@ Quick documentation:
 
   </inputSet>
 
 
   </inputSet>
 

+  <inputSet id="places">
+    <input type="choice" name="Type of Place" presence="always" key="place">
+      <choice value="locality" text="Locality"/>
+      <choice value="hamlet" text="Hamlet"/>
+      <choice value="village" text="Village"/>
+      <choice value="suburb" text="Suburb"/>
+      <choice value="town" text="Town"/>
+      <choice value="city" text="City"/>
+      <choice value="county" text="County"/>
+      <choice value="region" text="Region"/>
+      <choice value="state" text="State"/>
+      <choice value="country" text="Country"/>
+      <choice value="continent" text="Continent"/>
+      <choice value="island" text="Island"/>
+      <choice value="islet" text="Islet"/>
+    </input>
+  </inputSet>
+

   <!-- ************************************************************************
        Roads
        ************************************************************************ -->
   <!-- ************************************************************************
        Roads
        ************************************************************************ -->


@@ -555,9 +573,9 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
     <inputSet ref="common"/>
   </feature>
 

-  <feature name="Motorway link" icon="features/motorway_link.png">
+  <feature name="Motorway link">

     <category>roads</category>
     <category>roads</category>

-    <icon image="features/highway__motorway.png"/>
+    <icon image="features/highway__motorway_link.png"/>

     <line/>
     <tag k="highway" v="motorway_link"/>
 
     <line/>
     <tag k="highway" v="motorway_link"/>
 


@@ -580,9 +598,9 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
     <inputSet ref="common"/>
   </feature>
 

-  <feature name="Trunk link" icon="features/motorway_link.png">
+  <feature name="Trunk link">

     <category>roads</category>
     <category>roads</category>

-    <icon image="features/highway__trunk.png"/>
+    <icon image="features/highway__trunk_link.png"/>

     <line/>
     <tag k="highway" v="trunk_link"/>
 
     <line/>
     <tag k="highway" v="trunk_link"/>
 


@@ -592,7 +610,7 @@ Quick documentation:
 
   <feature name="Primary road">
     <category>roads</category>
 
   <feature name="Primary road">
     <category>roads</category>

-    <icon image="features/highway__unclassified.png">
+    <icon image="features/highway__primary.png">

       <font size="16pt"><b>${ref}</b></font><br/>
       <font size="10pt">${name}</font>
     </icon>
       <font size="16pt"><b>${ref}</b></font><br/>
       <font size="10pt">${name}</font>
     </icon>


@@ -605,9 +623,9 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
     <inputSet ref="common"/>
   </feature>
 

-  <feature name="Primary road link">
+  <feature name="Primary link">

     <category>roads</category>
     <category>roads</category>

-    <icon image="features/highway__unclassified.png">
+    <icon image="features/highway__primary_link.png">

       <font size="16pt"><b>${ref}</b></font><br/>
       <font size="10pt">${name}</font>
     </icon>
       <font size="16pt"><b>${ref}</b></font><br/>
       <font size="10pt">${name}</font>
     </icon>


@@ -623,7 +641,7 @@ Quick documentation:
 
   <feature name="Secondary road">
     <category>roads</category>
 
   <feature name="Secondary road">
     <category>roads</category>

-    <icon image="features/highway__unclassified.png">
+    <icon image="features/highway__secondary.png">

       <font size="16pt"><b>${ref}</b></font><br/>
       <font size="10pt">${name}</font>
     </icon>
       <font size="16pt"><b>${ref}</b></font><br/>
       <font size="10pt">${name}</font>
     </icon>


@@ -636,9 +654,9 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
     <inputSet ref="common"/>
   </feature>
 

-  <feature name="Secondary road link">
+  <feature name="Secondary link">

     <category>roads</category>
     <category>roads</category>

-    <icon image="features/highway__unclassified.png">
+    <icon image="features/highway__secondary_link.png">

       <font size="16pt">
         <b>${ref}</b>
       </font>
       <font size="16pt">
         <b>${ref}</b>
       </font>


@@ -658,7 +676,7 @@ Quick documentation:
 
   <feature name="Tertiary road">
     <category>roads</category>
 
   <feature name="Tertiary road">
     <category>roads</category>

-    <icon image="features/highway__unclassified.png">
+    <icon image="features/highway__tertiary.png">

       <font size="14pt"><b>${name}</b></font><br/>
       <font size="10pt">${ref}</font>
     </icon>
       <font size="14pt"><b>${name}</b></font><br/>
       <font size="10pt">${ref}</font>
     </icon>


@@ -671,9 +689,9 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
     <inputSet ref="common"/>
   </feature>
 

-  <feature name="Tertiary road link">
+  <feature name="Tertiary link">

     <category>roads</category>
     <category>roads</category>

-    <icon image="features/highway__unclassified.png">
+    <icon image="features/highway__tertiary_link.png">

       <font size="14pt"><b>${name}</b></font><br/>
       <font size="10pt">${ref}</font>
     </icon>
       <font size="14pt"><b>${name}</b></font><br/>
       <font size="10pt">${ref}</font>
     </icon>


@@ -746,7 +764,7 @@ Quick documentation:
 
   <feature name="Unknown road">
     <category>roads</category>
 
   <feature name="Unknown road">
     <category>roads</category>

-    <icon image="features/highway__service.png">
+    <icon image="features/highway__unknown.png">

       <font size="10pt">This road has not been given a specific type. It's a road, and that's all that's known.</font>
     </icon>
 
       <font size="10pt">This road has not been given a specific type. It's a road, and that's all that's known.</font>
     </icon>
 


@@ -759,7 +777,7 @@ Quick documentation:
 
   <feature name="Living Street">
     <category>roads</category>
 
   <feature name="Living Street">
     <category>roads</category>

-    <icon image="features/highway__residential.png">
+    <icon image="features/highway__living_street.png">

       <font size="14pt"><b>${name}</b></font>
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dliving_street</help>
       <font size="14pt"><b>${name}</b></font>
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dliving_street</help>


@@ -773,7 +791,7 @@ Quick documentation:
 
   <feature name="Track">
     <category>roads</category>
 
   <feature name="Track">
     <category>roads</category>

-    <icon image="features/highway__unclassified.png">
+    <icon image="features/highway__track.png">

       <font size="14pt"><b>${name}</b></font>
     </icon>
 
       <font size="14pt"><b>${name}</b></font>
     </icon>
 


@@ -813,7 +831,7 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
     <inputSet ref="common"/>
   </feature>
 

-  <feature name="Pedestrian Street">
+  <feature name="Pedestrian street">

     <category>paths</category>
     <icon image="features/paths__pedestrian.png">
       <font size="14pt">
     <category>paths</category>
     <icon image="features/paths__pedestrian.png">
       <font size="14pt">


@@ -1025,7 +1043,7 @@ Quick documentation:
 
   <feature name="Drain">
     <category>water</category>
 
   <feature name="Drain">
     <category>water</category>

-    <icon image="features/pois/water_generic.24.png">
+    <icon image="features/waterway__drain.png">

       <font size="14pt"><b>${name}</b></font>
     </icon>
 
       <font size="14pt"><b>${name}</b></font>
     </icon>
 


@@ -1111,7 +1129,7 @@ Quick documentation:
 
   <feature name="Weir">
     <category>water</category>
 
   <feature name="Weir">
     <category>water</category>

-    <icon image="features/pois/water_generic.24.png">
+    <icon image="features/waterway__weir.png">

       <font size="14pt">
         <b>${name}</b>
       </font>
       <font size="14pt">
         <b>${name}</b>
       </font>


@@ -1159,7 +1177,7 @@ Quick documentation:
 
   <feature name="Slipway">
     <category>water</category>
 
   <feature name="Slipway">
     <category>water</category>

-    <icon image="features/pois/water_generic.24.png"/>
+    <icon image="features/waterway__slipway.png" />

     <line/>
     <tag k="leisure" v="slipway"/>
     <inputSet ref="names"/>
     <line/>
     <tag k="leisure" v="slipway"/>
     <inputSet ref="names"/>


@@ -1961,33 +1979,62 @@ Quick documentation:
   </inputSet>
 
   <!-- Places -->
   </inputSet>
 
   <!-- Places -->

-  <feature name="Place">
-    <category>misc</category>
+
+
+  <feature name="Hamlet">
+    <category>places</category>

     <icon image="icons/place.png"/>
     <point/>
     <area/>
     <icon image="icons/place.png"/>
     <point/>
     <area/>

-    <!-- TODO: make this work -->
-    <!-- <tag k="place" v="*"/>-->
+    <tag k="place" v="hamlet" />

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

-    <input type="choice" name="Type of place name" presence="always" key="place">
-      <choice value="locality" text="Locality"/>
-      <choice value="hamlet" text="Hamlet"/>
-      <choice value="village" text="Village"/>
-      <choice value="suburb" text="Suburb"/>
-      <choice value="county" text="County"/>
-      <choice value="city" text="City"/>
-      <choice value="region" text="Region"/>
-      <choice value="state" text="State"/>
-      <choice value="country" text="Country"/>
-      <choice value="continent" text="Continent"/>
-      <choice value="island" text="Island"/>
-      <choice value="islet" text="Islet"/>
-    </input>
+    <inputSet ref="places"/>

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

+  <feature name="Village">
+    <category>places</category>
+    <icon image="icons/place.png"/>
+    <point/>
+    <area/>
+    <tag k="place" v="village" />
+    <inputSet ref="names"/>
+    <inputSet ref="places"/>
+    <inputSet ref="common"/>
+  </feature>

 
 

+  <feature name="Suburb">
+    <category>places</category>
+    <icon image="icons/place.png"/>
+    <point/>
+    <area/>
+    <tag k="place" v="suburb" />
+    <inputSet ref="names"/>
+    <inputSet ref="places"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Town">
+    <category>places</category>
+    <icon image="icons/place.png"/>
+    <point/>
+    <area/>
+    <tag k="place" v="town" />
+    <inputSet ref="names"/>
+    <inputSet ref="places"/>
+    <inputSet ref="common"/>
+  </feature>

 
 

+  <feature name="City">
+    <category>places</category>
+    <icon image="icons/place.png"/>
+    <point/>
+    <area/>
+    <tag k="place" v="city" />
+    <inputSet ref="names"/>
+    <inputSet ref="places"/>
+    <inputSet ref="common"/>
+  </feature>

 
   <!-- ************************************************************************
        POIs
 
   <!-- ************************************************************************
        POIs


@@ -2709,6 +2756,7 @@ Quick documentation:
     <point/>
     <!-- Warning: creates "traffic_calming=*" by default, but it's the best we can do. Steve Bennett-->
     <!--<tag k="traffic_calming" v="*"/>-->
     <point/>
     <!-- Warning: creates "traffic_calming=*" by default, but it's the best we can do. Steve Bennett-->
     <!--<tag k="traffic_calming" v="*"/>-->

+    <tag k="traffic_calming" v="yes"/>

     <input type="choice" key="traffic_calming" name="Obstacle type" category="Traffic calming" presence="onTagMatch">
       <choice value="yes" text="Unspecified"/>
       <choice value="bump" text="Short bump" description="A sharp speed bump, typically slowing cars to 15 kph or less."/>
     <input type="choice" key="traffic_calming" name="Obstacle type" category="Traffic calming" presence="onTagMatch">
       <choice value="yes" text="Unspecified"/>
       <choice value="bump" text="Short bump" description="A sharp speed bump, typically slowing cars to 15 kph or less."/>