X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/b90219f1d393c0b6e16848eb611e638fa14bf3ff..13743ae8d56cf6c8e8d33c8b20e57124ea09761f:/public/potlatch2/potlatch.css diff --git a/public/potlatch2/potlatch.css b/public/potlatch2/potlatch.css index d8d2c6154..9297f925d 100644 --- a/public/potlatch2/potlatch.css +++ b/public/potlatch2/potlatch.css @@ -26,7 +26,7 @@ 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] { text: name; text-color: black; font-size: 10; text-position: line; text-halo-color: white; text-halo-radius: 2; } +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; } @@ -44,6 +44,8 @@ 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; casing-dashes: 2,4;} way[highway=pedestrian] :area { color: #555555; width: 1; fill-color: #ddddee; fill-opacity: 0.8; } +way[highway=living_street] { z-index: 5; color: #ddffee; width: 3; casing-color: #555555; casing-width: 4; } + way[highway=steps] { color: #FF6644; width: 6; dashes: 2, 2; } way[highway=footway] { color: #FF6644; width: 2; dashes: 6, 3; set .path;} way[highway=footway][bicycle=yes] { z-index: 4; color: Blue; width: 1; } @@ -52,7 +54,7 @@ way[highway=track] { color: #996644; width: 2; dashes: 4, 2; .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 .path {text:name; text-color: black; text-position: offset; text-offset: 3;} +way .path {text:name; text-color: black; text-position: offset; text-offset: 5;} /* Could be improved */ way[highway=proposed] { color: #88ffff; width: 6; dashes: 8, 4; } @@ -92,7 +94,8 @@ way[landuse=retail] :area { color: #cc2222; width: 2; fill-col way[landuse=commercial] :area { color: #4444bb; width: 2; fill-color: #444488; fill-opacity: 0.15; } way[landuse=military] :area { color: #ff4444; width: 2; fill-color: #ff4444; fill-opacity: 0.2; set .area_small_name; } way[amenity],way[shop] :area { color: #ADCEB5; width: 1; fill-color: #ADCEB5; fill-opacity: 0.2; } -way[leisure],way[sport] :area { color: #8CD6B5; width: 1; fill-color: #8CD6B5; fill-opacity: 0.2; } +/* 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[military] :area { color: #D6D6D6; width: 1; fill-color: #D6D6D6; fill-opacity: 0.2; set .area_small_name;} @@ -117,10 +120,12 @@ way[leisure=marina] :area { color: pink; fill-color: pink; fill-opacity: 0.4 way[leisure=slipway] { color: grey; width: 3; casing-color: blue; casing-width: 7; } way[leisure=golf_course] :area { color: #44ee22; width: 2; fill-color: #44ee22; fill-opacity: 0.2; set .area_small_name;} -way[embankment=yes] { z-index: 6; opacity: 0.5; color: brown; width: eval('_width+16'); dashes: 2, 14; } - { z-index: 5; opacity: 0.5; color: brown; width: eval('_width+24'); dashes: 2, 30; } /* meh, improve this */ - -way[boundary=administrative] { color: purple; width: 10; opacity: 0.2; dashes: 12,24; } +way[boundary] { color: #000066; width: 2; opacity: 0.6; dashes: 24,4, 4, 4; z-index: 4;} +/* Perhaps should be filled, on lower zooms. */ +way[boundary=national_park] { color: #225500; width: 2; opacity: 0.6; dashes: 24,4, 4, 4; z-index: 4;} +way[boundary=protected_area] { color: #447744; width: 2; opacity: 0.6; dashes: 12,4, 4, 4; z-index: 4;} +way[boundary=administrative] { color: purple; width: 2; opacity: 0.2; dashes: 24,4; z-index: 4;} +way[boundary=administrative][waterway] { opacity: 0.8; z-index: 4; dashes: 24,4; width: 6; } way[landuse=cemetery] { color: #664466; width: 2; fill-color: color: #664466; opacity: 0.2; set .area_small_name;} /* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */ @@ -235,11 +240,14 @@ 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[embankment=yes], way[cutting=yes] + { z-index: 3; opacity: 0.5; color: grey; width: eval('_width+5'); dashes: 2, 2; } + /* Oneway */ -way[oneway=yes] { z-index: 15; color: #444444; width: 2; dashes: 15,35; line-style: arrows; } +way[oneway=yes], way[junction=roundabout] { z-index: 15; color: #444444; width: 2; dashes: 15,35; line-style: arrows; } -way[access=private],way[access=no] { z-index: 10; color: red; width: eval('_width+8'); dashes: 2,15;} -way[access=permissive] { z-index: 10; color: green; width: eval('_width+6'); dashes: 1,7;} +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 .area_small_name {text-color: black; font-size: 9; text: name; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;} /* Change the road colour based on dynamically set "highlighted" tag (see earlier) */ @@ -254,9 +262,7 @@ way :selected { z-index: 2; width: eval('_width+10'); color: yellow; opacity: 0. 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 !:drawn !:hasTags{ z-index:10; width: 0.5; color: red; }*/ -way !:drawn { z-index:9; width: 2; color: black; dashes: 4,0;} { z-index:10; width: 2; color: #ffff00; dashes: 0, 4, 4, 0;} - /*IMHO (Steve Bennett), in early testing we want to highlight ways that aren't triggering rules */ -/* way !:drawn { z-index:10; width: 0.5; color: gray; } was like this */ +way !:drawn { z-index:10; width: 1; color: #333333; } way :tiger { casing-color: #ff00ff;}