From: Tom Hughes <tom@compton.nu>
Date: Sun, 3 Apr 2011 13:33:55 +0000 (+0100)
Subject: Update Potlatch 2 to 2.0 build
X-Git-Tag: live~6254^2~76
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/6cfa483e8b8131950fb082477d81945d42fa5a60

Update Potlatch 2 to 2.0 build
---

diff --git a/public/potlatch2/features/pois/amenity_vendingmachine.png b/public/potlatch2/features/pois/amenity_vendingmachine.png
deleted file mode 100644
index 58f033372..000000000
Binary files a/public/potlatch2/features/pois/amenity_vendingmachine.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/barrier_generic.24.png b/public/potlatch2/features/pois/barrier_generic.24.png
deleted file mode 100644
index a57de177e..000000000
Binary files a/public/potlatch2/features/pois/barrier_generic.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/boat-launch-24.png b/public/potlatch2/features/pois/boat-launch-24.png
deleted file mode 100644
index 62312b927..000000000
Binary files a/public/potlatch2/features/pois/boat-launch-24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/power_substation.n.24.png b/public/potlatch2/features/pois/power_substation.n.24.png
new file mode 100644
index 000000000..3cf3bff40
Binary files /dev/null and b/public/potlatch2/features/pois/power_substation.n.24.png differ
diff --git a/public/potlatch2/features/pois/power_tower_high2.n.24.png b/public/potlatch2/features/pois/power_tower_high2.n.24.png
new file mode 100644
index 000000000..98822fa7e
Binary files /dev/null and b/public/potlatch2/features/pois/power_tower_high2.n.24.png differ
diff --git a/public/potlatch2/features/pois/power_tower_low.n.24.png b/public/potlatch2/features/pois/power_tower_low.n.24.png
new file mode 100644
index 000000000..de3d6dbbd
Binary files /dev/null and b/public/potlatch2/features/pois/power_tower_low.n.24.png differ
diff --git a/public/potlatch2/features/pois/power_transformer.n.24.png b/public/potlatch2/features/pois/power_transformer.n.24.png
new file mode 100644
index 000000000..87a43eb64
Binary files /dev/null and b/public/potlatch2/features/pois/power_transformer.n.24.png differ
diff --git a/public/potlatch2/features/pois/shopping_kiosk.n.24.png b/public/potlatch2/features/pois/shopping_kiosk.n.24.png
new file mode 100644
index 000000000..de4ab5a60
Binary files /dev/null and b/public/potlatch2/features/pois/shopping_kiosk.n.24.png differ
diff --git a/public/potlatch2/features/pois/shopping_marketplace.n.24.png b/public/potlatch2/features/pois/shopping_marketplace.n.24.png
new file mode 100644
index 000000000..4fba55a7f
Binary files /dev/null and b/public/potlatch2/features/pois/shopping_marketplace.n.24.png differ
diff --git a/public/potlatch2/features/pois/shopping_toy.n.24.png b/public/potlatch2/features/pois/shopping_toy.n.24.png
deleted file mode 100644
index 08d7db0e1..000000000
Binary files a/public/potlatch2/features/pois/shopping_toy.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/shopping_toys.n.24.png b/public/potlatch2/features/pois/shopping_toys.n.24.png
new file mode 100644
index 000000000..63500028d
Binary files /dev/null and b/public/potlatch2/features/pois/shopping_toys.n.24.png differ
diff --git a/public/potlatch2/features/pois/shopping_vending_machine.n.24.png b/public/potlatch2/features/pois/shopping_vending_machine.n.24.png
new file mode 100644
index 000000000..1a18e63af
Binary files /dev/null and b/public/potlatch2/features/pois/shopping_vending_machine.n.24.png differ
diff --git a/public/potlatch2/features/pois/sport_shooting.n.24.png b/public/potlatch2/features/pois/sport_shooting.n.24.png
index 9e50b0029..f26d78de4 100644
Binary files a/public/potlatch2/features/pois/sport_shooting.n.24.png and b/public/potlatch2/features/pois/sport_shooting.n.24.png differ
diff --git a/public/potlatch2/features/pois/sport_stadium.n.24.png b/public/potlatch2/features/pois/sport_stadium.n.24.png
new file mode 100644
index 000000000..f1349e437
Binary files /dev/null and b/public/potlatch2/features/pois/sport_stadium.n.24.png differ
diff --git a/public/potlatch2/features/pois/transport_mini_roundabout.n.24.png b/public/potlatch2/features/pois/transport_mini_roundabout.n.24.png
deleted file mode 100644
index f52dc06ad..000000000
Binary files a/public/potlatch2/features/pois/transport_mini_roundabout.n.24.png and /dev/null differ
diff --git a/public/potlatch2/features/pois/transport_miniroundabout_anticlockwise.n.24.png b/public/potlatch2/features/pois/transport_miniroundabout_anticlockwise.n.24.png
new file mode 100644
index 000000000..41b1de3dc
Binary files /dev/null and b/public/potlatch2/features/pois/transport_miniroundabout_anticlockwise.n.24.png differ
diff --git a/public/potlatch2/features/pois/transport_slipway.n.24.png b/public/potlatch2/features/pois/transport_slipway.n.24.png
index f7d07a678..5a34dcbc7 100644
Binary files a/public/potlatch2/features/pois/transport_slipway.n.24.png and b/public/potlatch2/features/pois/transport_slipway.n.24.png differ
diff --git a/public/potlatch2/features/pois/transport_speedbump.n.24.png b/public/potlatch2/features/pois/transport_speedbump.n.24.png
new file mode 100644
index 000000000..a4f5efd6c
Binary files /dev/null and b/public/potlatch2/features/pois/transport_speedbump.n.24.png differ
diff --git a/public/potlatch2/features/pois/water_generic.24.png b/public/potlatch2/features/pois/water_generic.24.png
deleted file mode 100644
index c04dd77d0..000000000
Binary files a/public/potlatch2/features/pois/water_generic.24.png and /dev/null differ
diff --git a/public/potlatch2/icons/bollard.png b/public/potlatch2/icons/bollard.png
deleted file mode 100644
index 7714a3f1e..000000000
Binary files a/public/potlatch2/icons/bollard.png and /dev/null differ
diff --git a/public/potlatch2/icons/power_blank.png b/public/potlatch2/icons/power_blank.png
deleted file mode 100644
index 32ee9afac..000000000
Binary files a/public/potlatch2/icons/power_blank.png and /dev/null differ
diff --git a/public/potlatch2/icons/power_pole_24.png b/public/potlatch2/icons/power_pole_24.png
deleted file mode 100644
index 925904051..000000000
Binary files a/public/potlatch2/icons/power_pole_24.png and /dev/null differ
diff --git a/public/potlatch2/icons/power_tower_24.png b/public/potlatch2/icons/power_tower_24.png
deleted file mode 100644
index 0aa272085..000000000
Binary files a/public/potlatch2/icons/power_tower_24.png and /dev/null differ
diff --git a/public/potlatch2/icons/tourist_blank.png b/public/potlatch2/icons/tourist_blank.png
deleted file mode 100644
index 35d488890..000000000
Binary files a/public/potlatch2/icons/tourist_blank.png and /dev/null differ
diff --git a/public/potlatch2/icons/transport_airport_48.png b/public/potlatch2/icons/transport_airport_48.png
deleted file mode 100644
index fc38eab9a..000000000
Binary files a/public/potlatch2/icons/transport_airport_48.png and /dev/null differ
diff --git a/public/potlatch2/icons/transport_blank.png b/public/potlatch2/icons/transport_blank.png
deleted file mode 100644
index 6fa7955e7..000000000
Binary files a/public/potlatch2/icons/transport_blank.png and /dev/null differ
diff --git a/public/potlatch2/icons/transport_helipad_48.png b/public/potlatch2/icons/transport_helipad_48.png
deleted file mode 100644
index 362bc9a03..000000000
Binary files a/public/potlatch2/icons/transport_helipad_48.png and /dev/null differ
diff --git a/public/potlatch2/imagery.xml b/public/potlatch2/imagery.xml
index b246a52f4..0a0de6771 100644
--- a/public/potlatch2/imagery.xml
+++ b/public/potlatch2/imagery.xml
@@ -46,7 +46,7 @@
 	</set>
 	<set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9">
 		<name>OS 7th Series historic</name>
