From: Tom Hughes <tom@compton.nu>
Date: Sun, 4 Mar 2012 17:36:25 +0000 (+0000)
Subject: Update Potlatch 2 to 2.3-190-g0bb4cb3 build
X-Git-Tag: live~5729
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/516c13a77b5911bad7318a5cef03becc7274da50

Update Potlatch 2 to 2.3-190-g0bb4cb3 build
---

diff --git a/lib/potlatch2.rb b/lib/potlatch2.rb
index 618dc8ccc..08b375aa6 100644
--- a/lib/potlatch2.rb
+++ b/lib/potlatch2.rb
@@ -21,8 +21,7 @@ module Potlatch2
     "ru" => "ru",
     "sq" => "sq",
     "tr" => "tr",
-    "vi" => "vi",
-    "vi-VN" => "vi_VN",
+    "vi" => "vi_VN",
     "zh" => "zh_VN"
   }
 end
diff --git a/public/potlatch2/locales/ast.swf b/public/potlatch2/locales/ast.swf
index dd9598f7d..05cd7031a 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 58d673b7b..6c255b053 100644
Binary files a/public/potlatch2/locales/br.swf and b/public/potlatch2/locales/br.swf differ
diff --git a/public/potlatch2/locales/de_DE.swf b/public/potlatch2/locales/de_DE.swf
index a02a7a1c4..786be17b7 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 f5667bd0e..19d4ffb92 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 7158d8719..18b31b8ba 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 c641200be..fb349798b 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/fi.swf b/public/potlatch2/locales/fi.swf
index fd059b10c..ca7c4630f 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 a821f49b7..7f38d8414 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/he.swf b/public/potlatch2/locales/he.swf
index 7d3011e94..a0d8f936c 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 1ee0611c8..b69a15322 100644
Binary files a/public/potlatch2/locales/hsb.swf and b/public/potlatch2/locales/hsb.swf differ
diff --git a/public/potlatch2/locales/ja_JP.swf b/public/potlatch2/locales/ja_JP.swf
index 38b673cdd..9cf58b765 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/mk.swf b/public/potlatch2/locales/mk.swf
index c60429f66..fe6c58dfc 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 e4e0a6a57..e4ca84663 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 39a717864..b573704e4 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 984da7b85..18fe68e98 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 bb716ea4c..82760f76d 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 b3582a2ba..0fec84004 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 653ca58c7..e2d3c14f3 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 0ccc252ad..ba8863359 100644
Binary files a/public/potlatch2/locales/sq.swf and b/public/potlatch2/locales/sq.swf differ
diff --git a/public/potlatch2/locales/tr.swf b/public/potlatch2/locales/tr.swf
index 4c13a7c62..8cfcc63bb 100644
Binary files a/public/potlatch2/locales/tr.swf and b/public/potlatch2/locales/tr.swf differ
diff --git a/public/potlatch2/locales/vi.swf b/public/potlatch2/locales/vi.swf
deleted file mode 100644
index 882b39432..000000000
Binary files a/public/potlatch2/locales/vi.swf and /dev/null differ
diff --git a/public/potlatch2/locales/vi_VN.swf b/public/potlatch2/locales/vi_VN.swf
index 722e3b3e1..4461ecba2 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 2490b30d5..429d72e5b 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/buildings.xml b/public/potlatch2/map_features/buildings.xml
index aa1b7da4b..e82502689 100644
--- a/public/potlatch2/map_features/buildings.xml
+++ b/public/potlatch2/map_features/buildings.xml
@@ -234,24 +234,6 @@
   </feature>
 
 
-  <feature name="Sports centre">
-    <category>buildings</category>
-    <icon image="features/pois/sport_leisure_centre.n.24.png">
-      <b>${name} ${addr:housename}</b><br/>
-      ${addr:housenumber} ${addr:street} ${addr:postcode}
-    </icon>
-
-    <area/>
-    <point/>
-    <tag k="leisure" v="sports_centre"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="pitchSport"/>
-    <inputSet ref="isBuilding"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
   <!-- Generic building. Should be last in the entire xml chain -->
   <!-- When user changes feature to some amenity, building tag is cleared. This should not be. -->
   <feature name="Building">
diff --git a/public/potlatch2/map_features/landuse.xml b/public/potlatch2/map_features/landuse.xml
index b7631ad1e..5a8eb1066 100644
--- a/public/potlatch2/map_features/landuse.xml
+++ b/public/potlatch2/map_features/landuse.xml
@@ -190,6 +190,24 @@
     <inputSet ref="common"/>
   </feature>
 
+  <feature name="Sports centre">
+    <category>sport</category>
+    <icon image="features/pois/sport_leisure_centre.n.24.png">
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <point/>
+    <tag k="leisure" v="sports_centre"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="pitchSport"/>
+    <inputSet ref="isBuilding"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
   <!-- **************** Agriculture *************** -->
   <feature name="Farm">
     <category>agriculture</category>
