From: Tom Hughes <tom@compton.nu>
Date: Sun, 22 May 2011 16:49:07 +0000 (+0100)
Subject: Update Potlatch 2 to 2.1-12-g870b72b build
X-Git-Tag: live~6228^2~1
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/c41d0c277e643cb362c0a6c84d3737774bc2509c

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
index 000000000..1c173e21a
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
index d12f23e1e..000000000
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 37d2ecc8e..7af4465d0 100644
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
index 000000000..07acd4ec6
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 5caaf3b0c..eaf416acb 100644
--- 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 bfadae6bf..7a7a5188b 100644
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 e9274d8b3..d99cf3836 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 00d242c24..91bc4a385 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 092e5862d..52be7fe2e 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
index c7860c01d..a1bf69d06 100644
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 7590a96c7..451b1e732 100644
--- 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 c03452f26..1ad78ae1d 100644
--- 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 a039e0ad8..7c0bad00b 100644
--- 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 5cc9fa34e..c1cb9f390 100644
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 158096d62..62d804088 100644
--- 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; }