-		<url>http://ooc.openstreetmap.org/os7/$z/$x/$y.png</url>
+		<url>http://ooc.openstreetmap.org/os7/$z/$x/$y.jpg</url>
 		<sourcetag>OS7</sourcetag>
 	</set>
 	<set minlat="49.8" minlon="-5.8" maxlat="55.8" maxlon="1.9">
diff --git a/public/potlatch2/locales/de_DE.swf b/public/potlatch2/locales/de_DE.swf
new file mode 100644
index 000000000..44c092f42
Binary files /dev/null and b/public/potlatch2/locales/de_DE.swf differ
diff --git a/public/potlatch2/locales/en_GB.swf b/public/potlatch2/locales/en_GB.swf
index fd652e4e3..d03bc182e 100644
Binary files a/public/potlatch2/locales/en_GB.swf and b/public/potlatch2/locales/en_GB.swf differ
diff --git a/public/potlatch2/locales/en_US.swf b/public/potlatch2/locales/en_US.swf
index a2bc69cd3..c2e29e25e 100644
Binary files a/public/potlatch2/locales/en_US.swf and b/public/potlatch2/locales/en_US.swf differ
diff --git a/public/potlatch2/locales/fr_FR.swf b/public/potlatch2/locales/fr_FR.swf
index c26b5d264..97386316d 100644
Binary files a/public/potlatch2/locales/fr_FR.swf and b/public/potlatch2/locales/fr_FR.swf differ
diff --git a/public/potlatch2/locales/pl_PL.swf b/public/potlatch2/locales/pl_PL.swf
new file mode 100644
index 000000000..087709303
Binary files /dev/null and b/public/potlatch2/locales/pl_PL.swf differ
diff --git a/public/potlatch2/map_features/amenities.xml b/public/potlatch2/map_features/amenities.xml
index 7b6ef52e2..1151a5ea9 100644
--- a/public/potlatch2/map_features/amenities.xml
+++ b/public/potlatch2/map_features/amenities.xml
@@ -305,7 +305,7 @@
   <feature name="Vending machine">
     <category>amenity</category>
     <category>foodanddrink</category>
