Update Potlatch 2 to r24558 build

diff --git a/public/potlatch2/features/paths__bike.png b/public/potlatch2/features/paths__bike.png
index 75d98bed134a50f3d06c2f783992f9452c40c43b..0d9c012858f9c9bf7f9dea0ea19f9a6aa746050a 100644 (file)
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 79b3874e816664150c51bf1a1a4f102105467668..94772d018ca664dcc66b5d99461e49c87f4cb820 100644 (file)
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 082cfffeaf88077f22bd93f401bf95ce03ba30c4..c7c476e6364fcc39a82958b8e675519c43911e46 100644 (file)
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 7348ed9901078c0efb41c4081ddf9c0c529b7203..3ad754937362f379c00806d3610b8e521a0ccbd6 100644 (file)
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 1590b29ce4e3abe15b18d4935457f6b41a260533..e32cfd8c7cf0e6c60ddac184512968fd3e70ebfc 100644 (file)
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 64256429a576399cfd7507b5d0c99dbb9dff6ae5..8f04ccd3fb8066be848b9b4aec5437871ebfc612 100644 (file)
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 (file)
index 0000000..6351862
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 ad17f6b190372e0256897fccbac6800b87b65e5f..79f7256abc73e38085e0b6c1f7920a7c3dd18837 100644 (file)
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 (file)
index 0000000..f50633b
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 1772d462b0e02643eab35be2194d55eb9594d4eb..888956e528e50079f5dcc882481c2f0fc16f3f7c 100644 (file)
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 (file)
index 0000000..3b12080
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 a15956aeff498de8c3b08c0f4a832ecfcebfa37a..0829ac04ba2076d3ab4c506cb86d91d5476587ba 100644 (file)
--- a/public/potlatch2/map_features.xml
+++ b/public/potlatch2/map_features.xml
@@ -831,7 +831,7 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
     <inputSet ref="common"/>
   </feature>
 

-  <feature name="Pedestrian Street">
+  <feature name="Pedestrian street">

     <category>paths</category>
     <icon image="features/paths__pedestrian.png">
       <font size="14pt">
     <category>paths</category>
     <icon image="features/paths__pedestrian.png">
       <font size="14pt">


@@ -1043,7 +1043,7 @@ Quick documentation:
 
   <feature name="Drain">
     <category>water</category>
 
   <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>
 
       <font size="14pt"><b>${name}</b></font>
     </icon>
 


@@ -1129,7 +1129,7 @@ Quick documentation:
 
   <feature name="Weir">
     <category>water</category>
 
   <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>
       <font size="14pt">
         <b>${name}</b>
       </font>


@@ -1177,7 +1177,7 @@ Quick documentation:
 
   <feature name="Slipway">
     <category>water</category>
 
   <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"/>
     <line/>
     <tag k="leisure" v="slipway"/>
     <inputSet ref="names"/>

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