Update Potlatch 2 to r24576 build

diff --git a/public/potlatch2/map_features.xml b/public/potlatch2/map_features.xml
index 0829ac04ba2076d3ab4c506cb86d91d5476587ba..17845f6f85a4cf02570f848ec6527a19fcc5d857 100644 (file)
--- a/public/potlatch2/map_features.xml
+++ b/public/potlatch2/map_features.xml
@@ -109,9 +109,7 @@ Quick documentation:
   </inputSet>
 
   <inputSet id="source">
   </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">
   </inputSet>
 
   <inputSet id="common">


@@ -1184,8 +1182,20 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
     <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
 
   <!-- ************************************************************************
        Transport


@@ -1662,7 +1672,7 @@ Quick documentation:
        Landuse
        ************************************************************************ -->
 
        Landuse
        ************************************************************************ -->
 

-  <feature name="Industry">
+  <feature name="Industrial Area">

     <category>landuse</category>
     <area/>
     <icon image="features/pois/building_generic.png">
     <category>landuse</category>
     <area/>
     <icon image="features/pois/building_generic.png">


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

-  <feature name="Residential">
+  <feature name="Residential Area">

     <category>landuse</category>
     <area/>
     <icon image="features/pois/building_generic.png">
     <category>landuse</category>
     <area/>
     <icon image="features/pois/building_generic.png">


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

-  <feature name="Retail">
+  <feature name="Retail Area">

     <category>landuse</category>
     <area/>
     <icon image="features/pois/building_generic.png">
     <category>landuse</category>
     <area/>
     <icon image="features/pois/building_generic.png">


@@ -1707,6 +1717,17 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
     <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>
 
   <feature name="Marketplace">
     <category>landuse</category>


@@ -2164,6 +2185,13 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
     <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. -->
 
   <!-- ========= 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>
 
     <inputSet ref="common"/>
   </feature>
 

-
-

   <!-- ========= Transport ========= -->
 
   <feature name="Aerodrome">
   <!-- ========= Transport ========= -->
 
   <feature name="Aerodrome">


@@ -2747,6 +2773,14 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
     <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">
 
 
   <feature name="Traffic calming">
 


@@ -3190,6 +3224,15 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
     <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
 
   <!-- ************************************************************************
        Relations

diff --git a/public/potlatch2/potlatch.css b/public/potlatch2/potlatch.css
index 809835b0d6db98dceb7c53827c5f9d48ceff6d15..f51fdd135b6dfe42efecd3a9c54e34e3fa37f7ef 100644 (file)
--- a/public/potlatch2/potlatch.css
+++ b/public/potlatch2/potlatch.css
@@ -117,10 +117,7 @@ way[leisure=marina] :area                                  { color: pink; fill-color: pink; fill-opacity: 0.4
 way[leisure=slipway]                                           { color: grey; width: 3; casing-color: blue; casing-width: 7; }
 way[leisure=golf_course] :area { color: #44ee22; width: 2; fill-color: #44ee22; fill-opacity: 0.2; set .area_small_name;}
 
 way[leisure=slipway]                                           { color: grey; width: 3; casing-color: blue; casing-width: 7; }
 way[leisure=golf_course] :area { color: #44ee22; width: 2; fill-color: #44ee22; fill-opacity: 0.2; set .area_small_name;}
 

-way[embankment=yes]                        { z-index: 6; opacity: 0.5; color: brown; width: eval('_width+16'); dashes: 2, 14; }
-                                           { z-index: 5; opacity: 0.5; color: brown; width: eval('_width+24'); dashes: 2, 30; } /* meh, improve this */
-
-way[boundary=administrative]                { color: purple; width: 10; opacity: 0.2; dashes: 12,24; }
+way[boundary=administrative]                { color: purple; width: 2; opacity: 0.2; dashes: 24,4; }

 way[landuse=cemetery]                                          { color: #664466; width: 2; fill-color: color: #664466; opacity: 0.2; set .area_small_name;}
 /* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */
 
 way[landuse=cemetery]                                          { color: #664466; width: 2; fill-color: color: #664466; opacity: 0.2; set .area_small_name;}
 /* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */
 


@@ -235,11 +232,14 @@ way[tunnel=yes][!waterway]
     { z-index: 4; color: white; width: eval('_width+2'); }
     { z-index: 3; color: black; width: eval('_width+6'); dashes: 4,4; }
 
     { z-index: 4; color: white; width: eval('_width+2'); }
     { z-index: 3; color: black; width: eval('_width+6'); dashes: 4,4; }
 

+way[embankment=yes], way[cutting=yes]
+    { z-index: 8; opacity: 0.5; color: grey; width: eval('_width+5'); dashes: 2, 2; }
+

 /* Oneway */
 way[oneway=yes] { z-index: 15; color: #444444; width: 2; dashes: 15,35; line-style: arrows; }
 
 /* Oneway */
 way[oneway=yes] { z-index: 15; color: #444444; width: 2; dashes: 15,35; line-style: arrows; }
 

-way[access=private],way[access=no] { z-index: 10; color: red; width: eval('_width+8'); dashes: 2,15;}
-way[access=permissive] { z-index: 10; color: green; width: eval('_width+6'); dashes: 1,7;}
+way[access=private],way[access=no] { z-index: 10; color: red; width: eval('_width+2'); dashes: 2,5;}
+way[access=permissive] { z-index: 10; color: green; width: eval('_width+2'); dashes: 1,3;}

 
 way .area_small_name {text-color: black; font-size: 9; text: name; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;}
 /* Change the road colour based on dynamically set "highlighted" tag (see earlier) */
 
 way .area_small_name {text-color: black; font-size: 9; text: name; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;}
 /* Change the road colour based on dynamically set "highlighted" tag (see earlier) */


@@ -254,9 +254,7 @@ way :selected { z-index: 2; width: eval('_width+10'); color: yellow; opacity: 0.
 way :restrictfrom { z-index: -1; width: eval('_width+10'); color: red; opacity: 0.7;}
 way :restrictto { z-index: -1; width: eval('_width+10'); color: blue; opacity: 0.7;}
 /*way !:drawn !:hasTags{ z-index:10; width: 0.5; color: red; }*/
 way :restrictfrom { z-index: -1; width: eval('_width+10'); color: red; opacity: 0.7;}
 way :restrictto { z-index: -1; width: eval('_width+10'); color: blue; opacity: 0.7;}
 /*way !:drawn !:hasTags{ z-index:10; width: 0.5; color: red; }*/

-way !:drawn { z-index:9; width: 2; color: black; dashes: 4,0;} { z-index:10; width: 2; color: #ffff00; dashes: 0, 4, 4, 0;}
- /*IMHO (Steve Bennett), in early testing we want to highlight ways that aren't triggering rules */
-/* way !:drawn { z-index:10; width: 0.5; color: gray; } was like this */
+way !:drawn { z-index:10; width: 1; color: #333333; }

 way :tiger { casing-color: #ff00ff;}
 
 
 way :tiger { casing-color: #ff00ff;}
 
 

diff --git a/public/potlatch2/potlatch2.swf b/public/potlatch2/potlatch2.swf
index 7785f2c55ec68d6e5721dd4125caa17217e07777..37a0857bf2fa3f2461637c380af3910fc1c91063 100644 (file)
Binary files a/public/potlatch2/potlatch2.swf and b/public/potlatch2/potlatch2.swf differ