-    <icon image="features/pois/amenity_vendingmachine.png">A vending machine.</icon>
+    <icon image="features/pois/shopping_vending_machine.n.24.png">A vending machine.</icon>
 
     <point/>
     <tag k="amenity" v="vending_machine"/>
diff --git a/public/potlatch2/map_features/buildings.xml b/public/potlatch2/map_features/buildings.xml
index 5a3205f67..7590a96c7 100644
--- a/public/potlatch2/map_features/buildings.xml
+++ b/public/potlatch2/map_features/buildings.xml
@@ -220,7 +220,7 @@
 
   <feature name="Stadium">
     <category>buildings</category>
-    <icon image="icons/tourist_blank.png">
+    <icon image="features/pois/sport_stadium.n.24.png">
       <b>${name} ${addr:housename}</b><br/>
       ${addr:housenumber} ${addr:street} ${addr:postcode}
     </icon>
diff --git a/public/potlatch2/map_features/landuse.xml b/public/potlatch2/map_features/landuse.xml
index 20ad351d8..5c308c114 100644
--- a/public/potlatch2/map_features/landuse.xml
+++ b/public/potlatch2/map_features/landuse.xml
@@ -61,7 +61,7 @@
     <category>shopping</category>
     <point />
     <area/>
-    <icon image="features/pois/shopping_greengrocer.n.24.png">
+    <icon image="features/pois/shopping_marketplace.n.24.png">
       <b>${name}</b>
     </icon>
     <tag k="amenity" v="marketplace"/>
diff --git a/public/potlatch2/map_features/power.xml b/public/potlatch2/map_features/power.xml
index 47769a77c..fb0c66abc 100644
--- a/public/potlatch2/map_features/power.xml
+++ b/public/potlatch2/map_features/power.xml
@@ -21,7 +21,7 @@
 
   <feature name="High-voltage pylon">
     <category>power</category>
