Update Potlatch 2 to r24796 build

diff --git a/public/potlatch2/map_features.xml b/public/potlatch2/map_features.xml
index fe29b07cae07072984e2d8516cf59a13bb824243..00a2b266eea666aaa88de3664d0d3fecf860052d 100644 (file)
--- a/public/potlatch2/map_features.xml
+++ b/public/potlatch2/map_features.xml
@@ -453,11 +453,13 @@ Quick documentation:
         name="Bike lanes" category="Cycle" description="Road has bike lanes within the road surface"
         key="cycleway" layout="horizontal">
       <choice value="no" text="No bike lanes"/>
         name="Bike lanes" category="Cycle" description="Road has bike lanes within the road surface"
         key="cycleway" layout="horizontal">
       <choice value="no" text="No bike lanes"/>

-      <choice value="lane" text="On-road bike lane" description="Separated by painted line"/>
+      <choice value="lane" text="On-road bike lane" description="Separated by painted line on the road from cars"/>

       <choice value="track" text="Parallel track" description="Separated by kerb or parked cars"/>
       <choice value="opposite_lane" text="Contraflow lane" description="Separated by painted line, and allowing bicycles in both directions in an otherwise one-way street."/>
       <choice value="opposite_track" text="Contraflow track" description="Separated by kerb or parked cars, and allowing bicycles in both directions in an otherwise one-way street."/>
       <choice value="opposite" text="Contraflow unmarked" description="The route may be cycled in the direction opposite of other traffic, but does not have a dedicated lane."/>
       <choice value="track" text="Parallel track" description="Separated by kerb or parked cars"/>
       <choice value="opposite_lane" text="Contraflow lane" description="Separated by painted line, and allowing bicycles in both directions in an otherwise one-way street."/>
       <choice value="opposite_track" text="Contraflow track" description="Separated by kerb or parked cars, and allowing bicycles in both directions in an otherwise one-way street."/>
       <choice value="opposite" text="Contraflow unmarked" description="The route may be cycled in the direction opposite of other traffic, but does not have a dedicated lane."/>

+      <choice value="segregated" text="Segregated cycle path" description="A path where cyclists and pedestrians are separated by a painted line or kerb."/>
+      <choice value="shared" text="Shared cycle path" description="A path where cyclists and pedestrians share the full width of the path."/>

       <help>http://wiki.openstreetmap.org/wiki/Key:cycleway</help>
     </input>
   </inputSet>
       <help>http://wiki.openstreetmap.org/wiki/Key:cycleway</help>
     </input>
   </inputSet>


@@ -2095,6 +2097,10 @@ Quick documentation:
     <point/>
     <tag k="amenity" v="hospital"/>
     <input type="freetext" presence="always" category="" name="name" key="name" description="The Name of it." priority="low"/>
     <point/>
     <tag k="amenity" v="hospital"/>
     <input type="freetext" presence="always" category="" name="name" key="name" description="The Name of it." priority="low"/>

+    <input type="choice" presence="always" category="Hospital" 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>

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

diff --git a/public/potlatch2/potlatch.css b/public/potlatch2/potlatch.css
index f51fdd135b6dfe42efecd3a9c54e34e3fa37f7ef..e54ce6230001e5c10813ccc05e6bfd95366e5832 100644 (file)
--- a/public/potlatch2/potlatch.css
+++ b/public/potlatch2/potlatch.css
@@ -236,7 +236,7 @@ way[embankment=yes], way[cutting=yes]
     { z-index: 8; opacity: 0.5; color: grey; width: eval('_width+5'); dashes: 2, 2; }
 
 /* Oneway */
     { 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; }
+way[oneway=yes], way[junction=roundabout] { 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+2'); dashes: 2,5;}
 way[access=permissive] { z-index: 10; color: green; width: eval('_width+2'); dashes: 1,3;}
 
 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;}

diff --git a/public/potlatch2/potlatch2.swf b/public/potlatch2/potlatch2.swf
index ed67465cca12e5e01ffb7601f4c646aaab4006d8..68347d3d3e6550c2e5fb53b95289e6a63d695acb 100644 (file)
Binary files a/public/potlatch2/potlatch2.swf and b/public/potlatch2/potlatch2.swf differ