Update Potlatch 2 to 2.3-190-g0bb4cb3 build
authorTom Hughes <tom@compton.nu>
Sun, 4 Mar 2012 17:36:25 +0000 (17:36 +0000)
committerTom Hughes <tom@compton.nu>
Sun, 4 Mar 2012 17:36:25 +0000 (17:36 +0000)
29 files changed:
lib/potlatch2.rb
public/potlatch2/locales/ast.swf
public/potlatch2/locales/br.swf
public/potlatch2/locales/de_DE.swf
public/potlatch2/locales/en_GB.swf
public/potlatch2/locales/en_US.swf
public/potlatch2/locales/es_ES.swf
public/potlatch2/locales/fi.swf
public/potlatch2/locales/fr_FR.swf
public/potlatch2/locales/he.swf
public/potlatch2/locales/hsb.swf
public/potlatch2/locales/ja_JP.swf
public/potlatch2/locales/mk.swf
public/potlatch2/locales/ms.swf
public/potlatch2/locales/nb_NO.swf
public/potlatch2/locales/nl_NL.swf
public/potlatch2/locales/nn_NO.swf
public/potlatch2/locales/pl_PL.swf
public/potlatch2/locales/ru.swf
public/potlatch2/locales/sq.swf
public/potlatch2/locales/tr.swf
public/potlatch2/locales/vi.swf [deleted file]
public/potlatch2/locales/vi_VN.swf
public/potlatch2/locales/zh_CN.swf
public/potlatch2/map_features/buildings.xml
public/potlatch2/map_features/landuse.xml
public/potlatch2/potlatch2.swf
public/potlatch2/stylesheets/core_ways.css
public/potlatch2/stylesheets/snapshot.css

