Update Potlatch 2 to 2.1-12-g870b72b build

diff --git a/public/potlatch2/features/pois/transport_car_wash.n.24.png b/public/potlatch2/features/pois/transport_car_wash.n.24.png
new file mode 100644 (file)
index 0000000..1c173e2
Binary files /dev/null and b/public/potlatch2/features/pois/transport_car_wash.n.24.png differ

diff --git a/public/potlatch2/icons/accommodation_blank.png b/public/potlatch2/icons/accommodation_blank.png
deleted file mode 100644 (file)
index d12f23e..0000000
Binary files a/public/potlatch2/icons/accommodation_blank.png and /dev/null differ

diff --git a/public/potlatch2/icons/shopping_garden_centre.n.16.png b/public/potlatch2/icons/shopping_garden_centre.n.16.png
index 37d2ecc8eedc01cb8a974b38a1e5b517992e8e7e..7af4465d013aaec97bc22a6b9e45995bd292f4ac 100644 (file)
Binary files a/public/potlatch2/icons/shopping_garden_centre.n.16.png and b/public/potlatch2/icons/shopping_garden_centre.n.16.png differ

diff --git a/public/potlatch2/icons/transport_car_wash.n.16.png b/public/potlatch2/icons/transport_car_wash.n.16.png
new file mode 100644 (file)
index 0000000..07acd4e
Binary files /dev/null and b/public/potlatch2/icons/transport_car_wash.n.16.png differ

diff --git a/public/potlatch2/imagery.xml b/public/potlatch2/imagery.xml
index 5caaf3b0cc41233de392322d649301cb689b73d9..eaf416acb6b76664e7e12977a89fe1e1614e3a66 100644 (file)
--- a/public/potlatch2/imagery.xml
+++ b/public/potlatch2/imagery.xml
@@ -45,12 +45,12 @@
        <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>
-               <sourcetag>OS OpenData StreetView</sourcetag>
+               <sourcetag>OS_OpenData_StreetView</sourcetag>
        </set>
        <set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9">
                <name>OS OpenData Locator</name>
                <url>http://tiles.itoworld.com/os_locator/$z/$x/$y.png</url>
-               <sourcetag>OS OpenData Locator</sourcetag>
+               <sourcetag>OS_OpenData_Locator</sourcetag>
                <sourcekey>source:name</sourcekey>
        </set>
        <set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9">

diff --git a/public/potlatch2/locales/de_DE.swf b/public/potlatch2/locales/de_DE.swf
index bfadae6bf9fe810546fe2db7529e3fb0cf2ac268..7a7a5188be0b3c2c391dbfb0c601f59d5333ac1e 100644 (file)
Binary files a/public/potlatch2/locales/de_DE.swf 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 e9274d8b3cd541625a6d95938f1d85f96256ed99..d99cf38365fb19dbdfa3475bd7aeec6fe7b5a2ab 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 00d242c249ce8fefab443bb516a0c11c682df7a1..91bc4a385966cd6afabf414bf868fedc79d569a5 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 092e5862def516f8e1a848d3a7e4944820b520c5..52be7fe2ebed9bfbad493e9f306875558acce67d 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
index c7860c01daceec6dbdb160f3e709a1b349c608ea..a1bf69d06e4654d1f315e7d0b457ef02641c54a1 100644 (file)
Binary files a/public/potlatch2/locales/pl_PL.swf and b/public/potlatch2/locales/pl_PL.swf differ

diff --git a/public/potlatch2/map_features/buildings.xml b/public/potlatch2/map_features/buildings.xml
index 7590a96c71c3d1b1333c1dc35bc993a705256784..451b1e7322ae60cb2da2e65fea13f705b9e50bd6 100644 (file)
--- a/public/potlatch2/map_features/buildings.xml
+++ b/public/potlatch2/map_features/buildings.xml
@@ -242,6 +242,7 @@
     </icon>
 
     <area/>
+    <point/>
     <!-- This should catch all the "building=*" tags in use: yes, hut, house, residential, entrance, apartments, garage, industrial,  garages, service, manufacture, collapsed... 
          Is this possible? -->
     <!-- <tag k="building" v="*"/> -->

diff --git a/public/potlatch2/map_features/tourism.xml b/public/potlatch2/map_features/tourism.xml
index c03452f265188807f9432c40226b0a30c8097a6c..1ad78ae1daea6eaeeb1e9283fcb12b61ee9bf0b5 100644 (file)
--- a/public/potlatch2/map_features/tourism.xml
+++ b/public/potlatch2/map_features/tourism.xml
@@ -183,13 +183,13 @@
   </feature>
 
 
-  <feature name="Ruin">
+  <feature name="Ruins">
     <category>tourism</category>
     <point/>
     <area/>
     <inputSet ref="simpleName"/>
     <icon image="features/pois/tourist_ruin.n.24.png"/>
