From: Tom Hughes <tom@compton.nu>
Date: Mon, 12 Mar 2012 20:27:32 +0000 (+0000)
Subject: Update Potlatch 2 to 2.3-224-g2df4b28 build
X-Git-Tag: live~6258
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/7575f1ec0adfeadf750f9c5edacd2071a5765385?hp=d07680a0855705313477a56b8394164ee569e51a

Update Potlatch 2 to 2.3-224-g2df4b28 build
---

diff --git a/lib/potlatch2.rb b/lib/potlatch2.rb
index 45c0ccde9..06a231156 100644
--- a/lib/potlatch2.rb
+++ b/lib/potlatch2.rb
@@ -2,15 +2,23 @@ module Potlatch2
   LOCALES = {
     "ast" => "ast",
     "br" => "br",
+    "ca" => "ca",
     "de" => "de_DE",
     "en" => "en_US",
     "en-GB" => "en_GB",
     "es" => "es_ES",
+    "fa" => "fa",
     "fi" => "fi",
     "fr" => "fr_FR",
+    "ga" => "ga",
+    "gl" => "gl",
     "he" => "he",
     "hsb" => "hsb",
+    "hu" => "hu",
+    "ia" => "ia",
     "ja" => "ja_JP",
+    "ka" => "ka",
+    "lb" => "lb",
     "mk" => "mk",
     "ms" => "ms",
     "nb" => "nb_NO",
@@ -20,7 +28,9 @@ module Potlatch2
     "pl" => "pl_PL",
     "ru" => "ru",
     "sq" => "sq",
+    "ta" => "ta",
     "tr" => "tr",
+    "uk" => "uk",
     "vi" => "vi_VN",
     "zh" => "zh_CN"
   }
diff --git a/public/potlatch2/imagery.xml b/public/potlatch2/imagery.xml
index 3d12a1dd0..a916c984a 100644
--- a/public/potlatch2/imagery.xml
+++ b/public/potlatch2/imagery.xml
@@ -136,4 +136,9 @@
 		<url>http://irs.gis-lab.info/?layers=spot&request=GetTile&z=$z&x=$x&y=$y</url>
 		<sourcetag>Kosmosnimki.ru SPOT4</sourcetag>
 	</set>
+	<set minlon="96" minlat="-44" maxlon="168" maxlat="-9">
+		<name>Australia - Geographic Reference Image</name>
+		<url>http://agri.openstreetmap.org/$z/$x/$y.png</url>
+		<sourcetag>AGRI</sourcetag>
+	</set>
 </imagery>
