From: Tom Hughes <tom@compton.nu>
Date: Tue, 14 Dec 2010 21:21:42 +0000 (+0000)
Subject: Update Potlatch 2 to r24750 build
X-Git-Tag: live~6279^2^2~42
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e09d9682701257ddc972c542c9faf7759bc37366?ds=inline

Update Potlatch 2 to r24750 build
---

diff --git a/public/potlatch2/imagery.xml b/public/potlatch2/imagery.xml
index 72f61468d..a7d8eb5a7 100644
--- 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>
+    <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>
diff --git a/public/potlatch2/map_features.xml b/public/potlatch2/map_features.xml
index 31c5c39bc..fe29b07ca 100644
--- 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">
-      <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="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>
diff --git a/public/potlatch2/potlatch2.swf b/public/potlatch2/potlatch2.swf
index 0af8168f8..ed67465cc 100644
Binary files a/public/potlatch2/potlatch2.swf and b/public/potlatch2/potlatch2.swf differ