Changeset 17016 in josm for trunk


Ignore:
Timestamp:
2020-09-12T14:31:56+02:00 (4 years ago)
Author:
Klumbumbus
Message:

see #18866 - Update to latest and probably last version of Potlatch2 mappaint style

Location:
trunk
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/nodist/styles/potlatch2/README

    r16006 r17016  
    1717When updating from upstream, keep all 4 locations in sync.
    1818
    19 At time of writing, the last update used 0a21b8bca71f6105c244cb52d7b7dcb5a840bd3a (2014-10-07) but better check the commit dates as well.
     19At time of writing, the last update used 28c84372002671c8d71a81a2e423f4965388edd7 (2019-06-21) but better check the commit dates as well.

  • trunk/nodist/styles/potlatch2/patched/core_pois.css

    r9343 r17016  
    4141node[amenity=hospital] { icon-image: icons/health_hospital.n.16.png; z-index: 20; }
    4242node[amenity=pharmacy] { icon-image: icons/health_pharmacy.n.16.png; z-index: 20; }
     43node[emergency=defibrillator] { icon-image: icons/ISO_7010_E010.16.png; z-index: 20; }
    4344node[amenity=atm] { icon-image: icons/money_atm.n.16.png; z-index: 20; }
    4445node[amenity=bank] { icon-image: icons/money_bank2.n.16.png; z-index: 20; }
    … …  
    4748node[amenity=drinking_water] { icon-image: icons/food_drinkingtap.n.16.png; z-index: 20; }
    4849node[amenity=emergency_phone] { icon-image: icons/emergency-telephone-16.png; z-index: 20; }
     50node[emergency=phone] { icon-image: icons/emergency-telephone-16.png; z-index: 20; }
    4951node[amenity=fountain] { icon-image: icons/amenity_fountain2.n.16.png; z-index: 20; }
    5052node[amenity=hunting_stand] { icon-image: icons/sport_shooting.n.16.png; z-index: 20; }
    … …  
    5456node[amenity=post_office] { icon-image: icons/amenity_post_office.n.16.png; z-index: 20; }
    5557node[amenity=shelter] { icon-image: icons/accommodation_shelter2.n.16.png; z-index: 20; }
    56 node[amenity=swimming_pool] { icon-image: icons/sport_swimming_outdoor.n.16.png; z-index: 20; }
     58node[leisure=swimming_pool] { icon-image: icons/sport_swimming_outdoor.n.16.png; z-index: 20; }
    5759node[amenity=townhall] { icon-image: icons/amenity_town_hall.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
    5860node[amenity=toilets] { icon-image: icons/amenity_toilets.n.16.png; z-index: 20; }
    … …  
    6062node[amenity=veterinary] { icon-image: icons/health_veterinary.n.8E7409.16.png; z-index: 20; }
    6163node[amenity=waste_basket] { icon-image: icons/amenity_waste_bin.n.16.png; z-index: 20; }
    62 node[amenity=fire_hydrant] { icon-image: icons/emergency_hydrant.n.16.png; z-index: 20; }
    6364node[emergency=fire_hydrant] { icon-image: icons/emergency_hydrant.n.16.png; z-index: 20; }
    6465/* Shops */

  • trunk/nodist/styles/potlatch2/source/core_landuse.css

    r5376 r17016  
    4040way[boundary=administrative]                { color: purple; width: 2; opacity: 0.2; dashes: 24,4; z-index: 4;}
    4141way[boundary=administrative][waterway]      { opacity: 0.8; z-index: 4; dashes: 24,4; width: 6; }
    42 way[landuse=cemetery]                                           { color: #664466; width: 2; fill-color: #664466; opacity: 0.2; set .area_small_name;}
     42way[landuse=cemetery]                                           { color: #664466; width: 2; fill-color: color: #664466; opacity: 0.2; set .area_small_name;}
    4343/* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */

  • trunk/nodist/styles/potlatch2/source/core_pois.css

    r9343 r17016  
    3434node[amenity=hospital] { icon-image: icons/health_hospital.n.16.png; z-index: 20; }
    3535node[amenity=pharmacy] { icon-image: icons/health_pharmacy.n.16.png; z-index: 20; }
     36node[emergency=defibrillator] { icon-image: icons/ISO_7010_E010.16.png; z-index: 20; }
    3637node[amenity=atm] { icon-image: icons/money_atm.n.16.png; z-index: 20; }
    3738node[amenity=bank] { icon-image: icons/money_bank2.n.16.png; z-index: 20; }
    … …  
    4041node[amenity=drinking_water] { icon-image: icons/food_drinkingtap.n.16.png; z-index: 20; }
    4142node[amenity=emergency_phone] { icon-image: icons/emergency-telephone-16.png; z-index: 20; }
     43node[emergency=phone] { icon-image: icons/emergency-telephone-16.png; z-index: 20; }
    4244node[amenity=fountain] { icon-image: icons/amenity_fountain2.n.16.png; z-index: 20; }
    4345node[amenity=hunting_stand] { icon-image: icons/sport_shooting.n.16.png; z-index: 20; }
    … …  
    4749node[amenity=post_office] { icon-image: icons/amenity_post_office.n.16.png; z-index: 20; }
    4850node[amenity=shelter] { icon-image: icons/accommodation_shelter2.n.16.png; z-index: 20; }
    49 node[amenity=swimming_pool] { icon-image: icons/sport_swimming_outdoor.n.16.png; z-index: 20; }
     51node[leisure=swimming_pool] { icon-image: icons/sport_swimming_outdoor.n.16.png; z-index: 20; }
    5052node[amenity=townhall] { icon-image: icons/amenity_town_hall.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }
    5153node[amenity=toilets] { icon-image: icons/amenity_toilets.n.16.png; z-index: 20; }
    … …  
    5355node[amenity=veterinary] { icon-image: icons/health_veterinary.n.8E7409.16.png; z-index: 20; }
    5456node[amenity=waste_basket] { icon-image: icons/amenity_waste_bin.n.16.png; z-index: 20; }
    55 node[amenity=fire_hydrant] { icon-image: icons/emergency_hydrant.n.16.png; z-index: 20; }
    5657node[emergency=fire_hydrant] { icon-image: icons/emergency_hydrant.n.16.png; z-index: 20; }
    5758/* Shops */

  • trunk/nodist/styles/potlatch2/source/core_ways.css

    r6351 r17016  
    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

  • trunk/resources/styles/standard/potlatch2.mapcss

    r16059 r17016  
    216216node[amenity=hospital] { icon-image: icons/health_hospital.n.16.png; z-index: 20; }
    217217node[amenity=pharmacy] { icon-image: icons/health_pharmacy.n.16.png; z-index: 20; }
     218node[emergency=defibrillator] { icon-image: icons/ISO_7010_E010.16.png; z-index: 20; }
    218219node[amenity=atm] { icon-image: icons/money_atm.n.16.png; z-index: 20; }
    219220node[amenity=bank] { icon-image: icons/money_bank2.n.16.png; z-index: 20; }
    … …  
    222223node[amenity=drinking_water] { icon-image: icons/food_drinkingtap.n.16.png; z-index: 20; }
    223224node[amenity=emergency_phone] { icon-image: icons/emergency-telephone-16.png; z-index: 20; }
     225node[emergency=phone] { icon-image: icons/emergency-telephone-16.png; z-index: 20; }
    224226node[amenity=fountain] { icon-image: icons/amenity_fountain2.n.16.png; z-index: 20; }
    225227node[amenity=hunting_stand] { icon-image: icons/sport_shooting.n.16.png; z-index: 20; }
    … …  
    229231node[amenity=post_office] { icon-image: icons/amenity_post_office.n.16.png; z-index: 20; }
    230232node[amenity=shelter] { icon-image: icons/accommodation_shelter2.n.16.png; z-index: 20; }
    231 node[amenity=swimming_pool] { icon-image: icons/sport_swimming_outdoor.n.16.png; z-index: 20; }
     233node[leisure=swimming_pool] { icon-image: icons/sport_swimming_outdoor.n.16.png; z-index: 20; }
    232234node[amenity=townhall] { icon-image: icons/amenity_town_hall.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
    233235node[amenity=toilets] { icon-image: icons/amenity_toilets.n.16.png; z-index: 20; }
    … …  
    235237node[amenity=veterinary] { icon-image: icons/health_veterinary.n.8E7409.16.png; z-index: 20; }
    236238node[amenity=waste_basket] { icon-image: icons/amenity_waste_bin.n.16.png; z-index: 20; }
    237 node[amenity=fire_hydrant] { icon-image: icons/emergency_hydrant.n.16.png; z-index: 20; }
    238239node[emergency=fire_hydrant] { icon-image: icons/emergency_hydrant.n.16.png; z-index: 20; }
    239240/* Shops */
Note: See TracChangeset for help on using the changeset viewer.