diff --git a/public/potlatch2/locales/ast.swf b/public/potlatch2/locales/ast.swf
index 15822bd7d..ad339520b 100644
Binary files a/public/potlatch2/locales/ast.swf and b/public/potlatch2/locales/ast.swf differ
diff --git a/public/potlatch2/locales/br.swf b/public/potlatch2/locales/br.swf
index 1d6296aa2..639e2e957 100644
Binary files a/public/potlatch2/locales/br.swf and b/public/potlatch2/locales/br.swf differ
diff --git a/public/potlatch2/locales/ca.swf b/public/potlatch2/locales/ca.swf
new file mode 100644
index 000000000..45a8facf7
Binary files /dev/null and b/public/potlatch2/locales/ca.swf differ
diff --git a/public/potlatch2/locales/de_DE.swf b/public/potlatch2/locales/de_DE.swf
index 7d1361a7d..4a01c7b84 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 bd25d16e1..4b61e5f76 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 9dc8630b4..67c35fe6c 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/es_ES.swf b/public/potlatch2/locales/es_ES.swf
index 298d7cfe7..d515178d3 100644
Binary files a/public/potlatch2/locales/es_ES.swf and b/public/potlatch2/locales/es_ES.swf differ
diff --git a/public/potlatch2/locales/fa.swf b/public/potlatch2/locales/fa.swf
new file mode 100644
index 000000000..f0f61fd3c
Binary files /dev/null and b/public/potlatch2/locales/fa.swf differ
diff --git a/public/potlatch2/locales/fi.swf b/public/potlatch2/locales/fi.swf
index e334f2039..41bc47b67 100644
Binary files a/public/potlatch2/locales/fi.swf and b/public/potlatch2/locales/fi.swf differ
diff --git a/public/potlatch2/locales/fr_FR.swf b/public/potlatch2/locales/fr_FR.swf
index b65e3ede3..06b991de1 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/ga.swf b/public/potlatch2/locales/ga.swf
new file mode 100644
index 000000000..4a7c93495
Binary files /dev/null and b/public/potlatch2/locales/ga.swf differ
diff --git a/public/potlatch2/locales/gl.swf b/public/potlatch2/locales/gl.swf
new file mode 100644
index 000000000..b8f8b6cab
Binary files /dev/null and b/public/potlatch2/locales/gl.swf differ
diff --git a/public/potlatch2/locales/he.swf b/public/potlatch2/locales/he.swf
index dd61e160b..3ecc33c41 100644
Binary files a/public/potlatch2/locales/he.swf and b/public/potlatch2/locales/he.swf differ
diff --git a/public/potlatch2/locales/hsb.swf b/public/potlatch2/locales/hsb.swf
index 772b366da..e80a5a997 100644
Binary files a/public/potlatch2/locales/hsb.swf and b/public/potlatch2/locales/hsb.swf differ
diff --git a/public/potlatch2/locales/hu.swf b/public/potlatch2/locales/hu.swf
new file mode 100644
index 000000000..5afbcda65
Binary files /dev/null and b/public/potlatch2/locales/hu.swf differ
diff --git a/public/potlatch2/locales/ia.swf b/public/potlatch2/locales/ia.swf
new file mode 100644
index 000000000..2a88ab828
Binary files /dev/null and b/public/potlatch2/locales/ia.swf differ
diff --git a/public/potlatch2/locales/ja_JP.swf b/public/potlatch2/locales/ja_JP.swf
index a0dd94810..5b943e4f9 100644
Binary files a/public/potlatch2/locales/ja_JP.swf and b/public/potlatch2/locales/ja_JP.swf differ
diff --git a/public/potlatch2/locales/ka.swf b/public/potlatch2/locales/ka.swf
new file mode 100644
index 000000000..a5bb3bf4b
Binary files /dev/null and b/public/potlatch2/locales/ka.swf differ
diff --git a/public/potlatch2/locales/lb.swf b/public/potlatch2/locales/lb.swf
new file mode 100644
index 000000000..34646dbf5
Binary files /dev/null and b/public/potlatch2/locales/lb.swf differ
diff --git a/public/potlatch2/locales/mk.swf b/public/potlatch2/locales/mk.swf
index 4c90b424e..edb60a578 100644
Binary files a/public/potlatch2/locales/mk.swf and b/public/potlatch2/locales/mk.swf differ
diff --git a/public/potlatch2/locales/ms.swf b/public/potlatch2/locales/ms.swf
index 851623e23..cc64f3b7d 100644
Binary files a/public/potlatch2/locales/ms.swf and b/public/potlatch2/locales/ms.swf differ
diff --git a/public/potlatch2/locales/nb_NO.swf b/public/potlatch2/locales/nb_NO.swf
index 9287969dd..0bf5394bc 100644
Binary files a/public/potlatch2/locales/nb_NO.swf and b/public/potlatch2/locales/nb_NO.swf differ
diff --git a/public/potlatch2/locales/nl_NL.swf b/public/potlatch2/locales/nl_NL.swf
index c4abcad7b..8e872f137 100644
Binary files a/public/potlatch2/locales/nl_NL.swf and b/public/potlatch2/locales/nl_NL.swf differ
diff --git a/public/potlatch2/locales/nn_NO.swf b/public/potlatch2/locales/nn_NO.swf
index 006c5d236..b913b850a 100644
Binary files a/public/potlatch2/locales/nn_NO.swf and b/public/potlatch2/locales/nn_NO.swf differ
diff --git a/public/potlatch2/locales/pl_PL.swf b/public/potlatch2/locales/pl_PL.swf
index 02024b5f2..942288f76 100644
Binary files a/public/potlatch2/locales/pl_PL.swf and b/public/potlatch2/locales/pl_PL.swf differ
diff --git a/public/potlatch2/locales/ru.swf b/public/potlatch2/locales/ru.swf
index 6c506069d..12c01cade 100644
Binary files a/public/potlatch2/locales/ru.swf and b/public/potlatch2/locales/ru.swf differ
diff --git a/public/potlatch2/locales/sq.swf b/public/potlatch2/locales/sq.swf
index f65de2380..97df11af3 100644
Binary files a/public/potlatch2/locales/sq.swf and b/public/potlatch2/locales/sq.swf differ
diff --git a/public/potlatch2/locales/ta.swf b/public/potlatch2/locales/ta.swf
new file mode 100644
index 000000000..7155538ad
Binary files /dev/null and b/public/potlatch2/locales/ta.swf differ
diff --git a/public/potlatch2/locales/tr.swf b/public/potlatch2/locales/tr.swf
index 89e2e16e6..8448277e7 100644
Binary files a/public/potlatch2/locales/tr.swf and b/public/potlatch2/locales/tr.swf differ
diff --git a/public/potlatch2/locales/uk.swf b/public/potlatch2/locales/uk.swf
new file mode 100644
index 000000000..f4840c49d
Binary files /dev/null and b/public/potlatch2/locales/uk.swf differ
diff --git a/public/potlatch2/locales/vi_VN.swf b/public/potlatch2/locales/vi_VN.swf
index 9a00b3770..3dea8e47a 100644
Binary files a/public/potlatch2/locales/vi_VN.swf and b/public/potlatch2/locales/vi_VN.swf differ
diff --git a/public/potlatch2/locales/zh_CN.swf b/public/potlatch2/locales/zh_CN.swf
index d0a7076db..c314a49e6 100644
Binary files a/public/potlatch2/locales/zh_CN.swf and b/public/potlatch2/locales/zh_CN.swf differ
diff --git a/public/potlatch2/map_features/landuse.xml b/public/potlatch2/map_features/landuse.xml
index 5a8eb1066..915a6dce6 100644
--- a/public/potlatch2/map_features/landuse.xml
+++ b/public/potlatch2/map_features/landuse.xml
@@ -282,6 +282,7 @@
 
     <area/>
     <tag k="leisure" v="park"/>
