Update Potlatch 2 to 2.3-224-g2df4b28 build

diff --git a/lib/potlatch2.rb b/lib/potlatch2.rb
index 45c0ccde9a3b2a95bae481d1f1dcf8aba982bf69..06a23115604674a83f75abb26e37ffdceb0ff376 100644 (file)
--- a/lib/potlatch2.rb
+++ b/lib/potlatch2.rb
@@ -2,15 +2,23 @@ module Potlatch2
   LOCALES = {
     "ast" => "ast",
     "br" => "br",
   LOCALES = {
     "ast" => "ast",
     "br" => "br",

+    "ca" => "ca",

     "de" => "de_DE",
     "en" => "en_US",
     "en-GB" => "en_GB",
     "es" => "es_ES",
     "de" => "de_DE",
     "en" => "en_US",
     "en-GB" => "en_GB",
     "es" => "es_ES",

+    "fa" => "fa",

     "fi" => "fi",
     "fr" => "fr_FR",
     "fi" => "fi",
     "fr" => "fr_FR",

+    "ga" => "ga",
+    "gl" => "gl",

     "he" => "he",
     "hsb" => "hsb",
     "he" => "he",
     "hsb" => "hsb",

+    "hu" => "hu",
+    "ia" => "ia",

     "ja" => "ja_JP",
     "ja" => "ja_JP",

+    "ka" => "ka",
+    "lb" => "lb",

     "mk" => "mk",
     "ms" => "ms",
     "nb" => "nb_NO",
     "mk" => "mk",
     "ms" => "ms",
     "nb" => "nb_NO",


@@ -20,7 +28,9 @@ module Potlatch2
     "pl" => "pl_PL",
     "ru" => "ru",
     "sq" => "sq",
     "pl" => "pl_PL",
     "ru" => "ru",
     "sq" => "sq",

+    "ta" => "ta",

     "tr" => "tr",
     "tr" => "tr",

+    "uk" => "uk",

     "vi" => "vi_VN",
     "zh" => "zh_CN"
   }
     "vi" => "vi_VN",
     "zh" => "zh_CN"
   }

diff --git a/public/potlatch2/imagery.xml b/public/potlatch2/imagery.xml
index 3d12a1dd00010289fcf782005834c66e5600735e..a916c984ae9b54ed290aba786bc9b37f3de96f5e 100644 (file)
--- 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>
                <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>
 </imagery>