-    <icon image="icons/power_tower_24.png"/>
+    <icon image="features/pois/power_tower_high2.n.24.png"/>
     <point/>
     <tag k="power" v="tower"/>
     <inputSet ref="common"/>
@@ -30,7 +30,7 @@
 
   <feature name="Power pole">
     <category>power</category>
-    <icon image="icons/power_pole_24.png"/>
+    <icon image="features/pois/power_tower_low.n.24.png"/>
     <point/>
     <tag k="power" v="pole"/>
     <inputSet ref="common"/>
@@ -63,7 +63,7 @@
 
   <feature name="Substation">
     <category>power</category>
-    <icon image="icons/power_blank.png"/>"
+    <icon image="features/pois/power_substation.n.24.png"/>"
     <area/>
     <point/>
     <tag k="power" v="station"/>
@@ -73,7 +73,7 @@
 
   <feature name="Transformer">
     <category>power</category>
-    <icon image="icons/power_blank.png"/>
+    <icon image="features/pois/power_transformer.n.24.png"/>
     <area/>
     <point/>
     <tag k="power" v="sub_station"/>
diff --git a/public/potlatch2/map_features/roads.xml b/public/potlatch2/map_features/roads.xml
index a9da30379..8fe62ba82 100644
--- a/public/potlatch2/map_features/roads.xml
+++ b/public/potlatch2/map_features/roads.xml
@@ -274,7 +274,7 @@
 
   <feature name="Mini Roundabout">
     <category>transport</category>
-    <icon image="features/pois/transport_mini_roundabout.n.24.png"/>
+    <icon image="features/pois/transport_miniroundabout_anticlockwise.n.24.png"/>
     <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dmini_roundabout</help>
     <point/>
     <tag k="highway" v="mini_roundabout"/>
@@ -284,7 +284,7 @@
 
   <feature name="Traffic calming">
     <category>transport</category>
-    <icon image="features/pois/transport_traffic_calming.n.24.png"/>
+    <icon image="features/pois/transport_speedbump.n.24.png"/>
 <!--    <help>http://wiki.openstreetmap.org/wiki/Key:traffic_calming</help>-->
     <point/>
     <tag k="traffic_calming" v="yes" vmatch="*"/>
diff --git a/public/potlatch2/map_features/shopping.xml b/public/potlatch2/map_features/shopping.xml
index b7055bfe2..c0ab20eb3 100644
--- a/public/potlatch2/map_features/shopping.xml
+++ b/public/potlatch2/map_features/shopping.xml
@@ -270,7 +270,7 @@
     <inputSet ref="simpleName"/>
     <inputSet ref="web"/>
     <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_jewelry.n.24.png"/>
+    <icon image="features/pois/shopping_kiosk.n.24.png"/>
     <tag k="shop" v="kiosk"/>
     <inputSet ref="common"/>
   </feature>
@@ -333,7 +333,7 @@
 
   <feature name="Toy shop">
     <category>shopping</category>
-    <icon image="features/pois/shopping_toy.n.24.png" />
+    <icon image="features/pois/shopping_toys.n.24.png" />
     <point/>
     <area/>
     <inputSet ref="simpleName"/>
diff --git a/public/potlatch2/potlatch2.swf b/public/potlatch2/potlatch2.swf
index 00b0aa382..00c52f9fa 100644
Binary files a/public/potlatch2/potlatch2.swf and b/public/potlatch2/potlatch2.swf differ
diff --git a/public/potlatch2/stylesheets/opencyclemap.css b/public/potlatch2/stylesheets/opencyclemap.css
index 25d7fe1ca..194d9101d 100644
--- a/public/potlatch2/stylesheets/opencyclemap.css
+++ b/public/potlatch2/stylesheets/opencyclemap.css
@@ -103,7 +103,6 @@ node[amenity=school] { icon-image: icons/school.png; }
 node[amenity=taxi] { icon-image: icons/taxi.png; }
 node[amenity=telephone] { icon-image: icons/telephone.png; }
 way node[barrier=gate], way node[highway=gate] { icon-image: icons/gate.png; }
-way node[barrier=bollard] { icon-image: icons/bollard.png; }
 node[barrier=cattle_grid] { icon-image: icons/cattle_grid.png; }*/
 	
 /* We can stack styles at different z-index (depth) */