From: Tom Hughes Date: Fri, 17 Jun 2011 22:21:59 +0000 (+0100) Subject: Update Potlatch 2 to 2.2 build X-Git-Tag: live~6283 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/ee7878b288b8d7b018a76988305ed8efe6375866 Update Potlatch 2 to 2.2 build --- diff --git a/public/potlatch2/locales/de_DE.swf b/public/potlatch2/locales/de_DE.swf index 65ee3395a..6349b09c3 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 25526e728..f2c81fbdf 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 d8bf4e54d..8aaf0e558 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/fr_FR.swf b/public/potlatch2/locales/fr_FR.swf index 1e8746993..ffbd3416c 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/pl_PL.swf b/public/potlatch2/locales/pl_PL.swf index d65619e5e..a63fddde4 100644 Binary files a/public/potlatch2/locales/pl_PL.swf and b/public/potlatch2/locales/pl_PL.swf differ diff --git a/public/potlatch2/potlatch2.swf b/public/potlatch2/potlatch2.swf index 461e6b7cd..52ffdeedc 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 0e4ae8711..0c02f6117 100644 --- a/public/potlatch2/stylesheets/core_interactive.css +++ b/public/potlatch2/stylesheets/core_interactive.css @@ -4,10 +4,12 @@ relation[type=restriction] node { z-index:11; icon-image: icons/restriction.png; /* Interactive way behaviour */ -way :hover { z-index: 2; width: eval('_width+10'); color: #ffff99; } -way :selected { z-index: 2; width: eval('_width+10'); color: yellow; opacity: 0.7;} -way :restrictfrom { z-index: -1; width: eval('_width+10'); color: red; opacity: 0.7;} -way :restrictto { z-index: -1; width: eval('_width+10'); color: blue; opacity: 0.7;} +way::highlight :hover { z-index: 2; width: eval('_width+10'); color: #ffff99; } +way::highlight :hover :background { color: lightcyan; } +way::highlight :selected { z-index: 2; width: eval('_width+10'); color: yellow; opacity: 0.7;} +way::highlight :selected :background { color: cyan; } +way::highlight :restrictfrom { z-index: -1; width: eval('_width+10'); color: red; opacity: 0.7;} +way::highlight :restrictto { z-index: -1; width: eval('_width+10'); color: blue; opacity: 0.7;} /*way !:drawn !:hasTags{ z-index:10; width: 0.5; color: red; }*/ way !:drawn { z-index:10; width: 1; color: #333333; } way :tiger { casing-color: #ff00ff;} @@ -20,5 +22,6 @@ node !:drawn :poi { z-index: 2; icon-image: circle; icon-width: 4; color: green; node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 4; color: black; } node :hasTags :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: black; layer: 5; } node !:drawn :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: red; casing-color: #cc0000; casing-width: 1; layer: 5; } -node :selected { z-index: 1; icon-image: square; icon-width: eval('_width+10'); color: yellow; interactive: no; layer: 5; } -node :junction :selectedway { z-index: 8; icon-image: square; icon-width: 12; casing-color: black; 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; } diff --git a/public/potlatch2/stylesheets/core_landuse.css b/public/potlatch2/stylesheets/core_landuse.css index 7eeb11738..a113cc7e1 100644 --- a/public/potlatch2/stylesheets/core_landuse.css +++ b/public/potlatch2/stylesheets/core_landuse.css @@ -28,10 +28,10 @@ way[leisure=pitch] :area { z-index: 6; color: #88bb44; width: 2; fill-color: way[landuse=recreation_ground] :area { color: green; fill-color: green; set .area_small_name;} way[amenity=parking] :area { color: #bbaa66; width: 1; fill-color: #bbaa66; fill-opacity: 0.2; } way[public_transport=pay_scale_area] :area { color: gray; width: 1; fill-color: gray; fill-opacity: 0.1; } -way[man_made=pier] { z-index: 4; color: #777; width: 3; casing-color: black; casing-width: 5;} +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: 7; } +way[leisure=slipway] { color: grey; width: 3; casing-color: blue; 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_relations.css b/public/potlatch2/stylesheets/core_relations.css index d1b2d5f6d..7756abe64 100644 --- a/public/potlatch2/stylesheets/core_relations.css +++ b/public/potlatch2/stylesheets/core_relations.css @@ -1,7 +1,7 @@ /* Route relations */ -relation[type=route] way { z-index: 1; width: 13; color: blue; opacity: 0.3; } -relation[type=route][route=bicycle][network=ncn] way { z-index: 1; width: 12; color: red; opacity: 0.3; } -relation[type=route][route=bicycle][network=rcn] way { z-index: 1; width: 12; color: cyan; opacity: 0.3; } -relation[type=route][route=bicycle][network=lcn] way { z-index: 1; width: 12; color: blue; opacity: 0.3; } -relation[type=route][route=foot] way { z-index: 1; width: 10; color: #80ff80; opacity: 0.6; } +relation[type=route] way::route { z-index: 1; width: 13; color: blue; opacity: 0.3; } +relation[type=route][route=bicycle][network=ncn] way::route { z-index: 1; width: 12; color: red; opacity: 0.3; } +relation[type=route][route=bicycle][network=rcn] way::route { z-index: 1; width: 12; color: cyan; opacity: 0.3; } +relation[type=route][route=bicycle][network=lcn] way::route { z-index: 1; width: 12; color: blue; opacity: 0.3; } +relation[type=route][route=foot] way::route { z-index: 1; width: 10; color: #80ff80; opacity: 0.6; } diff --git a/public/potlatch2/stylesheets/core_ways.css b/public/potlatch2/stylesheets/core_ways.css index 9e087f59c..b7c282332 100644 --- a/public/potlatch2/stylesheets/core_ways.css +++ b/public/potlatch2/stylesheets/core_ways.css @@ -7,23 +7,23 @@ 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: 8; } -way[highway=trunk],way[highway=trunk_link] { z-index: 9; color: #7FC97F; width: 7; casing-color: black; casing-width: 8; } -way[highway=primary],way[highway=primary_link] { z-index: 8; color: #E46D71; width: 7; casing-color: black; casing-width: 8; } -way[highway=secondary],way[highway=secondary_link] { z-index: 7; color: #FDBF6F; width: 7; casing-width: 8; } -way[highway=tertiary] { z-index: 6; color: #FEFECB; width: 5; casing-width: 7; } -way[highway=unclassified] { z-index: 6; color: #D0D0D0; width: 5; casing-width: 7; } -way[highway=tertiary_link] { z-index: 5; color: #FEFECB; width: 4; casing-width: 5; } -way[highway=residential] { z-index: 5; color: #E8E8E8; width: 5; casing-color: gray; casing-width: 7; } -way[highway=service][service!=parking_aisle] { color: white; width: 3; casing-color: gray; casing-width: 5; } -way[highway=service][service=parking_aisle] { color: white; width: 1; casing-color: #aaaaaa; casing-width: 2; } -way[highway=service][service=alley] { color: white; width: 2; dashes: 6,2; casing-color: black; casing-width: 4; } -way[highway=road] { color: gray; width: 5; casing-color: white; casing-width: 7; } -way[highway=living_street] { z-index: 5; color: #ddffee; width: 3; casing-color: #555555; casing-width: 4; } +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=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; } +way[highway=service][service=alley] { color: white; width: 2; dashes: 6,2; casing-color: black; casing-width: 1; } +way[highway=road] { color: gray; width: 5; casing-color: white; casing-width: 1; } +way[highway=living_street] { z-index: 5; color: #ddffee; width: 3; casing-color: #555555; casing-width: 1; } /* Road areas */ -way[highway=pedestrian] !:area { color: #ddddee; width: 5; casing-color: #555555; casing-width: 6; casing-dashes: 2,4;} +way[highway=pedestrian] !:area { color: #ddddee; width: 5; casing-color: #555555; casing-width: 1; casing-dashes: 2,4;} way[highway=pedestrian] :area { color: #555555; width: 1; fill-color: #ddddee; fill-opacity: 0.8; } /* Paths */ @@ -35,29 +35,28 @@ 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: 6; } +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;} /* Under construction */ 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: 8; casing-dashes: 8,4;} -way[construction=rail] - { z-index: 6; color: black; width: 5; dashes: 6, 6, 4, 8;} - { z-index: 7; color: white; width: 3; dashes: 6,18; } +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; } - { z-index: 7; color: white; width: 3; dashes: 12,12; } +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=platform] { color:black; width: 2; } -way[railway=subway] - { z-index: 6; color: #444444; width: 5; } - { z-index: 7; color: white; width: 3; dashes: 8,8; } -way[railway=disused],way[railway=abandoned] - { z-index: 6; color: #444400; width: 3; dashes: 17, 2, 5, 0; } - { z-index: 7; color: #999999; width: 2; dashes: 12,12; } + +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[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; } /* Waterways */ @@ -70,25 +69,26 @@ way[waterway][tunnel=yes] {dashes: 8,4;} /* Aeroways */ way[aeroway=aerodrome] :area - { z-index: 3; color: #bb44bb; width: 3; casing-color: #66066; casing-width: 4; } + { z-index: 3; color: #bb44bb; width: 3; casing-color: #66066; casing-width: 1; } way|z-15[aeroway=aerodrome] :area { z-index: 3; fill-color: #bb99bb; fill-opacity: 0.5;} -way[aeroway=taxiway] !:area { z-index: 8; color: #999999; width: 3; casing-color: #aa66aa; casing-width: 6; } +way[aeroway=taxiway] !:area { z-index: 8; color: #999999; width: 3; casing-color: #aa66aa; casing-width: 2; } way[aeroway=taxiway] :area { z-index: 8; color: #bb99bb; width: 3; fill-color: #ccaacc; } -way|z17-[aeroway=runway] !:area - { z-index: 9; color: black; width: 11; casing-color: #aa66aa; casing-width: 12; } - { z-index: 10; color: white; width: 9; dashes: 0, 20, 4, 76; } - { z-index: 11; color: black; width: 7; } - { z-index: 12; color: white; width: 5; dashes: 0, 20, 4, 76; } - { z-index: 13; color: black; width: 3; } - { z-index: 14; color: white; width: 1; dashes: 4, 16; } -way|z15-16[aeroway=runway] !:area - { z-index: 9; color: black; width: 5; } - { z-index: 12; color: white; width: 5; dashes: 0, 20, 4, 76; } - { z-index: 13; color: black; width: 3; } - { z-index: 14; color: white; width: 1; dashes: 4, 16; } -way|z-14[aeroway=runway] !:area - { z-index: 9; color: #444444; width: 3; } + +way|z17-[aeroway=runway] !:area { z-index: 9; color: black; width: 11; casing-color: #aa66aa; casing-width: 1; } +way|z17-[aeroway=runway]::aa !:area { z-index: 10; color: white; width: 9; dashes: 0, 20, 4, 76; } +way|z17-[aeroway=runway]::bb !:area { z-index: 11; color: black; width: 7; } +way|z17-[aeroway=runway]::cc !:area { z-index: 12; color: white; width: 5; dashes: 0, 20, 4, 76; } +way|z17-[aeroway=runway]::dd !:area { z-index: 13; color: black; width: 3; } +way|z17-[aeroway=runway]::ee !:area { z-index: 14; color: white; width: 1; dashes: 4, 16; } + +way|z15-16[aeroway=runway] !:area { z-index: 9; color: black; width: 5; } +way|z15-16[aeroway=runway]::aa !:area { z-index: 12; color: white; width: 5; dashes: 0, 20, 4, 76; } +way|z15-16[aeroway=runway]::bb !:area { z-index: 13; color: black; width: 3; } +way|z15-16[aeroway=runway]::cc !:area { z-index: 14; color: white; width: 1; dashes: 4, 16; } + +way|z-14[aeroway=runway] !:area { z-index: 9; color: #444444; width: 3; } + way[aeroway=runway] :area { z-index: 9; color: black; width: 3; fill-color: #775577; } way[aeroway=apron] :area { z-index: 4; color: #cc66cc; width: 1; fill-color: #ddaadd; fill-opacity: 0.5;} @@ -99,27 +99,25 @@ way[barrier=fence] {color: #000000; width: 1; dashes: 8,4,2,4; } /* Power */ -way[power=line] {color: darkgray; width: 3; dashes: 12,2; casing-color: black; casing-width: 8; casing-dashes: 4, 38;} -way[power=minor_line] {color: gray; width: 2; dashes: 2,4; casing-width: 8; casing-color: white; casing-dashes: 2,22;} +way[power=line] {color: darkgray; width: 3; dashes: 12,2; casing-color: black; casing-width: 2; casing-dashes: 4, 38;} +way[power=minor_line] {color: gray; width: 2; dashes: 2,4; casing-width: 3; casing-color: white; casing-dashes: 2,22;} way[power=station] :area { color: black; width: 2; fill-color: #666666; fill-opacity: 0.6; set .area_small_name;} way[power=generator] :area { color: black; width: 2; fill-color: #444444; fill-opacity: 0.6; set .area_small_name;} /* Leisure */ -way[golf=hole] {color: darkgreen; width: 5; casing-color: green; casing-width: 10; } +way[golf=hole] {color: darkgreen; width: 5; casing-color: green; casing-width: 2; } way[leisure=sports_centre] :area { color: #66ddcc; fill-color: #66ddcc; set .area_small_name; } /* Physical decoration */ -way[bridge=yes], way[bridge=viaduct], way[bridge=suspension] - { z-index: 4; color: white; width: eval('_width+3'); } - { z-index: 3; color: black; width: eval('_width+6'); } -way[tunnel=yes][!waterway] - { z-index: 4; color: white; width: eval('_width+2'); } - { z-index: 3; color: black; width: eval('_width+6'); dashes: 4,4; } +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[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], way[junction=roundabout] { z-index: 15; color: #444444; width: 2; dashes: 15,35; line-style: arrows; } -way[oneway=-1] { 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: #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; } diff --git a/public/potlatch2/stylesheets/enhanced.css b/public/potlatch2/stylesheets/enhanced.css index 61315b395..23966e004 100644 --- a/public/potlatch2/stylesheets/enhanced.css +++ b/public/potlatch2/stylesheets/enhanced.css @@ -12,12 +12,12 @@ /* Access */ -way[access=private],way[access=no] { z-index: 10; color: red; width: eval('_width+2'); dashes: 2,5;} -way[access=permissive] { z-index: 10; color: green; width: eval('_width+2'); dashes: 1,3;} +way[access=private]::access,way[access=no]::access { z-index: 10; color: red; width: eval('_width+2'); dashes: 2,5;} +way[access=permissive]::access { z-index: 10; color: green; width: eval('_width+2'); dashes: 1,3;} /* Physical */ -way[embankment=yes], way[cutting=yes] +way[embankment=yes]::hatches, way[cutting=yes]::hatches { z-index: 3; opacity: 0.5; color: grey; width: eval('_width+5'); dashes: 2, 2; } /* Interactive behaviour */ @@ -28,8 +28,8 @@ way .area_small_name {text-color: black; font-size: 9; text: name; text-halo: #f /* Direction on selected ways */ -way[highway][!oneway][junction!=roundabout]:selected, -way[aerial_way]:selected { z-index: 14; color: #999922; width: 2; dashes: 3,60; line-style: arrows; } -way[waterway]:selected { z-index: 14; color: #4444CC; width: 2; dashes: 5,60; line-style: arrows; } -way[railway] :selected{ z-index: 14; color: #999999; width: 3; dashes: 4,92; line-style: arrows; } +way[highway][!oneway][junction!=roundabout]::direction :selected, +way[aerial_way]::direction :selected { z-index: 14; color: #999922; width: 2; dashes: 3,60; line-style: arrows; } +way[waterway]::direction :selected { z-index: 14; color: #4444CC; width: 2; dashes: 5,60; line-style: arrows; } +way[railway]::direction :selected{ z-index: 14; color: #999999; width: 3; dashes: 4,92; line-style: arrows; } diff --git a/public/potlatch2/stylesheets/network.css b/public/potlatch2/stylesheets/network.css index a8f72a6c0..d2a60a9fb 100644 --- a/public/potlatch2/stylesheets/network.css +++ b/public/potlatch2/stylesheets/network.css @@ -12,12 +12,12 @@ /* Access */ -way[access=private],way[access=no] { z-index: 10; color: red; width: eval('_width+2'); dashes: 2,5;} -way[access=permissive] { z-index: 10; color: green; width: eval('_width+2'); dashes: 1,3;} +way[access=private]::access,way[access=no]::access { z-index: 10; color: red; width: eval('_width+2'); dashes: 2,5;} +way[access=permissive]::access { z-index: 10; color: green; width: eval('_width+2'); dashes: 1,3;} /* Physical */ -way[embankment=yes], way[cutting=yes] +way[embankment=yes]::hatches, way[cutting=yes]::hatches { z-index: 3; opacity: 0.5; color: grey; width: eval('_width+5'); dashes: 2, 2; } /* Interactive behaviour */ @@ -28,8 +28,8 @@ way .area_small_name {text-color: black; font-size: 9; text: name; text-halo: #f /* Direction on selected ways */ -way[highway][!oneway][junction!=roundabout]:selected, -way[aerial_way]:selected { z-index: 14; color: #999922; width: 2; dashes: 3,60; line-style: arrows; } -way[waterway]:selected { z-index: 14; color: #4444CC; width: 2; dashes: 5,60; line-style: arrows; } -way[railway] :selected{ z-index: 14; color: #999999; width: 3; dashes: 4,92; line-style: arrows; } +way[highway][!oneway][junction!=roundabout]::direction :selected, +way[aerial_way]::direction :selected { z-index: 14; color: #999922; width: 2; dashes: 3,60; line-style: arrows; } +way[waterway]::direction :selected { z-index: 14; color: #4444CC; width: 2; dashes: 5,60; line-style: arrows; } +way[railway]::direction :selected{ z-index: 14; color: #999999; width: 3; dashes: 4,92; line-style: arrows; } diff --git a/public/potlatch2/stylesheets/opencyclemap.css b/public/potlatch2/stylesheets/opencyclemap.css index 194d9101d..1270ba26c 100644 --- a/public/potlatch2/stylesheets/opencyclemap.css +++ b/public/potlatch2/stylesheets/opencyclemap.css @@ -27,17 +27,17 @@ way[highway=primary],way[highway=primary_link], way[highway=secondary],way[highway=secondary_link], way[highway=tertiary],way[highway=tertiary_link], way[highway=residential] { text: name; text-color: black; font-size: 7; text-position: line;}*/ -way[highway=motorway],way[highway=motorway_link] { z-index: 9; color: #bfbfcf; width: 7; casing-color: #506077; casing-width: 9; } -way[highway=trunk],way[highway=trunk_link] { z-index: 9; color: #c8d8c8; width: 7; casing-color: #477147; casing-width: 9; } -way[highway=primary],way[highway=primary_link] { z-index: 8; color: #d8c8c8; width: 7; casing-color: #8d4346; casing-width: 9; } -way[highway=secondary],way[highway=secondary_link] { z-index: 7; color: #eeeec9; width: 7; casing-color: #a37b48; casing-width: 9; } -way[highway=tertiary],way[highway=unclassified] { z-index: 6; color: #eeeec9; width: 5; casing-color: #999999; casing-width: 7; } -way[highway=residential] { z-index: 5; color: white; width: 5; casing-color: #999; casing-width: 7; } -way[highway=service] { color: white; width: 3; casing-color: #999; casing-width: 5; } +way[highway=motorway],way[highway=motorway_link] { z-index: 9; color: #bfbfcf; width: 7; casing-color: #506077; casing-width: 1; } +way[highway=trunk],way[highway=trunk_link] { z-index: 9; color: #c8d8c8; width: 7; casing-color: #477147; casing-width: 1; } +way[highway=primary],way[highway=primary_link] { z-index: 8; color: #d8c8c8; width: 7; casing-color: #8d4346; casing-width: 1; } +way[highway=secondary],way[highway=secondary_link] { z-index: 7; color: #eeeec9; width: 7; casing-color: #a37b48; casing-width: 1; } +way[highway=tertiary],way[highway=unclassified] { z-index: 6; color: #eeeec9; width: 5; casing-color: #999999; casing-width: 1; } +way[highway=residential] { z-index: 5; color: white; width: 5; casing-color: #999; casing-width: 1; } +way[highway=service] { color: white; width: 3; casing-color: #999; casing-width: 1; } /* Pedestrian precincts need to be treated carefully. Only closed-loops with an explicit area=yes tag should be filled. The below doesn't yet work as intended. */ -way[highway=pedestrian] !:area { color: #ddddee; width: 5; casing-color: #555555; casing-width: 6; } +way[highway=pedestrian] !:area { color: #ddddee; width: 5; casing-color: #555555; casing-width: 1; } way[highway=pedestrian] :area { color: #555555; width: 1; fill-color: #ddddee; fill-opacity: 0.8; } way[highway=steps] { color: #be6c6c; width: 2; dashes: 4, 2; } @@ -107,26 +107,22 @@ node[barrier=cattle_grid] { icon-image: icons/cattle_grid.png; }*/ /* We can stack styles at different z-index (depth) */ -way[railway=rail] - { z-index: 6; color: #444444; width: 5; } - { z-index: 7; color: white; width: 3; dashes: 12,12; } +way[railway=rail] { z-index: 6; color: #444444; width: 5; } +way[railway=rail]::dashes { z-index: 7; color: white; width: 3; dashes: 12,12; } way[railway=platform] { color:black; width: 2; } -way[railway=subway] - { z-index: 6; color: #444444; width: 5; } - { z-index: 7; color: white; width: 3; dashes: 8,8; } +way[railway=subway] { z-index: 6; color: #444444; width: 5; } +way[railway=subway]::dashes { z-index: 7; color: white; width: 3; dashes: 8,8; } /* Bridge */ -way[bridge=yes], way[bridge=viaduct], way[bridge=suspension] - { z-index: 4; color: white; width: eval('_width+3'); } - { z-index: 3; color: black; width: eval('_width+6'); } +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'); } /* Tunnel */ -way[tunnel=yes] - { z-index: 4; color: white; width: eval('_width+2'); } - { z-index: 3; color: black; width: eval('_width+6'); dashes: 4,4; } +way[tunnel=yes]::tunnel1 { z-index: 4; color: white; width: eval('_width+2'); } +way[tunnel=yes]::tunnel2 { z-index: 3; color: black; width: eval('_width+6'); dashes: 4,4; } /* Oneway */ -way[oneway=yes] { z-index: 10; color: #6c70d5; width: 2; dashes: 10,30; line-style: arrows; } +way[oneway=yes]::arrows { z-index: 10; color: #6c70d5; width: 2; dashes: 10,30; line-style: arrows; } /* Change the road colour based on dynamically set "highlighted" tag (see earlier) */ @@ -136,24 +132,16 @@ way .highlighted { color: pink; } /* Interactive editors may choose different behaviour when a user mouses-over or selects an object. Potlatch 2 supports these but the stand-alone Halcyon viewer does not */ -way :hover { z-index: 2; width: eval('_width+10'); color: #ffff99; } -way :selected { z-index: 2; width: eval('_width+10'); color: yellow; opacity: 0.7;} -way !:drawn { z-index:10; width: 0.5; color: gray; } +@import("stylesheets/core_interactive.css"); -node :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: red; casing-color: #cc0000; casing-width: 1;} -node :hoverway { z-index: 9; icon-image: square; icon-width: 7; color: blue; } -node !:drawn :poi { z-index: 2; icon-image: circle; icon-width: 3; color: lightsteelblue; casing-color: black; casing-width: 1; } -node :selected { z-index: 1; icon-image: square; icon-width: eval('_width+10'); color: yellow; } -node :junction :selectedway { z-index: 8; icon-image: square; icon-width: 12; casing-color: black; casing-width: 1; } - /* Descendant selectors provide an easy way to style relations: this example means "any way which is part of a relation whose type=route". */ -relation[type=route] way { z-index: 1; width: 17; color: yellow; opacity: 0.3; } -relation[type=route][route=bicycle][network=ncn] way { z-index: 1; width: 12; color: red; opacity: 0.3; } -relation[type=route][route=bicycle][network=rcn] way { z-index: 1; width: 12; color: cyan; opacity: 0.3; } -relation[type=route][route=bicycle][network=lcn] way { z-index: 1; width: 12; color: blue; opacity: 0.3; } -relation[type=route][route=bicycle][network=mtb] way { z-index: 1; width: 12; color: #48a448; opacity: 0.3; } +relation[type=route] way::routeline { z-index: 1; width: 17; color: yellow; opacity: 0.3; } +relation[type=route][route=bicycle][network=ncn] way::routeline { z-index: 1; width: 12; color: red; opacity: 0.3; } +relation[type=route][route=bicycle][network=rcn] way::routeline { z-index: 1; width: 12; color: cyan; opacity: 0.3; } +relation[type=route][route=bicycle][network=lcn] way::routeline { z-index: 1; width: 12; color: blue; opacity: 0.3; } +relation[type=route][route=bicycle][network=mtb] way::routeline { z-index: 1; width: 12; color: #48a448; opacity: 0.3; } diff --git a/public/potlatch2/stylesheets/potlatch.css b/public/potlatch2/stylesheets/potlatch.css index 625d5462f..34fd3bc4a 100644 --- a/public/potlatch2/stylesheets/potlatch.css +++ b/public/potlatch2/stylesheets/potlatch.css @@ -18,3 +18,11 @@ way .area_small_name {text-color: black; font-size: 9; text: name; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;} @import("stylesheets/core_interactive.css"); +/* Test rendering for licence status */ + +way[_status=no]::status { z-index: 0; width: 20; color: red; } +way[_status=partial]::status { z-index: 0; width: 20; color: red; opacity: 0.4; } +way[_status=unsure]::status { z-index: 0; width: 20; color: orange; opacity: 0.4; } +node[_status=no]::status { z-index: 0; icon-image: square; icon-width: 15; color: red; } +node[_status=partial]::status { z-index: 0; icon-image: square; icon-width: 15; color: red; opacity: 0.4; } +node[_status=unsure]::status { z-index: 0; icon-image: square; icon-width: 15; color: orange; opacity: 0.4; }