map_features: tunnel, dam

potlatch.css: reservoir_covered, dam, tweak leisure=park

diff --git a/resources/map_features.xml b/resources/map_features.xml
index 094fffabc352d470c845757bf9449a5464da8fac..2ea543f3405214f3fd7472ef7646ddb80b609a9f 100644 (file)
--- a/resources/map_features.xml
+++ b/resources/map_features.xml
@@ -261,6 +261,7 @@ Quick documentation:
         defaultName="Ground"/>
     </inputSet>
   <inputSet id="tunnel">
+    <!-- Not ideal, used for non-roads too. -->  
     <input type="choice" presence="onTagMatch"
         name="Tunnel" category="Physical" description="Road goes into a tunnel"
         key="tunnel" layout="horizontal">
@@ -1021,7 +1022,7 @@ Quick documentation:
     <line/>
     <tag k="waterway" v="canal"/>
     <inputSet ref="waterways" />
-
+    <inputSet ref="tunnel"/>
     <inputSet ref="common"/>
   </feature>
 
@@ -1034,12 +1035,14 @@ Quick documentation:
 
     <line/>
     <tag k="waterway" v="drain"/>
+    <inputSet ref="tunnel"/>
     <inputSet ref="common"/>
   </feature>
 
 
   <feature name="Dam">
-    <category>water</category>
+    <!-- Moved to "barrier" because this describes the dam wall, not the water. -->
+    <category>barrier</category>
     <icon image="features/waterway__dam.png">
       <font size="14pt">
         <b>${name}</b>
@@ -1047,6 +1050,7 @@ Quick documentation:
     </icon>
 
     <line/>
+    <area/>
     <tag k="waterway" v="dam"/>
     <inputSet ref="common"/>
   </feature>

diff --git a/resources/potlatch.css b/resources/potlatch.css
index c7d86bd95648dddcb1c706bd0f87a5b6840dd986..c6288d5c06022302ca09e25b47d7d2b6520cec38 100644 (file)
--- a/resources/potlatch.css
+++ b/resources/potlatch.css
@@ -98,11 +98,15 @@ way[historic],way[ruins] :area              { color: #F7F7DE; width: 1; fill-col
 way[military] :area                         { color: #D6D6D6; width: 1; fill-color: #D6D6D6; fill-opacity: 0.2; set .area_small_name;}
 way[building] :area                         { color: #ff6ec7; width: 1; fill-color: #ff6ec7; fill-opacity: 0.2; }
 way[natural=water],
-way[waterway] :area               { color: blue;    width: 2; fill-color: blue;    fill-opacity: 0.2; set .area_small_name;}
+way[waterway][waterway!=dam] :area          { color: blue;    width: 2; fill-color: blue;    fill-opacity: 0.2; set .area_small_name;}
+way[waterway=dam]                                                      { color: black; width: 1; fill-color: #222222; fill-opacity: 0.1; set .area_small_name;}
+way[man_made] :area                                                    { color: black; width: 2; fill-color: #222222; fill-opacity: 0.1; set .area_small_name; }
+way[man_made=reservoir_covered] :area       { color: blue; width: 2; dashes: 4, 2; fill-color: #222222; fill-opacity: 0.1; set .area_small_name; }
+way[landuse=reservoir] :area                { color: blue;    width: 2; fill-color: blue;    fill-opacity: 0.2; set .area_small_name;}
 way[landuse=forest],way[natural=wood] :area { color: green;   width: 2; fill-color: green;   fill-opacity: 0.2; set .area_small_name;}
-way[leisure=park]  :area                    { color: #44ff44; width: 1; fill-color: #44ff44; fill-opacity: 0.15; set .area_small_name;}
+way[leisure=park]  :area                    { color: #22aa22; width: 2; fill-color: #44ff44; fill-opacity: 0.15; set .area_small_name;}
 way[leisure=garden]  :area                  { color: #66ff44; width: 1; fill-color: #66ff44; fill-opacity: 0.2; set .area_small_name;}
-way[leisure=pitch] :area                                       { z-index: 6; color: #88bb44; width: 2; fill-color: #88ff44; fill-opacity: 0.4; set .area_small_name;}
+way[leisure=pitch] :area                                       { z-index: 6; color: #88bb44; width: 2; fill-color: #88ff44; fill-opacity: 0.2; set .area_small_name;}
 way[landuse=recreation_ground] :area        { color: green; fill-color: green; set .area_small_name;}
 way[amenity=parking] :area                  { color: #bbaa66;    width: 1; fill-color: #bbaa66;    fill-opacity: 0.2; }
 way[public_transport=pay_scale_area] :area  { color: gray;    width: 1; fill-color: gray;    fill-opacity: 0.1; }