Update Potlatch 2 to r24750 build

diff --git a/public/potlatch2/imagery.xml b/public/potlatch2/imagery.xml
index 72f61468d1fe0531436c2e46d6030b28f3798c40..a7d8eb5a7ede90c5318738f7bdecea4eec7112a9 100644 (file)
--- a/public/potlatch2/imagery.xml
+++ b/public/potlatch2/imagery.xml
@@ -20,6 +20,14 @@
                <name>OSM - Osmarender</name>
                <url>http://tah.openstreetmap.org/Tiles/tile/$z/$x/$y.png</url>
        </set>
                <name>OSM - Osmarender</name>
                <url>http://tah.openstreetmap.org/Tiles/tile/$z/$x/$y.png</url>
        </set>

+    <set>
+        <name>OSM - OpenCycleMap</name>
+        <url>http://tile.opencyclemap.org/cycle/$z/$x/$y.png</url>
+    </set>
+    <set>
+        <name>OSM - MapQuest</name>
+        <url>http://otile1.mqcdn.com/tiles/1.0.0/osm/$z/$x/$y.png</url>
+    </set>

        <set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9">
                <name>OS OpenData Streetview</name>
                <url>http://os.openstreetmap.org/sv/$z/$x/$y.png</url>
        <set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9">
                <name>OS OpenData Streetview</name>
                <url>http://os.openstreetmap.org/sv/$z/$x/$y.png</url>

diff --git a/public/potlatch2/map_features.xml b/public/potlatch2/map_features.xml
index 31c5c39bcb23bc5271e8b9b07937c1944ddcf294..fe29b07cae07072984e2d8516cf59a13bb824243 100644 (file)
--- a/public/potlatch2/map_features.xml
+++ b/public/potlatch2/map_features.xml
@@ -439,8 +439,9 @@ Quick documentation:
     <input type="choice"
            name="Bicycles permitted" category="Cycle" description="Are bicyles allowed to use this road (regardless of physical suitability)?"
            key="bicycle">
     <input type="choice"
            name="Bicycles permitted" category="Cycle" description="Are bicyles allowed to use this road (regardless of physical suitability)?"
            key="bicycle">

-      <choice value="no" text="Prohibited"/>
+      <choice value="no" text="Prohibited" desciption="Cycling is not allowed. Pushing your bicycle is not allowed either."/>

       <choice value="yes" text="Allowed"/>
       <choice value="yes" text="Allowed"/>

+      <choice value="dismount" text="Cyclists dismount" description="Signage states that cyclists should dismount and push their bike for the selected path or road."/>

       <choice value="designated" text="Designated"/>
       <choice value="private" text="Private"/>
       <help>http://wiki.openstreetmap.org/wiki/Key:access</help>
       <choice value="designated" text="Designated"/>
       <choice value="private" text="Private"/>
       <help>http://wiki.openstreetmap.org/wiki/Key:access</help>

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