From: Tom Hughes <tom@compton.nu>
Date: Fri, 3 Dec 2010 15:01:28 +0000 (+0000)
Subject: Update Potlatch 2 to r24558 build
X-Git-Tag: live~6282^2~3
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/a4cb284409542aae57ae9c5a299374c50cf687cc

Update Potlatch 2 to r24558 build
---

diff --git a/public/potlatch2/features/paths__bike.png b/public/potlatch2/features/paths__bike.png
index 75d98bed1..0d9c01285 100644
Binary files a/public/potlatch2/features/paths__bike.png and b/public/potlatch2/features/paths__bike.png differ
diff --git a/public/potlatch2/features/paths__bridleway.png b/public/potlatch2/features/paths__bridleway.png
index 79b3874e8..94772d018 100644
Binary files a/public/potlatch2/features/paths__bridleway.png and b/public/potlatch2/features/paths__bridleway.png differ
diff --git a/public/potlatch2/features/paths__footway.png b/public/potlatch2/features/paths__footway.png
index 082cfffea..c7c476e63 100644
Binary files a/public/potlatch2/features/paths__footway.png and b/public/potlatch2/features/paths__footway.png differ
diff --git a/public/potlatch2/features/paths__pedestrian.png b/public/potlatch2/features/paths__pedestrian.png
index 7348ed990..3ad754937 100644
Binary files a/public/potlatch2/features/paths__pedestrian.png and b/public/potlatch2/features/paths__pedestrian.png differ
diff --git a/public/potlatch2/features/paths__steps.png b/public/potlatch2/features/paths__steps.png
index 1590b29ce..e32cfd8c7 100644
Binary files a/public/potlatch2/features/paths__steps.png and b/public/potlatch2/features/paths__steps.png differ
diff --git a/public/potlatch2/features/waterway__canal.png b/public/potlatch2/features/waterway__canal.png
index 64256429a..8f04ccd3f 100644
Binary files a/public/potlatch2/features/waterway__canal.png and b/public/potlatch2/features/waterway__canal.png differ
diff --git a/public/potlatch2/features/waterway__drain.png b/public/potlatch2/features/waterway__drain.png
new file mode 100644
index 000000000..6351862c8
Binary files /dev/null and b/public/potlatch2/features/waterway__drain.png differ
diff --git a/public/potlatch2/features/waterway__river.png b/public/potlatch2/features/waterway__river.png
index ad17f6b19..79f7256ab 100644
Binary files a/public/potlatch2/features/waterway__river.png and b/public/potlatch2/features/waterway__river.png differ
diff --git a/public/potlatch2/features/waterway__slipway.png b/public/potlatch2/features/waterway__slipway.png
new file mode 100644
index 000000000..f50633b56
Binary files /dev/null and b/public/potlatch2/features/waterway__slipway.png differ
diff --git a/public/potlatch2/features/waterway__stream.png b/public/potlatch2/features/waterway__stream.png
index 1772d462b..888956e52 100644
Binary files a/public/potlatch2/features/waterway__stream.png and b/public/potlatch2/features/waterway__stream.png differ
diff --git a/public/potlatch2/features/waterway__weir.png b/public/potlatch2/features/waterway__weir.png
new file mode 100644
index 000000000..3b12080d2
Binary files /dev/null and b/public/potlatch2/features/waterway__weir.png differ
diff --git a/public/potlatch2/map_features.xml b/public/potlatch2/map_features.xml
index a15956aef..0829ac04b 100644
--- a/public/potlatch2/map_features.xml
+++ b/public/potlatch2/map_features.xml
@@ -831,7 +831,7 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
-  <feature name="Pedestrian Street">
+  <feature name="Pedestrian street">
     <category>paths</category>
     <icon image="features/paths__pedestrian.png">
       <font size="14pt">
@@ -1043,7 +1043,7 @@ Quick documentation:
 
   <feature name="Drain">
     <category>water</category>
-    <icon image="features/pois/water_generic.24.png">
+    <icon image="features/waterway__drain.png">
       <font size="14pt"><b>${name}</b></font>
     </icon>
 
@@ -1129,7 +1129,7 @@ Quick documentation:
 
   <feature name="Weir">
     <category>water</category>
-    <icon image="features/pois/water_generic.24.png">
+    <icon image="features/waterway__weir.png">
       <font size="14pt">
         <b>${name}</b>
       </font>
@@ -1177,7 +1177,7 @@ Quick documentation:
 
   <feature name="Slipway">
     <category>water</category>
-    <icon image="features/pois/water_generic.24.png"/>
+    <icon image="features/waterway__slipway.png" />
     <line/>
     <tag k="leisure" v="slipway"/>
     <inputSet ref="names"/>
diff --git a/public/potlatch2/potlatch2.swf b/public/potlatch2/potlatch2.swf
index 73918832b..7785f2c55 100644
Binary files a/public/potlatch2/potlatch2.swf and b/public/potlatch2/potlatch2.swf differ