+    <inputSet ref="simpleName"/>
     <inputSet ref="common"/>
   </feature>
 
@@ -291,6 +292,7 @@
 
     <area/>
     <tag k="landuse" v="forest"/>
+    <inputSet ref="simpleName"/>
     <inputSet ref="common"/>
   </feature>
 
@@ -300,6 +302,7 @@
 
     <area/>
     <tag k="landuse" v="meadow"/>
+    <inputSet ref="simpleName"/>
     <inputSet ref="common"/>
   </feature>
 </featureGroup>
diff --git a/public/potlatch2/map_features/transport.xml b/public/potlatch2/map_features/transport.xml
index acd9be449..2dba71d95 100644
--- a/public/potlatch2/map_features/transport.xml
+++ b/public/potlatch2/map_features/transport.xml
@@ -305,6 +305,15 @@
     <inputSet ref="names"/>
     <input type="freetext" presence="onTagMatch" category="Details" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>
     <input type="number" minimum="0" maximum="99999" stepSize="1" presence="always" category="Parking" name="Capacity" key="capacity" description="The number of cars that can be parked in the car park"/>
+    <input type="choice" presence="always" category="Parking" name="Type" key="parking" priority="high">
+      <choice value="surface" text="Surface (outdoor)" />
+      <choice value="multi-storey" text="Multi-storey" />
+      <choice value="underground" text="Underground" />
+      <choice value="garage" text="Garage" />
+      <choice value="park_and_ride" text="Park-and-ride" />
+      <choice value="garage_boxes" text="Garage boxes" />
+    </input>
+    <input type="freetext" presence="onTagMatch" category="Parking" name="Maximum stay" key="maxstay" description="The maximum permitted duration of parking (eg, 4h)."/>
     <inputSet ref="fee"/>
     <inputSet ref="common"/>
   </feature>
diff --git a/public/potlatch2/potlatch2.swf b/public/potlatch2/potlatch2.swf
index d2a082b2a..dd77d5755 100644
Binary files a/public/potlatch2/potlatch2.swf and b/public/potlatch2/potlatch2.swf differ
diff --git a/public/potlatch2/stylesheets/core_landuse.css b/public/potlatch2/stylesheets/core_landuse.css
index a113cc7e1..4dfe9083b 100644
--- a/public/potlatch2/stylesheets/core_landuse.css
+++ b/public/potlatch2/stylesheets/core_landuse.css
@@ -12,7 +12,7 @@ way[amenity],way[shop] :area                { color: #ADCEB5; width: 1; fill-col
 /* way[sport] should not be rendered by itself, according to wiki. Can we make it an "if all else fails"? */
 way[leisure] :area                         { color: #8CD6B5; width: 1; fill-color: #8CD6B5; fill-opacity: 0.2; }
 way[tourism] :area                          { color: #F7CECE; width: 1; fill-color: #F7CECE; fill-opacity: 0.2; set .area_small_name;}
-way[historic],way[ruins] :area              { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; set .area_small_name;}
+way[historic] :area,way[ruins] :area        { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; set .area_small_name;}
 way[military] :area                         { color: #D6D6D6; width: 1; fill-color: #D6D6D6; fill-opacity: 0.2; set .area_small_name;}
 way[building] :area                         { color: #ff6ec7; width: 1; fill-color: #ff6ec7; fill-opacity: 0.2; }
 way[natural=water],