Changeset 6351 in josm for trunk/styles_nodist


Ignore:
Timestamp:
2013-11-02T00:25:21+01:00 (10 years ago)
Author:
Don-vip
Message:

update P2 map paint style: support of amenity=library, amenity=nightclub, emergency=fire_hydrant, shop=department_store

Location:
trunk/styles_nodist/potlatch2
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/styles_nodist/potlatch2/README

    r5215 r6351  
    1717When updating from upstream, keep all 4 locations in sync.
    1818
    19 At time of writing, the last update used f4019f791c0ee268443c942ad06f127d9911758a but better check the commit dates as well.
     19At time of writing, the last update used 570240ab6a42a3efa007a7dd6110fe96d079b277 (2013-02-10) but better check the commit dates as well.

  • trunk/styles_nodist/potlatch2/patched/core_pois.css

    r5218 r6351  
    3232node[barrier=cattle_grid] { icon-image: icons/barrier_cattle_grid.16.png; z-index: 20; }
    3333node[amenity=school] { icon-image: icons/education_school.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
    34 aera[amenity=school]:closed { color: yellow; fill-color: yellow; fill-opacity: 0.1; prop_area_small_name : 1; }
     34area[amenity=school]:closed { color: yellow; fill-color: yellow; fill-opacity: 0.1; prop_area_small_name : 1; }
    3535node[amenity=bar] { icon-image: icons/food_bar.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
    3636node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
    3737node[amenity=fast_food] { icon-image: icons/food_fastfood.n.16.png; z-index: 20; }
     38node[amenity=nightclub] { icon-image: icons/food_nightclub.n.16.png; text-offset: 0; text: auto; font-size: 10; z-index: 20; }
    3839node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset: 0; text: auto; font-size: 10; z-index: 20; }
    3940node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
    … …  
    4950node[amenity=hunting_stand] { icon-image: icons/sport_shooting.n.16.png; z-index: 20; }
    5051node[amenity=kindergarten] { icon-image: icons/education_nursery3.n.16.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; }
     52node[amenity=library] { icon-image: icons/amenity_library.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
    5153node[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; }
    5254node[amenity=post_office] { icon-image: icons/amenity_post_office.n.16.png; z-index: 20; }
    … …  
    5860node[amenity=veterinary] { icon-image: icons/health_veterinary.n.8E7409.16.png; z-index: 20; }
    5961node[amenity=waste_basket] { icon-image: icons/amenity_waste_bin.n.16.png; z-index: 20; }
     62node[amenity=fire_hydrant] { icon-image: icons/emergency_hydrant.n.16.png; z-index: 20; }
     63node[emergency=fire_hydrant] { icon-image: icons/emergency_hydrant.n.16.png; z-index: 20; }
    6064/* Shops */
    6165node[shop=alcohol] { icon-image: icons/shopping_alcohol.n.16.png; z-index: 20; }
    … …  
    6973node[shop=confectionery] { icon-image: icons/shopping_confectionery.n.16.png; z-index: 20; }
    7074node[shop=convenience] { icon-image: icons/shopping_convenience.n.16.png; z-index: 20; }
     75node[shop=department_store] { icon-image: icons/shopping_department_store.n.16.png; z-index: 20; }
    7176node[shop=doityourself] { icon-image: icons/shopping_diy.n.16.png; z-index: 20; }
    7277node[shop=fishmonger] { icon-image: icons/shopping_fish.n.16.png; z-index: 20; }
    … …  
    130135node[power=station] { icon-image: icons/power_substation.n.16.png; z-index: 20; }
    131136node[power=generator] { icon-image: icons/power_station.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; }
     137/* P2 previously had these icons instead of "icon-image: cross" which is not standard MapCSS but a P2 keyword we won't implement, so keep the old icons */
    132138node[power=tower] { icon-image: icons/power_tower_high2.n.16.png; z-index: 20; }
    133139node[power=pole] { icon-image: icons/power_tower_low.n.16.png; z-index: 20; }
    … …  
    141147node[addr:housename]::hn_casing { z-index: -100; symbol-shape: circle; symbol-size: 10; symbol-fill-color: blue; }
    142148
    143 way[addr:interpolation] { z-index: 5; color: #B0E0E6; width: 3; dashes: 3,3;}
     149way[addr:interpolation] { color: #B0E0E6; width: 3; dashes: 3,3;}

  • trunk/styles_nodist/potlatch2/patched/core_ways.css

    r5218 r6351  
    6161way[construction=subway]::dashes  { z-index: 7; color: white; width: 3; dashes: 4,12;}
    6262
    63 way[railway=disused],way[railway=abandoned] { z-index: 6; color: #444400; width: 3; dashes: 17, 2, 5, 0; }
    64 way[railway=disused]::dashes,way[railway=abandoned]::dashes { z-index: 7; color: #999999; width: 2; dashes: 12,12; }
     63way[railway=disused][!highway],way[railway=abandoned][!highway] { z-index: 6; color: #444400; width: 3; dashes: 17, 2, 5, 0; }
     64way[railway=disused][!highway]::dashes,way[railway=abandoned][!highway]::dashes { z-index: 7; color: #999999; width: 2; dashes: 12,12; }
    6565
    6666way[railway=tram]      { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; }
    … …  
    7373way[construction=light_rail]::dashes { z-index: 7; color: #999999; width: 2; dashes: 8,12; }
    7474
    75 /* Waterways */ 
     75/* Waterways */ 
    7676
    7777way[waterway=river],
    7878way[waterway=canal],
    7979way[waterway=stream]   { z-index: 5; color: #3434ff; width: 2; text:auto; text-color: #3434ff; font-size:9; text-position: line; text-offset: 7;}
    80 way[waterway=drain]                     {z-index: 5; color: #3434ff; width: 1; text:auto; text-color: #3434ff; text-position: line; text-offset: 3;}
     80way[waterway=drain]             {z-index: 5; color: #3434ff; width: 1; text:auto; text-color: #3434ff; text-position: line; text-offset: 3;}
    8181way[waterway][tunnel=yes]                {z-index: 5; dashes: 8,4;}
    8282
    … …  
    8585way[aeroway=aerodrome]:closed
    8686    { z-index: 3; color: #bb44bb; width: 3; casing-color: #66066;  casing-width: 1;  }
    87 way|z-15[aeroway=aerodrome]:closed
    88     { z-index: 3; fill-color: #bb99bb;  fill-opacity: 0.5;}
    8987way[aeroway=taxiway]!:closed { z-index: 8; color: #999999; width: 3; casing-color: #aa66aa; casing-width: 2; }
    90 area[aeroway=taxiway]:closed { z-index: 8; color: #bb99bb; width: 3; fill-color: #ccaacc; }
     88area[aeroway=taxiway]:closed { z-index: 8; color: #bb99bb; width: 3; fill-color: #ccaacc; } 
    9189
    92 way|z17-[aeroway=runway]!:closed { z-index: 9; color: black; width: 11; casing-color: #aa66aa; casing-width: 1; }
    93 way|z17-[aeroway=runway]!:closed::aa { z-index: 10; color: white; width: 9;  dashes: 0, 20, 4, 76; }
    94 way|z17-[aeroway=runway]!:closed::bb { z-index: 11; color: black; width: 7; }
    95 way|z17-[aeroway=runway]!:closed::cc { z-index: 12; color: white; width: 5;  dashes: 0, 20, 4, 76; }
    96 way|z17-[aeroway=runway]!:closed::dd { z-index: 13; color: black; width: 3; }
    97 way|z17-[aeroway=runway]!:closed::ee { z-index: 14; color: white; width: 1;  dashes: 4, 16; }
     90way[aeroway=runway]!:closed { z-index: 9; color: black; width: 5;  }
     91way[aeroway=runway]!:closed::aa { z-index: 12; color: white; width: 5;  dashes: 0, 20, 4, 76; }
     92way[aeroway=runway]!:closed::bb { z-index: 13; color: black; width: 3; }
     93way[aeroway=runway]!:closed::cc { z-index: 14; color: white; width: 1;  dashes: 4, 16; }
    9894
    99 way|z15-16[aeroway=runway]!:closed { z-index: 9; color: black; width: 5;  }
    100 way|z15-16[aeroway=runway]!:closed::aa { z-index: 12; color: white; width: 5;  dashes: 0, 20, 4, 76; }
    101 way|z15-16[aeroway=runway]!:closed::bb { z-index: 13; color: black; width: 3; }
    102 way|z15-16[aeroway=runway]!:closed::cc { z-index: 14; color: white; width: 1;  dashes: 4, 16; }
    103 
    104 way|z-14[aeroway=runway]!:closed { z-index: 9; color: #444444; width: 3;  }
    105 
    106 area[aeroway=runway]:closed { z-index: 9; color: black; width: 3; fill-color: #775577; }
    107 area[aeroway=apron]:closed { z-index: 4; color: #cc66cc; width: 1; fill-color: #ddaadd; fill-opacity: 0.5;}
     95area[aeroway=runway]:closed { z-index: 9; color: black; width: 3; fill-color: #775577; }
     96area[aeroway=apron]:closed { z-index: 4; color: #cc66cc; width: 1; fill-color: #ddaadd; fill-opacity: 0.5;}
    10897
    10998/* Barriers */

  • trunk/styles_nodist/potlatch2/source/core_pois.css

    r5215 r6351  
    2929node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }
    3030node[amenity=fast_food] { icon-image: icons/food_fastfood.n.16.png; z-index: 20; }
     31node[amenity=nightclub] { icon-image: icons/food_nightclub.n.16.png; text-offset: 15; text: name; font-size: 10; z-index: 20; }
    3132node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset: 15; text: name; font-size: 10; z-index: 20; }
    3233node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }
    … …  
    4243node[amenity=hunting_stand] { icon-image: icons/sport_shooting.n.16.png; z-index: 20; }
    4344node[amenity=kindergarten] { icon-image: icons/education_nursery3.n.16.png; z-index: 20; text-offset:15; text: name; font-size: 10; z-index: 20; }
     45node[amenity=library] { icon-image: icons/amenity_library.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }
    4446node[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; }
    4547node[amenity=post_office] { icon-image: icons/amenity_post_office.n.16.png; z-index: 20; }
    … …  
    5153node[amenity=veterinary] { icon-image: icons/health_veterinary.n.8E7409.16.png; z-index: 20; }
    5254node[amenity=waste_basket] { icon-image: icons/amenity_waste_bin.n.16.png; z-index: 20; }
     55node[amenity=fire_hydrant] { icon-image: icons/emergency_hydrant.n.16.png; z-index: 20; }
     56node[emergency=fire_hydrant] { icon-image: icons/emergency_hydrant.n.16.png; z-index: 20; }
    5357/* Shops */
    5458node[shop=alcohol] { icon-image: icons/shopping_alcohol.n.16.png; z-index: 20; }
    … …  
    6266node[shop=confectionery] { icon-image: icons/shopping_confectionery.n.16.png; z-index: 20; }
    6367node[shop=convenience] { icon-image: icons/shopping_convenience.n.16.png; z-index: 20; }
     68node[shop=department_store] { icon-image: icons/shopping_department_store.n.16.png; z-index: 20; }
    6469node[shop=doityourself] { icon-image: icons/shopping_diy.n.16.png; z-index: 20; }
    6570node[shop=fishmonger] { icon-image: icons/shopping_fish.n.16.png; z-index: 20; }
    … …  
    123128node[power=station] { icon-image: icons/power_substation.n.16.png; z-index: 20; }
    124129node[power=generator] { icon-image: icons/power_station.png; z-index: 20; text-offset:15; text: name; font-size: 10; z-index: 20; }
    125 node[power=tower] { icon-image: icons/power_tower_high2.n.16.png; z-index: 20; }
    126 node[power=pole] { icon-image: icons/power_tower_low.n.16.png; z-index: 20; }
     130node[power=tower] { icon-image: cross; icon-width: 7; width: 3; color: #F44; z-index: 20; }
     131node[power=pole] { icon-image: cross; icon-width: 7; width: 3; color: #444; z-index: 20; }
    127132node[waterway=weir] { icon-image: icons/transport_weir.n.16.png; z-index: 20; }
    128133

  • trunk/styles_nodist/potlatch2/source/core_ways.css

    r5215 r6351  
    5858way[construction=subway]::dashes  { z-index: 7; color: white; width: 3; dashes: 4,12;}
    5959
    60 way[railway=disused],way[railway=abandoned] { z-index: 6; color: #444400; width: 3; dashes: 17, 2, 5, 0; }
    61 way[railway=disused]::dashes,way[railway=abandoned]::dashes { z-index: 7; color: #999999; width: 2; dashes: 12,12; }
     60way[railway=disused][!highway],way[railway=abandoned][!highway] { z-index: 6; color: #444400; width: 3; dashes: 17, 2, 5, 0; }
     61way[railway=disused][!highway]::dashes,way[railway=abandoned][!highway]::dashes { z-index: 7; color: #999999; width: 2; dashes: 12,12; }
    6262
    6363way[railway=tram]      { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; }
    … …  
    7070way[construction=light_rail]::dashes { z-index: 7; color: #999999; width: 2; dashes: 8,12; }
    7171
    72 /* Waterways */ 
     72/* Waterways */ 
    7373
    7474way[waterway=river],
    7575way[waterway=canal],
    7676way[waterway=stream]   { color: #3434ff; width: 2; text:name; text-color: #3434ff; font-size:9; text-position: offset; text-offset: 7;}
    77 way[waterway=drain]                     {color: #3434ff; width: 1; text:name; text-color: #3434ff; text-position: offset; text-offset: 3;}
     77way[waterway=drain]             {color: #3434ff; width: 1; text:name; text-color: #3434ff; text-position: offset; text-offset: 3;}
    7878way[waterway][tunnel=yes]                {dashes: 8,4;}
    7979
    … …  
    8282way[aeroway=aerodrome] :area
    8383    { z-index: 3; color: #bb44bb; width: 3; casing-color: #66066;  casing-width: 1;  }
    84 way|z-15[aeroway=aerodrome] :area
    85     { z-index: 3; fill-color: #bb99bb;  fill-opacity: 0.5;}
    8684way[aeroway=taxiway] !:area { z-index: 8; color: #999999; width: 3; casing-color: #aa66aa; casing-width: 2; }
    8785way[aeroway=taxiway]  :area { z-index: 8; color: #bb99bb; width: 3; fill-color: #ccaacc; }
    8886
    89 way|z17-[aeroway=runway] !:area { z-index: 9; color: black; width: 11; casing-color: #aa66aa; casing-width: 1; }
    90 way|z17-[aeroway=runway]::aa !:area { z-index: 10; color: white; width: 9;  dashes: 0, 20, 4, 76; }
    91 way|z17-[aeroway=runway]::bb !:area { z-index: 11; color: black; width: 7; }
    92 way|z17-[aeroway=runway]::cc !:area { z-index: 12; color: white; width: 5;  dashes: 0, 20, 4, 76; }
    93 way|z17-[aeroway=runway]::dd !:area { z-index: 13; color: black; width: 3; }
    94 way|z17-[aeroway=runway]::ee !:area { z-index: 14; color: white; width: 1;  dashes: 4, 16; }
    95 
    96 way|z15-16[aeroway=runway] !:area { z-index: 9; color: black; width: 5;  }
    97 way|z15-16[aeroway=runway]::aa !:area { z-index: 12; color: white; width: 5;  dashes: 0, 20, 4, 76; }
    98 way|z15-16[aeroway=runway]::bb !:area { z-index: 13; color: black; width: 3; }
    99 way|z15-16[aeroway=runway]::cc !:area { z-index: 14; color: white; width: 1;  dashes: 4, 16; }
    100 
    101 way|z-14[aeroway=runway] !:area { z-index: 9; color: #444444; width: 3;  }
     87way[aeroway=runway] !:area { z-index: 9; color: black; width: 5;  }
     88way[aeroway=runway]::aa !:area { z-index: 12; color: white; width: 5;  dashes: 0, 20, 4, 76; }
     89way[aeroway=runway]::bb !:area { z-index: 13; color: black; width: 3; }
     90way[aeroway=runway]::cc !:area { z-index: 14; color: white; width: 1;  dashes: 4, 16; }
    10291
    10392way[aeroway=runway] :area { z-index: 9; color: black; width: 3; fill-color: #775577; }
Note: See TracChangeset for help on using the changeset viewer.