From: Tom Hughes Date: Sun, 25 Mar 2012 21:42:18 +0000 (+0100) Subject: Update Potlatch 2 to 2.3-367-ga54da3b build X-Git-Tag: live~5660 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/076755f50243a77b5828235fd9f20ec593600f8c?ds=sidebyside Update Potlatch 2 to 2.3-367-ga54da3b build --- diff --git a/public/potlatch2/features/natural__beach.png b/public/potlatch2/features/natural__beach.png new file mode 100644 index 000000000..5846d1999 Binary files /dev/null and b/public/potlatch2/features/natural__beach.png differ diff --git a/public/potlatch2/features/pois/health_veterinary.n.8E7409.24.png b/public/potlatch2/features/pois/health_veterinary.n.8E7409.24.png new file mode 100644 index 000000000..243d6e618 Binary files /dev/null and b/public/potlatch2/features/pois/health_veterinary.n.8E7409.24.png differ diff --git a/public/potlatch2/features/pois/transport_zebracrossing.n.24.png b/public/potlatch2/features/pois/transport_zebracrossing.n.24.png new file mode 100644 index 000000000..21e0c77d3 Binary files /dev/null and b/public/potlatch2/features/pois/transport_zebracrossing.n.24.png differ diff --git a/public/potlatch2/locales/ast.swf b/public/potlatch2/locales/ast.swf index 10e2d8ee7..b29259800 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 d7a0b52ef..26fcbfd8b 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 index 9c4431fb7..a33aea782 100644 Binary files a/public/potlatch2/locales/ca.swf 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 a40e2c8bb..43e5e701d 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 f25fb040d..c142e1fe1 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 3174cd9ac..02b5ee59c 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 c6a7bcd22..7005ee1be 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 index c3c4b18be..f8f1f7c64 100644 Binary files a/public/potlatch2/locales/fa.swf and b/public/potlatch2/locales/fa.swf differ diff --git a/public/potlatch2/locales/fi.swf b/public/potlatch2/locales/fi.swf index 52ea7457b..d4c3792d1 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 6efb0df1b..4c2249b02 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 index 0972b0347..ec1444e63 100644 Binary files a/public/potlatch2/locales/ga.swf and b/public/potlatch2/locales/ga.swf differ diff --git a/public/potlatch2/locales/gl.swf b/public/potlatch2/locales/gl.swf index c9194cbac..8250b1fb4 100644 Binary files a/public/potlatch2/locales/gl.swf and b/public/potlatch2/locales/gl.swf differ diff --git a/public/potlatch2/locales/he.swf b/public/potlatch2/locales/he.swf index 62d02ad50..a6061a9d1 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 97df42166..fc3136cf2 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 index faf12e114..387ee3c63 100644 Binary files a/public/potlatch2/locales/hu.swf and b/public/potlatch2/locales/hu.swf differ diff --git a/public/potlatch2/locales/ia.swf b/public/potlatch2/locales/ia.swf index 4a1bfee1b..2bd6bc077 100644 Binary files a/public/potlatch2/locales/ia.swf 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 c8d18f6c0..f621e9ec4 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 index 559d9a358..70b1a9517 100644 Binary files a/public/potlatch2/locales/ka.swf and b/public/potlatch2/locales/ka.swf differ diff --git a/public/potlatch2/locales/lb.swf b/public/potlatch2/locales/lb.swf index 305c13e8c..fdb6de7a0 100644 Binary files a/public/potlatch2/locales/lb.swf and b/public/potlatch2/locales/lb.swf differ diff --git a/public/potlatch2/locales/mk.swf b/public/potlatch2/locales/mk.swf index aaac7c385..a402d00b9 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 17a77c552..240c96a1a 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 556b3fde3..6cc57f4cf 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 a73e0eb4e..232125143 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 806d814bb..70679680d 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 b28fa24e6..f4956b68d 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 c12907b65..d0bbf21ab 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 8bbe09e02..af3d4b044 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 index 7af99320f..61f2ab178 100644 Binary files a/public/potlatch2/locales/ta.swf and b/public/potlatch2/locales/ta.swf differ diff --git a/public/potlatch2/locales/tr.swf b/public/potlatch2/locales/tr.swf index 60a6cb3fc..7b966cffa 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 index f7c96d521..57aae1336 100644 Binary files a/public/potlatch2/locales/uk.swf 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 a74bcea7e..8390be29e 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 0a23a91f0..8998799ab 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.xml b/public/potlatch2/map_features.xml index 2e296e964..fbc4a3986 100644 --- a/public/potlatch2/map_features.xml +++ b/public/potlatch2/map_features.xml @@ -48,7 +48,7 @@ - + @@ -142,6 +142,7 @@ + @@ -156,6 +157,7 @@ + @@ -267,6 +269,7 @@ + @@ -315,6 +318,13 @@ + + + + + + + @@ -368,6 +378,16 @@ + + + + + + ${name|operator} (${ref}) + + + + @@ -503,14 +523,18 @@ - + + + + + + - @@ -582,9 +606,10 @@ - + + @@ -625,6 +650,14 @@ + + + + + + + + diff --git a/public/potlatch2/map_features/amenities.xml b/public/potlatch2/map_features/amenities.xml index 3dbd64a9d..318ea6156 100644 --- a/public/potlatch2/map_features/amenities.xml +++ b/public/potlatch2/map_features/amenities.xml @@ -52,6 +52,20 @@ + + amenity + + ${name} + + http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dveterinary + + + + + + + + amenity @@ -74,7 +88,6 @@ - amenity @@ -315,12 +328,12 @@ - - - - - - + + + + + + @@ -381,8 +394,15 @@ + + + + + + + @@ -489,5 +509,5 @@ - + \ No newline at end of file diff --git a/public/potlatch2/map_features/landuse.xml b/public/potlatch2/map_features/landuse.xml index 915a6dce6..e2e51d845 100644 --- a/public/potlatch2/map_features/landuse.xml +++ b/public/potlatch2/map_features/landuse.xml @@ -123,6 +123,28 @@ + + natural + + + + + + + + + + + + + + + + + + + + diff --git a/public/potlatch2/map_features/roads.xml b/public/potlatch2/map_features/roads.xml index 8fe62ba82..b731d6dd2 100644 --- a/public/potlatch2/map_features/roads.xml +++ b/public/potlatch2/map_features/roads.xml @@ -302,6 +302,28 @@ + + transport + + + + + + + + + + + + + + + + + + + + advanced http://wiki.openstreetmap.org/wiki/Turn_restrictions @@ -329,13 +351,14 @@ - + - + + diff --git a/public/potlatch2/map_features/transport.xml b/public/potlatch2/map_features/transport.xml index 2dba71d95..a6462be6d 100644 --- a/public/potlatch2/map_features/transport.xml +++ b/public/potlatch2/map_features/transport.xml @@ -14,6 +14,8 @@ + + @@ -29,6 +31,7 @@ + @@ -44,6 +47,7 @@ + @@ -56,6 +60,7 @@ + @@ -70,6 +75,7 @@ + @@ -82,6 +88,7 @@ + @@ -100,6 +107,8 @@ + + @@ -111,7 +120,7 @@ - + @@ -135,6 +144,7 @@ + @@ -356,6 +366,8 @@ + + @@ -535,5 +547,25 @@ + + transport + + + ${name|operator} (${ref}) + + + + + + + + + + + + + + + diff --git a/public/potlatch2/potlatch2.swf b/public/potlatch2/potlatch2.swf index b7ce67708..ace217ed4 100644 Binary files a/public/potlatch2/potlatch2.swf and b/public/potlatch2/potlatch2.swf differ diff --git a/public/potlatch2/stylesheets/core_interactive.css b/public/potlatch2/stylesheets/core_interactive.css index 3fd9ea777..addf821cd 100644 --- a/public/potlatch2/stylesheets/core_interactive.css +++ b/public/potlatch2/stylesheets/core_interactive.css @@ -17,12 +17,12 @@ way :tiger { casing-color: #ff00ff;} /* Interactive node behaviour */ node :dupe { z-index: 9; icon-image: circle; icon-width:8; color: white; opacity: 0.4; casing-opacity: 0.4; casing-color: red; casing-width: 3; } -node :hoverway { z-index: 9; icon-image: square; icon-width: 7; color: blue; layer: 5; } -node !:drawn :hasTags :poi { z-index: 2; icon-image: circle; icon-width: 4; color: green; casing-color: black; casing-width: 1; } -node !:drawn :poi { z-index: 2; icon-image: circle; icon-width: 4; color: #BBB; casing-color: #333; casing-width: 1; } -node !:drawn :hasTags :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: black; layer: 5; } -node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 4; color: black; } -node !:drawn :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: red; casing-color: #cc0000; casing-width: 1; layer: 5; } +node :hoverway { z-index: 9; icon-image: circle; icon-width: 8; color: blue; layer: 5; } +node !:drawn :hasTags :poi { z-index: 2; icon-image: circle; icon-width: 8; color: #00ac00; casing-color: #004400; casing-width: 1; } +node !:drawn :poi { z-index: 2; icon-image: circle; icon-width: 8; color: #BBB; casing-color: #333; casing-width: 1; } +node !:drawn :hasTags :selectedway { z-index: 9; icon-image: circle; icon-width: 10; color: black; layer: 5; } +node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 8; color: black; } +node !:drawn :selectedway { z-index: 9; icon-image: circle; icon-width: 8; color: red; casing-color: #cc0000; casing-width: 1; layer: 5; } node::selectedNode :selected { z-index: 1; icon-image: square; icon-width: eval('_width+10'); color: yellow; interactive: no; layer: 5; } node::selectedNode :selected :background { color: cyan; } -node::junctionNode :junction :selectedway { z-index: 8; icon-image: square; icon-width: 12; casing-color: black; casing-width: 1; layer: 5; } +node::junctionNode :junction :selectedway { z-index: 8; icon-image: circle; icon-width: 12; casing-color: black; casing-width: 1; layer: 5; } diff --git a/public/potlatch2/stylesheets/core_landuse.css b/public/potlatch2/stylesheets/core_landuse.css index 4dfe9083b..26adf27f9 100644 --- a/public/potlatch2/stylesheets/core_landuse.css +++ b/public/potlatch2/stylesheets/core_landuse.css @@ -14,13 +14,13 @@ way[leisure] :area { color: #8CD6B5; width: 1; fill-colo way[tourism] :area { color: #F7CECE; width: 1; fill-color: #F7CECE; 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[building] :area { color: #bca9a9; width: 1; fill-color: #ff6ec7; fill-opacity: 0.2; } way[natural=water], -way[waterway][waterway!=dam] :area { color: blue; width: 2; fill-color: blue; fill-opacity: 0.2; set .area_small_name;} +way[waterway][waterway!=dam] :area { color: #3434ff; width: 2; fill-color: #3434ff; fill-opacity: 0.2; set .area_small_name;} way[waterway=dam] { color: black; width: 1; fill-color: #222222; fill-opacity: 0.1; set .area_small_name;} way[man_made] :area { color: black; width: 2; fill-color: #222222; fill-opacity: 0.1; set .area_small_name; } -way[man_made=reservoir_covered] :area { color: blue; width: 2; dashes: 4, 2; fill-color: #222222; fill-opacity: 0.1; set .area_small_name; } -way[landuse=reservoir] :area { color: blue; width: 2; fill-color: blue; fill-opacity: 0.2; set .area_small_name;} +way[man_made=reservoir_covered] :area { color: #3434ff; width: 2; dashes: 4, 2; fill-color: #222222; fill-opacity: 0.1; set .area_small_name; } +way[landuse=reservoir] :area { color: #3434ff; width: 2; fill-color: #3434ff; fill-opacity: 0.2; set .area_small_name;} way[landuse=forest],way[natural=wood] :area { color: green; width: 2; fill-color: green; fill-opacity: 0.2; set .area_small_name;} way[leisure=park] :area { color: #22aa22; width: 2; fill-color: #44ff44; fill-opacity: 0.15; set .area_small_name;} way[leisure=garden] :area { color: #66ff44; width: 1; fill-color: #66ff44; fill-opacity: 0.2; set .area_small_name;} @@ -31,7 +31,7 @@ way[public_transport=pay_scale_area] :area { color: gray; width: 1; fill-col way[man_made=pier] { z-index: 4; color: #777; width: 3; casing-color: black; casing-width: 1;} way[man_made=pier][floating=yes] { dashes: 4,2; casing-color: #444;} way[leisure=marina] :area { color: pink; fill-color: pink; fill-opacity: 0.4; set .area_small_name;} -way[leisure=slipway] { color: grey; width: 3; casing-color: blue; casing-width: 2; } +way[leisure=slipway] { color: grey; width: 3; casing-color: #3434ff; casing-width: 2; } way[leisure=golf_course] :area { color: #44ee22; width: 2; fill-color: #44ee22; fill-opacity: 0.2; set .area_small_name;} way[boundary] { color: #000066; width: 2; opacity: 0.6; dashes: 24,4, 4, 4; z-index: 4;} /* Perhaps should be filled, on lower zooms. */ diff --git a/public/potlatch2/stylesheets/core_pois.css b/public/potlatch2/stylesheets/core_pois.css index 62d804088..439c06c16 100644 --- a/public/potlatch2/stylesheets/core_pois.css +++ b/public/potlatch2/stylesheets/core_pois.css @@ -1,4 +1,4 @@ -node[place] { icon-image: icons/place.png; text-offset: 17; font-family: DejaVu; text: name; font-size: 9; font-weight: bold; text-decoration: underline; z-index: 20; } +node[place] { icon-image: icons/place.png; text-offset: 17; font-family: DejaVu; text: name; font-size: 10; font-weight: bold; z-index: 20; } node[amenity=telephone] { icon-image: icons/telephone.png; z-index: 20; } node[barrier=cattle_grid] { icon-image: icons/cattle_grid.png; z-index: 20; } node[tourism=guesthouse] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; } @@ -6,7 +6,7 @@ node[tourism=alpine_hut] { icon-image: icons/accommodation_alpinehut.n.16.png; z node[tourism=camp_site] { icon-image: icons/accommodation_camping.n.16.png; z-index: 20; } node[tourism=caravan_site] { icon-image: icons/accommodation_caravan_park.n.16.png; z-index: 20; } node[tourism=guest_house],node[tourism=bed_and_breakfast] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; } -node[tourism=hotel] { icon-image: icons/accommodation_hotel.n.16.png; text-offset:15; text: name; z-index: 20; } +node[tourism=hotel] { icon-image: icons/accommodation_hotel.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; } node[tourism=hostel] { icon-image: icons/accommodation_youth_hostel.n.16.png; z-index: 20; } node[amenity=fire_station] { icon-image: icons/amenity_firestation2.n.16.png; z-index: 20; } node[amenity=police] { icon-image: icons/amenity_police2.n.16.png; z-index: 20; } @@ -21,13 +21,13 @@ node[barrier=kissing_gate] { icon-image: icons/barrier_kissing_gate.16.png; z-in node[barrier=cycle_barrier] { icon-image: icons/barrier_cycle_barrier.16.png; z-index: 20; } node[barrier=block] { icon-image: icons/barrier_blocks.16.png; z-index: 20; } node[barrier=cattle_grid] { icon-image: icons/barrier_cattle_grid.16.png; z-index: 20; } -node[amenity=school] { icon-image: icons/education_school.n.16.png; text-offset:15; text: name; z-index: 20; } +node[amenity=school] { icon-image: icons/education_school.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; } way[amenity=school] :area { color: yellow; fill-color: yellow; fill-opacity: 0.1; set .area_small_name; } -node[amenity=bar] { icon-image: icons/food_bar.n.16.png; text-offset:15; text: name; z-index: 20; } -node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:15; text: name; z-index: 20; } +node[amenity=bar] { icon-image: icons/food_bar.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; } +node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; } node[amenity=fast_food] { icon-image: icons/food_fastfood.n.16.png; z-index: 20; } -node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset:15; text: name; z-index: 20; } -node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:15; text: name; z-index: 20; } +node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset: 15; text: name; font-size: 10; z-index: 20; } +node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; } node[amenity=hospital] { icon-image: icons/health_hospital.n.16.png; z-index: 20; } node[amenity=pharmacy] { icon-image: icons/health_pharmacy.n.16.png; z-index: 20; } node[amenity=atm] { icon-image: icons/money_atm.n.16.png; z-index: 20; } @@ -56,11 +56,11 @@ node[shop=music] { icon-image: icons/shopping_music.n.16.png; z-index: 20; } node[shop=supermarket] { icon-image: icons/shopping_supermarket.n.16.png; z-index: 20; } node[historic=archaeological_site] { icon-image: icons/tourist_archaeological.n.16.png; z-index: 20; } node[historic=battlefield] { icon-image: icons/tourist_battlefield.n.16.png; z-index: 20; } -node[historic=castle] { icon-image: icons/tourist_castle.n.16.png; text-offset:15; text: name; z-index: 20; } +node[historic=castle] { icon-image: icons/tourist_castle.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; } node[amenity=cinema] { icon-image: icons/tourist_cinema.n.16.png; z-index: 20; } -node[historic=memorial] { icon-image: icons/tourist_memorial.n.16.png; text-offset:15; text: name; z-index: 20; } -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[historic=memorial] { icon-image: icons/tourist_memorial.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; } +node[historic=monument] { icon-image: icons/tourist_monument.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; } +node[tourism=museum] { icon-image: icons/tourist_museum.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; } node[tourism=picnic_site] { icon-image: icons/tourist_picnic.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; } @@ -71,18 +71,18 @@ node[amenity=bus_station] { icon-image: icons/transport_bus_station.n.16.png; z- 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=bicycle_parking] { icon-image: icons/transport_parking_bicycle.n.16.png; text-offset: 15; text: capacity; font-size: 10; 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; } node[amenity=bicycle_rental] { icon-image: icons/transport_rental_bicycle.n.16.png; z-index: 20; } node[amenity=car_rental] { icon-image: icons/transport_rental_car.n.16.png; z-index: 20; } node[amenity=taxi] { icon-image: icons/transport_taxi_rank.n.16.png; z-index: 20; } -node[railway=station] { icon-image: icons/transport_train_station.n.16.png; text-offset:15; text: name; z-index: 20; } +node[railway=station] { icon-image: icons/transport_train_station.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; } node[railway=tram_stop] { icon-image: icons/transport_tram_stop.n.16.png; z-index: 20; } node[leisure=marina] { icon-image: icons/transport_marina.n.16.png; z-index: 20; } /* Addressing */ -node[addr:housenumber], -node[addr:housename] { icon-image: circle; icon-width: 4; color: #B0E0E6; casing-color:blue; casing-width: 1; } +node[addr:housenumber] !:drawn, +node[addr:housename] !:drawn { icon-image: circle; icon-width: 8; color: #B0E0E6; casing-color:blue; casing-width: 1; z-index: 20; } way[addr:interpolation] { color: #B0E0E6; width: 3; dashes: 3,3;} diff --git a/public/potlatch2/stylesheets/core_ways.css b/public/potlatch2/stylesheets/core_ways.css index 6c260b0fc..4824facb7 100644 --- a/public/potlatch2/stylesheets/core_ways.css +++ b/public/potlatch2/stylesheets/core_ways.css @@ -6,14 +6,13 @@ way[highway=trunk],way[highway=trunk_link], way[highway=primary],way[highway=primary_link], way[highway=secondary],way[highway=secondary_link], way[highway=tertiary],way[highway=tertiary_link], -way[highway=residential],way[highway=unclassified] { text: name; text-color: black; font-size: 10; text-position: line; text-halo-color: white; text-halo-radius: 2; } -way[highway=motorway],way[highway=motorway_link] { z-index: 9; color: #809BC0; width: 7; casing-color: black; casing-width: 1; } -way[highway=trunk],way[highway=trunk_link] { z-index: 9; color: #7FC97F; width: 7; casing-color: black; casing-width: 1; } -way[highway=primary],way[highway=primary_link] { z-index: 8; color: #E46D71; width: 7; casing-color: black; casing-width: 1; } -way[highway=secondary],way[highway=secondary_link] { z-index: 7; color: #FDBF6F; width: 7; casing-width: 1; } -way[highway=tertiary] { z-index: 6; color: #FEFECB; width: 5; casing-width: 1; } +way[highway=residential],way[highway=unclassified] { text: name; text-color: black; font-size: 12; text-position: offset; text-offset: 10; text-halo-color: white; text-halo-radius: 2; linecap: round; casing-linecap: round } +way[highway=motorway],way[highway=motorway_link] { z-index: 9; color: #809BC0; width: 7; casing-color: #1e375a; casing-width: 1; } +way[highway=trunk],way[highway=trunk_link] { z-index: 9; color: #7FC97F; width: 7; casing-color: #245424; casing-width: 1; } +way[highway=primary],way[highway=primary_link] { z-index: 8; color: #E46D71; width: 7; casing-color: #651316; casing-width: 1; } +way[highway=secondary],way[highway=secondary_link] { z-index: 7; color: #FDBF6F; width: 7; casing-color: #b16603; casing-width: 1; } +way[highway=tertiary],way[highway=tertiary_link] { z-index: 6; color: #FEFECB; width: 5; casing-color: #626202; casing-width: 1; } way[highway=unclassified] { z-index: 6; color: #D0D0D0; width: 5; casing-width: 1; } -way[highway=tertiary_link] { z-index: 5; color: #FEFECB; width: 4; casing-width: 1; } way[highway=residential] { z-index: 5; color: #E8E8E8; width: 5; casing-color: gray; casing-width: 1; } way[highway=service][service!=parking_aisle] { color: white; width: 3; casing-color: gray; casing-width: 1; } way[highway=service][service=parking_aisle] { color: white; width: 1; casing-color: #aaaaaa; casing-width: 1; } @@ -35,8 +34,7 @@ way[highway=bridleway] { z-index:9; color: #996644; width: 2; dashes: 4, 2, 2, 2 way[highway=track] { color: #996644; width: 2; dashes: 4, 2; set .path;} way[highway=path] { color: brown; width: 2; dashes: 2, 2; set .path;} way[highway=cycleway] { color: blue; width: 2; dashes: 4, 2; set .path;} -way[railway=tram] { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; } -way .path { text:name; text-color: black; text-position: offset; text-offset: 5;} +way .path { text: name; text-color: black; text-position: offset; text-offset: 7; font-size: 12; } /* Under construction */ @@ -45,8 +43,8 @@ way[highway=construction] { color: #ffffbb; width: 6; dashes: 8, 4; casing-color /* 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[railway=rail] { z-index: 6; color: black; width: 5; linecap: round; } +way[railway=rail]::dashes { z-index: 7; color: white; width: 3; dashes: 12,12; linecap: round; } 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; } @@ -75,8 +73,8 @@ way[construction=light_rail]::dashes { z-index: 7; color: #999999; width: 2; das way[waterway=river], way[waterway=canal], -way[waterway=stream] { color: blue; width: 2; text:name; text-color:blue; font-size:9; text-position: offset; text-offset: 7;} -way[waterway=drain] {color: blue; width: 1; text:name; text-color: blue; text-position: offset; text-offset: 3;} +way[waterway=stream] { color: #3434ff; width: 2; text:name; text-color: #3434ff; font-size:9; text-position: offset; text-offset: 7;} +way[waterway=drain] {color: #3434ff; width: 1; text:name; text-color: #3434ff; text-position: offset; text-offset: 3;} way[waterway][tunnel=yes] {dashes: 8,4;} /* Aeroways */ @@ -126,11 +124,11 @@ way[leisure=sports_centre] :area { color: #66ddcc; fill-color: #66ddcc; set .are /* Physical decoration */ way[bridge=yes]::bridge1, way[bridge=viaduct]::bridge1, way[bridge=suspension]::bridge1 { z-index: 4; color: white; width: eval('_width+3'); } -way[bridge=yes]::bridge2, way[bridge=viaduct]::bridge2, way[bridge=suspension]::bridge2 { z-index: 3; color: black; width: eval('_width+6'); } +way[bridge=yes]::bridge2, way[bridge=viaduct]::bridge2, way[bridge=suspension]::bridge2 { z-index: 3; color: #444444; width: eval('_width+6'); } way[tunnel=yes][!waterway]::bridge1 { z-index: 4; color: white; width: eval('_width+2'); } way[tunnel=yes][!waterway]::bridge2 { z-index: 3; color: black; width: eval('_width+6'); dashes: 4,4; } /* Attribute decoration */ -way[oneway=yes]::arrows, way[junction=roundabout]::arrows { z-index: 15; color: #444444; width: 2; dashes: 15,35; line-style: arrows; } -way[oneway=-1]::arrows { z-index: 15; color: #444444; width: 2; dashes: 15,35; line-style: arrows-reversed; } +way[oneway=yes]::arrows, way[junction=roundabout]::arrows { z-index: 15; color: #555555; width: 2; dashes: 10,50; line-style: arrows; } +way[oneway=-1]::arrows { z-index: 15; color: #555555; width: 2; dashes: 10,50; line-style: arrows-reversed; } diff --git a/public/potlatch2/stylesheets/gpx.css b/public/potlatch2/stylesheets/gpx.css index fe08e31ac..806048920 100644 --- a/public/potlatch2/stylesheets/gpx.css +++ b/public/potlatch2/stylesheets/gpx.css @@ -6,7 +6,7 @@ way { z-index: 2; width: 1; color: cyan; } node :poi { z-index: 2; - icon-image: circle; icon-width: 4; color: orange; + icon-image: circle; icon-width: 8; color: orange; casing-color: red; casing-width: 1; text-offset: 10; font-family: DejaVu; text: name; font-size: 9; text_color: red; } diff --git a/public/potlatch2/stylesheets/opencyclemap.css b/public/potlatch2/stylesheets/opencyclemap.css index 1270ba26c..4274f6686 100644 --- a/public/potlatch2/stylesheets/opencyclemap.css +++ b/public/potlatch2/stylesheets/opencyclemap.css @@ -72,7 +72,7 @@ way[public_transport=pay_scale_area] :area { color: gray; width: 1; fill-col /* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */ node[addr:housenumber], -node[addr:housename] { icon-image: circle; icon-width: 4; color: #B0E0E6; casing-color:blue; casing-width: 1; } +node[addr:housename] { icon-image: circle; icon-width: 8; color: #B0E0E6; casing-color:blue; casing-width: 1; } way[addr:interpolation] { color: #B0E0E6; width: 3; dashes: 3,3;} /* POIs, too, can have bitmap icons - they can even be transparent */ diff --git a/public/potlatch2/stylesheets/potlatch.css b/public/potlatch2/stylesheets/potlatch.css index 1598735d8..8774333f3 100644 --- a/public/potlatch2/stylesheets/potlatch.css +++ b/public/potlatch2/stylesheets/potlatch.css @@ -15,7 +15,7 @@ @import("stylesheets/core_pois.css"); @import("stylesheets/core_landuse.css"); @import("stylesheets/core_relations.css"); -way .area_small_name {text-color: black; font-size: 9; text: name; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;} +way .area_small_name {text-color: black; font-size: 10; text: name; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;} @import("stylesheets/core_interactive.css"); /* Rendering for licence status */ diff --git a/public/potlatch2/stylesheets/snapshot.css b/public/potlatch2/stylesheets/snapshot.css index 5450546e3..891ead686 100644 --- a/public/potlatch2/stylesheets/snapshot.css +++ b/public/potlatch2/stylesheets/snapshot.css @@ -8,18 +8,18 @@ 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; } +node :selectedway { z-index: 8; icon-image: circle; icon-width: 16; color: green; } +node :hoverway { z-index: 9; icon-image: circle; icon-width: 16; color: blue; } +node :selected { z-index: 9; icon-image: circle; icon-width: 16; color: red; casing-color: black; casing-width: 1; } +node !:drawn :poi { z-index: 6; icon-image: circle; icon-width: 16; color: green; casing-color: black; casing-width: 1; } +node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 16; color: black; } +node :hasTags :selectedway { z-index: 9; icon-image: circle; icon-width: 16; 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=incomplete]::statushighlight :hasTags { z-index: 5; icon-image: circle; icon-width: 24; color: #d95f02; } +node[_status=complete]::statushighlight :hasTags { z-index: 5; icon-image: circle; icon-width: 20; color: #1b9e77; opacity: 0.4; } node[_status=complete] { opacity: 0.7; } diff --git a/public/potlatch2/stylesheets/wireframe.css b/public/potlatch2/stylesheets/wireframe.css index 9fbb829ce..e3e408ce8 100644 --- a/public/potlatch2/stylesheets/wireframe.css +++ b/public/potlatch2/stylesheets/wireframe.css @@ -12,6 +12,6 @@ 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 !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 6; color: black; } node :hasTags :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: black; layer: 5; }