index 618dc8cccd8584ded27186826ff6e5a5fc71e3ce..08b375aa62e3186727979b8d4036b0d836f1baec 100644 (file)
@@ -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
index dd9598f7d93231bbf1dbaca06317fe906de275b9..05cd7031a43873ff872ae15a6888f25b9218cc8b 100644 (file)
Binary files a/public/potlatch2/locales/ast.swf and b/public/potlatch2/locales/ast.swf differ
index 58d673b7bd646d2a707666835689febd4eeef807..6c255b0535e608fef222fb66a2af7e41eb852019 100644 (file)
Binary files a/public/potlatch2/locales/br.swf and b/public/potlatch2/locales/br.swf differ
index a02a7a1c42742a4d064345fbb664ea35d1989b0f..786be17b7a2929e56874d85a9568b00742b27eb9 100644 (file)
Binary files a/public/potlatch2/locales/de_DE.swf and b/public/potlatch2/locales/de_DE.swf differ
index f5667bd0e9026f004cee2d4928f5e9cd80f3d55d..19d4ffb92734695c944db900d8daea734f2c8d33 100644 (file)
Binary files a/public/potlatch2/locales/en_GB.swf and b/public/potlatch2/locales/en_GB.swf differ
index 7158d87195e61483329f8e491a8bab9afd572be5..18b31b8ba7d9498f5d2ff589a3b2890e8de02479 100644 (file)
Binary files a/public/potlatch2/locales/en_US.swf and b/public/potlatch2/locales/en_US.swf differ
index c641200be93314e07a46c2c4b660811fe0447222..fb349798b464aafd8e0bf2f9bed8795d7334e85a 100644 (file)
Binary files a/public/potlatch2/locales/es_ES.swf and b/public/potlatch2/locales/es_ES.swf differ
index fd059b10c4aa86fbe7040eeb0fc8b053de294f24..ca7c4630f488383372e95c4534e530d4a07c03df 100644 (file)
Binary files a/public/potlatch2/locales/fi.swf and b/public/potlatch2/locales/fi.swf differ
index a821f49b73ce02b165386e6e3c131b590fe73f33..7f38d8414ff9d2170967d7c47e805b58483aec0d 100644 (file)
Binary files a/public/potlatch2/locales/fr_FR.swf and b/public/potlatch2/locales/fr_FR.swf differ
index 7d3011e94d3a3145f759194a9ec0035deaaa86e2..a0d8f936c30ca3d6fa45e40524480b44975c3a81 100644 (file)
Binary files a/public/potlatch2/locales/he.swf and b/public/potlatch2/locales/he.swf differ
index 1ee0611c89488469b49a48072156db6a85c5e77d..b69a1532271e70481ef05007c1c2e6660a6264f4 100644 (file)
Binary files a/public/potlatch2/locales/hsb.swf and b/public/potlatch2/locales/hsb.swf differ
index 38b673cddc83bf6966a8a5e22c0d15cb1ed223d1..9cf58b76540b48cb6dae07789c1511e7015de673 100644 (file)
Binary files a/public/potlatch2/locales/ja_JP.swf and b/public/potlatch2/locales/ja_JP.swf differ
index c60429f66c758d89afec3e60f903ccd3a5496e5e..fe6c58dfce21667c123717a703124ff9f45370f4 100644 (file)
Binary files a/public/potlatch2/locales/mk.swf and b/public/potlatch2/locales/mk.swf differ
index e4e0a6a5758c103c8eb0e9cac9dafa40ded27f50..e4ca84663f10ccbab10916bab006f45c2ae3f04f 100644 (file)
Binary files a/public/potlatch2/locales/ms.swf and b/public/potlatch2/locales/ms.swf differ
index 39a7178642be586d5bf044fb108a19904a1f326a..b573704e4ea3a67c2d992065978055af0b575811 100644 (file)
Binary files a/public/potlatch2/locales/nb_NO.swf and b/public/potlatch2/locales/nb_NO.swf differ
index 984da7b857f6a3b0be168e574fe24ecfc4f0b628..18fe68e984f85816adc85c4b85c678f47fbe3362 100644 (file)
Binary files a/public/potlatch2/locales/nl_NL.swf and b/public/potlatch2/locales/nl_NL.swf differ
index bb716ea4c89230982d2da8ff4e5671ee319e68ef..82760f76d7a046e238633015a0b4ed9a93fba0b1 100644 (file)
Binary files a/public/potlatch2/locales/nn_NO.swf and b/public/potlatch2/locales/nn_NO.swf differ
index b3582a2ba6852954cb2bb0a833f49d89b676f678..0fec840049f43106e7b6311822f1f03ef28f802a 100644 (file)
Binary files a/public/potlatch2/locales/pl_PL.swf and b/public/potlatch2/locales/pl_PL.swf differ
index 653ca58c7f2137f46a6237be4b3ff30b6e309742..e2d3c14f38da14d03e32d1878d90603f5e37970d 100644 (file)
Binary files a/public/potlatch2/locales/ru.swf and b/public/potlatch2/locales/ru.swf differ
index 0ccc252ad13801e419d5a2cc2145b50aba606b6d..ba886335974cb07f9ba916e546d242f6dbb67b2d 100644 (file)
Binary files a/public/potlatch2/locales/sq.swf and b/public/potlatch2/locales/sq.swf differ
index 4c13a7c62b4b48c25e1540931508f71b11bf00aa..8cfcc63bb16eed0a84e3920a85dd562483bbc748 100644 (file)
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 (file)
index 882b394..0000000
Binary files a/public/potlatch2/locales/vi.swf and /dev/null differ
index 722e3b3e1471f496f9965aac9c85008f7e81c4c6..4461ecba2288e92598c758a9364f19349fa7bbec 100644 (file)
Binary files a/public/potlatch2/locales/vi_VN.swf and b/public/potlatch2/locales/vi_VN.swf differ
index 2490b30d52d317ee91a44d5296a2100a56b8a88f..429d72e5b08b2c6ffcf8f4d919df6a837e096732 100644 (file)
Binary files a/public/potlatch2/locales/zh_CN.swf and b/public/potlatch2/locales/zh_CN.swf differ
index aa1b7da4bde8c218203f61c470236783d63e6139..e825026898569d34add085fddab0e207904ffc34 100644 (file)
   </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">
index b7631ad1ec6f90207f0310f52df54cbf0701e0dd..5a8eb106628a34e5b3a2143ff0c3b6b624e9d689 100644 (file)
     <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>
index 35b2ba1a442c923aba0449d8ac41031c23ac9b06..7558559e1de795822b167026aa3299ef0f58acaa 100644 (file)
Binary files a/public/potlatch2/potlatch2.swf and b/public/potlatch2/potlatch2.swf differ
index 30c6e8e1d99140a4794a3e500cf048d6c6e7ca7c..6c260b0fc964dbe6fb3ba75e9fc94d4979e5e80e 100644 (file)
@@ -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], 
index ef9442782779b9c0c5d6513fc76edfc6840225cf..5450546e3a9cefb52e2699637d78e95b82eb4fe6 100644 (file)
@@ -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; }