diff --git a/public/potlatch2/potlatch2.swf b/public/potlatch2/potlatch2.swf
index 35b2ba1a4..7558559e1 100644
Binary files a/public/potlatch2/potlatch2.swf and b/public/potlatch2/potlatch2.swf differ
diff --git a/public/potlatch2/stylesheets/core_ways.css b/public/potlatch2/stylesheets/core_ways.css
index 30c6e8e1d..6c260b0fc 100644
--- a/public/potlatch2/stylesheets/core_ways.css
+++ b/public/potlatch2/stylesheets/core_ways.css
@@ -42,22 +42,35 @@ way .path              { text:name; text-color: black; text-position: offset; te
 
 way[highway=proposed] { color: #88ffff; width: 6; dashes: 8, 4; }
 way[highway=construction] { color: #ffffbb; width: 6; dashes: 8, 4; casing-color: #0000aa; casing-width: 1; casing-dashes: 8,4;}
-way[construction=rail] { z-index: 6; color: black; width: 5; dashes: 6, 6, 4, 8;}
-way[construction=rail]::inner { z-index: 7; color: white; width: 3; dashes: 6,18; }
 
 /* Railways */
 
 way[railway=rail] { z-index: 6; color: black; width: 5; }
 way[railway=rail]::dashes { z-index: 7; color: white; width: 3; dashes: 12,12; }
 
+way[construction=rail] { z-index: 6; color: black; width: 5; dashes: 6, 6, 4, 8;}
+way[construction=rail]::inner { z-index: 7; color: white; width: 3; dashes: 6,18; }
+
 way[railway=platform] { color:black; width: 2; }
 
 way[railway=subway] { z-index: 6; color: #444444; width: 5; }
 way[railway=subway]::dashes  { z-index: 7; color: white; width: 3; dashes: 8,8; }
 
+way[construction=subway] { z-index: 6; color: #444444; width: 5; dashes: 4, 4; }
+way[construction=subway]::dashes  { z-index: 7; color: white; width: 3; dashes: 4,12;}
+
 way[railway=disused],way[railway=abandoned] { z-index: 6; color: #444400; width: 3; dashes: 17, 2, 5, 0; }
 way[railway=disused]::dashes,way[railway=abandoned]::dashes { z-index: 7; color: #999999; width: 2; dashes: 12,12; }
 
+way[railway=tram]      { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; }
+way[construction=tram] { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; dashes: 6, 6; casing-dashes: 6, 6; }
+
+way[railway=light_rail] { z-index: 6; color: black; width: 4; }
+way[railway=light_rail]::dashes { z-index: 7; color: #999999; width: 2; dashes: 8,4; }
+
+way[construction=light_rail] { z-index: 6; color: black; width: 4; dashes: 8, 4, 4, 4; }
+way[construction=light_rail]::dashes { z-index: 7; color: #999999; width: 2; dashes: 8,12; }
+
 /* Waterways */	
 
 way[waterway=river], 
diff --git a/public/potlatch2/stylesheets/snapshot.css b/public/potlatch2/stylesheets/snapshot.css
index ef9442782..5450546e3 100644
--- a/public/potlatch2/stylesheets/snapshot.css
+++ b/public/potlatch2/stylesheets/snapshot.css
@@ -4,21 +4,23 @@
 
 */
 
-way :hover	{ z-index: 2; width: 1; color: yellow; }
-way :selected { z-index: 2; width: 2; color: yellow; }
-way !:drawn { z-index:10; width: 1; color: black; }
-
-node :selectedway { z-index: 8; icon-image: square; icon-width: 6; color: green; }
-node :hoverway { z-index: 9; icon-image: square; icon-width: 6; color: blue; }
-node :selected { z-index: 9; icon-image: square; icon-width: 6; color: red; casing-color: black; casing-width: 1; }
-node !:drawn :poi { z-index: 2; icon-image: square; icon-width: 4; color: green; casing-color: black; casing-width: 1; }
-node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 3; color: black; }
-node :hasTags :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: black; layer: 5; }
-
-way[_status=incomplete]::statushighlight { z-index: 0; width: 10; color: #d95f02; }
-way[_status=complete]::statushighlight { z-index: 0; width: 10; color: #1b9e77; opacity: 0.4; }
-node[_status=incomplete]::statushighlight :hasTags { z-index: 0; icon-image: square; icon-width: 10; color: #d95f02; }
-node[_status=complete]::statushighlight :hasTags { z-index: 0; icon-image: square; icon-width: 10; color: #1b9e77; opacity: 0.4; }
+way :hover	{ z-index: 2; width: 14; color: yellow; linecap: round; }
+way :selected { z-index: 2; width: 14; color: yellow; linecap: round; }
+way !:drawn { z-index: 1; width: 14; color: #444444; linecap: round; }
+
+node :selectedway { z-index: 8; icon-image: circle; icon-width: 8; color: green; }
+node :hoverway { z-index: 9; icon-image: circle; icon-width: 8; color: blue; }
+node :selected { z-index: 9; icon-image: circle; icon-width: 8; color: red; casing-color: black; casing-width: 1; }
+node !:drawn :poi { z-index: 6; icon-image: circle; icon-width: 8; color: green; casing-color: black; casing-width: 1; }
+node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 8; color: black; }
+node :hasTags :selectedway { z-index: 9; icon-image: circle; icon-width: 8; color: black; }
+
+way[_status=incomplete]::statushighlight { z-index: 0; width: 20; color: #d95f02; linecap: round; }
+way[_status=complete]::statushighlight { z-index: 0; width: 18; color: #1b9e77; opacity: 0.4; linecap: round; }
+way[_status=complete] { opacity: 0.7; }
+node[_status=incomplete]::statushighlight :hasTags { z-index: 5; icon-image: circle; icon-width: 12; color: #d95f02; }
+node[_status=complete]::statushighlight :hasTags { z-index: 5; icon-image: circle; icon-width: 10; color: #1b9e77; opacity: 0.4; }
+node[_status=complete] { opacity: 0.7; }