diff --git a/public/potlatch2/locales/ast.swf b/public/potlatch2/locales/ast.swf
index 15822bd7da2582890f29737bbe10138cc0f51c5b..ad339520b8cb2be02a29889154c53a3ecd9146af 100644 (file)
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 1d6296aa2f47698559f2b027e8be629616c914ec..639e2e9576c7b8223829bef57425f85ba5cc6f3e 100644 (file)
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 (file)
index 0000000..45a8fac
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 7d1361a7dc338a8d57564fcf3abd75f87b73f576..4a01c7b84198cb30de56f326567f8f5f150417ee 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 bd25d16e12da655df4dd20e7232a3ba1c3f4e3d9..4b61e5f760ab42a956bb5384c96a88dafcd81928 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 9dc8630b4e250f08f610cebede9dd6b89be7a4fd..67c35fe6c2829a564ae1faab5fa00fc2d8a94c8c 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/es_ES.swf b/public/potlatch2/locales/es_ES.swf
index 298d7cfe7f7729e49215331e2abfc392b9276dd6..d515178d372e4588c88cb38e1a50b2ab3fbe9225 100644 (file)
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 (file)
index 0000000..f0f61fd
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 e334f2039b47467564c08890c338dd5177254a36..41bc47b67bd0af00e43682b6be2622b3c54034ca 100644 (file)
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 b65e3ede324b6e89b00818d9b92329ce843b2675..06b991de1034fe1fb604bfea451cf8ae74b3eb78 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/ga.swf b/public/potlatch2/locales/ga.swf
new file mode 100644 (file)
index 0000000..4a7c934
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 (file)
index 0000000..b8f8b6c
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 dd61e160bf5a37c7a24373dfda7354c146579c4f..3ecc33c4150949027667a8497b4ea53120531d52 100644 (file)
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 772b366daa6356479c2ff49371ae9456e1293c42..e80a5a9971f0740b27fe6e66e79a522036a91aa7 100644 (file)
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 (file)
index 0000000..5afbcda
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 (file)
index 0000000..2a88ab8
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 a0dd94810ca3f015e03da1550441dc9e25cbefa0..5b943e4f9ac9e8a089dc82acaa06dd8e263f782c 100644 (file)
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 (file)
index 0000000..a5bb3bf
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 (file)
index 0000000..34646db
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 4c90b424e931750fc0caf8142d9730746e06be25..edb60a578d6c928f2d86c57b6a710beb0545faf4 100644 (file)
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 851623e2309b246078c1593f3cf77d75bb90021c..cc64f3b7da3359b8639daf0fe7c51f8e02b8603d 100644 (file)
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 9287969dd9874b8ad9f3f87a7d2ad8232f5a89dd..0bf5394bca7fa654aeaccf8b5b35b6d16a81474a 100644 (file)
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 c4abcad7b90302f50f7cef1fe4eff500b5035df3..8e872f137478d58740f6a26d0201d7180d5615a7 100644 (file)
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 006c5d236cfa87202fa462befac82a56c0f72485..b913b850a49e22664dc6355a0848ba084baa07ce 100644 (file)
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 02024b5f296756403bd78c25d053531d8ee00e54..942288f76608347ee90dad8e49ac0b4081c0c1dd 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/locales/ru.swf b/public/potlatch2/locales/ru.swf
index 6c506069de3873e1e5793735f17fdd3de8ebee31..12c01cade69426ea00f6ddc4ab647abdab163b80 100644 (file)
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 f65de2380a448a4d76fc4e5c5eafe565a99f1cc7..97df11af34aabbe2c821105d66c66ac43f0182fe 100644 (file)
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 (file)
index 0000000..7155538
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 89e2e16e6f4a94c204251fd754a5bc5a414f127f..8448277e7bbdb4d241ad811561252e8d6b5558af 100644 (file)
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 (file)
index 0000000..f4840c4
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 9a00b3770958c1953edb70f8319391d5f0262e0c..3dea8e47a386e28f0aa98fe5875bb4dbb623a5b1 100644 (file)
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 d0a7076dbe6e29c1a38588efcdb89e06b837a3f3..c314a49e6dcc4a099152cb6d15997145293a0baa 100644 (file)
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 5a8eb106628a34e5b3a2143ff0c3b6b624e9d689..915a6dce67bde6bf61e2fe89024193528938952a 100644 (file)
--- a/public/potlatch2/map_features/landuse.xml
+++ b/public/potlatch2/map_features/landuse.xml
@@ -282,6 +282,7 @@
 
     <area/>
     <tag k="leisure" v="park"/>
 
     <area/>
     <tag k="leisure" v="park"/>

+    <inputSet ref="simpleName"/>

     <inputSet ref="common"/>
   </feature>
 
     <inputSet ref="common"/>
   </feature>
 


@@ -291,6 +292,7 @@
 
     <area/>
     <tag k="landuse" v="forest"/>
 
     <area/>
     <tag k="landuse" v="forest"/>

+    <inputSet ref="simpleName"/>

     <inputSet ref="common"/>
   </feature>
 
     <inputSet ref="common"/>
   </feature>
 


@@ -300,6 +302,7 @@
 
     <area/>
     <tag k="landuse" v="meadow"/>
 
     <area/>
     <tag k="landuse" v="meadow"/>

+    <inputSet ref="simpleName"/>

     <inputSet ref="common"/>
   </feature>
 </featureGroup>
     <inputSet ref="common"/>
   </feature>
 </featureGroup>

diff --git a/public/potlatch2/map_features/transport.xml b/public/potlatch2/map_features/transport.xml
index acd9be4499d0a72ba775b3bcc2cd528681da8053..2dba71d95025fa50d063d7caf65702f0ffabf4bb 100644 (file)
--- 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"/>
     <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>
     <inputSet ref="fee"/>
     <inputSet ref="common"/>
   </feature>

diff --git a/public/potlatch2/potlatch2.swf b/public/potlatch2/potlatch2.swf
index d2a082b2a4c284b347af70c12d0f7999d8ee8087..dd77d575533649a34eea3f1d775ec92ce1f4f3c3 100644 (file)
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 a113cc7e13c9658375df7ec5e909e282b8b15b60..4dfe9083b6b9fca9e02288a416cff1d78adea9c5 100644 (file)
--- 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[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],
 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],