Changeset 5215 in josm


Ignore:
Timestamp:
2012-05-06T12:46:32+02:00 (7 years ago)
Author:
bastiK
Message:

update Potlatch 2 style from upstream. (Fixes casing-width)

Location:
trunk
Files:
73 added
97 edited

Legend:

Unmodified
Added
Removed
  • trunk/styles/standard/potlatch2.mapcss

    r4771 r5215  
    4848}
    4949
    50 
    5150/****************
    5251 * core_ways.css
     
    6059way[highway=secondary],way[highway=secondary_link],
    6160way[highway=tertiary],way[highway=tertiary_link],
    62 way[highway=residential],way[highway=unclassified]  { z-index: 5; text: auto; text-color: black; font-size: 10; text-position: line; text-halo-color: white; text-halo-radius: 2; }
    63 way[highway=motorway],way[highway=motorway_link]    { z-index: 9; color: #809BC0; width: 7; casing-color: black; casing-width: 8; }
    64 way[highway=trunk],way[highway=trunk_link]          { z-index: 9; color: #7FC97F; width: 7; casing-color: black; casing-width: 8; }
    65 way[highway=primary],way[highway=primary_link]      { z-index: 8; color: #E46D71; width: 7; casing-color: black; casing-width: 8; }
    66 way[highway=secondary],way[highway=secondary_link]  { z-index: 7; color: #FDBF6F; width: 7; casing-width: 8; }
    67 way[highway=tertiary]                               { z-index: 6; color: #FEFECB; width: 5; casing-width: 7; }
    68 way[highway=unclassified]                           { z-index: 6; color: #D0D0D0; width: 5; casing-width: 7; }
    69 way[highway=tertiary_link]                          { z-index: 5; color: #FEFECB; width: 4; casing-width: 5; }
    70 way[highway=residential]                            { z-index: 5; color: #E8E8E8; width: 5; casing-color: gray; casing-width: 7; }
    71 way[highway=service][service!=parking_aisle]        { z-index: 5; color: white; width: 3; casing-color: gray; casing-width: 5; }
    72 way[highway=service][service=parking_aisle]         { z-index: 5; color: white; width: 1; casing-color: #aaaaaa; casing-width: 2; }
    73 way[highway=service][service=alley]                 { z-index: 5; color: white; width: 2; dashes: 6,2; casing-color: black; casing-width: 4; }
    74 way[highway=road]                                   { z-index: 5; color: gray; width: 5; casing-color: white; casing-width: 7; }
    75 way[highway=living_street]                          { z-index: 5; color: #ddffee; width: 3; casing-color: #555555; casing-width: 4; }
     61way[highway=residential],way[highway=unclassified]  { z-index: 5; text: auto; text-color: black; font-size: 12; text-position: line; text-offset: 10; text-halo-color: white; text-halo-radius: 2; linecap: round; casing-linecap: round }
     62way[highway=motorway],way[highway=motorway_link]    { z-index: 9; color: #809BC0; width: 7; casing-color: #1e375a; casing-width: 1; }
     63way[highway=trunk],way[highway=trunk_link]          { z-index: 9; color: #7FC97F; width: 7; casing-color: #245424; casing-width: 1; }
     64way[highway=primary],way[highway=primary_link]      { z-index: 8; color: #E46D71; width: 7; casing-color: #651316; casing-width: 1; }
     65way[highway=secondary],way[highway=secondary_link]  { z-index: 7; color: #FDBF6F; width: 7; casing-color: #b16603; casing-width: 1; }
     66way[highway=tertiary],way[highway=tertiary_link]    { z-index: 6; color: #FEFECB; width: 5; casing-color: #626202; casing-width: 1; }
     67way[highway=unclassified]                           { z-index: 6; color: #D0D0D0; width: 5; casing-width: 1; }
     68way[highway=residential]                            { z-index: 5; color: #E8E8E8; width: 5; casing-color: gray; casing-width: 1; }
     69way[highway=service][service!=parking_aisle]        { z-index: 5; color: white; width: 3; casing-color: gray; casing-width: 1; }
     70way[highway=service][service=parking_aisle]         { z-index: 5; color: white; width: 1; casing-color: #aaaaaa; casing-width: 1; }
     71way[highway=service][service=alley]                 { z-index: 5; color: white; width: 2; dashes: 6,2; casing-color: black; casing-width: 1; }
     72way[highway=road]                                   { z-index: 5; color: gray; width: 5; casing-color: white; casing-width: 1; }
     73way[highway=living_street]                          { z-index: 5; color: #ddffee; width: 3; casing-color: #555555; casing-width: 1; }
    7674
    7775/* Road areas */
    7876
    79 way[highway=pedestrian]!:closed { z-index: 5; color: #ddddee; width: 5; casing-color: #555555; casing-width: 6; casing-dashes: 2,4;}
    80 way[highway=pedestrian]:closed  { color: #555555; width: 1; fill-color: #ddddee; fill-opacity: 0.8; } /* FIXME: dashed outline */
     77way[highway=pedestrian]!:closed { z-index: 5; color: #ddddee; width: 5; casing-color: #555555; casing-width: 1; casing-dashes: 2,4;}
     78area[highway=pedestrian]:closed  { color: #555555; width: 1; fill-color: #ddddee; fill-opacity: 0.8; } /* FIXME: dashed outline */
    8179
    8280/* Paths */
     
    8482way[highway=steps]     { z-index: 5; color: #FF6644; width: 6; dashes: 2, 2; }
    8583way[highway=footway]   { z-index: 5; color: #FF6644; width: 2; dashes: 6, 3; prop_path : 1;}
    86 way[highway=footway][bicycle=yes]   { z-index: 4; color: blue; width: 1; }
     84way[highway=footway][bicycle=yes]::bike   { z-index: 4; color: blue; width: 1; }
    8785way[highway=bridleway] { z-index:9; color: #996644; width: 2; dashes: 4, 2, 2, 2; prop_path : 1;}
    8886way[highway=track]     { z-index: 5; color: #996644; width: 2; dashes: 4, 2; prop_path : 1;}
    8987way[highway=path]      { z-index: 5; color: brown; width: 2; dashes: 2, 2; prop_path : 1;}
    9088way[highway=cycleway]  { z-index: 5; color: blue; width: 2; dashes: 4, 2; prop_path : 1;}
    91 way[railway=tram]      { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 6; }
    92 way[is_prop_set("prop_path")]              { text:auto; text-color: black; text-position: line; text-offset: 5;}
     89way[is_prop_set("prop_path")]  { z-index: 5; text: auto; text-color: black; text-position: line; text-offset: 7; font-size: 12; }
    9390
    9491/* Under construction */
    9592
    9693way[highway=proposed] { z-index: 5; color: #88ffff; width: 6; dashes: 8, 4; }
    97 way[highway=construction] { z-index: 5; color: #ffffbb; width: 6; dashes: 8, 4; casing-color: #0000aa; casing-width: 8; casing-dashes: 8,4;}
    98 way[construction=rail]
    99         { z-index: 6; color: black; width: 5; dashes: 6, 6, 4, 8;}
    100 way[construction=rail]::rail_over
    101         { z-index: 7; color: white; width: 3; dashes: 6,18; }
     94way[highway=construction] { z-index: 5; color: #ffffbb; width: 6; dashes: 8, 4; casing-color: #0000aa; casing-width: 1; casing-dashes: 8,4;}
    10295
    10396/* Railways */
    10497
    105 way[railway=rail]
    106         { z-index: 6; color: black; width: 5; dashes: 0; }
    107 way[railway=rail]::rail_over
    108         { z-index: 7; color: white; width: 3; dashes: 12,12; }
    109 way[railway=platform] { color:black; width: 2; }
    110 way[railway=subway]
    111     { z-index: 6; color: #444444; width: 5; }
    112 way[railway=subway]::railway_over
    113     { z-index: 7; color: white; width: 3; dashes: 8,8; }
    114 way[railway=disused],way[railway=abandoned]
    115     { z-index: 6; color: #444400; width: 3; dashes: 17, 2, 5, 0; }
    116 way[railway=disused]::railway_over, way[railway=abandoned]::railway_over
    117     { z-index: 7; color: #999999; width: 2; dashes: 12,12; }
    118 
    119 /* Waterways */
    120 
    121 way[waterway=river],
    122 way[waterway=canal],
    123 way[waterway=stream]   { z-index: 5; color: blue; width: 2; text:auto; text-color:blue; font-size:9; text-position: line; text-offset: 7;}
    124 way[waterway=drain]                      {z-index: 5; color: blue; width: 1; text:auto; text-color: blue; text-position: line; text-offset: 3;}
     98way[railway=rail] { z-index: 6; color: black; width: 5; linecap: round; dashes: 0; }
     99way[railway=rail]::dashes { z-index: 7; color: white; width: 3; dashes: 12,12; linecap: round; }
     100
     101way[construction=rail] { z-index: 6; color: black; width: 5; dashes: 6, 6, 4, 8;}
     102way[construction=rail]::inner { z-index: 7; color: white; width: 3; dashes: 6,18; }
     103
     104way[railway=platform] { z-index: 5; color:black; width: 2; }
     105
     106way[railway=subway] { z-index: 6; color: #444444; width: 5; }
     107way[railway=subway]::dashes  { z-index: 7; color: white; width: 3; dashes: 8,8; }
     108
     109way[construction=subway] { z-index: 6; color: #444444; width: 5; dashes: 4, 4; }
     110way[construction=subway]::dashes  { z-index: 7; color: white; width: 3; dashes: 4,12;}
     111
     112way[railway=disused],way[railway=abandoned] { z-index: 6; color: #444400; width: 3; dashes: 17, 2, 5, 0; }
     113way[railway=disused]::dashes,way[railway=abandoned]::dashes { z-index: 7; color: #999999; width: 2; dashes: 12,12; }
     114
     115way[railway=tram]      { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; }
     116way[construction=tram] { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; dashes: 6, 6; casing-dashes: 6, 6; }
     117
     118way[railway=light_rail] { z-index: 6; color: black; width: 4; }
     119way[railway=light_rail]::dashes { z-index: 7; color: #999999; width: 2; dashes: 8,4; }
     120
     121way[construction=light_rail] { z-index: 6; color: black; width: 4; dashes: 8, 4, 4, 4; }
     122way[construction=light_rail]::dashes { z-index: 7; color: #999999; width: 2; dashes: 8,12; }
     123
     124/* Waterways */
     125
     126way[waterway=river],
     127way[waterway=canal],
     128way[waterway=stream]   { z-index: 5; color: #3434ff; width: 2; text:auto; text-color: #3434ff; font-size:9; text-position: line; text-offset: 7;}
     129way[waterway=drain]                      {z-index: 5; color: #3434ff; width: 1; text:auto; text-color: #3434ff; text-position: line; text-offset: 3;}
    125130way[waterway][tunnel=yes]                {z-index: 5; dashes: 8,4;}
    126131
    127132/* Aeroways */
    128133
    129 way[aeroway=aerodrome]:closed
    130     { z-index: 3; color: #bb44bb; width: 3; casing-color: #66066;  casing-width: 4;  }
    131 way|z-15[aeroway=aerodrome]:closed
     134area[aeroway=aerodrome]:closed
     135    { z-index: 3; color: #bb44bb; width: 3; casing-color: #66066;  casing-width: 1;  }
     136area|z-15[aeroway=aerodrome]:closed
    132137    { z-index: 3; fill-color: #bb99bb;  fill-opacity: 0.5;}
    133 way[aeroway=taxiway]!:closed { z-index: 8; color: #999999; width: 3; casing-color: #aa66aa; casing-width: 6; }
    134 way[aeroway=taxiway]:closed { z-index: 8; color: #bb99bb; width: 3; fill-color: #ccaacc; }
    135 way|z17-[aeroway=runway]!:closed
    136     { z-index: 9; color: black; width: 11; casing-color: #aa66aa; casing-width: 12; }
    137 way|z17-[aeroway=runway]!:closed::aeroway2
    138     { z-index: 10; color: white; width: 9;  dashes: 0, 20, 4, 76; }
    139 way|z17-[aeroway=runway]!:closed::aeroway3
    140     { z-index: 11; color: black; width: 7; }
    141 way|z17-[aeroway=runway]!:closed::aeroway4
    142     { z-index: 12; color: white; width: 5;  dashes: 0, 20, 4, 76; }
    143 way|z17-[aeroway=runway]!:closed::aeroway5
    144     { z-index: 13; color: black; width: 3; }
    145 way|z17-[aeroway=runway]!:closed::aeroway6
    146     { z-index: 14; color: white; width: 1;  dashes: 4, 16; }
    147 
    148 way|z15-16[aeroway=runway]!:closed
    149     { z-index: 9; color: black; width: 5;  }
    150 way|z15-16[aeroway=runway]!:closed::aeroway2
    151     { z-index: 12; color: white; width: 5;  dashes: 0, 20, 4, 76; }
    152 way|z15-16[aeroway=runway]!:closed::aeroway3
    153     { z-index: 13; color: black; width: 3; }
    154 way|z15-16[aeroway=runway]!:closed::aeroway4
    155     { z-index: 14; color: white; width: 1;  dashes: 4, 16; }
    156    
    157 way|z-14[aeroway=runway]!:closed
    158     { z-index: 9; color: #444444; width: 3;  }
    159 way[aeroway=runway]:closed { z-index: 9; color: black; width: 3; fill-color: #775577; }
    160 way[aeroway=apron]:closed { z-index: 4; color: #cc66cc; width: 1; fill-color: #ddaadd; fill-opacity: 0.5;}
     138way[aeroway=taxiway]!:closed { z-index: 8; color: #999999; width: 3; casing-color: #aa66aa; casing-width: 2; }
     139area[aeroway=taxiway]:closed { z-index: 8; color: #bb99bb; width: 3; fill-color: #ccaacc; }
     140
     141way|z17-[aeroway=runway]!:closed { z-index: 9; color: black; width: 11; casing-color: #aa66aa; casing-width: 1; }
     142way|z17-[aeroway=runway]!:closed::aa { z-index: 10; color: white; width: 9;  dashes: 0, 20, 4, 76; }
     143way|z17-[aeroway=runway]!:closed::bb { z-index: 11; color: black; width: 7; }
     144way|z17-[aeroway=runway]!:closed::cc { z-index: 12; color: white; width: 5;  dashes: 0, 20, 4, 76; }
     145way|z17-[aeroway=runway]!:closed::dd { z-index: 13; color: black; width: 3; }
     146way|z17-[aeroway=runway]!:closed::ee { z-index: 14; color: white; width: 1;  dashes: 4, 16; }
     147
     148way|z15-16[aeroway=runway]!:closed { z-index: 9; color: black; width: 5;  }
     149way|z15-16[aeroway=runway]!:closed::aa { z-index: 12; color: white; width: 5;  dashes: 0, 20, 4, 76; }
     150way|z15-16[aeroway=runway]!:closed::bb { z-index: 13; color: black; width: 3; }
     151way|z15-16[aeroway=runway]!:closed::cc { z-index: 14; color: white; width: 1;  dashes: 4, 16; }
     152
     153way|z-14[aeroway=runway]!:closed { z-index: 9; color: #444444; width: 3;  }
     154
     155area[aeroway=runway]:closed { z-index: 9; color: black; width: 3; fill-color: #775577; }
     156area[aeroway=apron]:closed { z-index: 4; color: #cc66cc; width: 1; fill-color: #ddaadd; fill-opacity: 0.5;}
    161157
    162158/* Barriers */
     
    167163/* Power */
    168164
    169 way[power=line] {z-index: 5; color: darkgray; width: 3; dashes: 12,2; casing-color: black; casing-width: 8; casing-dashes: 4, 38;}
    170 way[power=minor_line] {z-index: 5; color: gray; width: 2; dashes: 2,4; casing-width: 8; casing-color: white; casing-dashes: 2,22;}
    171 way[power=station]:closed { z-index: 5; color: black; width: 2; fill-color: #666666; fill-opacity: 0.6; prop_area_small_name : 1;}
    172 way[power=generator]:closed { z-index: 5; color: black; width: 2; fill-color: #444444; fill-opacity: 0.6; prop_area_small_name : 1;}
     165way[power=line] {z-index: 5; color: darkgray; width: 3; dashes: 12,2; casing-color: black; casing-width: 2; casing-dashes: 4, 38;}
     166way[power=minor_line] {z-index: 5; color: gray; width: 2; dashes: 2,4; casing-width: 3; casing-color: white; casing-dashes: 2,22;}
     167area[power=station]:closed { color: black; width: 2; fill-color: #666666; fill-opacity: 0.6; prop_area_small_name : 1;}
     168area[power=generator]:closed { color: black; width: 2; fill-color: #444444; fill-opacity: 0.6; prop_area_small_name : 1;}
    173169
    174170/* Leisure */
    175171
    176 way[golf=hole] {z-index: 5; color: darkgreen; width: 5; casing-color: green; casing-width: 10; }
    177 way[leisure=sports_centre]:closed { color: #66ddcc; fill-color: #66ddcc; prop_area_small_name : 1; }
     172way[golf=hole] {z-index: 5; color: darkgreen; width: 5; casing-color: green; casing-width: 2; }
     173area[leisure=sports_centre]:closed { color: #66ddcc; fill-color: #66ddcc; prop_area_small_name : 1; }
    178174
    179175
    180176/* Physical decoration */
    181177
    182 way[bridge=yes]::bridge1, way[bridge=viaduct]::bridge1, way[bridge=suspension]::bridge1
    183     { z-index: 4; color: white; width: +3; }
    184 way[bridge=yes]::bridge2, way[bridge=viaduct]::bridge2, way[bridge=suspension]::bridge2
    185     { z-index: 3; color: black; width: +6; }
    186 way[tunnel=yes][!waterway]::tunnel1
    187     { z-index: 4; color: white; width: +2; }
    188 way[tunnel=yes][!waterway]::tunnel2
    189     { z-index: 3; color: black; width: +6; dashes: 4,4; }
     178way[bridge=yes]::bridge1, way[bridge=viaduct]::bridge1, way[bridge=suspension]::bridge1 { z-index: 4; color: white; width: +3; }
     179way[bridge=yes]::bridge2, way[bridge=viaduct]::bridge2, way[bridge=suspension]::bridge2 { z-index: 3; color: #444444; width: +6; }
     180way[tunnel=yes][!waterway]::bridge1 { z-index: 4; color: white; width: +2; }
     181way[tunnel=yes][!waterway]::bridge2 { z-index: 3; color: black; width: +6; dashes: 4,4; }
    190182
    191183/* Attribute decoration */
    192184
    193 /*way[oneway=yes], way[junction=roundabout] { z-index: 15; color: #444444; width: 2; dashes: 15,35; line-style: arrows; }*/
    194 /*way[oneway="-1"] { z-index: 15; color: #444444; width: 2; dashes: 15,35; line-style: arrows-reversed; }*/
     185/*way[oneway=yes]::arrows, way[junction=roundabout]::arrows { z-index: 15; color: #555555; width: 2; dashes: 10,50; line-style: arrows; }
     186way[oneway=-1]::arrows { z-index: 15; color: #555555; width: 2; dashes: 10,50; line-style: arrows-reversed; }*/
    195187
    196188/****************
    197189 * core_pois.css
    198190 ****************/
     191
    199192node { text-anchor-horizontal: center; text-anchor-vertical: below; }
    200193
    201 node[place] { icon-image: icons/place.png; font-family: DejaVu; text: auto; font-size: 9; font-weight: bold; text-decoration: underline; z-index: 20; }
     194node[place] { icon-image: icons/place.png; font-family: DejaVu; text: auto; font-size: 10; font-weight: bold; z-index: 20; }
    202195node[amenity=telephone] { icon-image: icons/telephone.png; z-index: 20; }
    203196node[barrier=cattle_grid] { icon-image: icons/cattle_grid.png; z-index: 20; }
     
    206199node[tourism=camp_site] { icon-image: icons/accommodation_camping.n.16.png; z-index: 20; }
    207200node[tourism=caravan_site] { icon-image: icons/accommodation_caravan_park.n.16.png; z-index: 20; }
     201node[tourism=chalet] { icon-image: icons/accommodation_chalet.n.16.png; z-index: 20; }
    208202node[tourism=guest_house],node[tourism=bed_and_breakfast] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; }
    209 node[tourism=hotel] { icon-image: icons/accommodation_hotel.n.16.png; text-offset:0; text: auto; z-index: 20; }
     203node[tourism=hotel] { icon-image: icons/accommodation_hotel.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
    210204node[tourism=hostel] { icon-image: icons/accommodation_youth_hostel.n.16.png; z-index: 20; }
     205node[tourism=motel] { icon-image: icons/accommodation_motel.n.16.png; z-index: 20; }
    211206node[amenity=fire_station] { icon-image: icons/amenity_firestation2.n.16.png; z-index: 20; }
    212207node[amenity=police] { icon-image: icons/amenity_police2.n.16.png; z-index: 20; }
     
    222217node[barrier=block] { icon-image: icons/barrier_blocks.16.png; z-index: 20; }
    223218node[barrier=cattle_grid] { icon-image: icons/barrier_cattle_grid.16.png; z-index: 20; }
    224 node[amenity=school] { icon-image: icons/education_school.n.16.png; text-offset:0; text: auto; z-index: 20; }
    225 way[amenity=school]:closed { color: yellow; fill-color: yellow; fill-opacity: 0.1; prop_area_small_name : 1; }
    226 node[amenity=bar] { icon-image: icons/food_bar.n.16.png; text-offset:0; text: auto; z-index: 20; }
    227 node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:0; text: auto; z-index: 20; }
     219node[amenity=school] { icon-image: icons/education_school.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
     220aera[amenity=school]:closed { color: yellow; fill-color: yellow; fill-opacity: 0.1; prop_area_small_name : 1; }
     221node[amenity=bar] { icon-image: icons/food_bar.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
     222node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
    228223node[amenity=fast_food] { icon-image: icons/food_fastfood.n.16.png; z-index: 20; }
    229 node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset:0; text: name; z-index: 20; }
    230 node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:0; text: auto; z-index: 20; }
     224node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset: 15; text: auto; font-size: 10; z-index: 20; }
     225node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
    231226node[amenity=hospital] { icon-image: icons/health_hospital.n.16.png; z-index: 20; }
    232227node[amenity=pharmacy] { icon-image: icons/health_pharmacy.n.16.png; z-index: 20; }
    233228node[amenity=atm] { icon-image: icons/money_atm.n.16.png; z-index: 20; }
    234229node[amenity=bank] { icon-image: icons/money_bank2.n.16.png; z-index: 20; }
     230/* More Amenities */
     231node[amenity=bench] { icon-image: icons/amenity_bench.n.16.png; z-index: 20; }
     232node[amenity=drinking_water] { icon-image: icons/food_drinkingtap.n.16.png; z-index: 20; }
     233node[amenity=emergency_phone] { icon-image: icons/emergency-telephone-16.png; z-index: 20; }
     234node[amenity=fountain] { icon-image: icons/amenity_fountain2.n.16.png; z-index: 20; }
     235node[amenity=hunting_stand] { icon-image: icons/sport_shooting.n.16.png; z-index: 20; }
     236node[amenity=kindergarten] { icon-image: icons/education_nursery3.n.16.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; }
     237node[amenity=place_of_worship]  { icon-image: icons/place_of_worship_unknown.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
     238node[amenity=post_office] { icon-image: icons/amenity_post_office.n.16.png; z-index: 20; }
     239node[amenity=shelter] { icon-image: icons/accommodation_shelter2.n.16.png; z-index: 20; }
     240node[amenity=swimming_pool] { icon-image: icons/sport_swimming_outdoor.n.16.png; z-index: 20; }
     241node[amenity=townhall] { icon-image: icons/amenity_town_hall.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
     242node[amenity=toilets] { icon-image: icons/amenity_toilets.n.16.png; z-index: 20; }
     243node[amenity=vending_machine] { icon-image: icons/shopping_vending_machine.n.16.png; z-index: 20; }
     244node[amenity=veterinary] { icon-image: icons/health_veterinary.n.8E7409.16.png; z-index: 20; }
     245node[amenity=waste_basket] { icon-image: icons/amenity_waste_bin.n.16.png; z-index: 20; }
     246/* Shops */
    235247node[shop=alcohol] { icon-image: icons/shopping_alcohol.n.16.png; z-index: 20; }
    236248node[shop=bakery] { icon-image: icons/shopping_bakery.n.16.png; z-index: 20; }
    237249node[shop=bicycle] { icon-image: icons/shopping_bicycle.n.16.png; z-index: 20; }
    238 node[shop=book] { icon-image: icons/shopping_book.n.16.png; z-index: 20; }
     250node[shop=book], node[shop=books] { icon-image: icons/shopping_book.n.16.png; z-index: 20; }
    239251node[shop=butcher] { icon-image: icons/shopping_butcher.n.16.png; z-index: 20; }
    240252node[shop=car_repair] { icon-image: icons/shopping_car_repair.n.16.png; z-index: 20; }
     
    245257node[shop=doityourself] { icon-image: icons/shopping_diy.n.16.png; z-index: 20; }
    246258node[shop=fishmonger] { icon-image: icons/shopping_fish.n.16.png; z-index: 20; }
     259node[shop=florist] { icon-image: icons/shopping_florist.n.16.png; z-index: 20; }
    247260node[shop=garden_centre] { icon-image: icons/shopping_garden_centre.n.16.png; z-index: 20; }
    248261node[shop=gift] { icon-image: icons/shopping_gift.n.16.png; z-index: 20; }
     
    251264node[shop=hifi] { icon-image: icons/shopping_hifi.n.16.png; z-index: 20; }
    252265node[shop=jewelry] { icon-image: icons/shopping_jewelry.n.16.png; z-index: 20; }
     266node[shop=kiosk] { icon-image: icons/shopping_kiosk.n.16.png; z-index: 20; }
    253267node[shop=laundry] { icon-image: icons/shopping_laundrette.n.16.png; z-index: 20; }
     268node[amenity=marketplace] { icon-image: icons/shopping_marketplace.n.16.png; z-index: 20; }
    254269node[shop=motorcycle] { icon-image: icons/shopping_motorcycle.n.16.png; z-index: 20; }
    255270node[shop=music] { icon-image: icons/shopping_music.n.16.png; z-index: 20; }
    256271node[shop=supermarket] { icon-image: icons/shopping_supermarket.n.16.png; z-index: 20; }
     272node[shop=toys] { icon-image: icons/shopping_toys.n.16.png; z-index: 20; }
     273/* More Touristy Items */
     274node[tourism=artwork] { icon-image: icons/tourist_art_gallery2.n.16.png; z-index: 20; }
    257275node[historic=archaeological_site] { icon-image: icons/tourist_archaeological.n.16.png; z-index: 20; }
    258276node[historic=battlefield] { icon-image: icons/tourist_battlefield.n.16.png; z-index: 20; }
    259 node[historic=castle] { icon-image: icons/tourist_castle.n.16.png; text-offset:0; text: auto; z-index: 20; }
     277node[historic=castle] { icon-image: icons/tourist_castle.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
    260278node[amenity=cinema] { icon-image: icons/tourist_cinema.n.16.png; z-index: 20; }
    261 node[historic=memorial] { icon-image: icons/tourist_memorial.n.16.png; text-offset:0; text: auto; z-index: 20; }
    262 node[historic=monument] { icon-image: icons/tourist_monument.n.16.png; text-offset:0; text: auto; z-index: 20; }
    263 node[tourism=museum] { icon-image: icons/tourist_museum.n.16.png; text-offset:0; text: auto; z-index: 20; }
     279node[historic=memorial] { icon-image: icons/tourist_memorial.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
     280node[historic=monument] { icon-image: icons/tourist_monument.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
     281node[tourism=museum] { icon-image: icons/tourist_museum.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
     282node[tourism=information] { icon-image: icons/tourist_information.png; z-index: 20; }
    264283node[tourism=picnic_site] { icon-image: icons/tourist_picnic.n.16.png; z-index: 20; }
    265 node[historic=ruin] { icon-image: icons/tourist_ruin.n.16.png; z-index: 20; }
     284node[historic=ruins] { icon-image: icons/tourist_ruin.n.16.png; z-index: 20; }
    266285node[amenity=theatre] { icon-image: icons/tourist_theatre.n.16.png; z-index: 20; }
     286node[tourism=theme_park] { icon-image: icons/tourist_theme_park.n.16.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; }
    267287node[tourism=viewpoint] { icon-image: icons/tourist_view_point.n.16.png; z-index: 20; }
    268288node[tourism=zoo] { icon-image: icons/tourist_zoo.n.16.png; z-index: 20; }
     289/* Transport */
    269290node[aeroway=aerodrome] { icon-image: icons/transport_aerodrome.n.16.png; z-index: 20; }
     291node[aeroway=gate] { icon-image: icons/transport_airport_gate.n.16.png; z-index: 20; }
     292node[aeroway=terminal] { icon-image: icons/transport_airport_terminal.n.16.png; z-index: 20; }
     293node[aeroway=helipad] { icon-image: icons/transport_helicopter_pad.n.16.png; z-index: 20; }
    270294node[amenity=bus_station] { icon-image: icons/transport_bus_station.n.16.png; z-index: 20; }
    271295node[highway=bus_stop] { icon-image: icons/transport_bus_stop2.n.16.png; z-index: 20; }
    272296node[amenity=fuel] { icon-image: icons/transport_fuel.n.16.png; z-index: 20; }
    273 node[amenity=bicycle_parking] { icon-image: icons/transport_parking_bicycle.n.16.png; text-offset: 0; text: capacity; z-index: 20; }
     297node[amenity=car_wash] { icon-image: icons/transport_car_wash.n.16.png; z-index: 20; }
     298node[amenity=bicycle_parking] { icon-image: icons/transport_parking_bicycle.n.16.png; text-offset:0; text: capacity; font-size: 10; z-index: 20; }
    274299node[amenity=parking] { icon-image: icons/transport_parking_car.n.16.png; z-index: 20; }
    275300node[amenity=ferry_terminal] { icon-image: icons/transport_port.n.16.png; z-index: 20; }
     
    277302node[amenity=car_rental] { icon-image: icons/transport_rental_car.n.16.png; z-index: 20; }
    278303node[amenity=taxi] { icon-image: icons/transport_taxi_rank.n.16.png; z-index: 20; }
    279 node[railway=station] { icon-image: icons/transport_train_station.n.16.png; text-offset:0; text: auto; z-index: 20; }
     304node[railway=station] { icon-image: icons/transport_train_station.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
    280305node[railway=tram_stop] { icon-image: icons/transport_tram_stop.n.16.png; z-index: 20; }
    281306node[leisure=marina] { icon-image: icons/transport_marina.n.16.png; z-index: 20; }
     307node[highway=mini_roundabout] { icon-image: icons/transport_miniroundabout_anticlockwise.n.16.png; z-index: 20; }
     308node[highway=crossing] { icon-image: icons/transport_zebracrossing.n.16.png; z-index: 20; }
     309/* Misc */
     310node[leisure=playground] { icon-image: icons/amenity_playground.n.16.png; z-index: 20; }
     311node[leisure=sports_centre] { icon-image: icons/sport_leisure_centre.n.16.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; }
     312/* node[landuse=cemetery], node[landuse=grave_yard] { icon-image: icons/?.png; z-index: 20; } */
     313node[man_made=survey_point] { icon-image: icons/manmade_lighthouse.png; z-index: 20; }
     314node[man_made=tower] { icon-image: icons/manmade_tower.png; z-index: 20; }
     315/* Yes these power stations seem a little backward - but that's seemingly what the side menu uses ATM */
     316node[power=station] { icon-image: icons/power_substation.n.16.png; z-index: 20; }
     317node[power=generator] { icon-image: icons/power_station.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; }
     318node[power=tower] { icon-image: icons/power_tower_high2.n.16.png; z-index: 20; }
     319node[power=pole] { icon-image: icons/power_tower_low.n.16.png; z-index: 20; }
     320node[waterway=weir] { icon-image: icons/transport_weir.n.16.png; z-index: 20; }
    282321
    283322/* Addressing */
     
    287326node[addr:housenumber]::hn_casing,
    288327node[addr:housename]::hn_casing { z-index: -100; symbol-shape: circle; symbol-size: 10; symbol-fill-color: blue; }
     328
    289329way[addr:interpolation] { z-index: 5; color: #B0E0E6; width: 3; dashes: 3,3;}
    290 
    291330/****************
    292331 * core_landuse.css
     
    307346area[leisure]:closed                         { color: #8CD6B5; width: 1; fill-color: #8CD6B5; fill-opacity: 0.2; }
    308347area[tourism]:closed                          { color: #F7CECE; width: 1; fill-color: #F7CECE; fill-opacity: 0.2; prop_area_small_name : 1;}
    309 area[historic]:closed, area[ruins]:closed              { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; prop_area_small_name : 1;}
     348area[historic]:closed, area[ruins]:closed        { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; prop_area_small_name : 1;}
    310349area[military]:closed                         { color: #D6D6D6; width: 1; fill-color: #D6D6D6; fill-opacity: 0.2; prop_area_small_name : 1;}
    311 area[building]:closed                         { color: #ff6ec7; width: 1; fill-color: #ff6ec7; fill-opacity: 0.2; }
     350area[building]:closed                         { color: #bca9a9; width: 1; fill-color: #ff6ec7; fill-opacity: 0.2; }
    312351area[natural=water]:closed,
    313 area[waterway][waterway!=dam]:closed          { color: blue;    width: 2; fill-color: blue;    fill-opacity: 0.2; prop_area_small_name : 1;}
     352area[waterway][waterway!=dam]:closed          { color: #3434ff;    width: 2; fill-color: #3434ff;    fill-opacity: 0.2; prop_area_small_name : 1;}
    314353way[waterway=dam]                                                       { z-index: 5; color: black; width: 1; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1;}
    315354area[man_made]:closed                                                   { color: black; width: 2; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1; }
    316 area[man_made=reservoir_covered]:closed       { color: blue; width: 2; dashes: 4, 2; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1; }
    317 area[landuse=reservoir]:closed                { color: blue;    width: 2; fill-color: blue;    fill-opacity: 0.2; prop_area_small_name : 1;}
    318 area[landuse=forest]:closed,area[natural=wood]:closed { color: green;   width: 2; fill-color: green;   fill-opacity: 0.2; prop_area_small_name : 1;}
     355area[man_made=reservoir_covered]:closed       { color: #3434ff; width: 2; dashes: 4, 2; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1; }
     356area[landuse=reservoir]:closed                { color: #3434ff;    width: 2; fill-color: #3434ff;    fill-opacity: 0.2; prop_area_small_name : 1;}
     357area[landuse=forest]:closed, area[natural=wood]:closed { color: green;   width: 2; fill-color: green;   fill-opacity: 0.2; prop_area_small_name : 1;}
    319358area[leisure=park]:closed                    { color: #22aa22; width: 2; fill-color: #44ff44; fill-opacity: 0.15; prop_area_small_name : 1;}
    320359area[leisure=garden]:closed                  { color: #66ff44; width: 1; fill-color: #66ff44; fill-opacity: 0.2; prop_area_small_name : 1;}
     
    323362area[amenity=parking]:closed                  { color: #bbaa66;    width: 1; fill-color: #bbaa66;    fill-opacity: 0.2; }
    324363area[public_transport=pay_scale_area]:closed  { color: gray;    width: 1; fill-color: gray;    fill-opacity: 0.1; }
    325 way[man_made=pier]                                                      { z-index: 4; color: #777; width: 3; casing-color: black; casing-width: 5;}
     364way[man_made=pier]                                                      { z-index: 4; color: #777; width: 3; casing-color: black; casing-width: 1;}
    326365way[man_made=pier][floating=yes]                        { z-index: 5; dashes: 4,2; casing-color: #444;}
    327366area[leisure=marina]:closed                                     { color: pink; fill-color: pink; fill-opacity: 0.4; prop_area_small_name : 1;}
    328 way[leisure=slipway]                                            { z-index: 5; color: grey; width: 3; casing-color: blue; casing-width: 7; }
     367way[leisure=slipway]                                            { z-index: 5; color: grey; width: 3; casing-color: #3434ff; casing-width: 2; }
    329368area[leisure=golf_course]:closed { color: #44ee22; width: 2; fill-color: #44ee22; fill-opacity: 0.2; prop_area_small_name : 1;}
    330369way[boundary]                               { z-index: 5; color: #000066; width: 2; opacity: 0.6; dashes: 24,4, 4, 4; z-index: 4;}
     
    334373way[boundary=administrative]                { z-index: 5; color: purple; width: 2; opacity: 0.2; dashes: 24,4; z-index: 4;}
    335374way[boundary=administrative][waterway]      { z-index: 5; opacity: 0.8; z-index: 4; dashes: 24,4; width: 6; }
    336 way[landuse=cemetery]                                           { z-index: 5; color: #664466; width: 2; fill-color: #664466; opacity: 0.2; prop_area_small_name : 1;}
     375area[landuse=cemetery]:closed                                           { color: #664466; width: 2; fill-color: color: #664466; opacity: 0.2; prop_area_small_name : 1;}
    337376/* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */
    338377/* Route relations */
    339378
    340 relation[type=route] > way::relation_underlay { z-index: -1; width: 13; color: blue; opacity: 0.3; linecap: none; }
    341 relation[type=route][route=bicycle][network=ncn] > way::relation_underlay { z-index: -1; width: 12; color: red; opacity: 0.3; linecap: none; }
    342 relation[type=route][route=bicycle][network=rcn] > way::relation_underlay { z-index: -1; width: 12; color: cyan; opacity: 0.3; linecap: none; }
    343 relation[type=route][route=bicycle][network=lcn] > way::relation_underlay { z-index: -1; width: 12; color: blue; opacity: 0.3; linecap: none; }
    344 relation[type=route][route=foot] > way::relation_underlay { z-index: -1; width: 10; color: #80ff80; opacity: 0.6; linecap: none; }
    345 
     379relation[type=route] > way::route { z-index: -1; width: 13; color: blue; opacity: 0.3; linecap: none; }
     380relation[type=route][route=bicycle][network=ncn] > way::route { z-index: -1; width: 12; color: red; opacity: 0.3; linecap: none; }
     381relation[type=route][route=bicycle][network=rcn] > way::route { z-index: -1; width: 12; color: cyan; opacity: 0.3; linecap: none; }
     382relation[type=route][route=bicycle][network=lcn] > way::route { z-index: -1; width: 12; color: blue; opacity: 0.3; linecap: none; }
     383relation[type=route][route=mtb] > way::route { z-index: -1; width: 12; color: brown; opacity: 0.3; linecap: none; }
     384relation[type=route][route=foot] > way::route { z-index: -1; width: 10; color: #80ff80; opacity: 0.6; linecap: none; }
    346385
    347386/*@import("stylesheets/core_ways.css");*/
     
    349388/*@import("stylesheets/core_landuse.css");*/
    350389/*@import("stylesheets/core_relations.css");*/
    351 way[is_prop_set("prop_area_small_name")] {text-color: black; font-size: 9; text: name; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;}
     390way[is_prop_set("prop_area_small_name")] {text-color: black; font-size: 10; text: name; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;}
    352391/*@import("stylesheets/core_interactive.css");*/
    353392
     393/* Rendering for licence status */
     394
     395/*way[_status=no]::status       { z-index: 0; width: eval('_width+7'); color: #AA0000; }
     396way[_status=partial]::status  { z-index: 0; width: eval('_width+7'); color: #AA0000; opacity: 0.6; }
     397way[_status=unsure]::status   { z-index: 0; width: eval('_width+7'); color: darkorange; opacity: 0.6; }
     398node[_status=no]::status      { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: #AA0000; }
     399node[_status=partial]::status { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: #AA0000; opacity: 0.6; }
     400node[_status=unsure]::status  { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: darkorange; opacity: 0.6; }*/
  • trunk/styles_nodist/potlatch2/README

    r4771 r5215  
    1717When updating from upstream, keep all 4 locations in sync.
    1818
    19 At time of writing, the last update used 0f12f406e80e7cedb1ca9d4662ab2977077fdc79 but better check the commit dates as well.
     19At time of writing, the last update used f4019f791c0ee268443c942ad06f127d9911758a but better check the commit dates as well.
  • trunk/styles_nodist/potlatch2/patched/core_landuse.css

    r4597 r5215  
    1 
    21/****************
    32 * core_landuse.css
     
    1817area[leisure]:closed                         { color: #8CD6B5; width: 1; fill-color: #8CD6B5; fill-opacity: 0.2; }
    1918area[tourism]:closed                          { color: #F7CECE; width: 1; fill-color: #F7CECE; fill-opacity: 0.2; prop_area_small_name : 1;}
    20 area[historic]:closed, area[ruins]:closed              { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; prop_area_small_name : 1;}
     19area[historic]:closed, area[ruins]:closed        { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; prop_area_small_name : 1;}
    2120area[military]:closed                         { color: #D6D6D6; width: 1; fill-color: #D6D6D6; fill-opacity: 0.2; prop_area_small_name : 1;}
    22 area[building]:closed                         { color: #ff6ec7; width: 1; fill-color: #ff6ec7; fill-opacity: 0.2; }
     21area[building]:closed                         { color: #bca9a9; width: 1; fill-color: #ff6ec7; fill-opacity: 0.2; }
    2322area[natural=water]:closed,
    24 area[waterway][waterway!=dam]:closed          { color: blue;    width: 2; fill-color: blue;    fill-opacity: 0.2; prop_area_small_name : 1;}
     23area[waterway][waterway!=dam]:closed          { color: #3434ff;    width: 2; fill-color: #3434ff;    fill-opacity: 0.2; prop_area_small_name : 1;}
    2524way[waterway=dam]                                                       { z-index: 5; color: black; width: 1; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1;}
    2625area[man_made]:closed                                                   { color: black; width: 2; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1; }
    27 area[man_made=reservoir_covered]:closed       { color: blue; width: 2; dashes: 4, 2; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1; }
    28 area[landuse=reservoir]:closed                { color: blue;    width: 2; fill-color: blue;    fill-opacity: 0.2; prop_area_small_name : 1;}
    29 area[landuse=forest]:closed,area[natural=wood]:closed { color: green;   width: 2; fill-color: green;   fill-opacity: 0.2; prop_area_small_name : 1;}
     26area[man_made=reservoir_covered]:closed       { color: #3434ff; width: 2; dashes: 4, 2; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1; }
     27area[landuse=reservoir]:closed                { color: #3434ff;    width: 2; fill-color: #3434ff;    fill-opacity: 0.2; prop_area_small_name : 1;}
     28area[landuse=forest]:closed, area[natural=wood]:closed { color: green;   width: 2; fill-color: green;   fill-opacity: 0.2; prop_area_small_name : 1;}
    3029area[leisure=park]:closed                    { color: #22aa22; width: 2; fill-color: #44ff44; fill-opacity: 0.15; prop_area_small_name : 1;}
    3130area[leisure=garden]:closed                  { color: #66ff44; width: 1; fill-color: #66ff44; fill-opacity: 0.2; prop_area_small_name : 1;}
     
    3433area[amenity=parking]:closed                  { color: #bbaa66;    width: 1; fill-color: #bbaa66;    fill-opacity: 0.2; }
    3534area[public_transport=pay_scale_area]:closed  { color: gray;    width: 1; fill-color: gray;    fill-opacity: 0.1; }
    36 way[man_made=pier]                                                      { z-index: 4; color: #777; width: 3; casing-color: black; casing-width: 5;}
     35way[man_made=pier]                                                      { z-index: 4; color: #777; width: 3; casing-color: black; casing-width: 1;}
    3736way[man_made=pier][floating=yes]                        { z-index: 5; dashes: 4,2; casing-color: #444;}
    3837area[leisure=marina]:closed                                     { color: pink; fill-color: pink; fill-opacity: 0.4; prop_area_small_name : 1;}
    39 way[leisure=slipway]                                            { z-index: 5; color: grey; width: 3; casing-color: blue; casing-width: 7; }
     38way[leisure=slipway]                                            { z-index: 5; color: grey; width: 3; casing-color: #3434ff; casing-width: 2; }
    4039area[leisure=golf_course]:closed { color: #44ee22; width: 2; fill-color: #44ee22; fill-opacity: 0.2; prop_area_small_name : 1;}
    4140way[boundary]                               { z-index: 5; color: #000066; width: 2; opacity: 0.6; dashes: 24,4, 4, 4; z-index: 4;}
     
    4544way[boundary=administrative]                { z-index: 5; color: purple; width: 2; opacity: 0.2; dashes: 24,4; z-index: 4;}
    4645way[boundary=administrative][waterway]      { z-index: 5; opacity: 0.8; z-index: 4; dashes: 24,4; width: 6; }
    47 way[landuse=cemetery]                                           { z-index: 5; color: #664466; width: 2; fill-color: #664466; opacity: 0.2; prop_area_small_name : 1;}
     46area[landuse=cemetery]:closed                                           { color: #664466; width: 2; fill-color: color: #664466; opacity: 0.2; prop_area_small_name : 1;}
    4847/* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */
  • trunk/styles_nodist/potlatch2/patched/core_pois.css

    r4597 r5215  
    33 * core_pois.css
    44 ****************/
     5
    56node { text-anchor-horizontal: center; text-anchor-vertical: below; }
    67
    7 node[place] { icon-image: icons/place.png; font-family: DejaVu; text: auto; font-size: 9; font-weight: bold; text-decoration: underline; z-index: 20; }
     8node[place] { icon-image: icons/place.png; font-family: DejaVu; text: auto; font-size: 10; font-weight: bold; z-index: 20; }
    89node[amenity=telephone] { icon-image: icons/telephone.png; z-index: 20; }
    910node[barrier=cattle_grid] { icon-image: icons/cattle_grid.png; z-index: 20; }
     
    1213node[tourism=camp_site] { icon-image: icons/accommodation_camping.n.16.png; z-index: 20; }
    1314node[tourism=caravan_site] { icon-image: icons/accommodation_caravan_park.n.16.png; z-index: 20; }
     15node[tourism=chalet] { icon-image: icons/accommodation_chalet.n.16.png; z-index: 20; }
    1416node[tourism=guest_house],node[tourism=bed_and_breakfast] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; }
    15 node[tourism=hotel] { icon-image: icons/accommodation_hotel.n.16.png; text-offset:0; text: auto; z-index: 20; }
     17node[tourism=hotel] { icon-image: icons/accommodation_hotel.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
    1618node[tourism=hostel] { icon-image: icons/accommodation_youth_hostel.n.16.png; z-index: 20; }
     19node[tourism=motel] { icon-image: icons/accommodation_motel.n.16.png; z-index: 20; }
    1720node[amenity=fire_station] { icon-image: icons/amenity_firestation2.n.16.png; z-index: 20; }
    1821node[amenity=police] { icon-image: icons/amenity_police2.n.16.png; z-index: 20; }
     
    2831node[barrier=block] { icon-image: icons/barrier_blocks.16.png; z-index: 20; }
    2932node[barrier=cattle_grid] { icon-image: icons/barrier_cattle_grid.16.png; z-index: 20; }
    30 node[amenity=school] { icon-image: icons/education_school.n.16.png; text-offset:0; text: auto; z-index: 20; }
    31 way[amenity=school]:closed { color: yellow; fill-color: yellow; fill-opacity: 0.1; prop_area_small_name : 1; }
    32 node[amenity=bar] { icon-image: icons/food_bar.n.16.png; text-offset:0; text: auto; z-index: 20; }
    33 node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:0; text: auto; z-index: 20; }
     33node[amenity=school] { icon-image: icons/education_school.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
     34aera[amenity=school]:closed { color: yellow; fill-color: yellow; fill-opacity: 0.1; prop_area_small_name : 1; }
     35node[amenity=bar] { icon-image: icons/food_bar.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
     36node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
    3437node[amenity=fast_food] { icon-image: icons/food_fastfood.n.16.png; z-index: 20; }
    35 node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset:0; text: name; z-index: 20; }
    36 node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:0; text: auto; z-index: 20; }
     38node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset: 15; text: auto; font-size: 10; z-index: 20; }
     39node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
    3740node[amenity=hospital] { icon-image: icons/health_hospital.n.16.png; z-index: 20; }
    3841node[amenity=pharmacy] { icon-image: icons/health_pharmacy.n.16.png; z-index: 20; }
    3942node[amenity=atm] { icon-image: icons/money_atm.n.16.png; z-index: 20; }
    4043node[amenity=bank] { icon-image: icons/money_bank2.n.16.png; z-index: 20; }
     44/* More Amenities */
     45node[amenity=bench] { icon-image: icons/amenity_bench.n.16.png; z-index: 20; }
     46node[amenity=drinking_water] { icon-image: icons/food_drinkingtap.n.16.png; z-index: 20; }
     47node[amenity=emergency_phone] { icon-image: icons/emergency-telephone-16.png; z-index: 20; }
     48node[amenity=fountain] { icon-image: icons/amenity_fountain2.n.16.png; z-index: 20; }
     49node[amenity=hunting_stand] { icon-image: icons/sport_shooting.n.16.png; z-index: 20; }
     50node[amenity=kindergarten] { icon-image: icons/education_nursery3.n.16.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; }
     51node[amenity=place_of_worship]  { icon-image: icons/place_of_worship_unknown.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
     52node[amenity=post_office] { icon-image: icons/amenity_post_office.n.16.png; z-index: 20; }
     53node[amenity=shelter] { icon-image: icons/accommodation_shelter2.n.16.png; z-index: 20; }
     54node[amenity=swimming_pool] { icon-image: icons/sport_swimming_outdoor.n.16.png; z-index: 20; }
     55node[amenity=townhall] { icon-image: icons/amenity_town_hall.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
     56node[amenity=toilets] { icon-image: icons/amenity_toilets.n.16.png; z-index: 20; }
     57node[amenity=vending_machine] { icon-image: icons/shopping_vending_machine.n.16.png; z-index: 20; }
     58node[amenity=veterinary] { icon-image: icons/health_veterinary.n.8E7409.16.png; z-index: 20; }
     59node[amenity=waste_basket] { icon-image: icons/amenity_waste_bin.n.16.png; z-index: 20; }
     60/* Shops */
    4161node[shop=alcohol] { icon-image: icons/shopping_alcohol.n.16.png; z-index: 20; }
    4262node[shop=bakery] { icon-image: icons/shopping_bakery.n.16.png; z-index: 20; }
    4363node[shop=bicycle] { icon-image: icons/shopping_bicycle.n.16.png; z-index: 20; }
    44 node[shop=book] { icon-image: icons/shopping_book.n.16.png; z-index: 20; }
     64node[shop=book], node[shop=books] { icon-image: icons/shopping_book.n.16.png; z-index: 20; }
    4565node[shop=butcher] { icon-image: icons/shopping_butcher.n.16.png; z-index: 20; }
    4666node[shop=car_repair] { icon-image: icons/shopping_car_repair.n.16.png; z-index: 20; }
     
    5171node[shop=doityourself] { icon-image: icons/shopping_diy.n.16.png; z-index: 20; }
    5272node[shop=fishmonger] { icon-image: icons/shopping_fish.n.16.png; z-index: 20; }
     73node[shop=florist] { icon-image: icons/shopping_florist.n.16.png; z-index: 20; }
    5374node[shop=garden_centre] { icon-image: icons/shopping_garden_centre.n.16.png; z-index: 20; }
    5475node[shop=gift] { icon-image: icons/shopping_gift.n.16.png; z-index: 20; }
     
    5778node[shop=hifi] { icon-image: icons/shopping_hifi.n.16.png; z-index: 20; }
    5879node[shop=jewelry] { icon-image: icons/shopping_jewelry.n.16.png; z-index: 20; }
     80node[shop=kiosk] { icon-image: icons/shopping_kiosk.n.16.png; z-index: 20; }
    5981node[shop=laundry] { icon-image: icons/shopping_laundrette.n.16.png; z-index: 20; }
     82node[amenity=marketplace] { icon-image: icons/shopping_marketplace.n.16.png; z-index: 20; }
    6083node[shop=motorcycle] { icon-image: icons/shopping_motorcycle.n.16.png; z-index: 20; }
    6184node[shop=music] { icon-image: icons/shopping_music.n.16.png; z-index: 20; }
    6285node[shop=supermarket] { icon-image: icons/shopping_supermarket.n.16.png; z-index: 20; }
     86node[shop=toys] { icon-image: icons/shopping_toys.n.16.png; z-index: 20; }
     87/* More Touristy Items */
     88node[tourism=artwork] { icon-image: icons/tourist_art_gallery2.n.16.png; z-index: 20; }
    6389node[historic=archaeological_site] { icon-image: icons/tourist_archaeological.n.16.png; z-index: 20; }
    6490node[historic=battlefield] { icon-image: icons/tourist_battlefield.n.16.png; z-index: 20; }
    65 node[historic=castle] { icon-image: icons/tourist_castle.n.16.png; text-offset:0; text: auto; z-index: 20; }
     91node[historic=castle] { icon-image: icons/tourist_castle.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
    6692node[amenity=cinema] { icon-image: icons/tourist_cinema.n.16.png; z-index: 20; }
    67 node[historic=memorial] { icon-image: icons/tourist_memorial.n.16.png; text-offset:0; text: auto; z-index: 20; }
    68 node[historic=monument] { icon-image: icons/tourist_monument.n.16.png; text-offset:0; text: auto; z-index: 20; }
    69 node[tourism=museum] { icon-image: icons/tourist_museum.n.16.png; text-offset:0; text: auto; z-index: 20; }
     93node[historic=memorial] { icon-image: icons/tourist_memorial.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
     94node[historic=monument] { icon-image: icons/tourist_monument.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
     95node[tourism=museum] { icon-image: icons/tourist_museum.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
     96node[tourism=information] { icon-image: icons/tourist_information.png; z-index: 20; }
    7097node[tourism=picnic_site] { icon-image: icons/tourist_picnic.n.16.png; z-index: 20; }
    71 node[historic=ruin] { icon-image: icons/tourist_ruin.n.16.png; z-index: 20; }
     98node[historic=ruins] { icon-image: icons/tourist_ruin.n.16.png; z-index: 20; }
    7299node[amenity=theatre] { icon-image: icons/tourist_theatre.n.16.png; z-index: 20; }
     100node[tourism=theme_park] { icon-image: icons/tourist_theme_park.n.16.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; }
    73101node[tourism=viewpoint] { icon-image: icons/tourist_view_point.n.16.png; z-index: 20; }
    74102node[tourism=zoo] { icon-image: icons/tourist_zoo.n.16.png; z-index: 20; }
     103/* Transport */
    75104node[aeroway=aerodrome] { icon-image: icons/transport_aerodrome.n.16.png; z-index: 20; }
     105node[aeroway=gate] { icon-image: icons/transport_airport_gate.n.16.png; z-index: 20; }
     106node[aeroway=terminal] { icon-image: icons/transport_airport_terminal.n.16.png; z-index: 20; }
     107node[aeroway=helipad] { icon-image: icons/transport_helicopter_pad.n.16.png; z-index: 20; }
    76108node[amenity=bus_station] { icon-image: icons/transport_bus_station.n.16.png; z-index: 20; }
    77109node[highway=bus_stop] { icon-image: icons/transport_bus_stop2.n.16.png; z-index: 20; }
    78110node[amenity=fuel] { icon-image: icons/transport_fuel.n.16.png; z-index: 20; }
    79 node[amenity=bicycle_parking] { icon-image: icons/transport_parking_bicycle.n.16.png; text-offset: 0; text: capacity; z-index: 20; }
     111node[amenity=car_wash] { icon-image: icons/transport_car_wash.n.16.png; z-index: 20; }
     112node[amenity=bicycle_parking] { icon-image: icons/transport_parking_bicycle.n.16.png; text-offset:0; text: capacity; font-size: 10; z-index: 20; }
    80113node[amenity=parking] { icon-image: icons/transport_parking_car.n.16.png; z-index: 20; }
    81114node[amenity=ferry_terminal] { icon-image: icons/transport_port.n.16.png; z-index: 20; }
     
    83116node[amenity=car_rental] { icon-image: icons/transport_rental_car.n.16.png; z-index: 20; }
    84117node[amenity=taxi] { icon-image: icons/transport_taxi_rank.n.16.png; z-index: 20; }
    85 node[railway=station] { icon-image: icons/transport_train_station.n.16.png; text-offset:0; text: auto; z-index: 20; }
     118node[railway=station] { icon-image: icons/transport_train_station.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
    86119node[railway=tram_stop] { icon-image: icons/transport_tram_stop.n.16.png; z-index: 20; }
    87120node[leisure=marina] { icon-image: icons/transport_marina.n.16.png; z-index: 20; }
     121node[highway=mini_roundabout] { icon-image: icons/transport_miniroundabout_anticlockwise.n.16.png; z-index: 20; }
     122node[highway=crossing] { icon-image: icons/transport_zebracrossing.n.16.png; z-index: 20; }
     123/* Misc */
     124node[leisure=playground] { icon-image: icons/amenity_playground.n.16.png; z-index: 20; }
     125node[leisure=sports_centre] { icon-image: icons/sport_leisure_centre.n.16.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; }
     126/* node[landuse=cemetery], node[landuse=grave_yard] { icon-image: icons/?.png; z-index: 20; } */
     127node[man_made=survey_point] { icon-image: icons/manmade_lighthouse.png; z-index: 20; }
     128node[man_made=tower] { icon-image: icons/manmade_tower.png; z-index: 20; }
     129/* Yes these power stations seem a little backward - but that's seemingly what the side menu uses ATM */
     130node[power=station] { icon-image: icons/power_substation.n.16.png; z-index: 20; }
     131node[power=generator] { icon-image: icons/power_station.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; }
     132node[power=tower] { icon-image: icons/power_tower_high2.n.16.png; z-index: 20; }
     133node[power=pole] { icon-image: icons/power_tower_low.n.16.png; z-index: 20; }
     134node[waterway=weir] { icon-image: icons/transport_weir.n.16.png; z-index: 20; }
    88135
    89136/* Addressing */
     
    93140node[addr:housenumber]::hn_casing,
    94141node[addr:housename]::hn_casing { z-index: -100; symbol-shape: circle; symbol-size: 10; symbol-fill-color: blue; }
     142
    95143way[addr:interpolation] { z-index: 5; color: #B0E0E6; width: 3; dashes: 3,3;}
  • trunk/styles_nodist/potlatch2/patched/core_relations.css

    r3902 r5215  
    11/* Route relations */
    22
    3 relation[type=route] > way::relation_underlay { z-index: -1; width: 13; color: blue; opacity: 0.3; linecap: none; }
    4 relation[type=route][route=bicycle][network=ncn] > way::relation_underlay { z-index: -1; width: 12; color: red; opacity: 0.3; linecap: none; }
    5 relation[type=route][route=bicycle][network=rcn] > way::relation_underlay { z-index: -1; width: 12; color: cyan; opacity: 0.3; linecap: none; }
    6 relation[type=route][route=bicycle][network=lcn] > way::relation_underlay { z-index: -1; width: 12; color: blue; opacity: 0.3; linecap: none; }
    7 relation[type=route][route=foot] > way::relation_underlay { z-index: -1; width: 10; color: #80ff80; opacity: 0.6; linecap: none; }
    8 
     3relation[type=route] > way::route { z-index: -1; width: 13; color: blue; opacity: 0.3; linecap: none; }
     4relation[type=route][route=bicycle][network=ncn] > way::route { z-index: -1; width: 12; color: red; opacity: 0.3; linecap: none; }
     5relation[type=route][route=bicycle][network=rcn] > way::route { z-index: -1; width: 12; color: cyan; opacity: 0.3; linecap: none; }
     6relation[type=route][route=bicycle][network=lcn] > way::route { z-index: -1; width: 12; color: blue; opacity: 0.3; linecap: none; }
     7relation[type=route][route=mtb] > way::route { z-index: -1; width: 12; color: brown; opacity: 0.3; linecap: none; }
     8relation[type=route][route=foot] > way::route { z-index: -1; width: 10; color: #80ff80; opacity: 0.6; linecap: none; }
  • trunk/styles_nodist/potlatch2/patched/core_ways.css

    r4771 r5215  
    1 
    21/****************
    32 * core_ways.css
     
    1110way[highway=secondary],way[highway=secondary_link],
    1211way[highway=tertiary],way[highway=tertiary_link],
    13 way[highway=residential],way[highway=unclassified]  { z-index: 5; text: auto; text-color: black; font-size: 10; text-position: line; text-halo-color: white; text-halo-radius: 2; }
    14 way[highway=motorway],way[highway=motorway_link]    { z-index: 9; color: #809BC0; width: 7; casing-color: black; casing-width: 8; }
    15 way[highway=trunk],way[highway=trunk_link]          { z-index: 9; color: #7FC97F; width: 7; casing-color: black; casing-width: 8; }
    16 way[highway=primary],way[highway=primary_link]      { z-index: 8; color: #E46D71; width: 7; casing-color: black; casing-width: 8; }
    17 way[highway=secondary],way[highway=secondary_link]  { z-index: 7; color: #FDBF6F; width: 7; casing-width: 8; }
    18 way[highway=tertiary]                               { z-index: 6; color: #FEFECB; width: 5; casing-width: 7; }
    19 way[highway=unclassified]                           { z-index: 6; color: #D0D0D0; width: 5; casing-width: 7; }
    20 way[highway=tertiary_link]                          { z-index: 5; color: #FEFECB; width: 4; casing-width: 5; }
    21 way[highway=residential]                            { z-index: 5; color: #E8E8E8; width: 5; casing-color: gray; casing-width: 7; }
    22 way[highway=service][service!=parking_aisle]        { z-index: 5; color: white; width: 3; casing-color: gray; casing-width: 5; }
    23 way[highway=service][service=parking_aisle]         { z-index: 5; color: white; width: 1; casing-color: #aaaaaa; casing-width: 2; }
    24 way[highway=service][service=alley]                 { z-index: 5; color: white; width: 2; dashes: 6,2; casing-color: black; casing-width: 4; }
    25 way[highway=road]                                   { z-index: 5; color: gray; width: 5; casing-color: white; casing-width: 7; }
    26 way[highway=living_street]                          { z-index: 5; color: #ddffee; width: 3; casing-color: #555555; casing-width: 4; }
     12way[highway=residential],way[highway=unclassified]  { z-index: 5; text: auto; text-color: black; font-size: 12; text-position: line; text-offset: 10; text-halo-color: white; text-halo-radius: 2; linecap: round; casing-linecap: round }
     13way[highway=motorway],way[highway=motorway_link]    { z-index: 9; color: #809BC0; width: 7; casing-color: #1e375a; casing-width: 1; }
     14way[highway=trunk],way[highway=trunk_link]          { z-index: 9; color: #7FC97F; width: 7; casing-color: #245424; casing-width: 1; }
     15way[highway=primary],way[highway=primary_link]      { z-index: 8; color: #E46D71; width: 7; casing-color: #651316; casing-width: 1; }
     16way[highway=secondary],way[highway=secondary_link]  { z-index: 7; color: #FDBF6F; width: 7; casing-color: #b16603; casing-width: 1; }
     17way[highway=tertiary],way[highway=tertiary_link]    { z-index: 6; color: #FEFECB; width: 5; casing-color: #626202; casing-width: 1; }
     18way[highway=unclassified]                           { z-index: 6; color: #D0D0D0; width: 5; casing-width: 1; }
     19way[highway=residential]                            { z-index: 5; color: #E8E8E8; width: 5; casing-color: gray; casing-width: 1; }
     20way[highway=service][service!=parking_aisle]        { z-index: 5; color: white; width: 3; casing-color: gray; casing-width: 1; }
     21way[highway=service][service=parking_aisle]         { z-index: 5; color: white; width: 1; casing-color: #aaaaaa; casing-width: 1; }
     22way[highway=service][service=alley]                 { z-index: 5; color: white; width: 2; dashes: 6,2; casing-color: black; casing-width: 1; }
     23way[highway=road]                                   { z-index: 5; color: gray; width: 5; casing-color: white; casing-width: 1; }
     24way[highway=living_street]                          { z-index: 5; color: #ddffee; width: 3; casing-color: #555555; casing-width: 1; }
    2725
    2826/* Road areas */
    2927
    30 way[highway=pedestrian]!:closed { z-index: 5; color: #ddddee; width: 5; casing-color: #555555; casing-width: 6; casing-dashes: 2,4;}
    31 way[highway=pedestrian]:closed  { color: #555555; width: 1; fill-color: #ddddee; fill-opacity: 0.8; } /* FIXME: dashed outline */
     28way[highway=pedestrian]!:closed { z-index: 5; color: #ddddee; width: 5; casing-color: #555555; casing-width: 1; casing-dashes: 2,4;}
     29area[highway=pedestrian]:closed  { color: #555555; width: 1; fill-color: #ddddee; fill-opacity: 0.8; } /* FIXME: dashed outline */
    3230
    3331/* Paths */
     
    3533way[highway=steps]     { z-index: 5; color: #FF6644; width: 6; dashes: 2, 2; }
    3634way[highway=footway]   { z-index: 5; color: #FF6644; width: 2; dashes: 6, 3; prop_path : 1;}
    37 way[highway=footway][bicycle=yes]   { z-index: 4; color: blue; width: 1; }
     35way[highway=footway][bicycle=yes]::bike   { z-index: 4; color: blue; width: 1; }
    3836way[highway=bridleway] { z-index:9; color: #996644; width: 2; dashes: 4, 2, 2, 2; prop_path : 1;}
    3937way[highway=track]     { z-index: 5; color: #996644; width: 2; dashes: 4, 2; prop_path : 1;}
    4038way[highway=path]      { z-index: 5; color: brown; width: 2; dashes: 2, 2; prop_path : 1;}
    4139way[highway=cycleway]  { z-index: 5; color: blue; width: 2; dashes: 4, 2; prop_path : 1;}
    42 way[railway=tram]      { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 6; }
    43 way[is_prop_set("prop_path")]              { text:auto; text-color: black; text-position: line; text-offset: 5;}
     40way[is_prop_set("prop_path")]  { z-index: 5; text: auto; text-color: black; text-position: line; text-offset: 7; font-size: 12; }
    4441
    4542/* Under construction */
    4643
    4744way[highway=proposed] { z-index: 5; color: #88ffff; width: 6; dashes: 8, 4; }
    48 way[highway=construction] { z-index: 5; color: #ffffbb; width: 6; dashes: 8, 4; casing-color: #0000aa; casing-width: 8; casing-dashes: 8,4;}
    49 way[construction=rail]
    50         { z-index: 6; color: black; width: 5; dashes: 6, 6, 4, 8;}
    51 way[construction=rail]::rail_over
    52         { z-index: 7; color: white; width: 3; dashes: 6,18; }
     45way[highway=construction] { z-index: 5; color: #ffffbb; width: 6; dashes: 8, 4; casing-color: #0000aa; casing-width: 1; casing-dashes: 8,4;}
    5346
    5447/* Railways */
    5548
    56 way[railway=rail]
    57         { z-index: 6; color: black; width: 5; dashes: 0; }
    58 way[railway=rail]::rail_over
    59         { z-index: 7; color: white; width: 3; dashes: 12,12; }
    60 way[railway=platform] { color:black; width: 2; }
    61 way[railway=subway]
    62     { z-index: 6; color: #444444; width: 5; }
    63 way[railway=subway]::railway_over
    64     { z-index: 7; color: white; width: 3; dashes: 8,8; }
    65 way[railway=disused],way[railway=abandoned]
    66     { z-index: 6; color: #444400; width: 3; dashes: 17, 2, 5, 0; }
    67 way[railway=disused]::railway_over, way[railway=abandoned]::railway_over
    68     { z-index: 7; color: #999999; width: 2; dashes: 12,12; }
     49way[railway=rail] { z-index: 6; color: black; width: 5; linecap: round; dashes: 0; }
     50way[railway=rail]::dashes { z-index: 7; color: white; width: 3; dashes: 12,12; linecap: round; }
    6951
    70 /* Waterways */
     52way[construction=rail] { z-index: 6; color: black; width: 5; dashes: 6, 6, 4, 8;}
     53way[construction=rail]::inner { z-index: 7; color: white; width: 3; dashes: 6,18; }
    7154
    72 way[waterway=river],
    73 way[waterway=canal],
    74 way[waterway=stream]   { z-index: 5; color: blue; width: 2; text:auto; text-color:blue; font-size:9; text-position: line; text-offset: 7;}
    75 way[waterway=drain]                      {z-index: 5; color: blue; width: 1; text:auto; text-color: blue; text-position: line; text-offset: 3;}
     55way[railway=platform] { z-index: 5; color:black; width: 2; }
     56
     57way[railway=subway] { z-index: 6; color: #444444; width: 5; }
     58way[railway=subway]::dashes  { z-index: 7; color: white; width: 3; dashes: 8,8; }
     59
     60way[construction=subway] { z-index: 6; color: #444444; width: 5; dashes: 4, 4; }
     61way[construction=subway]::dashes  { z-index: 7; color: white; width: 3; dashes: 4,12;}
     62
     63way[railway=disused],way[railway=abandoned] { z-index: 6; color: #444400; width: 3; dashes: 17, 2, 5, 0; }
     64way[railway=disused]::dashes,way[railway=abandoned]::dashes { z-index: 7; color: #999999; width: 2; dashes: 12,12; }
     65
     66way[railway=tram]      { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; }
     67way[construction=tram] { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; dashes: 6, 6; casing-dashes: 6, 6; }
     68
     69way[railway=light_rail] { z-index: 6; color: black; width: 4; }
     70way[railway=light_rail]::dashes { z-index: 7; color: #999999; width: 2; dashes: 8,4; }
     71
     72way[construction=light_rail] { z-index: 6; color: black; width: 4; dashes: 8, 4, 4, 4; }
     73way[construction=light_rail]::dashes { z-index: 7; color: #999999; width: 2; dashes: 8,12; }
     74
     75/* Waterways */
     76
     77way[waterway=river],
     78way[waterway=canal],
     79way[waterway=stream]   { z-index: 5; color: #3434ff; width: 2; text:auto; text-color: #3434ff; font-size:9; text-position: line; text-offset: 7;}
     80way[waterway=drain]                      {z-index: 5; color: #3434ff; width: 1; text:auto; text-color: #3434ff; text-position: line; text-offset: 3;}
    7681way[waterway][tunnel=yes]                {z-index: 5; dashes: 8,4;}
    7782
    7883/* Aeroways */
    7984
    80 way[aeroway=aerodrome]:closed
    81     { z-index: 3; color: #bb44bb; width: 3; casing-color: #66066;  casing-width: 4;  }
    82 way|z-15[aeroway=aerodrome]:closed
     85area[aeroway=aerodrome]:closed
     86    { z-index: 3; color: #bb44bb; width: 3; casing-color: #66066;  casing-width: 1;  }
     87area|z-15[aeroway=aerodrome]:closed
    8388    { z-index: 3; fill-color: #bb99bb;  fill-opacity: 0.5;}
    84 way[aeroway=taxiway]!:closed { z-index: 8; color: #999999; width: 3; casing-color: #aa66aa; casing-width: 6; }
    85 way[aeroway=taxiway]:closed { z-index: 8; color: #bb99bb; width: 3; fill-color: #ccaacc; }
    86 way|z17-[aeroway=runway]!:closed
    87     { z-index: 9; color: black; width: 11; casing-color: #aa66aa; casing-width: 12; }
    88 way|z17-[aeroway=runway]!:closed::aeroway2
    89     { z-index: 10; color: white; width: 9;  dashes: 0, 20, 4, 76; }
    90 way|z17-[aeroway=runway]!:closed::aeroway3
    91     { z-index: 11; color: black; width: 7; }
    92 way|z17-[aeroway=runway]!:closed::aeroway4
    93     { z-index: 12; color: white; width: 5;  dashes: 0, 20, 4, 76; }
    94 way|z17-[aeroway=runway]!:closed::aeroway5
    95     { z-index: 13; color: black; width: 3; }
    96 way|z17-[aeroway=runway]!:closed::aeroway6
    97     { z-index: 14; color: white; width: 1;  dashes: 4, 16; }
     89way[aeroway=taxiway]!:closed { z-index: 8; color: #999999; width: 3; casing-color: #aa66aa; casing-width: 2; }
     90area[aeroway=taxiway]:closed { z-index: 8; color: #bb99bb; width: 3; fill-color: #ccaacc; }
    9891
    99 way|z15-16[aeroway=runway]!:closed
    100     { z-index: 9; color: black; width: 5;  }
    101 way|z15-16[aeroway=runway]!:closed::aeroway2
    102     { z-index: 12; color: white; width: 5;  dashes: 0, 20, 4, 76; }
    103 way|z15-16[aeroway=runway]!:closed::aeroway3
    104     { z-index: 13; color: black; width: 3; }
    105 way|z15-16[aeroway=runway]!:closed::aeroway4
    106     { z-index: 14; color: white; width: 1;  dashes: 4, 16; }
    107    
    108 way|z-14[aeroway=runway]!:closed
    109     { z-index: 9; color: #444444; width: 3;  }
    110 way[aeroway=runway]:closed { z-index: 9; color: black; width: 3; fill-color: #775577; }
    111 way[aeroway=apron]:closed { z-index: 4; color: #cc66cc; width: 1; fill-color: #ddaadd; fill-opacity: 0.5;}
     92way|z17-[aeroway=runway]!:closed { z-index: 9; color: black; width: 11; casing-color: #aa66aa; casing-width: 1; }
     93way|z17-[aeroway=runway]!:closed::aa { z-index: 10; color: white; width: 9;  dashes: 0, 20, 4, 76; }
     94way|z17-[aeroway=runway]!:closed::bb { z-index: 11; color: black; width: 7; }
     95way|z17-[aeroway=runway]!:closed::cc { z-index: 12; color: white; width: 5;  dashes: 0, 20, 4, 76; }
     96way|z17-[aeroway=runway]!:closed::dd { z-index: 13; color: black; width: 3; }
     97way|z17-[aeroway=runway]!:closed::ee { z-index: 14; color: white; width: 1;  dashes: 4, 16; }
     98
     99way|z15-16[aeroway=runway]!:closed { z-index: 9; color: black; width: 5;  }
     100way|z15-16[aeroway=runway]!:closed::aa { z-index: 12; color: white; width: 5;  dashes: 0, 20, 4, 76; }
     101way|z15-16[aeroway=runway]!:closed::bb { z-index: 13; color: black; width: 3; }
     102way|z15-16[aeroway=runway]!:closed::cc { z-index: 14; color: white; width: 1;  dashes: 4, 16; }
     103
     104way|z-14[aeroway=runway]!:closed { z-index: 9; color: #444444; width: 3;  }
     105
     106area[aeroway=runway]:closed { z-index: 9; color: black; width: 3; fill-color: #775577; }
     107area[aeroway=apron]:closed { z-index: 4; color: #cc66cc; width: 1; fill-color: #ddaadd; fill-opacity: 0.5;}
    112108
    113109/* Barriers */
     
    118114/* Power */
    119115
    120 way[power=line] {z-index: 5; color: darkgray; width: 3; dashes: 12,2; casing-color: black; casing-width: 8; casing-dashes: 4, 38;}
    121 way[power=minor_line] {z-index: 5; color: gray; width: 2; dashes: 2,4; casing-width: 8; casing-color: white; casing-dashes: 2,22;}
    122 way[power=station]:closed { z-index: 5; color: black; width: 2; fill-color: #666666; fill-opacity: 0.6; prop_area_small_name : 1;}
    123 way[power=generator]:closed { z-index: 5; color: black; width: 2; fill-color: #444444; fill-opacity: 0.6; prop_area_small_name : 1;}
     116way[power=line] {z-index: 5; color: darkgray; width: 3; dashes: 12,2; casing-color: black; casing-width: 2; casing-dashes: 4, 38;}
     117way[power=minor_line] {z-index: 5; color: gray; width: 2; dashes: 2,4; casing-width: 3; casing-color: white; casing-dashes: 2,22;}
     118area[power=station]:closed { color: black; width: 2; fill-color: #666666; fill-opacity: 0.6; prop_area_small_name : 1;}
     119area[power=generator]:closed { color: black; width: 2; fill-color: #444444; fill-opacity: 0.6; prop_area_small_name : 1;}
    124120
    125121/* Leisure */
    126122
    127 way[golf=hole] {z-index: 5; color: darkgreen; width: 5; casing-color: green; casing-width: 10; }
    128 way[leisure=sports_centre]:closed { color: #66ddcc; fill-color: #66ddcc; prop_area_small_name : 1; }
     123way[golf=hole] {z-index: 5; color: darkgreen; width: 5; casing-color: green; casing-width: 2; }
     124area[leisure=sports_centre]:closed { color: #66ddcc; fill-color: #66ddcc; prop_area_small_name : 1; }
    129125
    130126
    131127/* Physical decoration */
    132128
    133 way[bridge=yes]::bridge1, way[bridge=viaduct]::bridge1, way[bridge=suspension]::bridge1
    134     { z-index: 4; color: white; width: +3; }
    135 way[bridge=yes]::bridge2, way[bridge=viaduct]::bridge2, way[bridge=suspension]::bridge2
    136     { z-index: 3; color: black; width: +6; }
    137 way[tunnel=yes][!waterway]::tunnel1
    138     { z-index: 4; color: white; width: +2; }
    139 way[tunnel=yes][!waterway]::tunnel2
    140     { z-index: 3; color: black; width: +6; dashes: 4,4; }
     129way[bridge=yes]::bridge1, way[bridge=viaduct]::bridge1, way[bridge=suspension]::bridge1 { z-index: 4; color: white; width: +3; }
     130way[bridge=yes]::bridge2, way[bridge=viaduct]::bridge2, way[bridge=suspension]::bridge2 { z-index: 3; color: #444444; width: +6; }
     131way[tunnel=yes][!waterway]::bridge1 { z-index: 4; color: white; width: +2; }
     132way[tunnel=yes][!waterway]::bridge2 { z-index: 3; color: black; width: +6; dashes: 4,4; }
    141133
    142134/* Attribute decoration */
    143135
    144 /*way[oneway=yes], way[junction=roundabout] { z-index: 15; color: #444444; width: 2; dashes: 15,35; line-style: arrows; }*/
    145 /*way[oneway="-1"] { z-index: 15; color: #444444; width: 2; dashes: 15,35; line-style: arrows-reversed; }*/
     136/*way[oneway=yes]::arrows, way[junction=roundabout]::arrows { z-index: 15; color: #555555; width: 2; dashes: 10,50; line-style: arrows; }
     137way[oneway=-1]::arrows { z-index: 15; color: #555555; width: 2; dashes: 10,50; line-style: arrows-reversed; }*/
  • trunk/styles_nodist/potlatch2/patched/potlatch.css

    r3898 r5215  
    44/*@import("stylesheets/core_landuse.css");*/
    55/*@import("stylesheets/core_relations.css");*/
    6 way[is_prop_set("prop_area_small_name")] {text-color: black; font-size: 9; text: name; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;}
     6way[is_prop_set("prop_area_small_name")] {text-color: black; font-size: 10; text: name; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;}
    77/*@import("stylesheets/core_interactive.css");*/
    88
     9/* Rendering for licence status */
     10
     11/*way[_status=no]::status       { z-index: 0; width: eval('_width+7'); color: #AA0000; }
     12way[_status=partial]::status  { z-index: 0; width: eval('_width+7'); color: #AA0000; opacity: 0.6; }
     13way[_status=unsure]::status   { z-index: 0; width: eval('_width+7'); color: darkorange; opacity: 0.6; }
     14node[_status=no]::status      { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: #AA0000; }
     15node[_status=partial]::status { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: #AA0000; opacity: 0.6; }
     16node[_status=unsure]::status  { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: darkorange; opacity: 0.6; }*/
  • trunk/styles_nodist/potlatch2/source/core_interactive.css

    r3983 r5215  
    55/* Interactive way behaviour */
    66
    7 way :hover      { z-index: 2; width: eval('_width+10'); color: #ffff99; }
    8 way :selected { z-index: 2; width: eval('_width+10'); color: yellow; opacity: 0.7;}
    9 way :restrictfrom { z-index: -1; width: eval('_width+10'); color: red; opacity: 0.7;}
    10 way :restrictto { z-index: -1; width: eval('_width+10'); color: blue; opacity: 0.7;}
     7way::highlight :hover   { z-index: 2; width: eval('_width+10'); color: #ffff99; }
     8way::highlight :hover :background { color: lightcyan; }
     9way::highlight :selected { z-index: 2; width: eval('_width+10'); color: yellow; opacity: 0.7;}
     10way::highlight :selected :background { color: cyan; }
     11way::highlight :restrictfrom { z-index: -1; width: eval('_width+10'); color: red; opacity: 0.7;}
     12way::highlight :restrictto { z-index: -1; width: eval('_width+10'); color: blue; opacity: 0.7;}
    1113/*way !:drawn !:hasTags{ z-index:10; width: 0.5; color: red; }*/
    1214way !:drawn { z-index:10; width: 1; color: #333333; }
     
    1618
    1719node :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; }
    18 node :hoverway { z-index: 9; icon-image: square; icon-width: 7; color: blue; layer: 5; }
    19 node !:drawn :poi { z-index: 2; icon-image: circle; icon-width: 4; color: green; casing-color: black; casing-width: 1; }
    20 node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 4; color: black; }
    21 node :hasTags :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: black; layer: 5; }
    22 node !:drawn :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: red; casing-color: #cc0000; casing-width: 1; layer: 5; }
    23 node :selected { z-index: 1; icon-image: square; icon-width: eval('_width+10'); color: yellow; interactive: no; layer: 5; }
    24 node :junction :selectedway { z-index: 8; icon-image: square; icon-width: 12; casing-color: black; casing-width: 1; layer: 5; }
     20node :hoverway { z-index: 9; icon-image: circle; icon-width: 8; color: blue; layer: 5; }
     21node !:drawn :hasTags :poi { z-index: 2; icon-image: circle; icon-width: 8; color: #00ac00; casing-color: #004400; casing-width: 1; }
     22node !:drawn :poi { z-index: 2; icon-image: circle; icon-width: 8; color: #BBB; casing-color: #333; casing-width: 1; }
     23node !:drawn :hasTags :selectedway { z-index: 9; icon-image: circle; icon-width: 10; color: black; layer: 5; }
     24node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 8; color: black; }
     25node !:drawn :selectedway { z-index: 9; icon-image: circle; icon-width: 8; color: red; casing-color: #cc0000; casing-width: 1; layer: 5; }
     26node::selectedNode :selected { z-index: 1; icon-image: square; icon-width: eval('_width+10'); color: yellow; interactive: no; layer: 5; }
     27node::selectedNode :selected :background { color: cyan; }
     28node::junctionNode :junction :selectedway { z-index: 8; icon-image: circle; icon-width: 12; casing-color: black; casing-width: 1; layer: 5; }
  • trunk/styles_nodist/potlatch2/source/core_landuse.css

    r3983 r5215  
    1313way[leisure] :area                         { color: #8CD6B5; width: 1; fill-color: #8CD6B5; fill-opacity: 0.2; }
    1414way[tourism] :area                          { color: #F7CECE; width: 1; fill-color: #F7CECE; fill-opacity: 0.2; set .area_small_name;}
    15 way[historic],way[ruins] :area              { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; set .area_small_name;}
     15way[historic] :area,way[ruins] :area        { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; set .area_small_name;}
    1616way[military] :area                         { color: #D6D6D6; width: 1; fill-color: #D6D6D6; fill-opacity: 0.2; set .area_small_name;}
    17 way[building] :area                         { color: #ff6ec7; width: 1; fill-color: #ff6ec7; fill-opacity: 0.2; }
     17way[building] :area                         { color: #bca9a9; width: 1; fill-color: #ff6ec7; fill-opacity: 0.2; }
    1818way[natural=water],
    19 way[waterway][waterway!=dam] :area          { color: blue;    width: 2; fill-color: blue;    fill-opacity: 0.2; set .area_small_name;}
     19way[waterway][waterway!=dam] :area          { color: #3434ff;    width: 2; fill-color: #3434ff;    fill-opacity: 0.2; set .area_small_name;}
    2020way[waterway=dam]                                                       { color: black; width: 1; fill-color: #222222; fill-opacity: 0.1; set .area_small_name;}
    2121way[man_made] :area                                                     { color: black; width: 2; fill-color: #222222; fill-opacity: 0.1; set .area_small_name; }
    22 way[man_made=reservoir_covered] :area       { color: blue; width: 2; dashes: 4, 2; fill-color: #222222; fill-opacity: 0.1; set .area_small_name; }
    23 way[landuse=reservoir] :area                { color: blue;    width: 2; fill-color: blue;    fill-opacity: 0.2; set .area_small_name;}
     22way[man_made=reservoir_covered] :area       { color: #3434ff; width: 2; dashes: 4, 2; fill-color: #222222; fill-opacity: 0.1; set .area_small_name; }
     23way[landuse=reservoir] :area                { color: #3434ff;    width: 2; fill-color: #3434ff;    fill-opacity: 0.2; set .area_small_name;}
    2424way[landuse=forest],way[natural=wood] :area { color: green;   width: 2; fill-color: green;   fill-opacity: 0.2; set .area_small_name;}
    2525way[leisure=park]  :area                    { color: #22aa22; width: 2; fill-color: #44ff44; fill-opacity: 0.15; set .area_small_name;}
     
    2929way[amenity=parking] :area                  { color: #bbaa66;    width: 1; fill-color: #bbaa66;    fill-opacity: 0.2; }
    3030way[public_transport=pay_scale_area] :area  { color: gray;    width: 1; fill-color: gray;    fill-opacity: 0.1; }
    31 way[man_made=pier]                                                      { z-index: 4; color: #777; width: 3; casing-color: black; casing-width: 5;}
     31way[man_made=pier]                                                      { z-index: 4; color: #777; width: 3; casing-color: black; casing-width: 1;}
    3232way[man_made=pier][floating=yes]                        { dashes: 4,2; casing-color: #444;}
    3333way[leisure=marina] :area                                       { color: pink; fill-color: pink; fill-opacity: 0.4; set .area_small_name;}
    34 way[leisure=slipway]                                            { color: grey; width: 3; casing-color: blue; casing-width: 7; }
     34way[leisure=slipway]                                            { color: grey; width: 3; casing-color: #3434ff; casing-width: 2; }
    3535way[leisure=golf_course] :area { color: #44ee22; width: 2; fill-color: #44ee22; fill-opacity: 0.2; set .area_small_name;}
    3636way[boundary]                               { color: #000066; width: 2; opacity: 0.6; dashes: 24,4, 4, 4; z-index: 4;}
  • trunk/styles_nodist/potlatch2/source/core_pois.css

    r3983 r5215  
    1 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; }
     1node[place] { icon-image: icons/place.png; text-offset: 17; font-family: DejaVu; text: name; font-size: 10; font-weight: bold; z-index: 20; }
    22node[amenity=telephone] { icon-image: icons/telephone.png; z-index: 20; }
    33node[barrier=cattle_grid] { icon-image: icons/cattle_grid.png; z-index: 20; }
     
    66node[tourism=camp_site] { icon-image: icons/accommodation_camping.n.16.png; z-index: 20; }
    77node[tourism=caravan_site] { icon-image: icons/accommodation_caravan_park.n.16.png; z-index: 20; }
     8node[tourism=chalet] { icon-image: icons/accommodation_chalet.n.16.png; z-index: 20; }
    89node[tourism=guest_house],node[tourism=bed_and_breakfast] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; }
    9 node[tourism=hotel] { icon-image: icons/accommodation_hotel.n.16.png; text-offset:15; text: name; z-index: 20; }
     10node[tourism=hotel] { icon-image: icons/accommodation_hotel.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }
    1011node[tourism=hostel] { icon-image: icons/accommodation_youth_hostel.n.16.png; z-index: 20; }
     12node[tourism=motel] { icon-image: icons/accommodation_motel.n.16.png; z-index: 20; }
    1113node[amenity=fire_station] { icon-image: icons/amenity_firestation2.n.16.png; z-index: 20; }
    1214node[amenity=police] { icon-image: icons/amenity_police2.n.16.png; z-index: 20; }
     
    2224node[barrier=block] { icon-image: icons/barrier_blocks.16.png; z-index: 20; }
    2325node[barrier=cattle_grid] { icon-image: icons/barrier_cattle_grid.16.png; z-index: 20; }
    24 node[amenity=school] { icon-image: icons/education_school.n.16.png; text-offset:15; text: name; z-index: 20; }
     26node[amenity=school] { icon-image: icons/education_school.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }
    2527way[amenity=school] :area { color: yellow; fill-color: yellow; fill-opacity: 0.1; set .area_small_name; }
    26 node[amenity=bar] { icon-image: icons/food_bar.n.16.png; text-offset:15; text: name; z-index: 20; }
    27 node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:15; text: name; z-index: 20; }
     28node[amenity=bar] { icon-image: icons/food_bar.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }
     29node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }
    2830node[amenity=fast_food] { icon-image: icons/food_fastfood.n.16.png; z-index: 20; }
    29 node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset:15; text: name; z-index: 20; }
    30 node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:15; text: name; z-index: 20; }
     31node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset: 15; text: name; font-size: 10; z-index: 20; }
     32node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }
    3133node[amenity=hospital] { icon-image: icons/health_hospital.n.16.png; z-index: 20; }
    3234node[amenity=pharmacy] { icon-image: icons/health_pharmacy.n.16.png; z-index: 20; }
    3335node[amenity=atm] { icon-image: icons/money_atm.n.16.png; z-index: 20; }
    3436node[amenity=bank] { icon-image: icons/money_bank2.n.16.png; z-index: 20; }
     37/* More Amenities */
     38node[amenity=bench] { icon-image: icons/amenity_bench.n.16.png; z-index: 20; }
     39node[amenity=drinking_water] { icon-image: icons/food_drinkingtap.n.16.png; z-index: 20; }
     40node[amenity=emergency_phone] { icon-image: icons/emergency-telephone-16.png; z-index: 20; }
     41node[amenity=fountain] { icon-image: icons/amenity_fountain2.n.16.png; z-index: 20; }
     42node[amenity=hunting_stand] { icon-image: icons/sport_shooting.n.16.png; z-index: 20; }
     43node[amenity=kindergarten] { icon-image: icons/education_nursery3.n.16.png; z-index: 20; text-offset:15; text: name; font-size: 10; z-index: 20; }
     44node[amenity=place_of_worship]  { icon-image: icons/place_of_worship_unknown.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }
     45node[amenity=post_office] { icon-image: icons/amenity_post_office.n.16.png; z-index: 20; }
     46node[amenity=shelter] { icon-image: icons/accommodation_shelter2.n.16.png; z-index: 20; }
     47node[amenity=swimming_pool] { icon-image: icons/sport_swimming_outdoor.n.16.png; z-index: 20; }
     48node[amenity=townhall] { icon-image: icons/amenity_town_hall.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }
     49node[amenity=toilets] { icon-image: icons/amenity_toilets.n.16.png; z-index: 20; }
     50node[amenity=vending_machine] { icon-image: icons/shopping_vending_machine.n.16.png; z-index: 20; }
     51node[amenity=veterinary] { icon-image: icons/health_veterinary.n.8E7409.16.png; z-index: 20; }
     52node[amenity=waste_basket] { icon-image: icons/amenity_waste_bin.n.16.png; z-index: 20; }
     53/* Shops */
    3554node[shop=alcohol] { icon-image: icons/shopping_alcohol.n.16.png; z-index: 20; }
    3655node[shop=bakery] { icon-image: icons/shopping_bakery.n.16.png; z-index: 20; }
    3756node[shop=bicycle] { icon-image: icons/shopping_bicycle.n.16.png; z-index: 20; }
    38 node[shop=book] { icon-image: icons/shopping_book.n.16.png; z-index: 20; }
     57node[shop=book], node[shop=books] { icon-image: icons/shopping_book.n.16.png; z-index: 20; }
    3958node[shop=butcher] { icon-image: icons/shopping_butcher.n.16.png; z-index: 20; }
    4059node[shop=car_repair] { icon-image: icons/shopping_car_repair.n.16.png; z-index: 20; }
     
    4564node[shop=doityourself] { icon-image: icons/shopping_diy.n.16.png; z-index: 20; }
    4665node[shop=fishmonger] { icon-image: icons/shopping_fish.n.16.png; z-index: 20; }
     66node[shop=florist] { icon-image: icons/shopping_florist.n.16.png; z-index: 20; }
    4767node[shop=garden_centre] { icon-image: icons/shopping_garden_centre.n.16.png; z-index: 20; }
    4868node[shop=gift] { icon-image: icons/shopping_gift.n.16.png; z-index: 20; }
     
    5171node[shop=hifi] { icon-image: icons/shopping_hifi.n.16.png; z-index: 20; }
    5272node[shop=jewelry] { icon-image: icons/shopping_jewelry.n.16.png; z-index: 20; }
     73node[shop=kiosk] { icon-image: icons/shopping_kiosk.n.16.png; z-index: 20; }
    5374node[shop=laundry] { icon-image: icons/shopping_laundrette.n.16.png; z-index: 20; }
     75node[amenity=marketplace] { icon-image: icons/shopping_marketplace.n.16.png; z-index: 20; }
    5476node[shop=motorcycle] { icon-image: icons/shopping_motorcycle.n.16.png; z-index: 20; }
    5577node[shop=music] { icon-image: icons/shopping_music.n.16.png; z-index: 20; }
    5678node[shop=supermarket] { icon-image: icons/shopping_supermarket.n.16.png; z-index: 20; }
     79node[shop=toys] { icon-image: icons/shopping_toys.n.16.png; z-index: 20; }
     80/* More Touristy Items */
     81node[tourism=artwork] { icon-image: icons/tourist_art_gallery2.n.16.png; z-index: 20; }
    5782node[historic=archaeological_site] { icon-image: icons/tourist_archaeological.n.16.png; z-index: 20; }
    5883node[historic=battlefield] { icon-image: icons/tourist_battlefield.n.16.png; z-index: 20; }
    59 node[historic=castle] { icon-image: icons/tourist_castle.n.16.png; text-offset:15; text: name; z-index: 20; }
     84node[historic=castle] { icon-image: icons/tourist_castle.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }
    6085node[amenity=cinema] { icon-image: icons/tourist_cinema.n.16.png; z-index: 20; }
    61 node[historic=memorial] { icon-image: icons/tourist_memorial.n.16.png; text-offset:15; text: name; z-index: 20; }
    62 node[historic=monument] { icon-image: icons/tourist_monument.n.16.png; text-offset:15; text: name; z-index: 20; }
    63 node[tourism=museum] { icon-image: icons/tourist_museum.n.16.png; text-offset:15; text: name; z-index: 20; }
     86node[historic=memorial] { icon-image: icons/tourist_memorial.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }
     87node[historic=monument] { icon-image: icons/tourist_monument.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }
     88node[tourism=museum] { icon-image: icons/tourist_museum.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }
     89node[tourism=information] { icon-image: icons/tourist_information.png; z-index: 20; }
    6490node[tourism=picnic_site] { icon-image: icons/tourist_picnic.n.16.png; z-index: 20; }
    65 node[historic=ruin] { icon-image: icons/tourist_ruin.n.16.png; z-index: 20; }
     91node[historic=ruins] { icon-image: icons/tourist_ruin.n.16.png; z-index: 20; }
    6692node[amenity=theatre] { icon-image: icons/tourist_theatre.n.16.png; z-index: 20; }
     93node[tourism=theme_park] { icon-image: icons/tourist_theme_park.n.16.png; z-index: 20; text-offset:15; text: name; font-size: 10; z-index: 20; }
    6794node[tourism=viewpoint] { icon-image: icons/tourist_view_point.n.16.png; z-index: 20; }
    6895node[tourism=zoo] { icon-image: icons/tourist_zoo.n.16.png; z-index: 20; }
     96/* Transport */
    6997node[aeroway=aerodrome] { icon-image: icons/transport_aerodrome.n.16.png; z-index: 20; }
     98node[aeroway=gate] { icon-image: icons/transport_airport_gate.n.16.png; z-index: 20; }
     99node[aeroway=terminal] { icon-image: icons/transport_airport_terminal.n.16.png; z-index: 20; }
     100node[aeroway=helipad] { icon-image: icons/transport_helicopter_pad.n.16.png; z-index: 20; }
    70101node[amenity=bus_station] { icon-image: icons/transport_bus_station.n.16.png; z-index: 20; }
    71102node[highway=bus_stop] { icon-image: icons/transport_bus_stop2.n.16.png; z-index: 20; }
    72103node[amenity=fuel] { icon-image: icons/transport_fuel.n.16.png; z-index: 20; }
    73 node[amenity=bicycle_parking] { icon-image: icons/transport_parking_bicycle.n.16.png; text-offset: 15; text: capacity; z-index: 20; }
     104node[amenity=car_wash] { icon-image: icons/transport_car_wash.n.16.png; z-index: 20; }
     105node[amenity=bicycle_parking] { icon-image: icons/transport_parking_bicycle.n.16.png; text-offset: 15; text: capacity; font-size: 10; z-index: 20; }
    74106node[amenity=parking] { icon-image: icons/transport_parking_car.n.16.png; z-index: 20; }
    75107node[amenity=ferry_terminal] { icon-image: icons/transport_port.n.16.png; z-index: 20; }
     
    77109node[amenity=car_rental] { icon-image: icons/transport_rental_car.n.16.png; z-index: 20; }
    78110node[amenity=taxi] { icon-image: icons/transport_taxi_rank.n.16.png; z-index: 20; }
    79 node[railway=station] { icon-image: icons/transport_train_station.n.16.png; text-offset:15; text: name; z-index: 20; }
     111node[railway=station] { icon-image: icons/transport_train_station.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }
    80112node[railway=tram_stop] { icon-image: icons/transport_tram_stop.n.16.png; z-index: 20; }
    81113node[leisure=marina] { icon-image: icons/transport_marina.n.16.png; z-index: 20; }
     114node[highway=mini_roundabout] { icon-image: icons/transport_miniroundabout_anticlockwise.n.16.png; z-index: 20; }
     115node[highway=crossing] { icon-image: icons/transport_zebracrossing.n.16.png; z-index: 20; }
     116/* Misc */
     117node[leisure=playground] { icon-image: icons/amenity_playground.n.16.png; z-index: 20; }
     118node[leisure=sports_centre] { icon-image: icons/sport_leisure_centre.n.16.png; z-index: 20; text-offset:15; text: name; font-size: 10; z-index: 20; }
     119/* node[landuse=cemetery], node[landuse=grave_yard] { icon-image: icons/?.png; z-index: 20; } */
     120node[man_made=survey_point] { icon-image: icons/manmade_lighthouse.png; z-index: 20; }
     121node[man_made=tower] { icon-image: icons/manmade_tower.png; z-index: 20; }
     122/* Yes these power stations seem a little backward - but that's seemingly what the side menu uses ATM */
     123node[power=station] { icon-image: icons/power_substation.n.16.png; z-index: 20; }
     124node[power=generator] { icon-image: icons/power_station.png; z-index: 20; text-offset:15; text: name; font-size: 10; z-index: 20; }
     125node[power=tower] { icon-image: icons/power_tower_high2.n.16.png; z-index: 20; }
     126node[power=pole] { icon-image: icons/power_tower_low.n.16.png; z-index: 20; }
     127node[waterway=weir] { icon-image: icons/transport_weir.n.16.png; z-index: 20; }
    82128
    83129/* Addressing */
    84130
    85 node[addr:housenumber],
    86 node[addr:housename] { icon-image: circle; icon-width: 4; color: #B0E0E6; casing-color:blue; casing-width: 1; }
     131node[addr:housenumber] !:drawn,
     132node[addr:housename] !:drawn { icon-image: circle; icon-width: 8; color: #B0E0E6; casing-color:blue; casing-width: 1; z-index: 20; }
    87133way[addr:interpolation] { color: #B0E0E6; width: 3; dashes: 3,3;}
  • trunk/styles_nodist/potlatch2/source/core_relations.css

    r3983 r5215  
    11/* Route relations */
    22
    3 relation[type=route] way { z-index: 1; width: 13; color: blue; opacity: 0.3; }
    4 relation[type=route][route=bicycle][network=ncn] way { z-index: 1; width: 12; color: red; opacity: 0.3; }
    5 relation[type=route][route=bicycle][network=rcn] way { z-index: 1; width: 12; color: cyan; opacity: 0.3; }
    6 relation[type=route][route=bicycle][network=lcn] way { z-index: 1; width: 12; color: blue; opacity: 0.3; }
    7 relation[type=route][route=foot] way { z-index: 1; width: 10; color: #80ff80; opacity: 0.6; }
     3relation[type=route] way::route { z-index: 1; width: 13; color: blue; opacity: 0.3; }
     4relation[type=route][route=bicycle][network=ncn] way::route { z-index: 1; width: 12; color: red; opacity: 0.3; }
     5relation[type=route][route=bicycle][network=rcn] way::route { z-index: 1; width: 12; color: cyan; opacity: 0.3; }
     6relation[type=route][route=bicycle][network=lcn] way::route { z-index: 1; width: 12; color: blue; opacity: 0.3; }
     7relation[type=route][route=mtb] way::route { z-index: 1; width: 12; color: brown; opacity: 0.3; }
     8relation[type=route][route=foot] way::route { z-index: 1; width: 10; color: #80ff80; opacity: 0.6; }
  • trunk/styles_nodist/potlatch2/source/core_ways.css

    r3983 r5215  
    77way[highway=secondary],way[highway=secondary_link],
    88way[highway=tertiary],way[highway=tertiary_link],
    9 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; }
    10 way[highway=motorway],way[highway=motorway_link]    { z-index: 9; color: #809BC0; width: 7; casing-color: black; casing-width: 8; }
    11 way[highway=trunk],way[highway=trunk_link]          { z-index: 9; color: #7FC97F; width: 7; casing-color: black; casing-width: 8; }
    12 way[highway=primary],way[highway=primary_link]      { z-index: 8; color: #E46D71; width: 7; casing-color: black; casing-width: 8; }
    13 way[highway=secondary],way[highway=secondary_link]  { z-index: 7; color: #FDBF6F; width: 7; casing-width: 8; }
    14 way[highway=tertiary]                               { z-index: 6; color: #FEFECB; width: 5; casing-width: 7; }
    15 way[highway=unclassified]                           { z-index: 6; color: #D0D0D0; width: 5; casing-width: 7; }
    16 way[highway=tertiary_link]                          { z-index: 5; color: #FEFECB; width: 4; casing-width: 5; }
    17 way[highway=residential]                            { z-index: 5; color: #E8E8E8; width: 5; casing-color: gray; casing-width: 7; }
    18 way[highway=service][service!=parking_aisle]        { color: white; width: 3; casing-color: gray; casing-width: 5; }
    19 way[highway=service][service=parking_aisle]         { color: white; width: 1; casing-color: #aaaaaa; casing-width: 2; }
    20 way[highway=service][service=alley]                 { color: white; width: 2; dashes: 6,2; casing-color: black; casing-width: 4; }
    21 way[highway=road]                                   { color: gray; width: 5; casing-color: white; casing-width: 7; }
    22 way[highway=living_street]                          { z-index: 5; color: #ddffee; width: 3; casing-color: #555555; casing-width: 4; }
     9way[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 }
     10way[highway=motorway],way[highway=motorway_link]    { z-index: 9; color: #809BC0; width: 7; casing-color: #1e375a; casing-width: 1; }
     11way[highway=trunk],way[highway=trunk_link]          { z-index: 9; color: #7FC97F; width: 7; casing-color: #245424; casing-width: 1; }
     12way[highway=primary],way[highway=primary_link]      { z-index: 8; color: #E46D71; width: 7; casing-color: #651316; casing-width: 1; }
     13way[highway=secondary],way[highway=secondary_link]  { z-index: 7; color: #FDBF6F; width: 7; casing-color: #b16603; casing-width: 1; }
     14way[highway=tertiary],way[highway=tertiary_link]    { z-index: 6; color: #FEFECB; width: 5; casing-color: #626202; casing-width: 1; }
     15way[highway=unclassified]                           { z-index: 6; color: #D0D0D0; width: 5; casing-width: 1; }
     16way[highway=residential]                            { z-index: 5; color: #E8E8E8; width: 5; casing-color: gray; casing-width: 1; }
     17way[highway=service][service!=parking_aisle]        { color: white; width: 3; casing-color: gray; casing-width: 1; }
     18way[highway=service][service=parking_aisle]         { color: white; width: 1; casing-color: #aaaaaa; casing-width: 1; }
     19way[highway=service][service=alley]                 { color: white; width: 2; dashes: 6,2; casing-color: black; casing-width: 1; }
     20way[highway=road]                                   { color: gray; width: 5; casing-color: white; casing-width: 1; }
     21way[highway=living_street]                          { z-index: 5; color: #ddffee; width: 3; casing-color: #555555; casing-width: 1; }
    2322
    2423/* Road areas */
    2524
    26 way[highway=pedestrian] !:area { color: #ddddee; width: 5; casing-color: #555555; casing-width: 6; casing-dashes: 2,4;}
     25way[highway=pedestrian] !:area { color: #ddddee; width: 5; casing-color: #555555; casing-width: 1; casing-dashes: 2,4;}
    2726way[highway=pedestrian] :area  { color: #555555; width: 1; fill-color: #ddddee; fill-opacity: 0.8; }
    2827
     
    3130way[highway=steps]     { color: #FF6644; width: 6; dashes: 2, 2; }
    3231way[highway=footway]   { color: #FF6644; width: 2; dashes: 6, 3; set .path;}
    33 way[highway=footway][bicycle=yes]   { z-index: 4; color: blue; width: 1; }
     32way[highway=footway][bicycle=yes]::bike   { z-index: 4; color: blue; width: 1; }
    3433way[highway=bridleway] { z-index:9; color: #996644; width: 2; dashes: 4, 2, 2, 2; set .path;}
    3534way[highway=track]     { color: #996644; width: 2; dashes: 4, 2; set .path;}
    3635way[highway=path]      { color: brown; width: 2; dashes: 2, 2; set .path;}
    3736way[highway=cycleway]  { color: blue; width: 2; dashes: 4, 2; set .path;}
    38 way[railway=tram]      { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 6; }
    39 way .path              { text:name; text-color: black; text-position: offset; text-offset: 5;}
     37way .path              { text: name; text-color: black; text-position: offset; text-offset: 7; font-size: 12; }
    4038
    4139/* Under construction */
    4240
    4341way[highway=proposed] { color: #88ffff; width: 6; dashes: 8, 4; }
    44 way[highway=construction] { color: #ffffbb; width: 6; dashes: 8, 4; casing-color: #0000aa; casing-width: 8; casing-dashes: 8,4;}
    45 way[construction=rail]
    46         { z-index: 6; color: black; width: 5; dashes: 6, 6, 4, 8;}
    47         { z-index: 7; color: white; width: 3; dashes: 6,18; }
     42way[highway=construction] { color: #ffffbb; width: 6; dashes: 8, 4; casing-color: #0000aa; casing-width: 1; casing-dashes: 8,4;}
    4843
    4944/* Railways */
    5045
    51 way[railway=rail]
    52         { z-index: 6; color: black; width: 5; }
    53         { z-index: 7; color: white; width: 3; dashes: 12,12; }
     46way[railway=rail] { z-index: 6; color: black; width: 5; linecap: round; }
     47way[railway=rail]::dashes { z-index: 7; color: white; width: 3; dashes: 12,12; linecap: round; }
     48
     49way[construction=rail] { z-index: 6; color: black; width: 5; dashes: 6, 6, 4, 8;}
     50way[construction=rail]::inner { z-index: 7; color: white; width: 3; dashes: 6,18; }
     51
    5452way[railway=platform] { color:black; width: 2; }
    55 way[railway=subway]
    56     { z-index: 6; color: #444444; width: 5; }
    57     { z-index: 7; color: white; width: 3; dashes: 8,8; }
    58 way[railway=disused],way[railway=abandoned]
    59     { z-index: 6; color: #444400; width: 3; dashes: 17, 2, 5, 0; }
    60     { z-index: 7; color: #999999; width: 2; dashes: 12,12; }
     53
     54way[railway=subway] { z-index: 6; color: #444444; width: 5; }
     55way[railway=subway]::dashes  { z-index: 7; color: white; width: 3; dashes: 8,8; }
     56
     57way[construction=subway] { z-index: 6; color: #444444; width: 5; dashes: 4, 4; }
     58way[construction=subway]::dashes  { z-index: 7; color: white; width: 3; dashes: 4,12;}
     59
     60way[railway=disused],way[railway=abandoned] { z-index: 6; color: #444400; width: 3; dashes: 17, 2, 5, 0; }
     61way[railway=disused]::dashes,way[railway=abandoned]::dashes { z-index: 7; color: #999999; width: 2; dashes: 12,12; }
     62
     63way[railway=tram]      { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; }
     64way[construction=tram] { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; dashes: 6, 6; casing-dashes: 6, 6; }
     65
     66way[railway=light_rail] { z-index: 6; color: black; width: 4; }
     67way[railway=light_rail]::dashes { z-index: 7; color: #999999; width: 2; dashes: 8,4; }
     68
     69way[construction=light_rail] { z-index: 6; color: black; width: 4; dashes: 8, 4, 4, 4; }
     70way[construction=light_rail]::dashes { z-index: 7; color: #999999; width: 2; dashes: 8,12; }
    6171
    6272/* Waterways */
     
    6474way[waterway=river],
    6575way[waterway=canal],
    66 way[waterway=stream]   { color: blue; width: 2; text:name; text-color:blue; font-size:9; text-position: offset; text-offset: 7;}
    67 way[waterway=drain]                      {color: blue; width: 1; text:name; text-color: blue; text-position: offset; text-offset: 3;}
     76way[waterway=stream]   { color: #3434ff; width: 2; text:name; text-color: #3434ff; font-size:9; text-position: offset; text-offset: 7;}
     77way[waterway=drain]                      {color: #3434ff; width: 1; text:name; text-color: #3434ff; text-position: offset; text-offset: 3;}
    6878way[waterway][tunnel=yes]                {dashes: 8,4;}
    6979
     
    7181
    7282way[aeroway=aerodrome] :area
    73     { z-index: 3; color: #bb44bb; width: 3; casing-color: #66066;  casing-width: 4;  }
     83    { z-index: 3; color: #bb44bb; width: 3; casing-color: #66066;  casing-width: 1;  }
    7484way|z-15[aeroway=aerodrome] :area
    7585    { z-index: 3; fill-color: #bb99bb;  fill-opacity: 0.5;}
    76 way[aeroway=taxiway] !:area { z-index: 8; color: #999999; width: 3; casing-color: #aa66aa; casing-width: 6; }
     86way[aeroway=taxiway] !:area { z-index: 8; color: #999999; width: 3; casing-color: #aa66aa; casing-width: 2; }
    7787way[aeroway=taxiway]  :area { z-index: 8; color: #bb99bb; width: 3; fill-color: #ccaacc; }
    78 way|z17-[aeroway=runway] !:area
    79     { z-index: 9; color: black; width: 11; casing-color: #aa66aa; casing-width: 12; }
    80     { z-index: 10; color: white; width: 9;  dashes: 0, 20, 4, 76; }
    81     { z-index: 11; color: black; width: 7; }
    82     { z-index: 12; color: white; width: 5;  dashes: 0, 20, 4, 76; }
    83     { z-index: 13; color: black; width: 3; }
    84     { z-index: 14; color: white; width: 1;  dashes: 4, 16; }
    85 way|z15-16[aeroway=runway] !:area
    86     { z-index: 9; color: black; width: 5;  }
    87     { z-index: 12; color: white; width: 5;  dashes: 0, 20, 4, 76; }
    88     { z-index: 13; color: black; width: 3; }
    89     { z-index: 14; color: white; width: 1;  dashes: 4, 16; }
    90 way|z-14[aeroway=runway] !:area
    91     { z-index: 9; color: #444444; width: 3;  }
     88
     89way|z17-[aeroway=runway] !:area { z-index: 9; color: black; width: 11; casing-color: #aa66aa; casing-width: 1; }
     90way|z17-[aeroway=runway]::aa !:area { z-index: 10; color: white; width: 9;  dashes: 0, 20, 4, 76; }
     91way|z17-[aeroway=runway]::bb !:area { z-index: 11; color: black; width: 7; }
     92way|z17-[aeroway=runway]::cc !:area { z-index: 12; color: white; width: 5;  dashes: 0, 20, 4, 76; }
     93way|z17-[aeroway=runway]::dd !:area { z-index: 13; color: black; width: 3; }
     94way|z17-[aeroway=runway]::ee !:area { z-index: 14; color: white; width: 1;  dashes: 4, 16; }
     95
     96way|z15-16[aeroway=runway] !:area { z-index: 9; color: black; width: 5;  }
     97way|z15-16[aeroway=runway]::aa !:area { z-index: 12; color: white; width: 5;  dashes: 0, 20, 4, 76; }
     98way|z15-16[aeroway=runway]::bb !:area { z-index: 13; color: black; width: 3; }
     99way|z15-16[aeroway=runway]::cc !:area { z-index: 14; color: white; width: 1;  dashes: 4, 16; }
     100
     101way|z-14[aeroway=runway] !:area { z-index: 9; color: #444444; width: 3;  }
     102
    92103way[aeroway=runway] :area { z-index: 9; color: black; width: 3; fill-color: #775577; }
    93104way[aeroway=apron] :area { z-index: 4; color: #cc66cc; width: 1; fill-color: #ddaadd; fill-opacity: 0.5;}
     
    100111/* Power */
    101112
    102 way[power=line] {color: darkgray; width: 3; dashes: 12,2; casing-color: black; casing-width: 8; casing-dashes: 4, 38;}
    103 way[power=minor_line] {color: gray; width: 2; dashes: 2,4; casing-width: 8; casing-color: white; casing-dashes: 2,22;}
     113way[power=line] {color: darkgray; width: 3; dashes: 12,2; casing-color: black; casing-width: 2; casing-dashes: 4, 38;}
     114way[power=minor_line] {color: gray; width: 2; dashes: 2,4; casing-width: 3; casing-color: white; casing-dashes: 2,22;}
    104115way[power=station] :area { color: black; width: 2; fill-color: #666666; fill-opacity: 0.6; set .area_small_name;}
    105116way[power=generator] :area { color: black; width: 2; fill-color: #444444; fill-opacity: 0.6; set .area_small_name;}
     
    107118/* Leisure */
    108119
    109 way[golf=hole] {color: darkgreen; width: 5; casing-color: green; casing-width: 10; }
     120way[golf=hole] {color: darkgreen; width: 5; casing-color: green; casing-width: 2; }
    110121way[leisure=sports_centre] :area { color: #66ddcc; fill-color: #66ddcc; set .area_small_name; }
    111122
     
    113124/* Physical decoration */
    114125
    115 way[bridge=yes], way[bridge=viaduct], way[bridge=suspension]
    116     { z-index: 4; color: white; width: eval('_width+3'); }
    117     { z-index: 3; color: black; width: eval('_width+6'); }
    118 way[tunnel=yes][!waterway]
    119     { z-index: 4; color: white; width: eval('_width+2'); }
    120     { z-index: 3; color: black; width: eval('_width+6'); dashes: 4,4; }
     126way[bridge=yes]::bridge1, way[bridge=viaduct]::bridge1, way[bridge=suspension]::bridge1 { z-index: 4; color: white; width: eval('_width+3'); }
     127way[bridge=yes]::bridge2, way[bridge=viaduct]::bridge2, way[bridge=suspension]::bridge2 { z-index: 3; color: #444444; width: eval('_width+6'); }
     128way[tunnel=yes][!waterway]::bridge1 { z-index: 4; color: white; width: eval('_width+2'); }
     129way[tunnel=yes][!waterway]::bridge2 { z-index: 3; color: black; width: eval('_width+6'); dashes: 4,4; }
    121130
    122131/* Attribute decoration */
    123132
    124 way[oneway=yes], way[junction=roundabout] { z-index: 15; color: #444444; width: 2; dashes: 15,35; line-style: arrows; }
    125 way[oneway=-1] { z-index: 15; color: #444444; width: 2; dashes: 15,35; line-style: arrows-reversed; }
     133way[oneway=yes]::arrows, way[junction=roundabout]::arrows { z-index: 15; color: #555555; width: 2; dashes: 10,50; line-style: arrows; }
     134way[oneway=-1]::arrows { z-index: 15; color: #555555; width: 2; dashes: 10,50; line-style: arrows-reversed; }
  • trunk/styles_nodist/potlatch2/source/enhanced.css

    r3983 r5215  
    1313/* Access */
    1414
    15 way[access=private],way[access=no] { z-index: 10; color: red; width: eval('_width+2'); dashes: 2,5;}
    16 way[access=permissive] { z-index: 10; color: green; width: eval('_width+2'); dashes: 1,3;}
     15way[access=private]::access,way[access=no]::access { z-index: 10; color: red; width: eval('_width+2'); dashes: 2,5;}
     16way[access=permissive]::access { z-index: 10; color: green; width: eval('_width+2'); dashes: 1,3;}
    1717
    1818/* Physical */
    1919
    20 way[embankment=yes], way[cutting=yes]
     20way[embankment=yes]::hatches, way[cutting=yes]::hatches
    2121    { z-index: 3; opacity: 0.5; color: grey; width: eval('_width+5'); dashes: 2, 2; }
    2222
     
    2929/* Direction on selected ways */
    3030
    31 way[highway][!oneway][junction!=roundabout]:selected,
    32 way[aerial_way]:selected { z-index: 14; color: #999922; width: 2; dashes: 3,60; line-style: arrows; }
    33 way[waterway]:selected { z-index: 14; color: #4444CC; width: 2; dashes: 5,60; line-style: arrows; }
    34 way[railway] :selected{ z-index: 14; color: #999999; width: 3; dashes: 4,92; line-style: arrows; }
     31way[highway][!oneway][junction!=roundabout]::direction :selected,
     32way[aerial_way]::direction :selected { z-index: 14; color: #999922; width: 2; dashes: 3,60; line-style: arrows; }
     33way[waterway]::direction :selected { z-index: 14; color: #4444CC; width: 2; dashes: 5,60; line-style: arrows; }
     34way[railway]::direction :selected{ z-index: 14; color: #999999; width: 3; dashes: 4,92; line-style: arrows; }
    3535
  • trunk/styles_nodist/potlatch2/source/gpx.css

    r3983 r5215  
    77way { z-index: 2; width: 1; color: cyan; }
    88node :poi { z-index: 2;
    9                         icon-image: circle; icon-width: 4; color: orange;
     9                        icon-image: circle; icon-width: 8; color: orange;
    1010                        casing-color: red; casing-width: 1;
    1111                        text-offset: 10; font-family: DejaVu; text: name; font-size: 9; text_color: red; }
  • trunk/styles_nodist/potlatch2/source/network.css

    r3983 r5215  
    1313/* Access */
    1414
    15 way[access=private],way[access=no] { z-index: 10; color: red; width: eval('_width+2'); dashes: 2,5;}
    16 way[access=permissive] { z-index: 10; color: green; width: eval('_width+2'); dashes: 1,3;}
     15way[access=private]::access,way[access=no]::access { z-index: 10; color: red; width: eval('_width+2'); dashes: 2,5;}
     16way[access=permissive]::access { z-index: 10; color: green; width: eval('_width+2'); dashes: 1,3;}
    1717
    1818/* Physical */
    1919
    20 way[embankment=yes], way[cutting=yes]
     20way[embankment=yes]::hatches, way[cutting=yes]::hatches
    2121    { z-index: 3; opacity: 0.5; color: grey; width: eval('_width+5'); dashes: 2, 2; }
    2222
     
    2929/* Direction on selected ways */
    3030
    31 way[highway][!oneway][junction!=roundabout]:selected,
    32 way[aerial_way]:selected { z-index: 14; color: #999922; width: 2; dashes: 3,60; line-style: arrows; }
    33 way[waterway]:selected { z-index: 14; color: #4444CC; width: 2; dashes: 5,60; line-style: arrows; }
    34 way[railway] :selected{ z-index: 14; color: #999999; width: 3; dashes: 4,92; line-style: arrows; }
     31way[highway][!oneway][junction!=roundabout]::direction :selected,
     32way[aerial_way]::direction :selected { z-index: 14; color: #999922; width: 2; dashes: 3,60; line-style: arrows; }
     33way[waterway]::direction :selected { z-index: 14; color: #4444CC; width: 2; dashes: 5,60; line-style: arrows; }
     34way[railway]::direction :selected{ z-index: 14; color: #999999; width: 3; dashes: 4,92; line-style: arrows; }
    3535
  • trunk/styles_nodist/potlatch2/source/opencyclemap.css

    r3983 r5215  
    2828way[highway=tertiary],way[highway=tertiary_link],
    2929way[highway=residential]                             { text: name; text-color: black; font-size: 7; text-position: line;}*/
    30 way[highway=motorway],way[highway=motorway_link]    { z-index: 9; color: #bfbfcf; width: 7; casing-color: #506077; casing-width: 9; }
    31 way[highway=trunk],way[highway=trunk_link]          { z-index: 9; color: #c8d8c8; width: 7; casing-color: #477147; casing-width: 9; }
    32 way[highway=primary],way[highway=primary_link]      { z-index: 8; color: #d8c8c8; width: 7; casing-color: #8d4346; casing-width: 9; }
    33 way[highway=secondary],way[highway=secondary_link]  { z-index: 7; color: #eeeec9; width: 7; casing-color: #a37b48; casing-width: 9; }
    34 way[highway=tertiary],way[highway=unclassified]     { z-index: 6; color: #eeeec9; width: 5; casing-color: #999999; casing-width: 7; }
    35 way[highway=residential]                            { z-index: 5; color: white; width: 5; casing-color: #999; casing-width: 7; }
    36 way[highway=service]                                { color: white; width: 3; casing-color: #999; casing-width: 5; }
     30way[highway=motorway],way[highway=motorway_link]    { z-index: 9; color: #bfbfcf; width: 7; casing-color: #506077; casing-width: 1; }
     31way[highway=trunk],way[highway=trunk_link]          { z-index: 9; color: #c8d8c8; width: 7; casing-color: #477147; casing-width: 1; }
     32way[highway=primary],way[highway=primary_link]      { z-index: 8; color: #d8c8c8; width: 7; casing-color: #8d4346; casing-width: 1; }
     33way[highway=secondary],way[highway=secondary_link]  { z-index: 7; color: #eeeec9; width: 7; casing-color: #a37b48; casing-width: 1; }
     34way[highway=tertiary],way[highway=unclassified]     { z-index: 6; color: #eeeec9; width: 5; casing-color: #999999; casing-width: 1; }
     35way[highway=residential]                            { z-index: 5; color: white; width: 5; casing-color: #999; casing-width: 1; }
     36way[highway=service]                                { color: white; width: 3; casing-color: #999; casing-width: 1; }
    3737
    3838/* Pedestrian precincts need to be treated carefully. Only closed-loops with an explicit
    3939area=yes tag should be filled. The below doesn't yet work as intended. */
    40 way[highway=pedestrian] !:area { color: #ddddee; width: 5; casing-color: #555555; casing-width: 6; }
     40way[highway=pedestrian] !:area { color: #ddddee; width: 5; casing-color: #555555; casing-width: 1; }
    4141way[highway=pedestrian] :area  { color: #555555; width: 1; fill-color: #ddddee; fill-opacity: 0.8; }
    4242
     
    7373
    7474node[addr:housenumber],
    75 node[addr:housename] { icon-image: circle; icon-width: 4; color: #B0E0E6; casing-color:blue; casing-width: 1; }
     75node[addr:housename] { icon-image: circle; icon-width: 8; color: #B0E0E6; casing-color:blue; casing-width: 1; }
    7676way[addr:interpolation] { color: #B0E0E6; width: 3; dashes: 3,3;}
    7777
     
    104104node[amenity=telephone] { icon-image: icons/telephone.png; }
    105105way node[barrier=gate], way node[highway=gate] { icon-image: icons/gate.png; }
    106 way node[barrier=bollard] { icon-image: icons/bollard.png; }
    107106node[barrier=cattle_grid] { icon-image: icons/cattle_grid.png; }*/
    108        
     107
     108/* Important shops */
     109node[shop=bicycle] { icon-image: icons/shopping_bicycle.n.16.png; text-offset: 15; text: name; }
     110
    109111/* We can stack styles at different z-index (depth) */
    110112
    111 way[railway=rail]
    112         { z-index: 6; color: #444444; width: 5; }
    113         { z-index: 7; color: white; width: 3; dashes: 12,12; }
     113way[railway=rail] { z-index: 6; color: #444444; width: 5; }
     114way[railway=rail]::dashes { z-index: 7; color: white; width: 3; dashes: 12,12; }
    114115way[railway=platform] { color:black; width: 2; }
    115 way[railway=subway]
    116         { z-index: 6; color: #444444; width: 5; }
    117         { z-index: 7; color: white; width: 3; dashes: 8,8; }
     116way[railway=subway] { z-index: 6; color: #444444; width: 5; }
     117way[railway=subway]::dashes { z-index: 7; color: white; width: 3; dashes: 8,8; }
    118118
    119119/* Bridge */
    120 way[bridge=yes], way[bridge=viaduct], way[bridge=suspension]
    121     { z-index: 4; color: white; width: eval('_width+3'); }
    122     { z-index: 3; color: black; width: eval('_width+6'); }
     120way[bridge=yes]::bridge1, way[bridge=viaduct]::bridge1, way[bridge=suspension]::bridge1  { z-index: 4; color: white; width: eval('_width+3'); }
     121way[bridge=yes]::bridge2, way[bridge=viaduct]::bridge2, way[bridge=suspension]::bridge2  { z-index: 3; color: black; width: eval('_width+6'); }
    123122   
    124123/* Tunnel */
    125 way[tunnel=yes]
    126     { z-index: 4; color: white; width: eval('_width+2'); }
    127     { z-index: 3; color: black; width: eval('_width+6'); dashes: 4,4; }
     124way[tunnel=yes]::tunnel1 { z-index: 4; color: white; width: eval('_width+2'); }
     125way[tunnel=yes]::tunnel2 { z-index: 3; color: black; width: eval('_width+6'); dashes: 4,4; }
    128126
    129127/* Oneway */
    130 way[oneway=yes] { z-index: 10; color: #6c70d5; width: 2; dashes: 10,30; line-style: arrows; }
     128way[oneway=yes]::arrows { z-index: 10; color: #6c70d5; width: 2; dashes: 10,30; line-style: arrows; }
    131129
    132130
     
    138136   an object. Potlatch 2 supports these but the stand-alone Halcyon viewer does not */
    139137
    140 way :hover      { z-index: 2; width: eval('_width+10'); color: #ffff99; }
    141 way :selected { z-index: 2; width: eval('_width+10'); color: yellow; opacity: 0.7;}
    142 way !:drawn { z-index:10; width: 0.5; color: gray; }
     138@import("stylesheets/core_interactive.css");
    143139
    144 node :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: red; casing-color: #cc0000; casing-width: 1;}
    145 node :hoverway { z-index: 9; icon-image: square; icon-width: 7; color: blue; }
    146 node !:drawn :poi { z-index: 2; icon-image: circle; icon-width: 3; color: lightsteelblue; casing-color: black; casing-width: 1; }
    147 node :selected { z-index: 1; icon-image: square; icon-width: eval('_width+10'); color: yellow; }
    148 node :junction :selectedway { z-index: 8; icon-image: square; icon-width: 12; casing-color: black; casing-width: 1; }
    149        
    150140/* Descendant selectors provide an easy way to style relations: this example means "any way
    151141   which is part of a relation whose type=route". */
    152142
    153 relation[type=route] way { z-index: 1; width: 17; color: yellow; opacity: 0.3; }
    154 relation[type=route][route=bicycle][network=ncn] way { z-index: 1; width: 12; color: red; opacity: 0.3; }
    155 relation[type=route][route=bicycle][network=rcn] way { z-index: 1; width: 12; color: cyan; opacity: 0.3; }
    156 relation[type=route][route=bicycle][network=lcn] way { z-index: 1; width: 12; color: blue; opacity: 0.3; }
    157 relation[type=route][route=bicycle][network=mtb] way { z-index: 1; width: 12; color: #48a448; opacity: 0.3; }
     143relation[type=route] way::routeline { z-index: 1; width: 17; color: yellow; opacity: 0.3; }
     144relation[type=route][route=bicycle][network=ncn] way::routeline { z-index: 1; width: 12; color: red; opacity: 0.3; }
     145relation[type=route][route=bicycle][network=rcn] way::routeline { z-index: 1; width: 12; color: cyan; opacity: 0.3; }
     146relation[type=route][route=bicycle][network=lcn] way::routeline { z-index: 1; width: 12; color: blue; opacity: 0.3; }
     147relation[type=route][route=bicycle][network=mtb] way::routeline { z-index: 1; width: 12; color: #48a448; opacity: 0.3; }
    158148
    159149
  • trunk/styles_nodist/potlatch2/source/potlatch.css

    r3983 r5215  
    1616@import("stylesheets/core_landuse.css");
    1717@import("stylesheets/core_relations.css");
    18 way .area_small_name {text-color: black; font-size: 9; text: name; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;}
     18way .area_small_name {text-color: black; font-size: 10; text: name; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;}
    1919@import("stylesheets/core_interactive.css");
    2020
     21/* Rendering for licence status */
     22
     23way[_status=no]::status       { z-index: 0; width: eval('_width+7'); color: #AA0000; }
     24way[_status=partial]::status  { z-index: 0; width: eval('_width+7'); color: #AA0000; opacity: 0.6; }
     25way[_status=unsure]::status   { z-index: 0; width: eval('_width+7'); color: darkorange; opacity: 0.6; }
     26node[_status=no]::status      { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: #AA0000; }
     27node[_status=partial]::status { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: #AA0000; opacity: 0.6; }
     28node[_status=unsure]::status  { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: darkorange; opacity: 0.6; }
  • trunk/styles_nodist/potlatch2/source/wireframe.css

    r3983 r5215  
    1313node :selected { z-index: 9; icon-image: square; icon-width: 6; color: red; casing-color: black; casing-width: 1; }
    1414node !:drawn :poi { z-index: 2; icon-image: square; icon-width: 4; color: green; casing-color: black; casing-width: 1; }
    15 node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 3; color: black; }
     15node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 6; color: black; }
    1616node :hasTags :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: black; layer: 5; }
    1717
Note: See TracChangeset for help on using the changeset viewer.