-    <tag k="historic" v="ruin"/>
+    <tag k="historic" v="ruins"/>
     <inputSet ref="common"/>
   </feature>
 
@@ -268,4 +268,4 @@
     <tag k="tourism" v="theme_park"/>
     <inputSet ref="common"/>
   </feature>
-</featureGroup>
\ No newline at end of file
+</featureGroup>

diff --git a/public/potlatch2/map_features/transport.xml b/public/potlatch2/map_features/transport.xml
index a039e0ad8d9732e2f10c9085dd0fef09f3715100..7c0bad00b0d6e2f7f8cd14ae1447a75813923839 100644 (file)
--- a/public/potlatch2/map_features/transport.xml
+++ b/public/potlatch2/map_features/transport.xml
@@ -149,6 +149,29 @@
         <inputSet ref="common"/>
       </feature>
     
+  <feature name="Car Wash">
+    <category>transport</category>
+    <icon image="features/pois/transport_car_wash.n.24.png">
+      ${name}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcar_wash</help>
+    <point/>
+    <area/>
+    <tag k="amenity" v="car_wash"/>
+    <inputSet ref="names"/>
+    <input type="freetext" presence="onTagMatch" category="Naming" name="Operator" key="operator" description="The company/organisation that runs the car wash" priority="low"/>
+    <input type="freetext" presence="onTagMatch" category="Operation" name="Opening hours" key="opening_hours" priority="normal"/>
+    <input type="choice" presence="onTagMatch" category="Operation" name="Self service" key="self_service" priority="low">
+       <choice value="yes" text="Yes" />
+       <choice value="no" text="No" />
+    </input>
+    <input type="choice" presence="onTagMatch" category="Operation" name="Automated" key="automated" priority="low">
+       <choice value="yes" text="Yes" />
+       <choice value="no" text="No" />
+    </input>
+    
+    <inputSet ref="common"/>
+  </feature>
     
       <feature name="Bus station">
         <category>transport</category>

diff --git a/public/potlatch2/potlatch2.swf b/public/potlatch2/potlatch2.swf
index 5cc9fa34e429eaa575840e7f9d9167bf1a551e60..c1cb9f3905984027a5120c3025509b0db91f168d 100644 (file)
Binary files a/public/potlatch2/potlatch2.swf and b/public/potlatch2/potlatch2.swf differ

diff --git a/public/potlatch2/stylesheets/core_pois.css b/public/potlatch2/stylesheets/core_pois.css
index 158096d622c901f154ba50903c100fa7519fa286..62d804088ac01fd3d274761157456cd3033a8ea7 100644 (file)
--- a/public/potlatch2/stylesheets/core_pois.css
+++ b/public/potlatch2/stylesheets/core_pois.css
@@ -62,7 +62,7 @@ node[historic=memorial] { icon-image: icons/tourist_memorial.n.16.png; text-offs
 node[historic=monument] { icon-image: icons/tourist_monument.n.16.png; text-offset:15; text: name; z-index: 20; }
 node[tourism=museum] { icon-image: icons/tourist_museum.n.16.png; text-offset:15; text: name; z-index: 20; }
 node[tourism=picnic_site] { icon-image: icons/tourist_picnic.n.16.png; z-index: 20; }
-node[historic=ruin] { icon-image: icons/tourist_ruin.n.16.png; z-index: 20; }
+node[historic=ruins] { icon-image: icons/tourist_ruin.n.16.png; z-index: 20; }
 node[amenity=theatre] { icon-image: icons/tourist_theatre.n.16.png; z-index: 20; }
 node[tourism=viewpoint] { icon-image: icons/tourist_view_point.n.16.png; z-index: 20; }
 node[tourism=zoo] { icon-image: icons/tourist_zoo.n.16.png; z-index: 20; }
@@ -70,6 +70,7 @@ node[aeroway=aerodrome] { icon-image: icons/transport_aerodrome.n.16.png; z-inde
 node[amenity=bus_station] { icon-image: icons/transport_bus_station.n.16.png; z-index: 20; }
 node[highway=bus_stop] { icon-image: icons/transport_bus_stop2.n.16.png; z-index: 20; }
 node[amenity=fuel] { icon-image: icons/transport_fuel.n.16.png; z-index: 20; }
+node[amenity=car_wash] { icon-image: icons/transport_car_wash.n.16.png; z-index: 20; }
 node[amenity=bicycle_parking] { icon-image: icons/transport_parking_bicycle.n.16.png; text-offset: 15; text: capacity; z-index: 20; }
 node[amenity=parking] { icon-image: icons/transport_parking_car.n.16.png; z-index: 20; }
 node[amenity=ferry_terminal] { icon-image: icons/transport_port.n.16.png; z-index: 20; }