X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/19d683b4df6f7d4098ef786dd36c96b6f90c8df5..478691c596afe01f6d051fe202928d812943b7e6:/public/potlatch2/map_features.xml

diff --git a/public/potlatch2/map_features.xml b/public/potlatch2/map_features.xml
index a15956aef..17845f6f8 100644
--- a/public/potlatch2/map_features.xml
+++ b/public/potlatch2/map_features.xml
@@ -109,9 +109,7 @@ Quick documentation:
   </inputSet>
 
   <inputSet id="source">
-    <!-- Can you do a combined freetext/dropdown? -->
-    <!-- Also need to make sure every object gets this -->
-    <input type="freetext" category="Misc" presence="always" name="Source" key="source" description="The primary source of information for this object (GPS, survey, Yahoo, nearmap...)" priority="high"/>
+    <input type="freetext" category="Misc" presence="onTagMatch" name="Source" key="source" description="The primary source of information for this object (GPS, survey, Yahoo, ...)" priority="lowest"/>
   </inputSet>
 
   <inputSet id="common">
@@ -831,7 +829,7 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
-  <feature name="Pedestrian Street">
+  <feature name="Pedestrian street">
     <category>paths</category>
     <icon image="features/paths__pedestrian.png">
       <font size="14pt">
@@ -1043,7 +1041,7 @@ Quick documentation:
 
   <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>
 
@@ -1129,7 +1127,7 @@ Quick documentation:
 
   <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>
@@ -1177,15 +1175,27 @@ Quick documentation:
 
   <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"/>
     <inputSet ref="common"/>
   </feature>
 
+  <feature name="Slipway">
+    <category>water</category>
+    <point />
+    <tag k="leisure" v="slipway"/>
+    <inputSet ref="names"/>
+    <inputSet ref="common"/>
+  </feature>
 
-  <area/>
+  <feature name="Coastline">
+    <category>water</category>
+    <line/>
+    <tag k="natural" v="coastline"/>
+    <inputSet ref="common"/>
+  </feature>
 
   <!-- ************************************************************************
        Transport
@@ -1662,7 +1672,7 @@ Quick documentation:
        Landuse
        ************************************************************************ -->
 
-  <feature name="Industry">
+  <feature name="Industrial Area">
     <category>landuse</category>
     <area/>
     <icon image="features/pois/building_generic.png">
@@ -1685,7 +1695,7 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
-  <feature name="Residential">
+  <feature name="Residential Area">
     <category>landuse</category>
     <area/>
     <icon image="features/pois/building_generic.png">
@@ -1696,7 +1706,7 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
-  <feature name="Retail">
+  <feature name="Retail Area">
     <category>landuse</category>
     <area/>
     <icon image="features/pois/building_generic.png">
@@ -1707,6 +1717,17 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
+  <feature name="Construction Site">
+    <category>landuse</category>
+    <area/>
+    <icon image="features/pois/building_generic.png">
+      <b>${name}</b>
+    </icon>
+    <tag k="landuse" v="construction"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
 
   <feature name="Marketplace">
     <category>landuse</category>
@@ -2164,6 +2185,13 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
+  <feature name="Toilets">
+    <category>amenity</category>
+    <point/>
+    <tag k="amenity" v="toilets"/>
+    <inputSet ref="common"/>
+  </feature>
+
 
   <!-- ========= Accommodation ========= -->
   <!-- Split off from tourism by Steve Bennett, can be remerged if it doesn't work out. -->
@@ -2438,8 +2466,6 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
-
-
   <!-- ========= Transport ========= -->
 
   <feature name="Aerodrome">
@@ -2747,6 +2773,14 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
+  <feature name="Mini Roundabout">
+    <category>transport</category>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dmini_roundabout</help>
+    <point/>
+    <tag k="highway" v="mini_roundabout"/>
+    <inputSet ref="common"/>
+  </feature>
+
 
   <feature name="Traffic calming">
 
@@ -3190,6 +3224,15 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
+  <!-- boundaries -->
+
+  <feature name="Administrative Boundary">
+    <category>places</category>
+    <line/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=administrative</help>
+    <tag k="boundary" v="administrative"/>
+    <input type="number" minimum="2" maximum="10" presence="always" name="Admin Level" key="admin_level" description="The Administrative level" />
+  </feature>
 
   <!-- ************************************************************************
        Relations