Index: /trunk/styles/standard/potlatch2.mapcss =================================================================== --- /trunk/styles/standard/potlatch2.mapcss (revision 5214) +++ /trunk/styles/standard/potlatch2.mapcss (revision 5215) @@ -48,5 +48,4 @@ } - /**************** * core_ways.css @@ -60,23 +59,22 @@ way[highway=secondary],way[highway=secondary_link], way[highway=tertiary],way[highway=tertiary_link], -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; } -way[highway=motorway],way[highway=motorway_link] { z-index: 9; color: #809BC0; width: 7; casing-color: black; casing-width: 8; } -way[highway=trunk],way[highway=trunk_link] { z-index: 9; color: #7FC97F; width: 7; casing-color: black; casing-width: 8; } -way[highway=primary],way[highway=primary_link] { z-index: 8; color: #E46D71; width: 7; casing-color: black; casing-width: 8; } -way[highway=secondary],way[highway=secondary_link] { z-index: 7; color: #FDBF6F; width: 7; casing-width: 8; } -way[highway=tertiary] { z-index: 6; color: #FEFECB; width: 5; casing-width: 7; } -way[highway=unclassified] { z-index: 6; color: #D0D0D0; width: 5; casing-width: 7; } -way[highway=tertiary_link] { z-index: 5; color: #FEFECB; width: 4; casing-width: 5; } -way[highway=residential] { z-index: 5; color: #E8E8E8; width: 5; casing-color: gray; casing-width: 7; } -way[highway=service][service!=parking_aisle] { z-index: 5; color: white; width: 3; casing-color: gray; casing-width: 5; } -way[highway=service][service=parking_aisle] { z-index: 5; color: white; width: 1; casing-color: #aaaaaa; casing-width: 2; } -way[highway=service][service=alley] { z-index: 5; color: white; width: 2; dashes: 6,2; casing-color: black; casing-width: 4; } -way[highway=road] { z-index: 5; color: gray; width: 5; casing-color: white; casing-width: 7; } -way[highway=living_street] { z-index: 5; color: #ddffee; width: 3; casing-color: #555555; casing-width: 4; } +way[highway=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 } +way[highway=motorway],way[highway=motorway_link] { z-index: 9; color: #809BC0; width: 7; casing-color: #1e375a; casing-width: 1; } +way[highway=trunk],way[highway=trunk_link] { z-index: 9; color: #7FC97F; width: 7; casing-color: #245424; casing-width: 1; } +way[highway=primary],way[highway=primary_link] { z-index: 8; color: #E46D71; width: 7; casing-color: #651316; casing-width: 1; } +way[highway=secondary],way[highway=secondary_link] { z-index: 7; color: #FDBF6F; width: 7; casing-color: #b16603; casing-width: 1; } +way[highway=tertiary],way[highway=tertiary_link] { z-index: 6; color: #FEFECB; width: 5; casing-color: #626202; casing-width: 1; } +way[highway=unclassified] { z-index: 6; color: #D0D0D0; width: 5; casing-width: 1; } +way[highway=residential] { z-index: 5; color: #E8E8E8; width: 5; casing-color: gray; casing-width: 1; } +way[highway=service][service!=parking_aisle] { z-index: 5; color: white; width: 3; casing-color: gray; casing-width: 1; } +way[highway=service][service=parking_aisle] { z-index: 5; color: white; width: 1; casing-color: #aaaaaa; casing-width: 1; } +way[highway=service][service=alley] { z-index: 5; color: white; width: 2; dashes: 6,2; casing-color: black; casing-width: 1; } +way[highway=road] { z-index: 5; color: gray; width: 5; casing-color: white; casing-width: 1; } +way[highway=living_street] { z-index: 5; color: #ddffee; width: 3; casing-color: #555555; casing-width: 1; } /* Road areas */ -way[highway=pedestrian]!:closed { z-index: 5; color: #ddddee; width: 5; casing-color: #555555; casing-width: 6; casing-dashes: 2,4;} -way[highway=pedestrian]:closed { color: #555555; width: 1; fill-color: #ddddee; fill-opacity: 0.8; } /* FIXME: dashed outline */ +way[highway=pedestrian]!:closed { z-index: 5; color: #ddddee; width: 5; casing-color: #555555; casing-width: 1; casing-dashes: 2,4;} +area[highway=pedestrian]:closed { color: #555555; width: 1; fill-color: #ddddee; fill-opacity: 0.8; } /* FIXME: dashed outline */ /* Paths */ @@ -84,79 +82,77 @@ way[highway=steps] { z-index: 5; color: #FF6644; width: 6; dashes: 2, 2; } way[highway=footway] { z-index: 5; color: #FF6644; width: 2; dashes: 6, 3; prop_path : 1;} -way[highway=footway][bicycle=yes] { z-index: 4; color: blue; width: 1; } +way[highway=footway][bicycle=yes]::bike { z-index: 4; color: blue; width: 1; } way[highway=bridleway] { z-index:9; color: #996644; width: 2; dashes: 4, 2, 2, 2; prop_path : 1;} way[highway=track] { z-index: 5; color: #996644; width: 2; dashes: 4, 2; prop_path : 1;} way[highway=path] { z-index: 5; color: brown; width: 2; dashes: 2, 2; prop_path : 1;} way[highway=cycleway] { z-index: 5; color: blue; width: 2; dashes: 4, 2; prop_path : 1;} -way[railway=tram] { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 6; } -way[is_prop_set("prop_path")] { text:auto; text-color: black; text-position: line; text-offset: 5;} +way[is_prop_set("prop_path")] { z-index: 5; text: auto; text-color: black; text-position: line; text-offset: 7; font-size: 12; } /* Under construction */ way[highway=proposed] { z-index: 5; color: #88ffff; width: 6; dashes: 8, 4; } -way[highway=construction] { z-index: 5; color: #ffffbb; width: 6; dashes: 8, 4; casing-color: #0000aa; casing-width: 8; casing-dashes: 8,4;} -way[construction=rail] - { z-index: 6; color: black; width: 5; dashes: 6, 6, 4, 8;} -way[construction=rail]::rail_over - { z-index: 7; color: white; width: 3; dashes: 6,18; } +way[highway=construction] { z-index: 5; color: #ffffbb; width: 6; dashes: 8, 4; casing-color: #0000aa; casing-width: 1; casing-dashes: 8,4;} /* Railways */ -way[railway=rail] - { z-index: 6; color: black; width: 5; dashes: 0; } -way[railway=rail]::rail_over - { z-index: 7; color: white; width: 3; dashes: 12,12; } -way[railway=platform] { color:black; width: 2; } -way[railway=subway] - { z-index: 6; color: #444444; width: 5; } -way[railway=subway]::railway_over - { z-index: 7; color: white; width: 3; dashes: 8,8; } -way[railway=disused],way[railway=abandoned] - { z-index: 6; color: #444400; width: 3; dashes: 17, 2, 5, 0; } -way[railway=disused]::railway_over, way[railway=abandoned]::railway_over - { z-index: 7; color: #999999; width: 2; dashes: 12,12; } - -/* Waterways */ - -way[waterway=river], -way[waterway=canal], -way[waterway=stream] { z-index: 5; color: blue; width: 2; text:auto; text-color:blue; font-size:9; text-position: line; text-offset: 7;} -way[waterway=drain] {z-index: 5; color: blue; width: 1; text:auto; text-color: blue; text-position: line; text-offset: 3;} +way[railway=rail] { z-index: 6; color: black; width: 5; linecap: round; dashes: 0; } +way[railway=rail]::dashes { z-index: 7; color: white; width: 3; dashes: 12,12; linecap: round; } + +way[construction=rail] { z-index: 6; color: black; width: 5; dashes: 6, 6, 4, 8;} +way[construction=rail]::inner { z-index: 7; color: white; width: 3; dashes: 6,18; } + +way[railway=platform] { z-index: 5; color:black; width: 2; } + +way[railway=subway] { z-index: 6; color: #444444; width: 5; } +way[railway=subway]::dashes { z-index: 7; color: white; width: 3; dashes: 8,8; } + +way[construction=subway] { z-index: 6; color: #444444; width: 5; dashes: 4, 4; } +way[construction=subway]::dashes { z-index: 7; color: white; width: 3; dashes: 4,12;} + +way[railway=disused],way[railway=abandoned] { z-index: 6; color: #444400; width: 3; dashes: 17, 2, 5, 0; } +way[railway=disused]::dashes,way[railway=abandoned]::dashes { z-index: 7; color: #999999; width: 2; dashes: 12,12; } + +way[railway=tram] { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; } +way[construction=tram] { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; dashes: 6, 6; casing-dashes: 6, 6; } + +way[railway=light_rail] { z-index: 6; color: black; width: 4; } +way[railway=light_rail]::dashes { z-index: 7; color: #999999; width: 2; dashes: 8,4; } + +way[construction=light_rail] { z-index: 6; color: black; width: 4; dashes: 8, 4, 4, 4; } +way[construction=light_rail]::dashes { z-index: 7; color: #999999; width: 2; dashes: 8,12; } + +/* Waterways */ + +way[waterway=river], +way[waterway=canal], +way[waterway=stream] { z-index: 5; color: #3434ff; width: 2; text:auto; text-color: #3434ff; font-size:9; text-position: line; text-offset: 7;} +way[waterway=drain] {z-index: 5; color: #3434ff; width: 1; text:auto; text-color: #3434ff; text-position: line; text-offset: 3;} way[waterway][tunnel=yes] {z-index: 5; dashes: 8,4;} /* Aeroways */ -way[aeroway=aerodrome]:closed - { z-index: 3; color: #bb44bb; width: 3; casing-color: #66066; casing-width: 4; } -way|z-15[aeroway=aerodrome]:closed +area[aeroway=aerodrome]:closed + { z-index: 3; color: #bb44bb; width: 3; casing-color: #66066; casing-width: 1; } +area|z-15[aeroway=aerodrome]:closed { z-index: 3; fill-color: #bb99bb; fill-opacity: 0.5;} -way[aeroway=taxiway]!:closed { z-index: 8; color: #999999; width: 3; casing-color: #aa66aa; casing-width: 6; } -way[aeroway=taxiway]:closed { z-index: 8; color: #bb99bb; width: 3; fill-color: #ccaacc; } -way|z17-[aeroway=runway]!:closed - { z-index: 9; color: black; width: 11; casing-color: #aa66aa; casing-width: 12; } -way|z17-[aeroway=runway]!:closed::aeroway2 - { z-index: 10; color: white; width: 9; dashes: 0, 20, 4, 76; } -way|z17-[aeroway=runway]!:closed::aeroway3 - { z-index: 11; color: black; width: 7; } -way|z17-[aeroway=runway]!:closed::aeroway4 - { z-index: 12; color: white; width: 5; dashes: 0, 20, 4, 76; } -way|z17-[aeroway=runway]!:closed::aeroway5 - { z-index: 13; color: black; width: 3; } -way|z17-[aeroway=runway]!:closed::aeroway6 - { z-index: 14; color: white; width: 1; dashes: 4, 16; } - -way|z15-16[aeroway=runway]!:closed - { z-index: 9; color: black; width: 5; } -way|z15-16[aeroway=runway]!:closed::aeroway2 - { z-index: 12; color: white; width: 5; dashes: 0, 20, 4, 76; } -way|z15-16[aeroway=runway]!:closed::aeroway3 - { z-index: 13; color: black; width: 3; } -way|z15-16[aeroway=runway]!:closed::aeroway4 - { z-index: 14; color: white; width: 1; dashes: 4, 16; } - -way|z-14[aeroway=runway]!:closed - { z-index: 9; color: #444444; width: 3; } -way[aeroway=runway]:closed { z-index: 9; color: black; width: 3; fill-color: #775577; } -way[aeroway=apron]:closed { z-index: 4; color: #cc66cc; width: 1; fill-color: #ddaadd; fill-opacity: 0.5;} +way[aeroway=taxiway]!:closed { z-index: 8; color: #999999; width: 3; casing-color: #aa66aa; casing-width: 2; } +area[aeroway=taxiway]:closed { z-index: 8; color: #bb99bb; width: 3; fill-color: #ccaacc; } + +way|z17-[aeroway=runway]!:closed { z-index: 9; color: black; width: 11; casing-color: #aa66aa; casing-width: 1; } +way|z17-[aeroway=runway]!:closed::aa { z-index: 10; color: white; width: 9; dashes: 0, 20, 4, 76; } +way|z17-[aeroway=runway]!:closed::bb { z-index: 11; color: black; width: 7; } +way|z17-[aeroway=runway]!:closed::cc { z-index: 12; color: white; width: 5; dashes: 0, 20, 4, 76; } +way|z17-[aeroway=runway]!:closed::dd { z-index: 13; color: black; width: 3; } +way|z17-[aeroway=runway]!:closed::ee { z-index: 14; color: white; width: 1; dashes: 4, 16; } + +way|z15-16[aeroway=runway]!:closed { z-index: 9; color: black; width: 5; } +way|z15-16[aeroway=runway]!:closed::aa { z-index: 12; color: white; width: 5; dashes: 0, 20, 4, 76; } +way|z15-16[aeroway=runway]!:closed::bb { z-index: 13; color: black; width: 3; } +way|z15-16[aeroway=runway]!:closed::cc { z-index: 14; color: white; width: 1; dashes: 4, 16; } + +way|z-14[aeroway=runway]!:closed { z-index: 9; color: #444444; width: 3; } + +area[aeroway=runway]:closed { z-index: 9; color: black; width: 3; fill-color: #775577; } +area[aeroway=apron]:closed { z-index: 4; color: #cc66cc; width: 1; fill-color: #ddaadd; fill-opacity: 0.5;} /* Barriers */ @@ -167,37 +163,34 @@ /* Power */ -way[power=line] {z-index: 5; color: darkgray; width: 3; dashes: 12,2; casing-color: black; casing-width: 8; casing-dashes: 4, 38;} -way[power=minor_line] {z-index: 5; color: gray; width: 2; dashes: 2,4; casing-width: 8; casing-color: white; casing-dashes: 2,22;} -way[power=station]:closed { z-index: 5; color: black; width: 2; fill-color: #666666; fill-opacity: 0.6; prop_area_small_name : 1;} -way[power=generator]:closed { z-index: 5; color: black; width: 2; fill-color: #444444; fill-opacity: 0.6; prop_area_small_name : 1;} +way[power=line] {z-index: 5; color: darkgray; width: 3; dashes: 12,2; casing-color: black; casing-width: 2; casing-dashes: 4, 38;} +way[power=minor_line] {z-index: 5; color: gray; width: 2; dashes: 2,4; casing-width: 3; casing-color: white; casing-dashes: 2,22;} +area[power=station]:closed { color: black; width: 2; fill-color: #666666; fill-opacity: 0.6; prop_area_small_name : 1;} +area[power=generator]:closed { color: black; width: 2; fill-color: #444444; fill-opacity: 0.6; prop_area_small_name : 1;} /* Leisure */ -way[golf=hole] {z-index: 5; color: darkgreen; width: 5; casing-color: green; casing-width: 10; } -way[leisure=sports_centre]:closed { color: #66ddcc; fill-color: #66ddcc; prop_area_small_name : 1; } +way[golf=hole] {z-index: 5; color: darkgreen; width: 5; casing-color: green; casing-width: 2; } +area[leisure=sports_centre]:closed { color: #66ddcc; fill-color: #66ddcc; prop_area_small_name : 1; } /* Physical decoration */ -way[bridge=yes]::bridge1, way[bridge=viaduct]::bridge1, way[bridge=suspension]::bridge1 - { z-index: 4; color: white; width: +3; } -way[bridge=yes]::bridge2, way[bridge=viaduct]::bridge2, way[bridge=suspension]::bridge2 - { z-index: 3; color: black; width: +6; } -way[tunnel=yes][!waterway]::tunnel1 - { z-index: 4; color: white; width: +2; } -way[tunnel=yes][!waterway]::tunnel2 - { z-index: 3; color: black; width: +6; dashes: 4,4; } +way[bridge=yes]::bridge1, way[bridge=viaduct]::bridge1, way[bridge=suspension]::bridge1 { z-index: 4; color: white; width: +3; } +way[bridge=yes]::bridge2, way[bridge=viaduct]::bridge2, way[bridge=suspension]::bridge2 { z-index: 3; color: #444444; width: +6; } +way[tunnel=yes][!waterway]::bridge1 { z-index: 4; color: white; width: +2; } +way[tunnel=yes][!waterway]::bridge2 { z-index: 3; color: black; width: +6; dashes: 4,4; } /* Attribute decoration */ -/*way[oneway=yes], way[junction=roundabout] { z-index: 15; color: #444444; width: 2; dashes: 15,35; line-style: arrows; }*/ -/*way[oneway="-1"] { z-index: 15; color: #444444; width: 2; dashes: 15,35; line-style: arrows-reversed; }*/ +/*way[oneway=yes]::arrows, way[junction=roundabout]::arrows { z-index: 15; color: #555555; width: 2; dashes: 10,50; line-style: arrows; } +way[oneway=-1]::arrows { z-index: 15; color: #555555; width: 2; dashes: 10,50; line-style: arrows-reversed; }*/ /**************** * core_pois.css ****************/ + node { text-anchor-horizontal: center; text-anchor-vertical: below; } -node[place] { icon-image: icons/place.png; font-family: DejaVu; text: auto; font-size: 9; font-weight: bold; text-decoration: underline; z-index: 20; } +node[place] { icon-image: icons/place.png; font-family: DejaVu; text: auto; font-size: 10; font-weight: bold; z-index: 20; } node[amenity=telephone] { icon-image: icons/telephone.png; z-index: 20; } node[barrier=cattle_grid] { icon-image: icons/cattle_grid.png; z-index: 20; } @@ -206,7 +199,9 @@ node[tourism=camp_site] { icon-image: icons/accommodation_camping.n.16.png; z-index: 20; } node[tourism=caravan_site] { icon-image: icons/accommodation_caravan_park.n.16.png; z-index: 20; } +node[tourism=chalet] { icon-image: icons/accommodation_chalet.n.16.png; z-index: 20; } node[tourism=guest_house],node[tourism=bed_and_breakfast] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; } -node[tourism=hotel] { icon-image: icons/accommodation_hotel.n.16.png; text-offset:0; text: auto; z-index: 20; } +node[tourism=hotel] { icon-image: icons/accommodation_hotel.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } node[tourism=hostel] { icon-image: icons/accommodation_youth_hostel.n.16.png; z-index: 20; } +node[tourism=motel] { icon-image: icons/accommodation_motel.n.16.png; z-index: 20; } node[amenity=fire_station] { icon-image: icons/amenity_firestation2.n.16.png; z-index: 20; } node[amenity=police] { icon-image: icons/amenity_police2.n.16.png; z-index: 20; } @@ -222,19 +217,36 @@ node[barrier=block] { icon-image: icons/barrier_blocks.16.png; z-index: 20; } node[barrier=cattle_grid] { icon-image: icons/barrier_cattle_grid.16.png; z-index: 20; } -node[amenity=school] { icon-image: icons/education_school.n.16.png; text-offset:0; text: auto; z-index: 20; } -way[amenity=school]:closed { color: yellow; fill-color: yellow; fill-opacity: 0.1; prop_area_small_name : 1; } -node[amenity=bar] { icon-image: icons/food_bar.n.16.png; text-offset:0; text: auto; z-index: 20; } -node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:0; text: auto; z-index: 20; } +node[amenity=school] { icon-image: icons/education_school.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } +aera[amenity=school]:closed { color: yellow; fill-color: yellow; fill-opacity: 0.1; prop_area_small_name : 1; } +node[amenity=bar] { icon-image: icons/food_bar.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } +node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } node[amenity=fast_food] { icon-image: icons/food_fastfood.n.16.png; z-index: 20; } -node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset:0; text: name; z-index: 20; } -node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:0; text: auto; z-index: 20; } +node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset: 15; text: auto; font-size: 10; z-index: 20; } +node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } node[amenity=hospital] { icon-image: icons/health_hospital.n.16.png; z-index: 20; } node[amenity=pharmacy] { icon-image: icons/health_pharmacy.n.16.png; z-index: 20; } node[amenity=atm] { icon-image: icons/money_atm.n.16.png; z-index: 20; } node[amenity=bank] { icon-image: icons/money_bank2.n.16.png; z-index: 20; } +/* More Amenities */ +node[amenity=bench] { icon-image: icons/amenity_bench.n.16.png; z-index: 20; } +node[amenity=drinking_water] { icon-image: icons/food_drinkingtap.n.16.png; z-index: 20; } +node[amenity=emergency_phone] { icon-image: icons/emergency-telephone-16.png; z-index: 20; } +node[amenity=fountain] { icon-image: icons/amenity_fountain2.n.16.png; z-index: 20; } +node[amenity=hunting_stand] { icon-image: icons/sport_shooting.n.16.png; z-index: 20; } +node[amenity=kindergarten] { icon-image: icons/education_nursery3.n.16.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; } +node[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; } +node[amenity=post_office] { icon-image: icons/amenity_post_office.n.16.png; z-index: 20; } +node[amenity=shelter] { icon-image: icons/accommodation_shelter2.n.16.png; z-index: 20; } +node[amenity=swimming_pool] { icon-image: icons/sport_swimming_outdoor.n.16.png; z-index: 20; } +node[amenity=townhall] { icon-image: icons/amenity_town_hall.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } +node[amenity=toilets] { icon-image: icons/amenity_toilets.n.16.png; z-index: 20; } +node[amenity=vending_machine] { icon-image: icons/shopping_vending_machine.n.16.png; z-index: 20; } +node[amenity=veterinary] { icon-image: icons/health_veterinary.n.8E7409.16.png; z-index: 20; } +node[amenity=waste_basket] { icon-image: icons/amenity_waste_bin.n.16.png; z-index: 20; } +/* Shops */ node[shop=alcohol] { icon-image: icons/shopping_alcohol.n.16.png; z-index: 20; } node[shop=bakery] { icon-image: icons/shopping_bakery.n.16.png; z-index: 20; } node[shop=bicycle] { icon-image: icons/shopping_bicycle.n.16.png; z-index: 20; } -node[shop=book] { icon-image: icons/shopping_book.n.16.png; z-index: 20; } +node[shop=book], node[shop=books] { icon-image: icons/shopping_book.n.16.png; z-index: 20; } node[shop=butcher] { icon-image: icons/shopping_butcher.n.16.png; z-index: 20; } node[shop=car_repair] { icon-image: icons/shopping_car_repair.n.16.png; z-index: 20; } @@ -245,4 +257,5 @@ node[shop=doityourself] { icon-image: icons/shopping_diy.n.16.png; z-index: 20; } node[shop=fishmonger] { icon-image: icons/shopping_fish.n.16.png; z-index: 20; } +node[shop=florist] { icon-image: icons/shopping_florist.n.16.png; z-index: 20; } node[shop=garden_centre] { icon-image: icons/shopping_garden_centre.n.16.png; z-index: 20; } node[shop=gift] { icon-image: icons/shopping_gift.n.16.png; z-index: 20; } @@ -251,25 +264,37 @@ node[shop=hifi] { icon-image: icons/shopping_hifi.n.16.png; z-index: 20; } node[shop=jewelry] { icon-image: icons/shopping_jewelry.n.16.png; z-index: 20; } +node[shop=kiosk] { icon-image: icons/shopping_kiosk.n.16.png; z-index: 20; } node[shop=laundry] { icon-image: icons/shopping_laundrette.n.16.png; z-index: 20; } +node[amenity=marketplace] { icon-image: icons/shopping_marketplace.n.16.png; z-index: 20; } node[shop=motorcycle] { icon-image: icons/shopping_motorcycle.n.16.png; z-index: 20; } node[shop=music] { icon-image: icons/shopping_music.n.16.png; z-index: 20; } node[shop=supermarket] { icon-image: icons/shopping_supermarket.n.16.png; z-index: 20; } +node[shop=toys] { icon-image: icons/shopping_toys.n.16.png; z-index: 20; } +/* More Touristy Items */ +node[tourism=artwork] { icon-image: icons/tourist_art_gallery2.n.16.png; z-index: 20; } node[historic=archaeological_site] { icon-image: icons/tourist_archaeological.n.16.png; z-index: 20; } node[historic=battlefield] { icon-image: icons/tourist_battlefield.n.16.png; z-index: 20; } -node[historic=castle] { icon-image: icons/tourist_castle.n.16.png; text-offset:0; text: auto; z-index: 20; } +node[historic=castle] { icon-image: icons/tourist_castle.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } node[amenity=cinema] { icon-image: icons/tourist_cinema.n.16.png; z-index: 20; } -node[historic=memorial] { icon-image: icons/tourist_memorial.n.16.png; text-offset:0; text: auto; z-index: 20; } -node[historic=monument] { icon-image: icons/tourist_monument.n.16.png; text-offset:0; text: auto; z-index: 20; } -node[tourism=museum] { icon-image: icons/tourist_museum.n.16.png; text-offset:0; text: auto; z-index: 20; } +node[historic=memorial] { icon-image: icons/tourist_memorial.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } +node[historic=monument] { icon-image: icons/tourist_monument.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } +node[tourism=museum] { icon-image: icons/tourist_museum.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } +node[tourism=information] { icon-image: icons/tourist_information.png; z-index: 20; } node[tourism=picnic_site] { icon-image: icons/tourist_picnic.n.16.png; z-index: 20; } -node[historic=ruin] { icon-image: icons/tourist_ruin.n.16.png; z-index: 20; } +node[historic=ruins] { icon-image: icons/tourist_ruin.n.16.png; z-index: 20; } node[amenity=theatre] { icon-image: icons/tourist_theatre.n.16.png; z-index: 20; } +node[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; } node[tourism=viewpoint] { icon-image: icons/tourist_view_point.n.16.png; z-index: 20; } node[tourism=zoo] { icon-image: icons/tourist_zoo.n.16.png; z-index: 20; } +/* Transport */ node[aeroway=aerodrome] { icon-image: icons/transport_aerodrome.n.16.png; z-index: 20; } +node[aeroway=gate] { icon-image: icons/transport_airport_gate.n.16.png; z-index: 20; } +node[aeroway=terminal] { icon-image: icons/transport_airport_terminal.n.16.png; z-index: 20; } +node[aeroway=helipad] { icon-image: icons/transport_helicopter_pad.n.16.png; z-index: 20; } node[amenity=bus_station] { icon-image: icons/transport_bus_station.n.16.png; z-index: 20; } node[highway=bus_stop] { icon-image: icons/transport_bus_stop2.n.16.png; z-index: 20; } node[amenity=fuel] { icon-image: icons/transport_fuel.n.16.png; z-index: 20; } -node[amenity=bicycle_parking] { icon-image: icons/transport_parking_bicycle.n.16.png; text-offset: 0; text: capacity; z-index: 20; } +node[amenity=car_wash] { icon-image: icons/transport_car_wash.n.16.png; z-index: 20; } +node[amenity=bicycle_parking] { icon-image: icons/transport_parking_bicycle.n.16.png; text-offset:0; text: capacity; font-size: 10; z-index: 20; } node[amenity=parking] { icon-image: icons/transport_parking_car.n.16.png; z-index: 20; } node[amenity=ferry_terminal] { icon-image: icons/transport_port.n.16.png; z-index: 20; } @@ -277,7 +302,21 @@ node[amenity=car_rental] { icon-image: icons/transport_rental_car.n.16.png; z-index: 20; } node[amenity=taxi] { icon-image: icons/transport_taxi_rank.n.16.png; z-index: 20; } -node[railway=station] { icon-image: icons/transport_train_station.n.16.png; text-offset:0; text: auto; z-index: 20; } +node[railway=station] { icon-image: icons/transport_train_station.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } node[railway=tram_stop] { icon-image: icons/transport_tram_stop.n.16.png; z-index: 20; } node[leisure=marina] { icon-image: icons/transport_marina.n.16.png; z-index: 20; } +node[highway=mini_roundabout] { icon-image: icons/transport_miniroundabout_anticlockwise.n.16.png; z-index: 20; } +node[highway=crossing] { icon-image: icons/transport_zebracrossing.n.16.png; z-index: 20; } +/* Misc */ +node[leisure=playground] { icon-image: icons/amenity_playground.n.16.png; z-index: 20; } +node[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; } +/* node[landuse=cemetery], node[landuse=grave_yard] { icon-image: icons/?.png; z-index: 20; } */ +node[man_made=survey_point] { icon-image: icons/manmade_lighthouse.png; z-index: 20; } +node[man_made=tower] { icon-image: icons/manmade_tower.png; z-index: 20; } +/* Yes these power stations seem a little backward - but that's seemingly what the side menu uses ATM */ +node[power=station] { icon-image: icons/power_substation.n.16.png; z-index: 20; } +node[power=generator] { icon-image: icons/power_station.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; } +node[power=tower] { icon-image: icons/power_tower_high2.n.16.png; z-index: 20; } +node[power=pole] { icon-image: icons/power_tower_low.n.16.png; z-index: 20; } +node[waterway=weir] { icon-image: icons/transport_weir.n.16.png; z-index: 20; } /* Addressing */ @@ -287,6 +326,6 @@ node[addr:housenumber]::hn_casing, node[addr:housename]::hn_casing { z-index: -100; symbol-shape: circle; symbol-size: 10; symbol-fill-color: blue; } + way[addr:interpolation] { z-index: 5; color: #B0E0E6; width: 3; dashes: 3,3;} - /**************** * core_landuse.css @@ -307,14 +346,14 @@ area[leisure]:closed { color: #8CD6B5; width: 1; fill-color: #8CD6B5; fill-opacity: 0.2; } area[tourism]:closed { color: #F7CECE; width: 1; fill-color: #F7CECE; fill-opacity: 0.2; prop_area_small_name : 1;} -area[historic]:closed, area[ruins]:closed { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; prop_area_small_name : 1;} +area[historic]:closed, area[ruins]:closed { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; prop_area_small_name : 1;} area[military]:closed { color: #D6D6D6; width: 1; fill-color: #D6D6D6; fill-opacity: 0.2; prop_area_small_name : 1;} -area[building]:closed { color: #ff6ec7; width: 1; fill-color: #ff6ec7; fill-opacity: 0.2; } +area[building]:closed { color: #bca9a9; width: 1; fill-color: #ff6ec7; fill-opacity: 0.2; } area[natural=water]:closed, -area[waterway][waterway!=dam]:closed { color: blue; width: 2; fill-color: blue; fill-opacity: 0.2; prop_area_small_name : 1;} +area[waterway][waterway!=dam]:closed { color: #3434ff; width: 2; fill-color: #3434ff; fill-opacity: 0.2; prop_area_small_name : 1;} way[waterway=dam] { z-index: 5; color: black; width: 1; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1;} area[man_made]:closed { color: black; width: 2; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1; } -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; } -area[landuse=reservoir]:closed { color: blue; width: 2; fill-color: blue; fill-opacity: 0.2; prop_area_small_name : 1;} -area[landuse=forest]:closed,area[natural=wood]:closed { color: green; width: 2; fill-color: green; fill-opacity: 0.2; prop_area_small_name : 1;} +area[man_made=reservoir_covered]:closed { color: #3434ff; width: 2; dashes: 4, 2; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1; } +area[landuse=reservoir]:closed { color: #3434ff; width: 2; fill-color: #3434ff; fill-opacity: 0.2; prop_area_small_name : 1;} +area[landuse=forest]:closed, area[natural=wood]:closed { color: green; width: 2; fill-color: green; fill-opacity: 0.2; prop_area_small_name : 1;} area[leisure=park]:closed { color: #22aa22; width: 2; fill-color: #44ff44; fill-opacity: 0.15; prop_area_small_name : 1;} area[leisure=garden]:closed { color: #66ff44; width: 1; fill-color: #66ff44; fill-opacity: 0.2; prop_area_small_name : 1;} @@ -323,8 +362,8 @@ area[amenity=parking]:closed { color: #bbaa66; width: 1; fill-color: #bbaa66; fill-opacity: 0.2; } area[public_transport=pay_scale_area]:closed { color: gray; width: 1; fill-color: gray; fill-opacity: 0.1; } -way[man_made=pier] { z-index: 4; color: #777; width: 3; casing-color: black; casing-width: 5;} +way[man_made=pier] { z-index: 4; color: #777; width: 3; casing-color: black; casing-width: 1;} way[man_made=pier][floating=yes] { z-index: 5; dashes: 4,2; casing-color: #444;} area[leisure=marina]:closed { color: pink; fill-color: pink; fill-opacity: 0.4; prop_area_small_name : 1;} -way[leisure=slipway] { z-index: 5; color: grey; width: 3; casing-color: blue; casing-width: 7; } +way[leisure=slipway] { z-index: 5; color: grey; width: 3; casing-color: #3434ff; casing-width: 2; } area[leisure=golf_course]:closed { color: #44ee22; width: 2; fill-color: #44ee22; fill-opacity: 0.2; prop_area_small_name : 1;} way[boundary] { z-index: 5; color: #000066; width: 2; opacity: 0.6; dashes: 24,4, 4, 4; z-index: 4;} @@ -334,14 +373,14 @@ way[boundary=administrative] { z-index: 5; color: purple; width: 2; opacity: 0.2; dashes: 24,4; z-index: 4;} way[boundary=administrative][waterway] { z-index: 5; opacity: 0.8; z-index: 4; dashes: 24,4; width: 6; } -way[landuse=cemetery] { z-index: 5; color: #664466; width: 2; fill-color: #664466; opacity: 0.2; prop_area_small_name : 1;} +area[landuse=cemetery]:closed { color: #664466; width: 2; fill-color: color: #664466; opacity: 0.2; prop_area_small_name : 1;} /* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */ /* Route relations */ -relation[type=route] > way::relation_underlay { z-index: -1; width: 13; color: blue; opacity: 0.3; linecap: none; } -relation[type=route][route=bicycle][network=ncn] > way::relation_underlay { z-index: -1; width: 12; color: red; opacity: 0.3; linecap: none; } -relation[type=route][route=bicycle][network=rcn] > way::relation_underlay { z-index: -1; width: 12; color: cyan; opacity: 0.3; linecap: none; } -relation[type=route][route=bicycle][network=lcn] > way::relation_underlay { z-index: -1; width: 12; color: blue; opacity: 0.3; linecap: none; } -relation[type=route][route=foot] > way::relation_underlay { z-index: -1; width: 10; color: #80ff80; opacity: 0.6; linecap: none; } - +relation[type=route] > way::route { z-index: -1; width: 13; color: blue; opacity: 0.3; linecap: none; } +relation[type=route][route=bicycle][network=ncn] > way::route { z-index: -1; width: 12; color: red; opacity: 0.3; linecap: none; } +relation[type=route][route=bicycle][network=rcn] > way::route { z-index: -1; width: 12; color: cyan; opacity: 0.3; linecap: none; } +relation[type=route][route=bicycle][network=lcn] > way::route { z-index: -1; width: 12; color: blue; opacity: 0.3; linecap: none; } +relation[type=route][route=mtb] > way::route { z-index: -1; width: 12; color: brown; opacity: 0.3; linecap: none; } +relation[type=route][route=foot] > way::route { z-index: -1; width: 10; color: #80ff80; opacity: 0.6; linecap: none; } /*@import("stylesheets/core_ways.css");*/ @@ -349,5 +388,13 @@ /*@import("stylesheets/core_landuse.css");*/ /*@import("stylesheets/core_relations.css");*/ -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;} +way[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;} /*@import("stylesheets/core_interactive.css");*/ +/* Rendering for licence status */ + +/*way[_status=no]::status { z-index: 0; width: eval('_width+7'); color: #AA0000; } +way[_status=partial]::status { z-index: 0; width: eval('_width+7'); color: #AA0000; opacity: 0.6; } +way[_status=unsure]::status { z-index: 0; width: eval('_width+7'); color: darkorange; opacity: 0.6; } +node[_status=no]::status { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: #AA0000; } +node[_status=partial]::status { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: #AA0000; opacity: 0.6; } +node[_status=unsure]::status { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: darkorange; opacity: 0.6; }*/ Index: /trunk/styles_nodist/potlatch2/README =================================================================== --- /trunk/styles_nodist/potlatch2/README (revision 5214) +++ /trunk/styles_nodist/potlatch2/README (revision 5215) @@ -17,3 +17,3 @@ When updating from upstream, keep all 4 locations in sync. -At time of writing, the last update used 0f12f406e80e7cedb1ca9d4662ab2977077fdc79 but better check the commit dates as well. +At time of writing, the last update used f4019f791c0ee268443c942ad06f127d9911758a but better check the commit dates as well. Index: /trunk/styles_nodist/potlatch2/patched/core_landuse.css =================================================================== --- /trunk/styles_nodist/potlatch2/patched/core_landuse.css (revision 5214) +++ /trunk/styles_nodist/potlatch2/patched/core_landuse.css (revision 5215) @@ -1,3 +1,2 @@ - /**************** * core_landuse.css @@ -18,14 +17,14 @@ area[leisure]:closed { color: #8CD6B5; width: 1; fill-color: #8CD6B5; fill-opacity: 0.2; } area[tourism]:closed { color: #F7CECE; width: 1; fill-color: #F7CECE; fill-opacity: 0.2; prop_area_small_name : 1;} -area[historic]:closed, area[ruins]:closed { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; prop_area_small_name : 1;} +area[historic]:closed, area[ruins]:closed { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; prop_area_small_name : 1;} area[military]:closed { color: #D6D6D6; width: 1; fill-color: #D6D6D6; fill-opacity: 0.2; prop_area_small_name : 1;} -area[building]:closed { color: #ff6ec7; width: 1; fill-color: #ff6ec7; fill-opacity: 0.2; } +area[building]:closed { color: #bca9a9; width: 1; fill-color: #ff6ec7; fill-opacity: 0.2; } area[natural=water]:closed, -area[waterway][waterway!=dam]:closed { color: blue; width: 2; fill-color: blue; fill-opacity: 0.2; prop_area_small_name : 1;} +area[waterway][waterway!=dam]:closed { color: #3434ff; width: 2; fill-color: #3434ff; fill-opacity: 0.2; prop_area_small_name : 1;} way[waterway=dam] { z-index: 5; color: black; width: 1; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1;} area[man_made]:closed { color: black; width: 2; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1; } -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; } -area[landuse=reservoir]:closed { color: blue; width: 2; fill-color: blue; fill-opacity: 0.2; prop_area_small_name : 1;} -area[landuse=forest]:closed,area[natural=wood]:closed { color: green; width: 2; fill-color: green; fill-opacity: 0.2; prop_area_small_name : 1;} +area[man_made=reservoir_covered]:closed { color: #3434ff; width: 2; dashes: 4, 2; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1; } +area[landuse=reservoir]:closed { color: #3434ff; width: 2; fill-color: #3434ff; fill-opacity: 0.2; prop_area_small_name : 1;} +area[landuse=forest]:closed, area[natural=wood]:closed { color: green; width: 2; fill-color: green; fill-opacity: 0.2; prop_area_small_name : 1;} area[leisure=park]:closed { color: #22aa22; width: 2; fill-color: #44ff44; fill-opacity: 0.15; prop_area_small_name : 1;} area[leisure=garden]:closed { color: #66ff44; width: 1; fill-color: #66ff44; fill-opacity: 0.2; prop_area_small_name : 1;} @@ -34,8 +33,8 @@ area[amenity=parking]:closed { color: #bbaa66; width: 1; fill-color: #bbaa66; fill-opacity: 0.2; } area[public_transport=pay_scale_area]:closed { color: gray; width: 1; fill-color: gray; fill-opacity: 0.1; } -way[man_made=pier] { z-index: 4; color: #777; width: 3; casing-color: black; casing-width: 5;} +way[man_made=pier] { z-index: 4; color: #777; width: 3; casing-color: black; casing-width: 1;} way[man_made=pier][floating=yes] { z-index: 5; dashes: 4,2; casing-color: #444;} area[leisure=marina]:closed { color: pink; fill-color: pink; fill-opacity: 0.4; prop_area_small_name : 1;} -way[leisure=slipway] { z-index: 5; color: grey; width: 3; casing-color: blue; casing-width: 7; } +way[leisure=slipway] { z-index: 5; color: grey; width: 3; casing-color: #3434ff; casing-width: 2; } area[leisure=golf_course]:closed { color: #44ee22; width: 2; fill-color: #44ee22; fill-opacity: 0.2; prop_area_small_name : 1;} way[boundary] { z-index: 5; color: #000066; width: 2; opacity: 0.6; dashes: 24,4, 4, 4; z-index: 4;} @@ -45,4 +44,4 @@ way[boundary=administrative] { z-index: 5; color: purple; width: 2; opacity: 0.2; dashes: 24,4; z-index: 4;} way[boundary=administrative][waterway] { z-index: 5; opacity: 0.8; z-index: 4; dashes: 24,4; width: 6; } -way[landuse=cemetery] { z-index: 5; color: #664466; width: 2; fill-color: #664466; opacity: 0.2; prop_area_small_name : 1;} +area[landuse=cemetery]:closed { color: #664466; width: 2; fill-color: color: #664466; opacity: 0.2; prop_area_small_name : 1;} /* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */ Index: /trunk/styles_nodist/potlatch2/patched/core_pois.css =================================================================== --- /trunk/styles_nodist/potlatch2/patched/core_pois.css (revision 5214) +++ /trunk/styles_nodist/potlatch2/patched/core_pois.css (revision 5215) @@ -3,7 +3,8 @@ * core_pois.css ****************/ + node { text-anchor-horizontal: center; text-anchor-vertical: below; } -node[place] { icon-image: icons/place.png; font-family: DejaVu; text: auto; font-size: 9; font-weight: bold; text-decoration: underline; z-index: 20; } +node[place] { icon-image: icons/place.png; font-family: DejaVu; text: auto; font-size: 10; font-weight: bold; z-index: 20; } node[amenity=telephone] { icon-image: icons/telephone.png; z-index: 20; } node[barrier=cattle_grid] { icon-image: icons/cattle_grid.png; z-index: 20; } @@ -12,7 +13,9 @@ node[tourism=camp_site] { icon-image: icons/accommodation_camping.n.16.png; z-index: 20; } node[tourism=caravan_site] { icon-image: icons/accommodation_caravan_park.n.16.png; z-index: 20; } +node[tourism=chalet] { icon-image: icons/accommodation_chalet.n.16.png; z-index: 20; } node[tourism=guest_house],node[tourism=bed_and_breakfast] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; } -node[tourism=hotel] { icon-image: icons/accommodation_hotel.n.16.png; text-offset:0; text: auto; z-index: 20; } +node[tourism=hotel] { icon-image: icons/accommodation_hotel.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } node[tourism=hostel] { icon-image: icons/accommodation_youth_hostel.n.16.png; z-index: 20; } +node[tourism=motel] { icon-image: icons/accommodation_motel.n.16.png; z-index: 20; } node[amenity=fire_station] { icon-image: icons/amenity_firestation2.n.16.png; z-index: 20; } node[amenity=police] { icon-image: icons/amenity_police2.n.16.png; z-index: 20; } @@ -28,19 +31,36 @@ node[barrier=block] { icon-image: icons/barrier_blocks.16.png; z-index: 20; } node[barrier=cattle_grid] { icon-image: icons/barrier_cattle_grid.16.png; z-index: 20; } -node[amenity=school] { icon-image: icons/education_school.n.16.png; text-offset:0; text: auto; z-index: 20; } -way[amenity=school]:closed { color: yellow; fill-color: yellow; fill-opacity: 0.1; prop_area_small_name : 1; } -node[amenity=bar] { icon-image: icons/food_bar.n.16.png; text-offset:0; text: auto; z-index: 20; } -node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:0; text: auto; z-index: 20; } +node[amenity=school] { icon-image: icons/education_school.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } +aera[amenity=school]:closed { color: yellow; fill-color: yellow; fill-opacity: 0.1; prop_area_small_name : 1; } +node[amenity=bar] { icon-image: icons/food_bar.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } +node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } node[amenity=fast_food] { icon-image: icons/food_fastfood.n.16.png; z-index: 20; } -node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset:0; text: name; z-index: 20; } -node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:0; text: auto; z-index: 20; } +node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset: 15; text: auto; font-size: 10; z-index: 20; } +node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } node[amenity=hospital] { icon-image: icons/health_hospital.n.16.png; z-index: 20; } node[amenity=pharmacy] { icon-image: icons/health_pharmacy.n.16.png; z-index: 20; } node[amenity=atm] { icon-image: icons/money_atm.n.16.png; z-index: 20; } node[amenity=bank] { icon-image: icons/money_bank2.n.16.png; z-index: 20; } +/* More Amenities */ +node[amenity=bench] { icon-image: icons/amenity_bench.n.16.png; z-index: 20; } +node[amenity=drinking_water] { icon-image: icons/food_drinkingtap.n.16.png; z-index: 20; } +node[amenity=emergency_phone] { icon-image: icons/emergency-telephone-16.png; z-index: 20; } +node[amenity=fountain] { icon-image: icons/amenity_fountain2.n.16.png; z-index: 20; } +node[amenity=hunting_stand] { icon-image: icons/sport_shooting.n.16.png; z-index: 20; } +node[amenity=kindergarten] { icon-image: icons/education_nursery3.n.16.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; } +node[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; } +node[amenity=post_office] { icon-image: icons/amenity_post_office.n.16.png; z-index: 20; } +node[amenity=shelter] { icon-image: icons/accommodation_shelter2.n.16.png; z-index: 20; } +node[amenity=swimming_pool] { icon-image: icons/sport_swimming_outdoor.n.16.png; z-index: 20; } +node[amenity=townhall] { icon-image: icons/amenity_town_hall.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } +node[amenity=toilets] { icon-image: icons/amenity_toilets.n.16.png; z-index: 20; } +node[amenity=vending_machine] { icon-image: icons/shopping_vending_machine.n.16.png; z-index: 20; } +node[amenity=veterinary] { icon-image: icons/health_veterinary.n.8E7409.16.png; z-index: 20; } +node[amenity=waste_basket] { icon-image: icons/amenity_waste_bin.n.16.png; z-index: 20; } +/* Shops */ node[shop=alcohol] { icon-image: icons/shopping_alcohol.n.16.png; z-index: 20; } node[shop=bakery] { icon-image: icons/shopping_bakery.n.16.png; z-index: 20; } node[shop=bicycle] { icon-image: icons/shopping_bicycle.n.16.png; z-index: 20; } -node[shop=book] { icon-image: icons/shopping_book.n.16.png; z-index: 20; } +node[shop=book], node[shop=books] { icon-image: icons/shopping_book.n.16.png; z-index: 20; } node[shop=butcher] { icon-image: icons/shopping_butcher.n.16.png; z-index: 20; } node[shop=car_repair] { icon-image: icons/shopping_car_repair.n.16.png; z-index: 20; } @@ -51,4 +71,5 @@ node[shop=doityourself] { icon-image: icons/shopping_diy.n.16.png; z-index: 20; } node[shop=fishmonger] { icon-image: icons/shopping_fish.n.16.png; z-index: 20; } +node[shop=florist] { icon-image: icons/shopping_florist.n.16.png; z-index: 20; } node[shop=garden_centre] { icon-image: icons/shopping_garden_centre.n.16.png; z-index: 20; } node[shop=gift] { icon-image: icons/shopping_gift.n.16.png; z-index: 20; } @@ -57,25 +78,37 @@ node[shop=hifi] { icon-image: icons/shopping_hifi.n.16.png; z-index: 20; } node[shop=jewelry] { icon-image: icons/shopping_jewelry.n.16.png; z-index: 20; } +node[shop=kiosk] { icon-image: icons/shopping_kiosk.n.16.png; z-index: 20; } node[shop=laundry] { icon-image: icons/shopping_laundrette.n.16.png; z-index: 20; } +node[amenity=marketplace] { icon-image: icons/shopping_marketplace.n.16.png; z-index: 20; } node[shop=motorcycle] { icon-image: icons/shopping_motorcycle.n.16.png; z-index: 20; } node[shop=music] { icon-image: icons/shopping_music.n.16.png; z-index: 20; } node[shop=supermarket] { icon-image: icons/shopping_supermarket.n.16.png; z-index: 20; } +node[shop=toys] { icon-image: icons/shopping_toys.n.16.png; z-index: 20; } +/* More Touristy Items */ +node[tourism=artwork] { icon-image: icons/tourist_art_gallery2.n.16.png; z-index: 20; } node[historic=archaeological_site] { icon-image: icons/tourist_archaeological.n.16.png; z-index: 20; } node[historic=battlefield] { icon-image: icons/tourist_battlefield.n.16.png; z-index: 20; } -node[historic=castle] { icon-image: icons/tourist_castle.n.16.png; text-offset:0; text: auto; z-index: 20; } +node[historic=castle] { icon-image: icons/tourist_castle.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } node[amenity=cinema] { icon-image: icons/tourist_cinema.n.16.png; z-index: 20; } -node[historic=memorial] { icon-image: icons/tourist_memorial.n.16.png; text-offset:0; text: auto; z-index: 20; } -node[historic=monument] { icon-image: icons/tourist_monument.n.16.png; text-offset:0; text: auto; z-index: 20; } -node[tourism=museum] { icon-image: icons/tourist_museum.n.16.png; text-offset:0; text: auto; z-index: 20; } +node[historic=memorial] { icon-image: icons/tourist_memorial.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } +node[historic=monument] { icon-image: icons/tourist_monument.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } +node[tourism=museum] { icon-image: icons/tourist_museum.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } +node[tourism=information] { icon-image: icons/tourist_information.png; z-index: 20; } node[tourism=picnic_site] { icon-image: icons/tourist_picnic.n.16.png; z-index: 20; } -node[historic=ruin] { icon-image: icons/tourist_ruin.n.16.png; z-index: 20; } +node[historic=ruins] { icon-image: icons/tourist_ruin.n.16.png; z-index: 20; } node[amenity=theatre] { icon-image: icons/tourist_theatre.n.16.png; z-index: 20; } +node[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; } node[tourism=viewpoint] { icon-image: icons/tourist_view_point.n.16.png; z-index: 20; } node[tourism=zoo] { icon-image: icons/tourist_zoo.n.16.png; z-index: 20; } +/* Transport */ node[aeroway=aerodrome] { icon-image: icons/transport_aerodrome.n.16.png; z-index: 20; } +node[aeroway=gate] { icon-image: icons/transport_airport_gate.n.16.png; z-index: 20; } +node[aeroway=terminal] { icon-image: icons/transport_airport_terminal.n.16.png; z-index: 20; } +node[aeroway=helipad] { icon-image: icons/transport_helicopter_pad.n.16.png; z-index: 20; } node[amenity=bus_station] { icon-image: icons/transport_bus_station.n.16.png; z-index: 20; } node[highway=bus_stop] { icon-image: icons/transport_bus_stop2.n.16.png; z-index: 20; } node[amenity=fuel] { icon-image: icons/transport_fuel.n.16.png; z-index: 20; } -node[amenity=bicycle_parking] { icon-image: icons/transport_parking_bicycle.n.16.png; text-offset: 0; text: capacity; z-index: 20; } +node[amenity=car_wash] { icon-image: icons/transport_car_wash.n.16.png; z-index: 20; } +node[amenity=bicycle_parking] { icon-image: icons/transport_parking_bicycle.n.16.png; text-offset:0; text: capacity; font-size: 10; z-index: 20; } node[amenity=parking] { icon-image: icons/transport_parking_car.n.16.png; z-index: 20; } node[amenity=ferry_terminal] { icon-image: icons/transport_port.n.16.png; z-index: 20; } @@ -83,7 +116,21 @@ node[amenity=car_rental] { icon-image: icons/transport_rental_car.n.16.png; z-index: 20; } node[amenity=taxi] { icon-image: icons/transport_taxi_rank.n.16.png; z-index: 20; } -node[railway=station] { icon-image: icons/transport_train_station.n.16.png; text-offset:0; text: auto; z-index: 20; } +node[railway=station] { icon-image: icons/transport_train_station.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } node[railway=tram_stop] { icon-image: icons/transport_tram_stop.n.16.png; z-index: 20; } node[leisure=marina] { icon-image: icons/transport_marina.n.16.png; z-index: 20; } +node[highway=mini_roundabout] { icon-image: icons/transport_miniroundabout_anticlockwise.n.16.png; z-index: 20; } +node[highway=crossing] { icon-image: icons/transport_zebracrossing.n.16.png; z-index: 20; } +/* Misc */ +node[leisure=playground] { icon-image: icons/amenity_playground.n.16.png; z-index: 20; } +node[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; } +/* node[landuse=cemetery], node[landuse=grave_yard] { icon-image: icons/?.png; z-index: 20; } */ +node[man_made=survey_point] { icon-image: icons/manmade_lighthouse.png; z-index: 20; } +node[man_made=tower] { icon-image: icons/manmade_tower.png; z-index: 20; } +/* Yes these power stations seem a little backward - but that's seemingly what the side menu uses ATM */ +node[power=station] { icon-image: icons/power_substation.n.16.png; z-index: 20; } +node[power=generator] { icon-image: icons/power_station.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; } +node[power=tower] { icon-image: icons/power_tower_high2.n.16.png; z-index: 20; } +node[power=pole] { icon-image: icons/power_tower_low.n.16.png; z-index: 20; } +node[waterway=weir] { icon-image: icons/transport_weir.n.16.png; z-index: 20; } /* Addressing */ @@ -93,3 +140,4 @@ node[addr:housenumber]::hn_casing, node[addr:housename]::hn_casing { z-index: -100; symbol-shape: circle; symbol-size: 10; symbol-fill-color: blue; } + way[addr:interpolation] { z-index: 5; color: #B0E0E6; width: 3; dashes: 3,3;} Index: /trunk/styles_nodist/potlatch2/patched/core_relations.css =================================================================== --- /trunk/styles_nodist/potlatch2/patched/core_relations.css (revision 5214) +++ /trunk/styles_nodist/potlatch2/patched/core_relations.css (revision 5215) @@ -1,8 +1,8 @@ /* Route relations */ -relation[type=route] > way::relation_underlay { z-index: -1; width: 13; color: blue; opacity: 0.3; linecap: none; } -relation[type=route][route=bicycle][network=ncn] > way::relation_underlay { z-index: -1; width: 12; color: red; opacity: 0.3; linecap: none; } -relation[type=route][route=bicycle][network=rcn] > way::relation_underlay { z-index: -1; width: 12; color: cyan; opacity: 0.3; linecap: none; } -relation[type=route][route=bicycle][network=lcn] > way::relation_underlay { z-index: -1; width: 12; color: blue; opacity: 0.3; linecap: none; } -relation[type=route][route=foot] > way::relation_underlay { z-index: -1; width: 10; color: #80ff80; opacity: 0.6; linecap: none; } - +relation[type=route] > way::route { z-index: -1; width: 13; color: blue; opacity: 0.3; linecap: none; } +relation[type=route][route=bicycle][network=ncn] > way::route { z-index: -1; width: 12; color: red; opacity: 0.3; linecap: none; } +relation[type=route][route=bicycle][network=rcn] > way::route { z-index: -1; width: 12; color: cyan; opacity: 0.3; linecap: none; } +relation[type=route][route=bicycle][network=lcn] > way::route { z-index: -1; width: 12; color: blue; opacity: 0.3; linecap: none; } +relation[type=route][route=mtb] > way::route { z-index: -1; width: 12; color: brown; opacity: 0.3; linecap: none; } +relation[type=route][route=foot] > way::route { z-index: -1; width: 10; color: #80ff80; opacity: 0.6; linecap: none; } Index: /trunk/styles_nodist/potlatch2/patched/core_ways.css =================================================================== --- /trunk/styles_nodist/potlatch2/patched/core_ways.css (revision 5214) +++ /trunk/styles_nodist/potlatch2/patched/core_ways.css (revision 5215) @@ -1,3 +1,2 @@ - /**************** * core_ways.css @@ -11,23 +10,22 @@ way[highway=secondary],way[highway=secondary_link], way[highway=tertiary],way[highway=tertiary_link], -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; } -way[highway=motorway],way[highway=motorway_link] { z-index: 9; color: #809BC0; width: 7; casing-color: black; casing-width: 8; } -way[highway=trunk],way[highway=trunk_link] { z-index: 9; color: #7FC97F; width: 7; casing-color: black; casing-width: 8; } -way[highway=primary],way[highway=primary_link] { z-index: 8; color: #E46D71; width: 7; casing-color: black; casing-width: 8; } -way[highway=secondary],way[highway=secondary_link] { z-index: 7; color: #FDBF6F; width: 7; casing-width: 8; } -way[highway=tertiary] { z-index: 6; color: #FEFECB; width: 5; casing-width: 7; } -way[highway=unclassified] { z-index: 6; color: #D0D0D0; width: 5; casing-width: 7; } -way[highway=tertiary_link] { z-index: 5; color: #FEFECB; width: 4; casing-width: 5; } -way[highway=residential] { z-index: 5; color: #E8E8E8; width: 5; casing-color: gray; casing-width: 7; } -way[highway=service][service!=parking_aisle] { z-index: 5; color: white; width: 3; casing-color: gray; casing-width: 5; } -way[highway=service][service=parking_aisle] { z-index: 5; color: white; width: 1; casing-color: #aaaaaa; casing-width: 2; } -way[highway=service][service=alley] { z-index: 5; color: white; width: 2; dashes: 6,2; casing-color: black; casing-width: 4; } -way[highway=road] { z-index: 5; color: gray; width: 5; casing-color: white; casing-width: 7; } -way[highway=living_street] { z-index: 5; color: #ddffee; width: 3; casing-color: #555555; casing-width: 4; } +way[highway=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 } +way[highway=motorway],way[highway=motorway_link] { z-index: 9; color: #809BC0; width: 7; casing-color: #1e375a; casing-width: 1; } +way[highway=trunk],way[highway=trunk_link] { z-index: 9; color: #7FC97F; width: 7; casing-color: #245424; casing-width: 1; } +way[highway=primary],way[highway=primary_link] { z-index: 8; color: #E46D71; width: 7; casing-color: #651316; casing-width: 1; } +way[highway=secondary],way[highway=secondary_link] { z-index: 7; color: #FDBF6F; width: 7; casing-color: #b16603; casing-width: 1; } +way[highway=tertiary],way[highway=tertiary_link] { z-index: 6; color: #FEFECB; width: 5; casing-color: #626202; casing-width: 1; } +way[highway=unclassified] { z-index: 6; color: #D0D0D0; width: 5; casing-width: 1; } +way[highway=residential] { z-index: 5; color: #E8E8E8; width: 5; casing-color: gray; casing-width: 1; } +way[highway=service][service!=parking_aisle] { z-index: 5; color: white; width: 3; casing-color: gray; casing-width: 1; } +way[highway=service][service=parking_aisle] { z-index: 5; color: white; width: 1; casing-color: #aaaaaa; casing-width: 1; } +way[highway=service][service=alley] { z-index: 5; color: white; width: 2; dashes: 6,2; casing-color: black; casing-width: 1; } +way[highway=road] { z-index: 5; color: gray; width: 5; casing-color: white; casing-width: 1; } +way[highway=living_street] { z-index: 5; color: #ddffee; width: 3; casing-color: #555555; casing-width: 1; } /* Road areas */ -way[highway=pedestrian]!:closed { z-index: 5; color: #ddddee; width: 5; casing-color: #555555; casing-width: 6; casing-dashes: 2,4;} -way[highway=pedestrian]:closed { color: #555555; width: 1; fill-color: #ddddee; fill-opacity: 0.8; } /* FIXME: dashed outline */ +way[highway=pedestrian]!:closed { z-index: 5; color: #ddddee; width: 5; casing-color: #555555; casing-width: 1; casing-dashes: 2,4;} +area[highway=pedestrian]:closed { color: #555555; width: 1; fill-color: #ddddee; fill-opacity: 0.8; } /* FIXME: dashed outline */ /* Paths */ @@ -35,79 +33,77 @@ way[highway=steps] { z-index: 5; color: #FF6644; width: 6; dashes: 2, 2; } way[highway=footway] { z-index: 5; color: #FF6644; width: 2; dashes: 6, 3; prop_path : 1;} -way[highway=footway][bicycle=yes] { z-index: 4; color: blue; width: 1; } +way[highway=footway][bicycle=yes]::bike { z-index: 4; color: blue; width: 1; } way[highway=bridleway] { z-index:9; color: #996644; width: 2; dashes: 4, 2, 2, 2; prop_path : 1;} way[highway=track] { z-index: 5; color: #996644; width: 2; dashes: 4, 2; prop_path : 1;} way[highway=path] { z-index: 5; color: brown; width: 2; dashes: 2, 2; prop_path : 1;} way[highway=cycleway] { z-index: 5; color: blue; width: 2; dashes: 4, 2; prop_path : 1;} -way[railway=tram] { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 6; } -way[is_prop_set("prop_path")] { text:auto; text-color: black; text-position: line; text-offset: 5;} +way[is_prop_set("prop_path")] { z-index: 5; text: auto; text-color: black; text-position: line; text-offset: 7; font-size: 12; } /* Under construction */ way[highway=proposed] { z-index: 5; color: #88ffff; width: 6; dashes: 8, 4; } -way[highway=construction] { z-index: 5; color: #ffffbb; width: 6; dashes: 8, 4; casing-color: #0000aa; casing-width: 8; casing-dashes: 8,4;} -way[construction=rail] - { z-index: 6; color: black; width: 5; dashes: 6, 6, 4, 8;} -way[construction=rail]::rail_over - { z-index: 7; color: white; width: 3; dashes: 6,18; } +way[highway=construction] { z-index: 5; color: #ffffbb; width: 6; dashes: 8, 4; casing-color: #0000aa; casing-width: 1; casing-dashes: 8,4;} /* Railways */ -way[railway=rail] - { z-index: 6; color: black; width: 5; dashes: 0; } -way[railway=rail]::rail_over - { z-index: 7; color: white; width: 3; dashes: 12,12; } -way[railway=platform] { color:black; width: 2; } -way[railway=subway] - { z-index: 6; color: #444444; width: 5; } -way[railway=subway]::railway_over - { z-index: 7; color: white; width: 3; dashes: 8,8; } -way[railway=disused],way[railway=abandoned] - { z-index: 6; color: #444400; width: 3; dashes: 17, 2, 5, 0; } -way[railway=disused]::railway_over, way[railway=abandoned]::railway_over - { z-index: 7; color: #999999; width: 2; dashes: 12,12; } +way[railway=rail] { z-index: 6; color: black; width: 5; linecap: round; dashes: 0; } +way[railway=rail]::dashes { z-index: 7; color: white; width: 3; dashes: 12,12; linecap: round; } -/* Waterways */ +way[construction=rail] { z-index: 6; color: black; width: 5; dashes: 6, 6, 4, 8;} +way[construction=rail]::inner { z-index: 7; color: white; width: 3; dashes: 6,18; } -way[waterway=river], -way[waterway=canal], -way[waterway=stream] { z-index: 5; color: blue; width: 2; text:auto; text-color:blue; font-size:9; text-position: line; text-offset: 7;} -way[waterway=drain] {z-index: 5; color: blue; width: 1; text:auto; text-color: blue; text-position: line; text-offset: 3;} +way[railway=platform] { z-index: 5; color:black; width: 2; } + +way[railway=subway] { z-index: 6; color: #444444; width: 5; } +way[railway=subway]::dashes { z-index: 7; color: white; width: 3; dashes: 8,8; } + +way[construction=subway] { z-index: 6; color: #444444; width: 5; dashes: 4, 4; } +way[construction=subway]::dashes { z-index: 7; color: white; width: 3; dashes: 4,12;} + +way[railway=disused],way[railway=abandoned] { z-index: 6; color: #444400; width: 3; dashes: 17, 2, 5, 0; } +way[railway=disused]::dashes,way[railway=abandoned]::dashes { z-index: 7; color: #999999; width: 2; dashes: 12,12; } + +way[railway=tram] { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; } +way[construction=tram] { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; dashes: 6, 6; casing-dashes: 6, 6; } + +way[railway=light_rail] { z-index: 6; color: black; width: 4; } +way[railway=light_rail]::dashes { z-index: 7; color: #999999; width: 2; dashes: 8,4; } + +way[construction=light_rail] { z-index: 6; color: black; width: 4; dashes: 8, 4, 4, 4; } +way[construction=light_rail]::dashes { z-index: 7; color: #999999; width: 2; dashes: 8,12; } + +/* Waterways */ + +way[waterway=river], +way[waterway=canal], +way[waterway=stream] { z-index: 5; color: #3434ff; width: 2; text:auto; text-color: #3434ff; font-size:9; text-position: line; text-offset: 7;} +way[waterway=drain] {z-index: 5; color: #3434ff; width: 1; text:auto; text-color: #3434ff; text-position: line; text-offset: 3;} way[waterway][tunnel=yes] {z-index: 5; dashes: 8,4;} /* Aeroways */ -way[aeroway=aerodrome]:closed - { z-index: 3; color: #bb44bb; width: 3; casing-color: #66066; casing-width: 4; } -way|z-15[aeroway=aerodrome]:closed +area[aeroway=aerodrome]:closed + { z-index: 3; color: #bb44bb; width: 3; casing-color: #66066; casing-width: 1; } +area|z-15[aeroway=aerodrome]:closed { z-index: 3; fill-color: #bb99bb; fill-opacity: 0.5;} -way[aeroway=taxiway]!:closed { z-index: 8; color: #999999; width: 3; casing-color: #aa66aa; casing-width: 6; } -way[aeroway=taxiway]:closed { z-index: 8; color: #bb99bb; width: 3; fill-color: #ccaacc; } -way|z17-[aeroway=runway]!:closed - { z-index: 9; color: black; width: 11; casing-color: #aa66aa; casing-width: 12; } -way|z17-[aeroway=runway]!:closed::aeroway2 - { z-index: 10; color: white; width: 9; dashes: 0, 20, 4, 76; } -way|z17-[aeroway=runway]!:closed::aeroway3 - { z-index: 11; color: black; width: 7; } -way|z17-[aeroway=runway]!:closed::aeroway4 - { z-index: 12; color: white; width: 5; dashes: 0, 20, 4, 76; } -way|z17-[aeroway=runway]!:closed::aeroway5 - { z-index: 13; color: black; width: 3; } -way|z17-[aeroway=runway]!:closed::aeroway6 - { z-index: 14; color: white; width: 1; dashes: 4, 16; } +way[aeroway=taxiway]!:closed { z-index: 8; color: #999999; width: 3; casing-color: #aa66aa; casing-width: 2; } +area[aeroway=taxiway]:closed { z-index: 8; color: #bb99bb; width: 3; fill-color: #ccaacc; } -way|z15-16[aeroway=runway]!:closed - { z-index: 9; color: black; width: 5; } -way|z15-16[aeroway=runway]!:closed::aeroway2 - { z-index: 12; color: white; width: 5; dashes: 0, 20, 4, 76; } -way|z15-16[aeroway=runway]!:closed::aeroway3 - { z-index: 13; color: black; width: 3; } -way|z15-16[aeroway=runway]!:closed::aeroway4 - { z-index: 14; color: white; width: 1; dashes: 4, 16; } - -way|z-14[aeroway=runway]!:closed - { z-index: 9; color: #444444; width: 3; } -way[aeroway=runway]:closed { z-index: 9; color: black; width: 3; fill-color: #775577; } -way[aeroway=apron]:closed { z-index: 4; color: #cc66cc; width: 1; fill-color: #ddaadd; fill-opacity: 0.5;} +way|z17-[aeroway=runway]!:closed { z-index: 9; color: black; width: 11; casing-color: #aa66aa; casing-width: 1; } +way|z17-[aeroway=runway]!:closed::aa { z-index: 10; color: white; width: 9; dashes: 0, 20, 4, 76; } +way|z17-[aeroway=runway]!:closed::bb { z-index: 11; color: black; width: 7; } +way|z17-[aeroway=runway]!:closed::cc { z-index: 12; color: white; width: 5; dashes: 0, 20, 4, 76; } +way|z17-[aeroway=runway]!:closed::dd { z-index: 13; color: black; width: 3; } +way|z17-[aeroway=runway]!:closed::ee { z-index: 14; color: white; width: 1; dashes: 4, 16; } + +way|z15-16[aeroway=runway]!:closed { z-index: 9; color: black; width: 5; } +way|z15-16[aeroway=runway]!:closed::aa { z-index: 12; color: white; width: 5; dashes: 0, 20, 4, 76; } +way|z15-16[aeroway=runway]!:closed::bb { z-index: 13; color: black; width: 3; } +way|z15-16[aeroway=runway]!:closed::cc { z-index: 14; color: white; width: 1; dashes: 4, 16; } + +way|z-14[aeroway=runway]!:closed { z-index: 9; color: #444444; width: 3; } + +area[aeroway=runway]:closed { z-index: 9; color: black; width: 3; fill-color: #775577; } +area[aeroway=apron]:closed { z-index: 4; color: #cc66cc; width: 1; fill-color: #ddaadd; fill-opacity: 0.5;} /* Barriers */ @@ -118,28 +114,24 @@ /* Power */ -way[power=line] {z-index: 5; color: darkgray; width: 3; dashes: 12,2; casing-color: black; casing-width: 8; casing-dashes: 4, 38;} -way[power=minor_line] {z-index: 5; color: gray; width: 2; dashes: 2,4; casing-width: 8; casing-color: white; casing-dashes: 2,22;} -way[power=station]:closed { z-index: 5; color: black; width: 2; fill-color: #666666; fill-opacity: 0.6; prop_area_small_name : 1;} -way[power=generator]:closed { z-index: 5; color: black; width: 2; fill-color: #444444; fill-opacity: 0.6; prop_area_small_name : 1;} +way[power=line] {z-index: 5; color: darkgray; width: 3; dashes: 12,2; casing-color: black; casing-width: 2; casing-dashes: 4, 38;} +way[power=minor_line] {z-index: 5; color: gray; width: 2; dashes: 2,4; casing-width: 3; casing-color: white; casing-dashes: 2,22;} +area[power=station]:closed { color: black; width: 2; fill-color: #666666; fill-opacity: 0.6; prop_area_small_name : 1;} +area[power=generator]:closed { color: black; width: 2; fill-color: #444444; fill-opacity: 0.6; prop_area_small_name : 1;} /* Leisure */ -way[golf=hole] {z-index: 5; color: darkgreen; width: 5; casing-color: green; casing-width: 10; } -way[leisure=sports_centre]:closed { color: #66ddcc; fill-color: #66ddcc; prop_area_small_name : 1; } +way[golf=hole] {z-index: 5; color: darkgreen; width: 5; casing-color: green; casing-width: 2; } +area[leisure=sports_centre]:closed { color: #66ddcc; fill-color: #66ddcc; prop_area_small_name : 1; } /* Physical decoration */ -way[bridge=yes]::bridge1, way[bridge=viaduct]::bridge1, way[bridge=suspension]::bridge1 - { z-index: 4; color: white; width: +3; } -way[bridge=yes]::bridge2, way[bridge=viaduct]::bridge2, way[bridge=suspension]::bridge2 - { z-index: 3; color: black; width: +6; } -way[tunnel=yes][!waterway]::tunnel1 - { z-index: 4; color: white; width: +2; } -way[tunnel=yes][!waterway]::tunnel2 - { z-index: 3; color: black; width: +6; dashes: 4,4; } +way[bridge=yes]::bridge1, way[bridge=viaduct]::bridge1, way[bridge=suspension]::bridge1 { z-index: 4; color: white; width: +3; } +way[bridge=yes]::bridge2, way[bridge=viaduct]::bridge2, way[bridge=suspension]::bridge2 { z-index: 3; color: #444444; width: +6; } +way[tunnel=yes][!waterway]::bridge1 { z-index: 4; color: white; width: +2; } +way[tunnel=yes][!waterway]::bridge2 { z-index: 3; color: black; width: +6; dashes: 4,4; } /* Attribute decoration */ -/*way[oneway=yes], way[junction=roundabout] { z-index: 15; color: #444444; width: 2; dashes: 15,35; line-style: arrows; }*/ -/*way[oneway="-1"] { z-index: 15; color: #444444; width: 2; dashes: 15,35; line-style: arrows-reversed; }*/ +/*way[oneway=yes]::arrows, way[junction=roundabout]::arrows { z-index: 15; color: #555555; width: 2; dashes: 10,50; line-style: arrows; } +way[oneway=-1]::arrows { z-index: 15; color: #555555; width: 2; dashes: 10,50; line-style: arrows-reversed; }*/ Index: /trunk/styles_nodist/potlatch2/patched/potlatch.css =================================================================== --- /trunk/styles_nodist/potlatch2/patched/potlatch.css (revision 5214) +++ /trunk/styles_nodist/potlatch2/patched/potlatch.css (revision 5215) @@ -4,5 +4,13 @@ /*@import("stylesheets/core_landuse.css");*/ /*@import("stylesheets/core_relations.css");*/ -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;} +way[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;} /*@import("stylesheets/core_interactive.css");*/ +/* Rendering for licence status */ + +/*way[_status=no]::status { z-index: 0; width: eval('_width+7'); color: #AA0000; } +way[_status=partial]::status { z-index: 0; width: eval('_width+7'); color: #AA0000; opacity: 0.6; } +way[_status=unsure]::status { z-index: 0; width: eval('_width+7'); color: darkorange; opacity: 0.6; } +node[_status=no]::status { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: #AA0000; } +node[_status=partial]::status { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: #AA0000; opacity: 0.6; } +node[_status=unsure]::status { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: darkorange; opacity: 0.6; }*/ Index: /trunk/styles_nodist/potlatch2/source/core_interactive.css =================================================================== --- /trunk/styles_nodist/potlatch2/source/core_interactive.css (revision 5214) +++ /trunk/styles_nodist/potlatch2/source/core_interactive.css (revision 5215) @@ -5,8 +5,10 @@ /* Interactive way behaviour */ -way :hover { z-index: 2; width: eval('_width+10'); color: #ffff99; } -way :selected { z-index: 2; width: eval('_width+10'); color: yellow; opacity: 0.7;} -way :restrictfrom { z-index: -1; width: eval('_width+10'); color: red; opacity: 0.7;} -way :restrictto { z-index: -1; width: eval('_width+10'); color: blue; opacity: 0.7;} +way::highlight :hover { z-index: 2; width: eval('_width+10'); color: #ffff99; } +way::highlight :hover :background { color: lightcyan; } +way::highlight :selected { z-index: 2; width: eval('_width+10'); color: yellow; opacity: 0.7;} +way::highlight :selected :background { color: cyan; } +way::highlight :restrictfrom { z-index: -1; width: eval('_width+10'); color: red; opacity: 0.7;} +way::highlight :restrictto { z-index: -1; width: eval('_width+10'); color: blue; opacity: 0.7;} /*way !:drawn !:hasTags{ z-index:10; width: 0.5; color: red; }*/ way !:drawn { z-index:10; width: 1; color: #333333; } @@ -16,9 +18,11 @@ node :dupe { z-index: 9; icon-image: circle; icon-width:8; color: white; opacity: 0.4; casing-opacity: 0.4; casing-color: red; casing-width: 3; } -node :hoverway { z-index: 9; icon-image: square; icon-width: 7; color: blue; layer: 5; } -node !:drawn :poi { z-index: 2; icon-image: circle; icon-width: 4; color: green; casing-color: black; casing-width: 1; } -node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 4; color: black; } -node :hasTags :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: black; layer: 5; } -node !:drawn :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: red; casing-color: #cc0000; casing-width: 1; layer: 5; } -node :selected { z-index: 1; icon-image: square; icon-width: eval('_width+10'); color: yellow; interactive: no; layer: 5; } -node :junction :selectedway { z-index: 8; icon-image: square; icon-width: 12; casing-color: black; casing-width: 1; layer: 5; } +node :hoverway { z-index: 9; icon-image: circle; icon-width: 8; color: blue; layer: 5; } +node !:drawn :hasTags :poi { z-index: 2; icon-image: circle; icon-width: 8; color: #00ac00; casing-color: #004400; casing-width: 1; } +node !:drawn :poi { z-index: 2; icon-image: circle; icon-width: 8; color: #BBB; casing-color: #333; casing-width: 1; } +node !:drawn :hasTags :selectedway { z-index: 9; icon-image: circle; icon-width: 10; color: black; layer: 5; } +node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 8; color: black; } +node !:drawn :selectedway { z-index: 9; icon-image: circle; icon-width: 8; color: red; casing-color: #cc0000; casing-width: 1; layer: 5; } +node::selectedNode :selected { z-index: 1; icon-image: square; icon-width: eval('_width+10'); color: yellow; interactive: no; layer: 5; } +node::selectedNode :selected :background { color: cyan; } +node::junctionNode :junction :selectedway { z-index: 8; icon-image: circle; icon-width: 12; casing-color: black; casing-width: 1; layer: 5; } Index: /trunk/styles_nodist/potlatch2/source/core_landuse.css =================================================================== --- /trunk/styles_nodist/potlatch2/source/core_landuse.css (revision 5214) +++ /trunk/styles_nodist/potlatch2/source/core_landuse.css (revision 5215) @@ -13,13 +13,13 @@ way[leisure] :area { color: #8CD6B5; width: 1; fill-color: #8CD6B5; fill-opacity: 0.2; } way[tourism] :area { color: #F7CECE; width: 1; fill-color: #F7CECE; fill-opacity: 0.2; set .area_small_name;} -way[historic],way[ruins] :area { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; set .area_small_name;} +way[historic] :area,way[ruins] :area { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; set .area_small_name;} way[military] :area { color: #D6D6D6; width: 1; fill-color: #D6D6D6; fill-opacity: 0.2; set .area_small_name;} -way[building] :area { color: #ff6ec7; width: 1; fill-color: #ff6ec7; fill-opacity: 0.2; } +way[building] :area { color: #bca9a9; width: 1; fill-color: #ff6ec7; fill-opacity: 0.2; } way[natural=water], -way[waterway][waterway!=dam] :area { color: blue; width: 2; fill-color: blue; fill-opacity: 0.2; set .area_small_name;} +way[waterway][waterway!=dam] :area { color: #3434ff; width: 2; fill-color: #3434ff; fill-opacity: 0.2; set .area_small_name;} way[waterway=dam] { color: black; width: 1; fill-color: #222222; fill-opacity: 0.1; set .area_small_name;} way[man_made] :area { color: black; width: 2; fill-color: #222222; fill-opacity: 0.1; set .area_small_name; } -way[man_made=reservoir_covered] :area { color: blue; width: 2; dashes: 4, 2; fill-color: #222222; fill-opacity: 0.1; set .area_small_name; } -way[landuse=reservoir] :area { color: blue; width: 2; fill-color: blue; fill-opacity: 0.2; set .area_small_name;} +way[man_made=reservoir_covered] :area { color: #3434ff; width: 2; dashes: 4, 2; fill-color: #222222; fill-opacity: 0.1; set .area_small_name; } +way[landuse=reservoir] :area { color: #3434ff; width: 2; fill-color: #3434ff; fill-opacity: 0.2; set .area_small_name;} way[landuse=forest],way[natural=wood] :area { color: green; width: 2; fill-color: green; fill-opacity: 0.2; set .area_small_name;} way[leisure=park] :area { color: #22aa22; width: 2; fill-color: #44ff44; fill-opacity: 0.15; set .area_small_name;} @@ -29,8 +29,8 @@ way[amenity=parking] :area { color: #bbaa66; width: 1; fill-color: #bbaa66; fill-opacity: 0.2; } way[public_transport=pay_scale_area] :area { color: gray; width: 1; fill-color: gray; fill-opacity: 0.1; } -way[man_made=pier] { z-index: 4; color: #777; width: 3; casing-color: black; casing-width: 5;} +way[man_made=pier] { z-index: 4; color: #777; width: 3; casing-color: black; casing-width: 1;} way[man_made=pier][floating=yes] { dashes: 4,2; casing-color: #444;} way[leisure=marina] :area { color: pink; fill-color: pink; fill-opacity: 0.4; set .area_small_name;} -way[leisure=slipway] { color: grey; width: 3; casing-color: blue; casing-width: 7; } +way[leisure=slipway] { color: grey; width: 3; casing-color: #3434ff; casing-width: 2; } way[leisure=golf_course] :area { color: #44ee22; width: 2; fill-color: #44ee22; fill-opacity: 0.2; set .area_small_name;} way[boundary] { color: #000066; width: 2; opacity: 0.6; dashes: 24,4, 4, 4; z-index: 4;} Index: /trunk/styles_nodist/potlatch2/source/core_pois.css =================================================================== --- /trunk/styles_nodist/potlatch2/source/core_pois.css (revision 5214) +++ /trunk/styles_nodist/potlatch2/source/core_pois.css (revision 5215) @@ -1,3 +1,3 @@ -node[place] { icon-image: icons/place.png; text-offset: 17; font-family: DejaVu; text: name; font-size: 9; font-weight: bold; text-decoration: underline; z-index: 20; } +node[place] { icon-image: icons/place.png; text-offset: 17; font-family: DejaVu; text: name; font-size: 10; font-weight: bold; z-index: 20; } node[amenity=telephone] { icon-image: icons/telephone.png; z-index: 20; } node[barrier=cattle_grid] { icon-image: icons/cattle_grid.png; z-index: 20; } @@ -6,7 +6,9 @@ node[tourism=camp_site] { icon-image: icons/accommodation_camping.n.16.png; z-index: 20; } node[tourism=caravan_site] { icon-image: icons/accommodation_caravan_park.n.16.png; z-index: 20; } +node[tourism=chalet] { icon-image: icons/accommodation_chalet.n.16.png; z-index: 20; } node[tourism=guest_house],node[tourism=bed_and_breakfast] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; } -node[tourism=hotel] { icon-image: icons/accommodation_hotel.n.16.png; text-offset:15; text: name; z-index: 20; } +node[tourism=hotel] { icon-image: icons/accommodation_hotel.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; } node[tourism=hostel] { icon-image: icons/accommodation_youth_hostel.n.16.png; z-index: 20; } +node[tourism=motel] { icon-image: icons/accommodation_motel.n.16.png; z-index: 20; } node[amenity=fire_station] { icon-image: icons/amenity_firestation2.n.16.png; z-index: 20; } node[amenity=police] { icon-image: icons/amenity_police2.n.16.png; z-index: 20; } @@ -22,19 +24,36 @@ node[barrier=block] { icon-image: icons/barrier_blocks.16.png; z-index: 20; } node[barrier=cattle_grid] { icon-image: icons/barrier_cattle_grid.16.png; z-index: 20; } -node[amenity=school] { icon-image: icons/education_school.n.16.png; text-offset:15; text: name; z-index: 20; } +node[amenity=school] { icon-image: icons/education_school.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; } way[amenity=school] :area { color: yellow; fill-color: yellow; fill-opacity: 0.1; set .area_small_name; } -node[amenity=bar] { icon-image: icons/food_bar.n.16.png; text-offset:15; text: name; z-index: 20; } -node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:15; text: name; z-index: 20; } +node[amenity=bar] { icon-image: icons/food_bar.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; } +node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; } node[amenity=fast_food] { icon-image: icons/food_fastfood.n.16.png; z-index: 20; } -node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset:15; text: name; z-index: 20; } -node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:15; text: name; z-index: 20; } +node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset: 15; text: name; font-size: 10; z-index: 20; } +node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; } node[amenity=hospital] { icon-image: icons/health_hospital.n.16.png; z-index: 20; } node[amenity=pharmacy] { icon-image: icons/health_pharmacy.n.16.png; z-index: 20; } node[amenity=atm] { icon-image: icons/money_atm.n.16.png; z-index: 20; } node[amenity=bank] { icon-image: icons/money_bank2.n.16.png; z-index: 20; } +/* More Amenities */ +node[amenity=bench] { icon-image: icons/amenity_bench.n.16.png; z-index: 20; } +node[amenity=drinking_water] { icon-image: icons/food_drinkingtap.n.16.png; z-index: 20; } +node[amenity=emergency_phone] { icon-image: icons/emergency-telephone-16.png; z-index: 20; } +node[amenity=fountain] { icon-image: icons/amenity_fountain2.n.16.png; z-index: 20; } +node[amenity=hunting_stand] { icon-image: icons/sport_shooting.n.16.png; z-index: 20; } +node[amenity=kindergarten] { icon-image: icons/education_nursery3.n.16.png; z-index: 20; text-offset:15; text: name; font-size: 10; z-index: 20; } +node[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; } +node[amenity=post_office] { icon-image: icons/amenity_post_office.n.16.png; z-index: 20; } +node[amenity=shelter] { icon-image: icons/accommodation_shelter2.n.16.png; z-index: 20; } +node[amenity=swimming_pool] { icon-image: icons/sport_swimming_outdoor.n.16.png; z-index: 20; } +node[amenity=townhall] { icon-image: icons/amenity_town_hall.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; } +node[amenity=toilets] { icon-image: icons/amenity_toilets.n.16.png; z-index: 20; } +node[amenity=vending_machine] { icon-image: icons/shopping_vending_machine.n.16.png; z-index: 20; } +node[amenity=veterinary] { icon-image: icons/health_veterinary.n.8E7409.16.png; z-index: 20; } +node[amenity=waste_basket] { icon-image: icons/amenity_waste_bin.n.16.png; z-index: 20; } +/* Shops */ node[shop=alcohol] { icon-image: icons/shopping_alcohol.n.16.png; z-index: 20; } node[shop=bakery] { icon-image: icons/shopping_bakery.n.16.png; z-index: 20; } node[shop=bicycle] { icon-image: icons/shopping_bicycle.n.16.png; z-index: 20; } -node[shop=book] { icon-image: icons/shopping_book.n.16.png; z-index: 20; } +node[shop=book], node[shop=books] { icon-image: icons/shopping_book.n.16.png; z-index: 20; } node[shop=butcher] { icon-image: icons/shopping_butcher.n.16.png; z-index: 20; } node[shop=car_repair] { icon-image: icons/shopping_car_repair.n.16.png; z-index: 20; } @@ -45,4 +64,5 @@ node[shop=doityourself] { icon-image: icons/shopping_diy.n.16.png; z-index: 20; } node[shop=fishmonger] { icon-image: icons/shopping_fish.n.16.png; z-index: 20; } +node[shop=florist] { icon-image: icons/shopping_florist.n.16.png; z-index: 20; } node[shop=garden_centre] { icon-image: icons/shopping_garden_centre.n.16.png; z-index: 20; } node[shop=gift] { icon-image: icons/shopping_gift.n.16.png; z-index: 20; } @@ -51,25 +71,37 @@ node[shop=hifi] { icon-image: icons/shopping_hifi.n.16.png; z-index: 20; } node[shop=jewelry] { icon-image: icons/shopping_jewelry.n.16.png; z-index: 20; } +node[shop=kiosk] { icon-image: icons/shopping_kiosk.n.16.png; z-index: 20; } node[shop=laundry] { icon-image: icons/shopping_laundrette.n.16.png; z-index: 20; } +node[amenity=marketplace] { icon-image: icons/shopping_marketplace.n.16.png; z-index: 20; } node[shop=motorcycle] { icon-image: icons/shopping_motorcycle.n.16.png; z-index: 20; } node[shop=music] { icon-image: icons/shopping_music.n.16.png; z-index: 20; } node[shop=supermarket] { icon-image: icons/shopping_supermarket.n.16.png; z-index: 20; } +node[shop=toys] { icon-image: icons/shopping_toys.n.16.png; z-index: 20; } +/* More Touristy Items */ +node[tourism=artwork] { icon-image: icons/tourist_art_gallery2.n.16.png; z-index: 20; } node[historic=archaeological_site] { icon-image: icons/tourist_archaeological.n.16.png; z-index: 20; } node[historic=battlefield] { icon-image: icons/tourist_battlefield.n.16.png; z-index: 20; } -node[historic=castle] { icon-image: icons/tourist_castle.n.16.png; text-offset:15; text: name; z-index: 20; } +node[historic=castle] { icon-image: icons/tourist_castle.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; } node[amenity=cinema] { icon-image: icons/tourist_cinema.n.16.png; z-index: 20; } -node[historic=memorial] { icon-image: icons/tourist_memorial.n.16.png; text-offset:15; text: name; z-index: 20; } -node[historic=monument] { icon-image: icons/tourist_monument.n.16.png; text-offset:15; text: name; z-index: 20; } -node[tourism=museum] { icon-image: icons/tourist_museum.n.16.png; text-offset:15; text: name; z-index: 20; } +node[historic=memorial] { icon-image: icons/tourist_memorial.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; } +node[historic=monument] { icon-image: icons/tourist_monument.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; } +node[tourism=museum] { icon-image: icons/tourist_museum.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; } +node[tourism=information] { icon-image: icons/tourist_information.png; z-index: 20; } node[tourism=picnic_site] { icon-image: icons/tourist_picnic.n.16.png; z-index: 20; } -node[historic=ruin] { icon-image: icons/tourist_ruin.n.16.png; z-index: 20; } +node[historic=ruins] { icon-image: icons/tourist_ruin.n.16.png; z-index: 20; } node[amenity=theatre] { icon-image: icons/tourist_theatre.n.16.png; z-index: 20; } +node[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; } node[tourism=viewpoint] { icon-image: icons/tourist_view_point.n.16.png; z-index: 20; } node[tourism=zoo] { icon-image: icons/tourist_zoo.n.16.png; z-index: 20; } +/* Transport */ node[aeroway=aerodrome] { icon-image: icons/transport_aerodrome.n.16.png; z-index: 20; } +node[aeroway=gate] { icon-image: icons/transport_airport_gate.n.16.png; z-index: 20; } +node[aeroway=terminal] { icon-image: icons/transport_airport_terminal.n.16.png; z-index: 20; } +node[aeroway=helipad] { icon-image: icons/transport_helicopter_pad.n.16.png; z-index: 20; } node[amenity=bus_station] { icon-image: icons/transport_bus_station.n.16.png; z-index: 20; } node[highway=bus_stop] { icon-image: icons/transport_bus_stop2.n.16.png; z-index: 20; } node[amenity=fuel] { icon-image: icons/transport_fuel.n.16.png; z-index: 20; } -node[amenity=bicycle_parking] { icon-image: icons/transport_parking_bicycle.n.16.png; text-offset: 15; text: capacity; z-index: 20; } +node[amenity=car_wash] { icon-image: icons/transport_car_wash.n.16.png; z-index: 20; } +node[amenity=bicycle_parking] { icon-image: icons/transport_parking_bicycle.n.16.png; text-offset: 15; text: capacity; font-size: 10; z-index: 20; } node[amenity=parking] { icon-image: icons/transport_parking_car.n.16.png; z-index: 20; } node[amenity=ferry_terminal] { icon-image: icons/transport_port.n.16.png; z-index: 20; } @@ -77,11 +109,25 @@ node[amenity=car_rental] { icon-image: icons/transport_rental_car.n.16.png; z-index: 20; } node[amenity=taxi] { icon-image: icons/transport_taxi_rank.n.16.png; z-index: 20; } -node[railway=station] { icon-image: icons/transport_train_station.n.16.png; text-offset:15; text: name; z-index: 20; } +node[railway=station] { icon-image: icons/transport_train_station.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; } node[railway=tram_stop] { icon-image: icons/transport_tram_stop.n.16.png; z-index: 20; } node[leisure=marina] { icon-image: icons/transport_marina.n.16.png; z-index: 20; } +node[highway=mini_roundabout] { icon-image: icons/transport_miniroundabout_anticlockwise.n.16.png; z-index: 20; } +node[highway=crossing] { icon-image: icons/transport_zebracrossing.n.16.png; z-index: 20; } +/* Misc */ +node[leisure=playground] { icon-image: icons/amenity_playground.n.16.png; z-index: 20; } +node[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; } +/* node[landuse=cemetery], node[landuse=grave_yard] { icon-image: icons/?.png; z-index: 20; } */ +node[man_made=survey_point] { icon-image: icons/manmade_lighthouse.png; z-index: 20; } +node[man_made=tower] { icon-image: icons/manmade_tower.png; z-index: 20; } +/* Yes these power stations seem a little backward - but that's seemingly what the side menu uses ATM */ +node[power=station] { icon-image: icons/power_substation.n.16.png; z-index: 20; } +node[power=generator] { icon-image: icons/power_station.png; z-index: 20; text-offset:15; text: name; font-size: 10; z-index: 20; } +node[power=tower] { icon-image: icons/power_tower_high2.n.16.png; z-index: 20; } +node[power=pole] { icon-image: icons/power_tower_low.n.16.png; z-index: 20; } +node[waterway=weir] { icon-image: icons/transport_weir.n.16.png; z-index: 20; } /* Addressing */ -node[addr:housenumber], -node[addr:housename] { icon-image: circle; icon-width: 4; color: #B0E0E6; casing-color:blue; casing-width: 1; } +node[addr:housenumber] !:drawn, +node[addr:housename] !:drawn { icon-image: circle; icon-width: 8; color: #B0E0E6; casing-color:blue; casing-width: 1; z-index: 20; } way[addr:interpolation] { color: #B0E0E6; width: 3; dashes: 3,3;} Index: /trunk/styles_nodist/potlatch2/source/core_relations.css =================================================================== --- /trunk/styles_nodist/potlatch2/source/core_relations.css (revision 5214) +++ /trunk/styles_nodist/potlatch2/source/core_relations.css (revision 5215) @@ -1,7 +1,8 @@ /* Route relations */ -relation[type=route] way { z-index: 1; width: 13; color: blue; opacity: 0.3; } -relation[type=route][route=bicycle][network=ncn] way { z-index: 1; width: 12; color: red; opacity: 0.3; } -relation[type=route][route=bicycle][network=rcn] way { z-index: 1; width: 12; color: cyan; opacity: 0.3; } -relation[type=route][route=bicycle][network=lcn] way { z-index: 1; width: 12; color: blue; opacity: 0.3; } -relation[type=route][route=foot] way { z-index: 1; width: 10; color: #80ff80; opacity: 0.6; } +relation[type=route] way::route { z-index: 1; width: 13; color: blue; opacity: 0.3; } +relation[type=route][route=bicycle][network=ncn] way::route { z-index: 1; width: 12; color: red; opacity: 0.3; } +relation[type=route][route=bicycle][network=rcn] way::route { z-index: 1; width: 12; color: cyan; opacity: 0.3; } +relation[type=route][route=bicycle][network=lcn] way::route { z-index: 1; width: 12; color: blue; opacity: 0.3; } +relation[type=route][route=mtb] way::route { z-index: 1; width: 12; color: brown; opacity: 0.3; } +relation[type=route][route=foot] way::route { z-index: 1; width: 10; color: #80ff80; opacity: 0.6; } Index: /trunk/styles_nodist/potlatch2/source/core_ways.css =================================================================== --- /trunk/styles_nodist/potlatch2/source/core_ways.css (revision 5214) +++ /trunk/styles_nodist/potlatch2/source/core_ways.css (revision 5215) @@ -7,22 +7,21 @@ way[highway=secondary],way[highway=secondary_link], way[highway=tertiary],way[highway=tertiary_link], -way[highway=residential],way[highway=unclassified] { text: name; text-color: black; font-size: 10; text-position: line; text-halo-color: white; text-halo-radius: 2; } -way[highway=motorway],way[highway=motorway_link] { z-index: 9; color: #809BC0; width: 7; casing-color: black; casing-width: 8; } -way[highway=trunk],way[highway=trunk_link] { z-index: 9; color: #7FC97F; width: 7; casing-color: black; casing-width: 8; } -way[highway=primary],way[highway=primary_link] { z-index: 8; color: #E46D71; width: 7; casing-color: black; casing-width: 8; } -way[highway=secondary],way[highway=secondary_link] { z-index: 7; color: #FDBF6F; width: 7; casing-width: 8; } -way[highway=tertiary] { z-index: 6; color: #FEFECB; width: 5; casing-width: 7; } -way[highway=unclassified] { z-index: 6; color: #D0D0D0; width: 5; casing-width: 7; } -way[highway=tertiary_link] { z-index: 5; color: #FEFECB; width: 4; casing-width: 5; } -way[highway=residential] { z-index: 5; color: #E8E8E8; width: 5; casing-color: gray; casing-width: 7; } -way[highway=service][service!=parking_aisle] { color: white; width: 3; casing-color: gray; casing-width: 5; } -way[highway=service][service=parking_aisle] { color: white; width: 1; casing-color: #aaaaaa; casing-width: 2; } -way[highway=service][service=alley] { color: white; width: 2; dashes: 6,2; casing-color: black; casing-width: 4; } -way[highway=road] { color: gray; width: 5; casing-color: white; casing-width: 7; } -way[highway=living_street] { z-index: 5; color: #ddffee; width: 3; casing-color: #555555; casing-width: 4; } +way[highway=residential],way[highway=unclassified] { text: name; text-color: black; font-size: 12; text-position: offset; text-offset: 10; text-halo-color: white; text-halo-radius: 2; linecap: round; casing-linecap: round } +way[highway=motorway],way[highway=motorway_link] { z-index: 9; color: #809BC0; width: 7; casing-color: #1e375a; casing-width: 1; } +way[highway=trunk],way[highway=trunk_link] { z-index: 9; color: #7FC97F; width: 7; casing-color: #245424; casing-width: 1; } +way[highway=primary],way[highway=primary_link] { z-index: 8; color: #E46D71; width: 7; casing-color: #651316; casing-width: 1; } +way[highway=secondary],way[highway=secondary_link] { z-index: 7; color: #FDBF6F; width: 7; casing-color: #b16603; casing-width: 1; } +way[highway=tertiary],way[highway=tertiary_link] { z-index: 6; color: #FEFECB; width: 5; casing-color: #626202; casing-width: 1; } +way[highway=unclassified] { z-index: 6; color: #D0D0D0; width: 5; casing-width: 1; } +way[highway=residential] { z-index: 5; color: #E8E8E8; width: 5; casing-color: gray; casing-width: 1; } +way[highway=service][service!=parking_aisle] { color: white; width: 3; casing-color: gray; casing-width: 1; } +way[highway=service][service=parking_aisle] { color: white; width: 1; casing-color: #aaaaaa; casing-width: 1; } +way[highway=service][service=alley] { color: white; width: 2; dashes: 6,2; casing-color: black; casing-width: 1; } +way[highway=road] { color: gray; width: 5; casing-color: white; casing-width: 1; } +way[highway=living_street] { z-index: 5; color: #ddffee; width: 3; casing-color: #555555; casing-width: 1; } /* Road areas */ -way[highway=pedestrian] !:area { color: #ddddee; width: 5; casing-color: #555555; casing-width: 6; casing-dashes: 2,4;} +way[highway=pedestrian] !:area { color: #ddddee; width: 5; casing-color: #555555; casing-width: 1; casing-dashes: 2,4;} way[highway=pedestrian] :area { color: #555555; width: 1; fill-color: #ddddee; fill-opacity: 0.8; } @@ -31,32 +30,43 @@ way[highway=steps] { color: #FF6644; width: 6; dashes: 2, 2; } way[highway=footway] { color: #FF6644; width: 2; dashes: 6, 3; set .path;} -way[highway=footway][bicycle=yes] { z-index: 4; color: blue; width: 1; } +way[highway=footway][bicycle=yes]::bike { z-index: 4; color: blue; width: 1; } way[highway=bridleway] { z-index:9; color: #996644; width: 2; dashes: 4, 2, 2, 2; set .path;} way[highway=track] { color: #996644; width: 2; dashes: 4, 2; set .path;} way[highway=path] { color: brown; width: 2; dashes: 2, 2; set .path;} way[highway=cycleway] { color: blue; width: 2; dashes: 4, 2; set .path;} -way[railway=tram] { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 6; } -way .path { text:name; text-color: black; text-position: offset; text-offset: 5;} +way .path { text: name; text-color: black; text-position: offset; text-offset: 7; font-size: 12; } /* Under construction */ way[highway=proposed] { color: #88ffff; width: 6; dashes: 8, 4; } -way[highway=construction] { color: #ffffbb; width: 6; dashes: 8, 4; casing-color: #0000aa; casing-width: 8; casing-dashes: 8,4;} -way[construction=rail] - { z-index: 6; color: black; width: 5; dashes: 6, 6, 4, 8;} - { z-index: 7; color: white; width: 3; dashes: 6,18; } +way[highway=construction] { color: #ffffbb; width: 6; dashes: 8, 4; casing-color: #0000aa; casing-width: 1; casing-dashes: 8,4;} /* Railways */ -way[railway=rail] - { z-index: 6; color: black; width: 5; } - { z-index: 7; color: white; width: 3; dashes: 12,12; } +way[railway=rail] { z-index: 6; color: black; width: 5; linecap: round; } +way[railway=rail]::dashes { z-index: 7; color: white; width: 3; dashes: 12,12; linecap: round; } + +way[construction=rail] { z-index: 6; color: black; width: 5; dashes: 6, 6, 4, 8;} +way[construction=rail]::inner { z-index: 7; color: white; width: 3; dashes: 6,18; } + way[railway=platform] { color:black; width: 2; } -way[railway=subway] - { z-index: 6; color: #444444; width: 5; } - { z-index: 7; color: white; width: 3; dashes: 8,8; } -way[railway=disused],way[railway=abandoned] - { z-index: 6; color: #444400; width: 3; dashes: 17, 2, 5, 0; } - { z-index: 7; color: #999999; width: 2; dashes: 12,12; } + +way[railway=subway] { z-index: 6; color: #444444; width: 5; } +way[railway=subway]::dashes { z-index: 7; color: white; width: 3; dashes: 8,8; } + +way[construction=subway] { z-index: 6; color: #444444; width: 5; dashes: 4, 4; } +way[construction=subway]::dashes { z-index: 7; color: white; width: 3; dashes: 4,12;} + +way[railway=disused],way[railway=abandoned] { z-index: 6; color: #444400; width: 3; dashes: 17, 2, 5, 0; } +way[railway=disused]::dashes,way[railway=abandoned]::dashes { z-index: 7; color: #999999; width: 2; dashes: 12,12; } + +way[railway=tram] { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; } +way[construction=tram] { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; dashes: 6, 6; casing-dashes: 6, 6; } + +way[railway=light_rail] { z-index: 6; color: black; width: 4; } +way[railway=light_rail]::dashes { z-index: 7; color: #999999; width: 2; dashes: 8,4; } + +way[construction=light_rail] { z-index: 6; color: black; width: 4; dashes: 8, 4, 4, 4; } +way[construction=light_rail]::dashes { z-index: 7; color: #999999; width: 2; dashes: 8,12; } /* Waterways */ @@ -64,6 +74,6 @@ way[waterway=river], way[waterway=canal], -way[waterway=stream] { color: blue; width: 2; text:name; text-color:blue; font-size:9; text-position: offset; text-offset: 7;} -way[waterway=drain] {color: blue; width: 1; text:name; text-color: blue; text-position: offset; text-offset: 3;} +way[waterway=stream] { color: #3434ff; width: 2; text:name; text-color: #3434ff; font-size:9; text-position: offset; text-offset: 7;} +way[waterway=drain] {color: #3434ff; width: 1; text:name; text-color: #3434ff; text-position: offset; text-offset: 3;} way[waterway][tunnel=yes] {dashes: 8,4;} @@ -71,23 +81,24 @@ way[aeroway=aerodrome] :area - { z-index: 3; color: #bb44bb; width: 3; casing-color: #66066; casing-width: 4; } + { z-index: 3; color: #bb44bb; width: 3; casing-color: #66066; casing-width: 1; } way|z-15[aeroway=aerodrome] :area { z-index: 3; fill-color: #bb99bb; fill-opacity: 0.5;} -way[aeroway=taxiway] !:area { z-index: 8; color: #999999; width: 3; casing-color: #aa66aa; casing-width: 6; } +way[aeroway=taxiway] !:area { z-index: 8; color: #999999; width: 3; casing-color: #aa66aa; casing-width: 2; } way[aeroway=taxiway] :area { z-index: 8; color: #bb99bb; width: 3; fill-color: #ccaacc; } -way|z17-[aeroway=runway] !:area - { z-index: 9; color: black; width: 11; casing-color: #aa66aa; casing-width: 12; } - { z-index: 10; color: white; width: 9; dashes: 0, 20, 4, 76; } - { z-index: 11; color: black; width: 7; } - { z-index: 12; color: white; width: 5; dashes: 0, 20, 4, 76; } - { z-index: 13; color: black; width: 3; } - { z-index: 14; color: white; width: 1; dashes: 4, 16; } -way|z15-16[aeroway=runway] !:area - { z-index: 9; color: black; width: 5; } - { z-index: 12; color: white; width: 5; dashes: 0, 20, 4, 76; } - { z-index: 13; color: black; width: 3; } - { z-index: 14; color: white; width: 1; dashes: 4, 16; } -way|z-14[aeroway=runway] !:area - { z-index: 9; color: #444444; width: 3; } + +way|z17-[aeroway=runway] !:area { z-index: 9; color: black; width: 11; casing-color: #aa66aa; casing-width: 1; } +way|z17-[aeroway=runway]::aa !:area { z-index: 10; color: white; width: 9; dashes: 0, 20, 4, 76; } +way|z17-[aeroway=runway]::bb !:area { z-index: 11; color: black; width: 7; } +way|z17-[aeroway=runway]::cc !:area { z-index: 12; color: white; width: 5; dashes: 0, 20, 4, 76; } +way|z17-[aeroway=runway]::dd !:area { z-index: 13; color: black; width: 3; } +way|z17-[aeroway=runway]::ee !:area { z-index: 14; color: white; width: 1; dashes: 4, 16; } + +way|z15-16[aeroway=runway] !:area { z-index: 9; color: black; width: 5; } +way|z15-16[aeroway=runway]::aa !:area { z-index: 12; color: white; width: 5; dashes: 0, 20, 4, 76; } +way|z15-16[aeroway=runway]::bb !:area { z-index: 13; color: black; width: 3; } +way|z15-16[aeroway=runway]::cc !:area { z-index: 14; color: white; width: 1; dashes: 4, 16; } + +way|z-14[aeroway=runway] !:area { z-index: 9; color: #444444; width: 3; } + way[aeroway=runway] :area { z-index: 9; color: black; width: 3; fill-color: #775577; } way[aeroway=apron] :area { z-index: 4; color: #cc66cc; width: 1; fill-color: #ddaadd; fill-opacity: 0.5;} @@ -100,6 +111,6 @@ /* Power */ -way[power=line] {color: darkgray; width: 3; dashes: 12,2; casing-color: black; casing-width: 8; casing-dashes: 4, 38;} -way[power=minor_line] {color: gray; width: 2; dashes: 2,4; casing-width: 8; casing-color: white; casing-dashes: 2,22;} +way[power=line] {color: darkgray; width: 3; dashes: 12,2; casing-color: black; casing-width: 2; casing-dashes: 4, 38;} +way[power=minor_line] {color: gray; width: 2; dashes: 2,4; casing-width: 3; casing-color: white; casing-dashes: 2,22;} way[power=station] :area { color: black; width: 2; fill-color: #666666; fill-opacity: 0.6; set .area_small_name;} way[power=generator] :area { color: black; width: 2; fill-color: #444444; fill-opacity: 0.6; set .area_small_name;} @@ -107,5 +118,5 @@ /* Leisure */ -way[golf=hole] {color: darkgreen; width: 5; casing-color: green; casing-width: 10; } +way[golf=hole] {color: darkgreen; width: 5; casing-color: green; casing-width: 2; } way[leisure=sports_centre] :area { color: #66ddcc; fill-color: #66ddcc; set .area_small_name; } @@ -113,13 +124,11 @@ /* Physical decoration */ -way[bridge=yes], way[bridge=viaduct], way[bridge=suspension] - { z-index: 4; color: white; width: eval('_width+3'); } - { z-index: 3; color: black; width: eval('_width+6'); } -way[tunnel=yes][!waterway] - { z-index: 4; color: white; width: eval('_width+2'); } - { z-index: 3; color: black; width: eval('_width+6'); dashes: 4,4; } +way[bridge=yes]::bridge1, way[bridge=viaduct]::bridge1, way[bridge=suspension]::bridge1 { z-index: 4; color: white; width: eval('_width+3'); } +way[bridge=yes]::bridge2, way[bridge=viaduct]::bridge2, way[bridge=suspension]::bridge2 { z-index: 3; color: #444444; width: eval('_width+6'); } +way[tunnel=yes][!waterway]::bridge1 { z-index: 4; color: white; width: eval('_width+2'); } +way[tunnel=yes][!waterway]::bridge2 { z-index: 3; color: black; width: eval('_width+6'); dashes: 4,4; } /* Attribute decoration */ -way[oneway=yes], way[junction=roundabout] { z-index: 15; color: #444444; width: 2; dashes: 15,35; line-style: arrows; } -way[oneway=-1] { z-index: 15; color: #444444; width: 2; dashes: 15,35; line-style: arrows-reversed; } +way[oneway=yes]::arrows, way[junction=roundabout]::arrows { z-index: 15; color: #555555; width: 2; dashes: 10,50; line-style: arrows; } +way[oneway=-1]::arrows { z-index: 15; color: #555555; width: 2; dashes: 10,50; line-style: arrows-reversed; } Index: /trunk/styles_nodist/potlatch2/source/enhanced.css =================================================================== --- /trunk/styles_nodist/potlatch2/source/enhanced.css (revision 5214) +++ /trunk/styles_nodist/potlatch2/source/enhanced.css (revision 5215) @@ -13,10 +13,10 @@ /* Access */ -way[access=private],way[access=no] { z-index: 10; color: red; width: eval('_width+2'); dashes: 2,5;} -way[access=permissive] { z-index: 10; color: green; width: eval('_width+2'); dashes: 1,3;} +way[access=private]::access,way[access=no]::access { z-index: 10; color: red; width: eval('_width+2'); dashes: 2,5;} +way[access=permissive]::access { z-index: 10; color: green; width: eval('_width+2'); dashes: 1,3;} /* Physical */ -way[embankment=yes], way[cutting=yes] +way[embankment=yes]::hatches, way[cutting=yes]::hatches { z-index: 3; opacity: 0.5; color: grey; width: eval('_width+5'); dashes: 2, 2; } @@ -29,7 +29,7 @@ /* Direction on selected ways */ -way[highway][!oneway][junction!=roundabout]:selected, -way[aerial_way]:selected { z-index: 14; color: #999922; width: 2; dashes: 3,60; line-style: arrows; } -way[waterway]:selected { z-index: 14; color: #4444CC; width: 2; dashes: 5,60; line-style: arrows; } -way[railway] :selected{ z-index: 14; color: #999999; width: 3; dashes: 4,92; line-style: arrows; } +way[highway][!oneway][junction!=roundabout]::direction :selected, +way[aerial_way]::direction :selected { z-index: 14; color: #999922; width: 2; dashes: 3,60; line-style: arrows; } +way[waterway]::direction :selected { z-index: 14; color: #4444CC; width: 2; dashes: 5,60; line-style: arrows; } +way[railway]::direction :selected{ z-index: 14; color: #999999; width: 3; dashes: 4,92; line-style: arrows; } Index: /trunk/styles_nodist/potlatch2/source/gpx.css =================================================================== --- /trunk/styles_nodist/potlatch2/source/gpx.css (revision 5214) +++ /trunk/styles_nodist/potlatch2/source/gpx.css (revision 5215) @@ -7,5 +7,5 @@ way { z-index: 2; width: 1; color: cyan; } node :poi { z-index: 2; - icon-image: circle; icon-width: 4; color: orange; + icon-image: circle; icon-width: 8; color: orange; casing-color: red; casing-width: 1; text-offset: 10; font-family: DejaVu; text: name; font-size: 9; text_color: red; } Index: /trunk/styles_nodist/potlatch2/source/network.css =================================================================== --- /trunk/styles_nodist/potlatch2/source/network.css (revision 5214) +++ /trunk/styles_nodist/potlatch2/source/network.css (revision 5215) @@ -13,10 +13,10 @@ /* Access */ -way[access=private],way[access=no] { z-index: 10; color: red; width: eval('_width+2'); dashes: 2,5;} -way[access=permissive] { z-index: 10; color: green; width: eval('_width+2'); dashes: 1,3;} +way[access=private]::access,way[access=no]::access { z-index: 10; color: red; width: eval('_width+2'); dashes: 2,5;} +way[access=permissive]::access { z-index: 10; color: green; width: eval('_width+2'); dashes: 1,3;} /* Physical */ -way[embankment=yes], way[cutting=yes] +way[embankment=yes]::hatches, way[cutting=yes]::hatches { z-index: 3; opacity: 0.5; color: grey; width: eval('_width+5'); dashes: 2, 2; } @@ -29,7 +29,7 @@ /* Direction on selected ways */ -way[highway][!oneway][junction!=roundabout]:selected, -way[aerial_way]:selected { z-index: 14; color: #999922; width: 2; dashes: 3,60; line-style: arrows; } -way[waterway]:selected { z-index: 14; color: #4444CC; width: 2; dashes: 5,60; line-style: arrows; } -way[railway] :selected{ z-index: 14; color: #999999; width: 3; dashes: 4,92; line-style: arrows; } +way[highway][!oneway][junction!=roundabout]::direction :selected, +way[aerial_way]::direction :selected { z-index: 14; color: #999922; width: 2; dashes: 3,60; line-style: arrows; } +way[waterway]::direction :selected { z-index: 14; color: #4444CC; width: 2; dashes: 5,60; line-style: arrows; } +way[railway]::direction :selected{ z-index: 14; color: #999999; width: 3; dashes: 4,92; line-style: arrows; } Index: /trunk/styles_nodist/potlatch2/source/opencyclemap.css =================================================================== --- /trunk/styles_nodist/potlatch2/source/opencyclemap.css (revision 5214) +++ /trunk/styles_nodist/potlatch2/source/opencyclemap.css (revision 5215) @@ -28,15 +28,15 @@ way[highway=tertiary],way[highway=tertiary_link], way[highway=residential] { text: name; text-color: black; font-size: 7; text-position: line;}*/ -way[highway=motorway],way[highway=motorway_link] { z-index: 9; color: #bfbfcf; width: 7; casing-color: #506077; casing-width: 9; } -way[highway=trunk],way[highway=trunk_link] { z-index: 9; color: #c8d8c8; width: 7; casing-color: #477147; casing-width: 9; } -way[highway=primary],way[highway=primary_link] { z-index: 8; color: #d8c8c8; width: 7; casing-color: #8d4346; casing-width: 9; } -way[highway=secondary],way[highway=secondary_link] { z-index: 7; color: #eeeec9; width: 7; casing-color: #a37b48; casing-width: 9; } -way[highway=tertiary],way[highway=unclassified] { z-index: 6; color: #eeeec9; width: 5; casing-color: #999999; casing-width: 7; } -way[highway=residential] { z-index: 5; color: white; width: 5; casing-color: #999; casing-width: 7; } -way[highway=service] { color: white; width: 3; casing-color: #999; casing-width: 5; } +way[highway=motorway],way[highway=motorway_link] { z-index: 9; color: #bfbfcf; width: 7; casing-color: #506077; casing-width: 1; } +way[highway=trunk],way[highway=trunk_link] { z-index: 9; color: #c8d8c8; width: 7; casing-color: #477147; casing-width: 1; } +way[highway=primary],way[highway=primary_link] { z-index: 8; color: #d8c8c8; width: 7; casing-color: #8d4346; casing-width: 1; } +way[highway=secondary],way[highway=secondary_link] { z-index: 7; color: #eeeec9; width: 7; casing-color: #a37b48; casing-width: 1; } +way[highway=tertiary],way[highway=unclassified] { z-index: 6; color: #eeeec9; width: 5; casing-color: #999999; casing-width: 1; } +way[highway=residential] { z-index: 5; color: white; width: 5; casing-color: #999; casing-width: 1; } +way[highway=service] { color: white; width: 3; casing-color: #999; casing-width: 1; } /* Pedestrian precincts need to be treated carefully. Only closed-loops with an explicit area=yes tag should be filled. The below doesn't yet work as intended. */ -way[highway=pedestrian] !:area { color: #ddddee; width: 5; casing-color: #555555; casing-width: 6; } +way[highway=pedestrian] !:area { color: #ddddee; width: 5; casing-color: #555555; casing-width: 1; } way[highway=pedestrian] :area { color: #555555; width: 1; fill-color: #ddddee; fill-opacity: 0.8; } @@ -73,5 +73,5 @@ node[addr:housenumber], -node[addr:housename] { icon-image: circle; icon-width: 4; color: #B0E0E6; casing-color:blue; casing-width: 1; } +node[addr:housename] { icon-image: circle; icon-width: 8; color: #B0E0E6; casing-color:blue; casing-width: 1; } way[addr:interpolation] { color: #B0E0E6; width: 3; dashes: 3,3;} @@ -104,29 +104,27 @@ node[amenity=telephone] { icon-image: icons/telephone.png; } way node[barrier=gate], way node[highway=gate] { icon-image: icons/gate.png; } -way node[barrier=bollard] { icon-image: icons/bollard.png; } node[barrier=cattle_grid] { icon-image: icons/cattle_grid.png; }*/ - + +/* Important shops */ +node[shop=bicycle] { icon-image: icons/shopping_bicycle.n.16.png; text-offset: 15; text: name; } + /* We can stack styles at different z-index (depth) */ -way[railway=rail] - { z-index: 6; color: #444444; width: 5; } - { z-index: 7; color: white; width: 3; dashes: 12,12; } +way[railway=rail] { z-index: 6; color: #444444; width: 5; } +way[railway=rail]::dashes { z-index: 7; color: white; width: 3; dashes: 12,12; } way[railway=platform] { color:black; width: 2; } -way[railway=subway] - { z-index: 6; color: #444444; width: 5; } - { z-index: 7; color: white; width: 3; dashes: 8,8; } +way[railway=subway] { z-index: 6; color: #444444; width: 5; } +way[railway=subway]::dashes { z-index: 7; color: white; width: 3; dashes: 8,8; } /* Bridge */ -way[bridge=yes], way[bridge=viaduct], way[bridge=suspension] - { z-index: 4; color: white; width: eval('_width+3'); } - { z-index: 3; color: black; width: eval('_width+6'); } +way[bridge=yes]::bridge1, way[bridge=viaduct]::bridge1, way[bridge=suspension]::bridge1 { z-index: 4; color: white; width: eval('_width+3'); } +way[bridge=yes]::bridge2, way[bridge=viaduct]::bridge2, way[bridge=suspension]::bridge2 { z-index: 3; color: black; width: eval('_width+6'); } /* Tunnel */ -way[tunnel=yes] - { z-index: 4; color: white; width: eval('_width+2'); } - { z-index: 3; color: black; width: eval('_width+6'); dashes: 4,4; } +way[tunnel=yes]::tunnel1 { z-index: 4; color: white; width: eval('_width+2'); } +way[tunnel=yes]::tunnel2 { z-index: 3; color: black; width: eval('_width+6'); dashes: 4,4; } /* Oneway */ -way[oneway=yes] { z-index: 10; color: #6c70d5; width: 2; dashes: 10,30; line-style: arrows; } +way[oneway=yes]::arrows { z-index: 10; color: #6c70d5; width: 2; dashes: 10,30; line-style: arrows; } @@ -138,22 +136,14 @@ an object. Potlatch 2 supports these but the stand-alone Halcyon viewer does not */ -way :hover { z-index: 2; width: eval('_width+10'); color: #ffff99; } -way :selected { z-index: 2; width: eval('_width+10'); color: yellow; opacity: 0.7;} -way !:drawn { z-index:10; width: 0.5; color: gray; } +@import("stylesheets/core_interactive.css"); -node :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: red; casing-color: #cc0000; casing-width: 1;} -node :hoverway { z-index: 9; icon-image: square; icon-width: 7; color: blue; } -node !:drawn :poi { z-index: 2; icon-image: circle; icon-width: 3; color: lightsteelblue; casing-color: black; casing-width: 1; } -node :selected { z-index: 1; icon-image: square; icon-width: eval('_width+10'); color: yellow; } -node :junction :selectedway { z-index: 8; icon-image: square; icon-width: 12; casing-color: black; casing-width: 1; } - /* Descendant selectors provide an easy way to style relations: this example means "any way which is part of a relation whose type=route". */ -relation[type=route] way { z-index: 1; width: 17; color: yellow; opacity: 0.3; } -relation[type=route][route=bicycle][network=ncn] way { z-index: 1; width: 12; color: red; opacity: 0.3; } -relation[type=route][route=bicycle][network=rcn] way { z-index: 1; width: 12; color: cyan; opacity: 0.3; } -relation[type=route][route=bicycle][network=lcn] way { z-index: 1; width: 12; color: blue; opacity: 0.3; } -relation[type=route][route=bicycle][network=mtb] way { z-index: 1; width: 12; color: #48a448; opacity: 0.3; } +relation[type=route] way::routeline { z-index: 1; width: 17; color: yellow; opacity: 0.3; } +relation[type=route][route=bicycle][network=ncn] way::routeline { z-index: 1; width: 12; color: red; opacity: 0.3; } +relation[type=route][route=bicycle][network=rcn] way::routeline { z-index: 1; width: 12; color: cyan; opacity: 0.3; } +relation[type=route][route=bicycle][network=lcn] way::routeline { z-index: 1; width: 12; color: blue; opacity: 0.3; } +relation[type=route][route=bicycle][network=mtb] way::routeline { z-index: 1; width: 12; color: #48a448; opacity: 0.3; } Index: /trunk/styles_nodist/potlatch2/source/potlatch.css =================================================================== --- /trunk/styles_nodist/potlatch2/source/potlatch.css (revision 5214) +++ /trunk/styles_nodist/potlatch2/source/potlatch.css (revision 5215) @@ -16,5 +16,13 @@ @import("stylesheets/core_landuse.css"); @import("stylesheets/core_relations.css"); -way .area_small_name {text-color: black; font-size: 9; text: name; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;} +way .area_small_name {text-color: black; font-size: 10; text: name; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;} @import("stylesheets/core_interactive.css"); +/* Rendering for licence status */ + +way[_status=no]::status { z-index: 0; width: eval('_width+7'); color: #AA0000; } +way[_status=partial]::status { z-index: 0; width: eval('_width+7'); color: #AA0000; opacity: 0.6; } +way[_status=unsure]::status { z-index: 0; width: eval('_width+7'); color: darkorange; opacity: 0.6; } +node[_status=no]::status { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: #AA0000; } +node[_status=partial]::status { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: #AA0000; opacity: 0.6; } +node[_status=unsure]::status { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: darkorange; opacity: 0.6; } Index: /trunk/styles_nodist/potlatch2/source/snapshot.css =================================================================== --- /trunk/styles_nodist/potlatch2/source/snapshot.css (revision 5215) +++ /trunk/styles_nodist/potlatch2/source/snapshot.css (revision 5215) @@ -0,0 +1,26 @@ +/* + + Stylesheet that does simple wireframe display + +*/ + +way :hover { z-index: 2; width: 14; color: yellow; linecap: round; } +way :selected { z-index: 2; width: 14; color: yellow; linecap: round; } +way !:drawn { z-index: 1; width: 14; color: #444444; linecap: round; } + +node :selectedway { z-index: 8; icon-image: circle; icon-width: 16; color: green; } +node :hoverway { z-index: 9; icon-image: circle; icon-width: 16; color: blue; } +node :selected { z-index: 9; icon-image: circle; icon-width: 16; color: red; casing-color: black; casing-width: 1; } +node !:drawn :poi { z-index: 6; icon-image: circle; icon-width: 16; color: green; casing-color: black; casing-width: 1; } +node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 16; color: black; } +node :hasTags :selectedway { z-index: 9; icon-image: circle; icon-width: 16; color: black; } + +way[_status=incomplete]::statushighlight { z-index: 0; width: 20; color: #d95f02; linecap: round; } +way[_status=complete]::statushighlight { z-index: 0; width: 18; color: #1b9e77; opacity: 0.4; linecap: round; } +way[_status=complete] { opacity: 0.7; } +node[_status=incomplete]::statushighlight :hasTags { z-index: 5; icon-image: circle; icon-width: 24; color: #d95f02; } +node[_status=complete]::statushighlight :hasTags { z-index: 5; icon-image: circle; icon-width: 20; color: #1b9e77; opacity: 0.4; } +node[_status=complete] { opacity: 0.7; } + + + Index: /trunk/styles_nodist/potlatch2/source/wireframe.css =================================================================== --- /trunk/styles_nodist/potlatch2/source/wireframe.css (revision 5214) +++ /trunk/styles_nodist/potlatch2/source/wireframe.css (revision 5215) @@ -13,5 +13,5 @@ node :selected { z-index: 9; icon-image: square; icon-width: 6; color: red; casing-color: black; casing-width: 1; } node !:drawn :poi { z-index: 2; icon-image: square; icon-width: 4; color: green; casing-color: black; casing-width: 1; } -node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 3; color: black; } +node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 6; color: black; } node :hasTags :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: black; layer: 5; }