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 (file)
index 58f0333..0000000
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 (file)
index a57de17..0000000
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 (file)
index 62312b9..0000000
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 (file)
index 0000000..3cf3bff
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 (file)
index 0000000..98822fa
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 (file)
index 0000000..de3d6db
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 (file)
index 0000000..87a43eb
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 (file)
index 0000000..de4ab5a
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 (file)
index 0000000..4fba55a
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 (file)
index 08d7db0..0000000
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 (file)
index 0000000..6350002
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 (file)
index 0000000..1a18e63
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 9e50b0029d222223e16e0acb867dde5e53a4842f..f26d78de43b5de300dce4344afe7051b2bcc0141 100644 (file)
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 (file)
index 0000000..f1349e4
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 (file)
index f52dc06..0000000
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 (file)
index 0000000..41b1de3
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 f7d07a678f1961f22a268a8d1cc01998e682fd62..5a34dcbc7ce267ccc8be64d220fa72fc3832c11e 100644 (file)
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 (file)
index 0000000..a4f5efd
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 (file)
index c04dd77..0000000
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 (file)
index 7714a3f..0000000
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 (file)
index 32ee9af..0000000
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 (file)
index 9259040..0000000
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 (file)
index 0aa2720..0000000
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 (file)
index 35d4888..0000000
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 (file)
index fc38eab..0000000
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 (file)
index 6fa7955..0000000
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 (file)
index 362bc9a..0000000
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 b246a52f4926fbd98c2983dacd1debf5641d1aea..0a0de6771159e6f75da8e553b981bf39244693dc 100644 (file)
--- 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>
        </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">
                <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 (file)
index 0000000..44c092f
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 fd652e4e30eac6dfb7282723734fa51389ffc363..d03bc182ea5cccb8156444409b6b5337f891ecf4 100644 (file)
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 a2bc69cd34387dc51e909748c42d8b465e020655..c2e29e25efd371627cd4697c974e0b4e721d678e 100644 (file)
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 c26b5d2645125449011ed78123397e30730b0c95..97386316d164419148e41be08b039953e49dc605 100644 (file)
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 (file)
index 0000000..0877093
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 7b6ef52e2144d3fe654a3e91722e1e43db0277a3..1151a5ea91061eb5cfb47a266a0081e79feffaed 100644 (file)
--- 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>
   <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"/>
 
     <point/>
     <tag k="amenity" v="vending_machine"/>

diff --git a/public/potlatch2/map_features/buildings.xml b/public/potlatch2/map_features/buildings.xml
index 5a3205f67242a543b36bfdbc9027f7f1e08ae80e..7590a96c71c3d1b1333c1dc35bc993a705256784 100644 (file)
--- a/public/potlatch2/map_features/buildings.xml
+++ b/public/potlatch2/map_features/buildings.xml
@@ -220,7 +220,7 @@
 
   <feature name="Stadium">
     <category>buildings</category>
 
   <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>
       <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 20ad351d8af1deced26a209d0fae996bd017bd61..5c308c114f4d872a6c2a4ec125fc5e492f5e87b7 100644 (file)
--- a/public/potlatch2/map_features/landuse.xml
+++ b/public/potlatch2/map_features/landuse.xml
@@ -61,7 +61,7 @@
     <category>shopping</category>
     <point />
     <area/>
     <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"/>
       <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 47769a77ca4f3df97b1f97f85edd97426463ee01..fb0c66abc9e55892eccb6683567427abb33bda0c 100644 (file)
--- 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>
 
   <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"/>
     <point/>
     <tag k="power" v="tower"/>
     <inputSet ref="common"/>


@@ -30,7 +30,7 @@
 
   <feature name="Power pole">
     <category>power</category>
 
   <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"/>
     <point/>
     <tag k="power" v="pole"/>
     <inputSet ref="common"/>


@@ -63,7 +63,7 @@
 
   <feature name="Substation">
     <category>power</category>
 
   <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"/>
     <area/>
     <point/>
     <tag k="power" v="station"/>


@@ -73,7 +73,7 @@
 
   <feature name="Transformer">
     <category>power</category>
 
   <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"/>
     <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 a9da30379d0c5eb84a20b7ab533906aabdbc4e31..8fe62ba82a8027e67761d7cce86e918627f259bf 100644 (file)
--- 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>
 
   <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"/>
     <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>
 
   <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="*"/>
 <!--    <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 b7055bfe27cd42d308642b357fe5f645c7953c8d..c0ab20eb3485ef93fe110cdfd87e4c912c3f375e 100644 (file)
--- 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"/>
     <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>
     <tag k="shop" v="kiosk"/>
     <inputSet ref="common"/>
   </feature>


@@ -333,7 +333,7 @@
 
   <feature name="Toy shop">
     <category>shopping</category>
 
   <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"/>
     <point/>
     <area/>
     <inputSet ref="simpleName"/>

diff --git a/public/potlatch2/potlatch2.swf b/public/potlatch2/potlatch2.swf
index 00b0aa382fec10951f49cedbaefed638a9af757a..00c52f9fa89fdfecf04a030319a6c47a97dab982 100644 (file)
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 25d7fe1cadbaa20f76cde6199af447dd19d95cbc..194d9101d63323c2b1efbc8e9582ac7f62ca27c4 100644 (file)
--- 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; }
 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) */
 node[barrier=cattle_grid] { icon-image: icons/cattle_grid.png; }*/
        
 /* We can stack styles at different z-index (depth) */