Changeset 3900 in josm


Ignore:
Timestamp:
Feb 13, 2011 11:01:55 PM (2 years ago)
Author:
bastiK
Message:

improve potlatch 2 style

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/images

    • Property svn:externals set to

  • trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java

    r3899 r3900  
    474474                y += (metrics.getAscent() - metrics.getDescent()) / 2; 
    475475            } else if (text.vAlign == VerticalTextAlignment.BELOW) { 
    476                 y += h_half + metrics.getAscent(); 
     476                y += h_half + metrics.getAscent() + 2; 
    477477            } else throw new AssertionError(); 
    478478        } 

  • trunk/styles/standard/potlatch2.mapcss

    r3898 r3900  
    1818 
    1919canvas { 
    20     background-color: white; 
    21 } 
     20    background-color: #ffffea; 
     21} 
     22 
     23node, area { 
     24    text-color: black; 
     25} 
     26 
     27relation[restriction=no_left_turn] { 
     28    icon-image: "vehicle/restriction/turn_restrictions/no_left_turn.png"; 
     29} 
     30relation[restriction=no_right_turn] { 
     31    icon-image: "vehicle/restriction/turn_restrictions/no_right_turn.png"; 
     32} 
     33relation[restriction=no_straight_on] { 
     34    icon-image: "vehicle/restriction/turn_restrictions/no_straight_on.png"; 
     35} 
     36relation[restriction=no_u_turn] { 
     37    icon-image: "vehicle/restriction/turn_restrictions/no_u_turn.png"; 
     38} 
     39relation[restriction=only_left_turn] { 
     40    icon-image: "vehicle/restriction/turn_restrictions/only_left_turn.png"; 
     41} 
     42relation[restriction=only_right_turn] { 
     43    icon-image: "vehicle/restriction/turn_restrictions/only_right_turn.png"; 
     44} 
     45relation[restriction=only_straight_on] { 
     46    icon-image: "vehicle/restriction/turn_restrictions/only_straight_on.png"; 
     47} 
     48 
    2249 
    2350/**************** 
    … …  
    93120way[waterway=river], 
    94121way[waterway=canal], 
    95 way[waterway=stream]   { color: blue; width: 2; text:auto; text-color:blue; font-size:9; text-position: offset; text-offset: 7;} 
    96 way[waterway=drain]                      {color: blue; width: 1; text:auto; text-color: blue; text-position: offset; text-offset: 3;} 
     122way[waterway=stream]   { color: blue; width: 2; text:auto; text-color:blue; font-size:9; text-position: line; text-offset: 7;} 
     123way[waterway=drain]                      {color: blue; width: 1; text:auto; text-color: blue; text-position: line; text-offset: 3;} 
    97124way[waterway][tunnel=yes]                {dashes: 8,4;} 
    98125 
    … …  
    169196 * core_pois.css 
    170197 ****************/ 
    171  
    172 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; } 
     198node { text-anchor-horizontal: center; text-anchor-vertical: below; } 
     199 
     200node[place] { icon-image: icons/place.png; font-family: DejaVu; text: auto; font-size: 9; font-weight: bold; text-decoration: underline; z-index: 20; } 
    173201node[amenity=telephone] { icon-image: icons/telephone.png; z-index: 20; } 
    174202node[barrier=cattle_grid] { icon-image: icons/cattle_grid.png; z-index: 20; } 
    … …  
    178206node[tourism=caravan_site] { icon-image: icons/accommodation_caravan_park.n.16.png; z-index: 20; } 
    179207node[tourism=guest_house],node[tourism=bed_and_breakfast] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; } 
    180 node[tourism=hotel] { icon-image: icons/accommodation_hotel.n.16.png; text-offset:15; text: name; z-index: 20; } 
     208node[tourism=hotel] { icon-image: icons/accommodation_hotel.n.16.png; text-offset:0; text: auto; z-index: 20; } 
    181209node[tourism=hostel] { icon-image: icons/accommodation_youth_hostel.n.16.png; z-index: 20; } 
    182210node[amenity=fire_station] { icon-image: icons/amenity_firestation2.n.16.png; z-index: 20; } 
    … …  
    193221node[barrier=block] { icon-image: icons/barrier_blocks.16.png; z-index: 20; } 
    194222node[barrier=cattle_grid] { icon-image: icons/barrier_cattle_grid.16.png; z-index: 20; } 
    195 node[amenity=school] { icon-image: icons/education_school.n.16.png; text-offset:15; text: name; z-index: 20; } 
     223node[amenity=school] { icon-image: icons/education_school.n.16.png; text-offset:0; text: auto; z-index: 20; } 
    196224way[amenity=school]:closed { color: yellow; fill-color: yellow; fill-opacity: 0.1; prop_area_small_name : 1; } 
    197 node[amenity=bar] { icon-image: icons/food_bar.n.16.png; text-offset:15; text: name; z-index: 20; } 
    198 node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:15; text: name; z-index: 20; } 
     225node[amenity=bar] { icon-image: icons/food_bar.n.16.png; text-offset:0; text: auto; z-index: 20; } 
     226node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:0; text: auto; z-index: 20; } 
    199227node[amenity=fast_food] { icon-image: icons/food_fastfood.n.16.png; z-index: 20; } 
    200 node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset:15; text: name; z-index: 20; } 
    201 node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:15; text: name; z-index: 20; } 
     228node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset:0; text: name; z-index: 20; } 
     229node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:0; text: auto; z-index: 20; } 
    202230node[amenity=hospital] { icon-image: icons/health_hospital.n.16.png; z-index: 20; } 
    203231node[amenity=pharmacy] { icon-image: icons/health_pharmacy.n.16.png; z-index: 20; } 
    … …  
    228256node[historic=archaeological_site] { icon-image: icons/tourist_archaeological.n.16.png; z-index: 20; } 
    229257node[historic=battlefield] { icon-image: icons/tourist_battlefield.n.16.png; z-index: 20; } 
    230 node[historic=castle] { icon-image: icons/tourist_castle.n.16.png; text-offset:15; text: name; z-index: 20; } 
     258node[historic=castle] { icon-image: icons/tourist_castle.n.16.png; text-offset:0; text: auto; z-index: 20; } 
    231259node[amenity=cinema] { icon-image: icons/tourist_cinema.n.16.png; z-index: 20; } 
    232 node[historic=memorial] { icon-image: icons/tourist_memorial.n.16.png; text-offset:15; text: name; z-index: 20; } 
    233 node[historic=monument] { icon-image: icons/tourist_monument.n.16.png; text-offset:15; text: name; z-index: 20; } 
    234 node[tourism=museum] { icon-image: icons/tourist_museum.n.16.png; text-offset:15; text: name; z-index: 20; } 
     260node[historic=memorial] { icon-image: icons/tourist_memorial.n.16.png; text-offset:0; text: auto; z-index: 20; } 
     261node[historic=monument] { icon-image: icons/tourist_monument.n.16.png; text-offset:0; text: auto; z-index: 20; } 
     262node[tourism=museum] { icon-image: icons/tourist_museum.n.16.png; text-offset:0; text: auto; z-index: 20; } 
    235263node[tourism=picnic_site] { icon-image: icons/tourist_picnic.n.16.png; z-index: 20; } 
    236264node[historic=ruin] { icon-image: icons/tourist_ruin.n.16.png; z-index: 20; } 
    … …  
    242270node[highway=bus_stop] { icon-image: icons/transport_bus_stop2.n.16.png; z-index: 20; } 
    243271node[amenity=fuel] { icon-image: icons/transport_fuel.n.16.png; z-index: 20; } 
    244 node[amenity=bicycle_parking] { icon-image: icons/transport_parking_bicycle.n.16.png; text-offset: 15; text: capacity; z-index: 20; } 
     272node[amenity=bicycle_parking] { icon-image: icons/transport_parking_bicycle.n.16.png; text-offset: 0; text: capacity; z-index: 20; } 
    245273node[amenity=parking] { icon-image: icons/transport_parking_car.n.16.png; z-index: 20; } 
    246274node[amenity=ferry_terminal] { icon-image: icons/transport_port.n.16.png; z-index: 20; } 
    … …  
    248276node[amenity=car_rental] { icon-image: icons/transport_rental_car.n.16.png; z-index: 20; } 
    249277node[amenity=taxi] { icon-image: icons/transport_taxi_rank.n.16.png; z-index: 20; } 
    250 node[railway=station] { icon-image: icons/transport_train_station.n.16.png; text-offset:15; text: name; z-index: 20; } 
     278node[railway=station] { icon-image: icons/transport_train_station.n.16.png; text-offset:0; text: auto; z-index: 20; } 
    251279node[railway=tram_stop] { icon-image: icons/transport_tram_stop.n.16.png; z-index: 20; } 
    252280node[leisure=marina] { icon-image: icons/transport_marina.n.16.png; z-index: 20; } 
    … …  
    255283 
    256284node["addr:housenumber"], 
    257 node["addr:housename"] { icon-image: circle; icon-width: 4; color: #B0E0E6; casing-color:blue; casing-width: 1; } 
     285node["addr:housename"] { symbol-shape: circle; symbol-size: 8; symbol-fill-color: #B0E0E6; } 
     286node["addr:housenumber"]::hn_casing, 
     287node["addr:housename"]::hn_casing { z-index: -100; symbol-shape: circle; symbol-size: 10; symbol-fill-color: blue; } 
    258288way["addr:interpolation"] { color: #B0E0E6; width: 3; dashes: 3,3;} 
    259289 
    … …  
    264294/* Landuse */ 
    265295 
    266 way[natural]:closed                          { color: #ADD6A5; width: 1; fill-color: #ADD6A5; fill-opacity: 0.2; } 
    267 way[natural=beach]:closed                    { color: #ffdd44; width: 1; fill-color: yellow; fill-opacity: 0.2; prop_area_small_name : 1;} 
     296area[natural]:closed                          { color: #ADD6A5; width: 1; fill-color: #ADD6A5; fill-opacity: 0.2; } 
     297area[natural=beach]:closed                    { color: #ffdd44; width: 1; fill-color: yellow; fill-opacity: 0.2; prop_area_small_name : 1;} 
    268298way[natural=coastline]                                          { color: black; width: 3; } 
    269 way[landuse]:closed                          { color: #444444; width: 2; fill-color: #444444; fill-opacity: 0.3; } 
    270 way[landuse=residential]:closed              { color: #666666; width: 2; fill-color: #666666; fill-opacity: 0.15; } 
    271 way[landuse=retail]:closed                   { color: #cc2222; width: 2; fill-color: #aa4422; fill-opacity: 0.15; } 
    272 way[landuse=commercial]:closed               { color: #4444bb; width: 2; fill-color: #444488; fill-opacity: 0.15; } 
    273 way[landuse=military]:closed                 { color: #ff4444; width: 2; fill-color: #ff4444; fill-opacity: 0.2; prop_area_small_name : 1; } 
    274 way[amenity],way[shop]:closed                { color: #ADCEB5; width: 1; fill-color: #ADCEB5; fill-opacity: 0.2; } 
     299area[landuse]:closed                          { color: #444444; width: 2; fill-color: #444444; fill-opacity: 0.3; } 
     300area[landuse=residential]:closed              { color: #666666; width: 2; fill-color: #666666; fill-opacity: 0.15; } 
     301area[landuse=retail]:closed                   { color: #cc2222; width: 2; fill-color: #aa4422; fill-opacity: 0.15; } 
     302area[landuse=commercial]:closed               { color: #4444bb; width: 2; fill-color: #444488; fill-opacity: 0.15; } 
     303area[landuse=military]:closed                 { color: #ff4444; width: 2; fill-color: #ff4444; fill-opacity: 0.2; prop_area_small_name : 1; } 
     304area[amenity]:closed, area[shop]:closed                { color: #ADCEB5; width: 1; fill-color: #ADCEB5; fill-opacity: 0.2; } 
    275305/* way[sport] should not be rendered by itself, according to wiki. Can we make it an "if all else fails"? */ 
    276 way[leisure]:closed                         { color: #8CD6B5; width: 1; fill-color: #8CD6B5; fill-opacity: 0.2; } 
    277 way[tourism]:closed                          { color: #F7CECE; width: 1; fill-color: #F7CECE; fill-opacity: 0.2; prop_area_small_name : 1;} 
    278 way[historic],way[ruins]:closed              { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; prop_area_small_name : 1;} 
    279 way[military]:closed                         { color: #D6D6D6; width: 1; fill-color: #D6D6D6; fill-opacity: 0.2; prop_area_small_name : 1;} 
    280 way[building]:closed                         { color: #ff6ec7; width: 1; fill-color: #ff6ec7; fill-opacity: 0.2; } 
    281 way[natural=water], 
    282 way[waterway][waterway!=dam]:closed          { color: blue;    width: 2; fill-color: blue;    fill-opacity: 0.2; prop_area_small_name : 1;} 
     306area[leisure]:closed                         { color: #8CD6B5; width: 1; fill-color: #8CD6B5; fill-opacity: 0.2; } 
     307area[tourism]:closed                          { color: #F7CECE; width: 1; fill-color: #F7CECE; fill-opacity: 0.2; prop_area_small_name : 1;} 
     308area[historic]:closed, area[ruins]:closed              { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; prop_area_small_name : 1;} 
     309area[military]:closed                         { color: #D6D6D6; width: 1; fill-color: #D6D6D6; fill-opacity: 0.2; prop_area_small_name : 1;} 
     310area[building]:closed                         { color: #ff6ec7; width: 1; fill-color: #ff6ec7; fill-opacity: 0.2; } 
     311area[natural=water]:closed, 
     312area[waterway][waterway!=dam]:closed          { color: blue;    width: 2; fill-color: blue;    fill-opacity: 0.2; prop_area_small_name : 1;} 
    283313way[waterway=dam]                                                       { color: black; width: 1; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1;} 
    284 way[man_made]:closed                                                    { color: black; width: 2; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1; } 
    285 way[man_made=reservoir_covered]:closed       { color: blue; width: 2; dashes: 4, 2; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1; } 
    286 way[landuse=reservoir]:closed                { color: blue;    width: 2; fill-color: blue;    fill-opacity: 0.2; prop_area_small_name : 1;} 
    287 way[landuse=forest],way[natural=wood]:closed { color: green;   width: 2; fill-color: green;   fill-opacity: 0.2; prop_area_small_name : 1;} 
    288 way[leisure=park]:closed                    { color: #22aa22; width: 2; fill-color: #44ff44; fill-opacity: 0.15; prop_area_small_name : 1;} 
    289 way[leisure=garden]:closed                  { color: #66ff44; width: 1; fill-color: #66ff44; fill-opacity: 0.2; prop_area_small_name : 1;} 
    290 way[leisure=pitch]:closed                                       { z-index: 6; color: #88bb44; width: 2; fill-color: #88ff44; fill-opacity: 0.2; prop_area_small_name : 1;} 
    291 way[landuse=recreation_ground]:closed        { color: green; fill-color: green; prop_area_small_name : 1;} 
    292 way[amenity=parking]:closed                  { color: #bbaa66;    width: 1; fill-color: #bbaa66;    fill-opacity: 0.2; } 
    293 way[public_transport=pay_scale_area]:closed  { color: gray;    width: 1; fill-color: gray;    fill-opacity: 0.1; } 
     314area[man_made]:closed                                                   { color: black; width: 2; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1; } 
     315area[man_made=reservoir_covered]:closed       { color: blue; width: 2; dashes: 4, 2; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1; } 
     316area[landuse=reservoir]:closed                { color: blue;    width: 2; fill-color: blue;    fill-opacity: 0.2; prop_area_small_name : 1;} 
     317area[landuse=forest]:closed,area[natural=wood]:closed { color: green;   width: 2; fill-color: green;   fill-opacity: 0.2; prop_area_small_name : 1;} 
     318area[leisure=park]:closed                    { color: #22aa22; width: 2; fill-color: #44ff44; fill-opacity: 0.15; prop_area_small_name : 1;} 
     319area[leisure=garden]:closed                  { color: #66ff44; width: 1; fill-color: #66ff44; fill-opacity: 0.2; prop_area_small_name : 1;} 
     320area[leisure=pitch]:closed                                      { z-index: 6; color: #88bb44; width: 2; fill-color: #88ff44; fill-opacity: 0.2; prop_area_small_name : 1;} 
     321area[landuse=recreation_ground]:closed        { color: green; fill-color: green; prop_area_small_name : 1;} 
     322area[amenity=parking]:closed                  { color: #bbaa66;    width: 1; fill-color: #bbaa66;    fill-opacity: 0.2; } 
     323area[public_transport=pay_scale_area]:closed  { color: gray;    width: 1; fill-color: gray;    fill-opacity: 0.1; } 
    294324way[man_made=pier]                                                      { z-index: 4; color: #777; width: 3; casing-color: black; casing-width: 5;} 
    295325way[man_made=pier][floating=yes]                        { dashes: 4,2; casing-color: #444;} 
    296 way[leisure=marina]:closed                                      { color: pink; fill-color: pink; fill-opacity: 0.4; prop_area_small_name : 1;} 
     326area[leisure=marina]:closed                                     { color: pink; fill-color: pink; fill-opacity: 0.4; prop_area_small_name : 1;} 
    297327way[leisure=slipway]                                            { color: grey; width: 3; casing-color: blue; casing-width: 7; } 
    298 way[leisure=golf_course]:closed { color: #44ee22; width: 2; fill-color: #44ee22; fill-opacity: 0.2; prop_area_small_name : 1;} 
     328area[leisure=golf_course]:closed { color: #44ee22; width: 2; fill-color: #44ee22; fill-opacity: 0.2; prop_area_small_name : 1;} 
    299329way[boundary]                               { color: #000066; width: 2; opacity: 0.6; dashes: 24,4, 4, 4; z-index: 4;} 
    300330/* Perhaps should be filled, on lower zooms. */ 
    … …  
    303333way[boundary=administrative]                { color: purple; width: 2; opacity: 0.2; dashes: 24,4; z-index: 4;} 
    304334way[boundary=administrative][waterway]      { opacity: 0.8; z-index: 4; dashes: 24,4; width: 6; } 
    305 way[landuse=cemetery]                                           { color: #664466; width: 2; fill-color: color: #664466; opacity: 0.2; prop_area_small_name : 1;} 
     335way[landuse=cemetery]                                           { color: #664466; width: 2; fill-color: #664466; opacity: 0.2; prop_area_small_name : 1;} 
    306336/* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */ 
    307337 

  • trunk/styles_nodist/potlatch2/build.xml

    r3899 r3900  
    4747     
    4848    <!--    Determine revision and save in  ${version.entry.commit.revision}--> 
    49     <target name="source-revision" depends="init"> 
     49    <target name="source-revision"> 
    5050        <exec append="false" output="REVISION.XML" executable="svn" dir="source" failifexecutionfails="true"> 
    5151            <env key="LANG" value="C"/> 

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

    r3898 r3900  
    66/* Landuse */ 
    77 
    8 way[natural]:closed                          { color: #ADD6A5; width: 1; fill-color: #ADD6A5; fill-opacity: 0.2; } 
    9 way[natural=beach]:closed                    { color: #ffdd44; width: 1; fill-color: yellow; fill-opacity: 0.2; prop_area_small_name : 1;} 
     8area[natural]:closed                          { color: #ADD6A5; width: 1; fill-color: #ADD6A5; fill-opacity: 0.2; } 
     9area[natural=beach]:closed                    { color: #ffdd44; width: 1; fill-color: yellow; fill-opacity: 0.2; prop_area_small_name : 1;} 
    1010way[natural=coastline]                                          { color: black; width: 3; } 
    11 way[landuse]:closed                          { color: #444444; width: 2; fill-color: #444444; fill-opacity: 0.3; } 
    12 way[landuse=residential]:closed              { color: #666666; width: 2; fill-color: #666666; fill-opacity: 0.15; } 
    13 way[landuse=retail]:closed                   { color: #cc2222; width: 2; fill-color: #aa4422; fill-opacity: 0.15; } 
    14 way[landuse=commercial]:closed               { color: #4444bb; width: 2; fill-color: #444488; fill-opacity: 0.15; } 
    15 way[landuse=military]:closed                 { color: #ff4444; width: 2; fill-color: #ff4444; fill-opacity: 0.2; prop_area_small_name : 1; } 
    16 way[amenity],way[shop]:closed                { color: #ADCEB5; width: 1; fill-color: #ADCEB5; fill-opacity: 0.2; } 
     11area[landuse]:closed                          { color: #444444; width: 2; fill-color: #444444; fill-opacity: 0.3; } 
     12area[landuse=residential]:closed              { color: #666666; width: 2; fill-color: #666666; fill-opacity: 0.15; } 
     13area[landuse=retail]:closed                   { color: #cc2222; width: 2; fill-color: #aa4422; fill-opacity: 0.15; } 
     14area[landuse=commercial]:closed               { color: #4444bb; width: 2; fill-color: #444488; fill-opacity: 0.15; } 
     15area[landuse=military]:closed                 { color: #ff4444; width: 2; fill-color: #ff4444; fill-opacity: 0.2; prop_area_small_name : 1; } 
     16area[amenity]:closed, area[shop]:closed                { color: #ADCEB5; width: 1; fill-color: #ADCEB5; fill-opacity: 0.2; } 
    1717/* way[sport] should not be rendered by itself, according to wiki. Can we make it an "if all else fails"? */ 
    18 way[leisure]:closed                         { color: #8CD6B5; width: 1; fill-color: #8CD6B5; fill-opacity: 0.2; } 
    19 way[tourism]:closed                          { color: #F7CECE; width: 1; fill-color: #F7CECE; fill-opacity: 0.2; prop_area_small_name : 1;} 
    20 way[historic],way[ruins]:closed              { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; prop_area_small_name : 1;} 
    21 way[military]:closed                         { color: #D6D6D6; width: 1; fill-color: #D6D6D6; fill-opacity: 0.2; prop_area_small_name : 1;} 
    22 way[building]:closed                         { color: #ff6ec7; width: 1; fill-color: #ff6ec7; fill-opacity: 0.2; } 
    23 way[natural=water], 
    24 way[waterway][waterway!=dam]:closed          { color: blue;    width: 2; fill-color: blue;    fill-opacity: 0.2; prop_area_small_name : 1;} 
     18area[leisure]:closed                         { color: #8CD6B5; width: 1; fill-color: #8CD6B5; fill-opacity: 0.2; } 
     19area[tourism]:closed                          { color: #F7CECE; width: 1; fill-color: #F7CECE; fill-opacity: 0.2; prop_area_small_name : 1;} 
     20area[historic]:closed, area[ruins]:closed              { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; prop_area_small_name : 1;} 
     21area[military]:closed                         { color: #D6D6D6; width: 1; fill-color: #D6D6D6; fill-opacity: 0.2; prop_area_small_name : 1;} 
     22area[building]:closed                         { color: #ff6ec7; width: 1; fill-color: #ff6ec7; fill-opacity: 0.2; } 
     23area[natural=water]:closed, 
     24area[waterway][waterway!=dam]:closed          { color: blue;    width: 2; fill-color: blue;    fill-opacity: 0.2; prop_area_small_name : 1;} 
    2525way[waterway=dam]                                                       { color: black; width: 1; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1;} 
    26 way[man_made]:closed                                                    { color: black; width: 2; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1; } 
    27 way[man_made=reservoir_covered]:closed       { color: blue; width: 2; dashes: 4, 2; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1; } 
    28 way[landuse=reservoir]:closed                { color: blue;    width: 2; fill-color: blue;    fill-opacity: 0.2; prop_area_small_name : 1;} 
    29 way[landuse=forest],way[natural=wood]:closed { color: green;   width: 2; fill-color: green;   fill-opacity: 0.2; prop_area_small_name : 1;} 
    30 way[leisure=park]:closed                    { color: #22aa22; width: 2; fill-color: #44ff44; fill-opacity: 0.15; prop_area_small_name : 1;} 
    31 way[leisure=garden]:closed                  { color: #66ff44; width: 1; fill-color: #66ff44; fill-opacity: 0.2; prop_area_small_name : 1;} 
    32 way[leisure=pitch]:closed                                       { z-index: 6; color: #88bb44; width: 2; fill-color: #88ff44; fill-opacity: 0.2; prop_area_small_name : 1;} 
    33 way[landuse=recreation_ground]:closed        { color: green; fill-color: green; prop_area_small_name : 1;} 
    34 way[amenity=parking]:closed                  { color: #bbaa66;    width: 1; fill-color: #bbaa66;    fill-opacity: 0.2; } 
    35 way[public_transport=pay_scale_area]:closed  { color: gray;    width: 1; fill-color: gray;    fill-opacity: 0.1; } 
     26area[man_made]:closed                                                   { color: black; width: 2; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1; } 
     27area[man_made=reservoir_covered]:closed       { color: blue; width: 2; dashes: 4, 2; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1; } 
     28area[landuse=reservoir]:closed                { color: blue;    width: 2; fill-color: blue;    fill-opacity: 0.2; prop_area_small_name : 1;} 
     29area[landuse=forest]:closed,area[natural=wood]:closed { color: green;   width: 2; fill-color: green;   fill-opacity: 0.2; prop_area_small_name : 1;} 
     30area[leisure=park]:closed                    { color: #22aa22; width: 2; fill-color: #44ff44; fill-opacity: 0.15; prop_area_small_name : 1;} 
     31area[leisure=garden]:closed                  { color: #66ff44; width: 1; fill-color: #66ff44; fill-opacity: 0.2; prop_area_small_name : 1;} 
     32area[leisure=pitch]:closed                                      { z-index: 6; color: #88bb44; width: 2; fill-color: #88ff44; fill-opacity: 0.2; prop_area_small_name : 1;} 
     33area[landuse=recreation_ground]:closed        { color: green; fill-color: green; prop_area_small_name : 1;} 
     34area[amenity=parking]:closed                  { color: #bbaa66;    width: 1; fill-color: #bbaa66;    fill-opacity: 0.2; } 
     35area[public_transport=pay_scale_area]:closed  { color: gray;    width: 1; fill-color: gray;    fill-opacity: 0.1; } 
    3636way[man_made=pier]                                                      { z-index: 4; color: #777; width: 3; casing-color: black; casing-width: 5;} 
    3737way[man_made=pier][floating=yes]                        { dashes: 4,2; casing-color: #444;} 
    38 way[leisure=marina]:closed                                      { color: pink; fill-color: pink; fill-opacity: 0.4; prop_area_small_name : 1;} 
     38area[leisure=marina]:closed                                     { color: pink; fill-color: pink; fill-opacity: 0.4; prop_area_small_name : 1;} 
    3939way[leisure=slipway]                                            { color: grey; width: 3; casing-color: blue; casing-width: 7; } 
    40 way[leisure=golf_course]:closed { color: #44ee22; width: 2; fill-color: #44ee22; fill-opacity: 0.2; prop_area_small_name : 1;} 
     40area[leisure=golf_course]:closed { color: #44ee22; width: 2; fill-color: #44ee22; fill-opacity: 0.2; prop_area_small_name : 1;} 
    4141way[boundary]                               { color: #000066; width: 2; opacity: 0.6; dashes: 24,4, 4, 4; z-index: 4;} 
    4242/* Perhaps should be filled, on lower zooms. */ 
    … …  
    4545way[boundary=administrative]                { color: purple; width: 2; opacity: 0.2; dashes: 24,4; z-index: 4;} 
    4646way[boundary=administrative][waterway]      { opacity: 0.8; z-index: 4; dashes: 24,4; width: 6; } 
    47 way[landuse=cemetery]                                           { color: #664466; width: 2; fill-color: color: #664466; opacity: 0.2; prop_area_small_name : 1;} 
     47way[landuse=cemetery]                                           { color: #664466; width: 2; fill-color: #664466; opacity: 0.2; prop_area_small_name : 1;} 
    4848/* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */ 

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

    r3898 r3900  
    33 * core_pois.css 
    44 ****************/ 
     5node { text-anchor-horizontal: center; text-anchor-vertical: below; } 
    56 
    6 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; } 
     7node[place] { icon-image: icons/place.png; font-family: DejaVu; text: auto; font-size: 9; font-weight: bold; text-decoration: underline; z-index: 20; } 
    78node[amenity=telephone] { icon-image: icons/telephone.png; z-index: 20; } 
    89node[barrier=cattle_grid] { icon-image: icons/cattle_grid.png; z-index: 20; } 
    … …  
    1213node[tourism=caravan_site] { icon-image: icons/accommodation_caravan_park.n.16.png; z-index: 20; } 
    1314node[tourism=guest_house],node[tourism=bed_and_breakfast] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; } 
    14 node[tourism=hotel] { icon-image: icons/accommodation_hotel.n.16.png; text-offset:15; text: name; z-index: 20; } 
     15node[tourism=hotel] { icon-image: icons/accommodation_hotel.n.16.png; text-offset:0; text: auto; z-index: 20; } 
    1516node[tourism=hostel] { icon-image: icons/accommodation_youth_hostel.n.16.png; z-index: 20; } 
    1617node[amenity=fire_station] { icon-image: icons/amenity_firestation2.n.16.png; z-index: 20; } 
    … …  
    2728node[barrier=block] { icon-image: icons/barrier_blocks.16.png; z-index: 20; } 
    2829node[barrier=cattle_grid] { icon-image: icons/barrier_cattle_grid.16.png; z-index: 20; } 
    29 node[amenity=school] { icon-image: icons/education_school.n.16.png; text-offset:15; text: name; z-index: 20; } 
     30node[amenity=school] { icon-image: icons/education_school.n.16.png; text-offset:0; text: auto; z-index: 20; } 
    3031way[amenity=school]:closed { color: yellow; fill-color: yellow; fill-opacity: 0.1; prop_area_small_name : 1; } 
    31 node[amenity=bar] { icon-image: icons/food_bar.n.16.png; text-offset:15; text: name; z-index: 20; } 
    32 node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:15; text: name; z-index: 20; } 
     32node[amenity=bar] { icon-image: icons/food_bar.n.16.png; text-offset:0; text: auto; z-index: 20; } 
     33node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:0; text: auto; z-index: 20; } 
    3334node[amenity=fast_food] { icon-image: icons/food_fastfood.n.16.png; z-index: 20; } 
    34 node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset:15; text: name; z-index: 20; } 
    35 node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:15; text: name; z-index: 20; } 
     35node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset:0; text: name; z-index: 20; } 
     36node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:0; text: auto; z-index: 20; } 
    3637node[amenity=hospital] { icon-image: icons/health_hospital.n.16.png; z-index: 20; } 
    3738node[amenity=pharmacy] { icon-image: icons/health_pharmacy.n.16.png; z-index: 20; } 
    … …  
    6263node[historic=archaeological_site] { icon-image: icons/tourist_archaeological.n.16.png; z-index: 20; } 
    6364node[historic=battlefield] { icon-image: icons/tourist_battlefield.n.16.png; z-index: 20; } 
    64 node[historic=castle] { icon-image: icons/tourist_castle.n.16.png; text-offset:15; text: name; z-index: 20; } 
     65node[historic=castle] { icon-image: icons/tourist_castle.n.16.png; text-offset:0; text: auto; z-index: 20; } 
    6566node[amenity=cinema] { icon-image: icons/tourist_cinema.n.16.png; z-index: 20; } 
    66 node[historic=memorial] { icon-image: icons/tourist_memorial.n.16.png; text-offset:15; text: name; z-index: 20; } 
    67 node[historic=monument] { icon-image: icons/tourist_monument.n.16.png; text-offset:15; text: name; z-index: 20; } 
    68 node[tourism=museum] { icon-image: icons/tourist_museum.n.16.png; text-offset:15; text: name; z-index: 20; } 
     67node[historic=memorial] { icon-image: icons/tourist_memorial.n.16.png; text-offset:0; text: auto; z-index: 20; } 
     68node[historic=monument] { icon-image: icons/tourist_monument.n.16.png; text-offset:0; text: auto; z-index: 20; } 
     69node[tourism=museum] { icon-image: icons/tourist_museum.n.16.png; text-offset:0; text: auto; z-index: 20; } 
    6970node[tourism=picnic_site] { icon-image: icons/tourist_picnic.n.16.png; z-index: 20; } 
    7071node[historic=ruin] { icon-image: icons/tourist_ruin.n.16.png; z-index: 20; } 
    … …  
    7677node[highway=bus_stop] { icon-image: icons/transport_bus_stop2.n.16.png; z-index: 20; } 
    7778node[amenity=fuel] { icon-image: icons/transport_fuel.n.16.png; z-index: 20; } 
    78 node[amenity=bicycle_parking] { icon-image: icons/transport_parking_bicycle.n.16.png; text-offset: 15; text: capacity; z-index: 20; } 
     79node[amenity=bicycle_parking] { icon-image: icons/transport_parking_bicycle.n.16.png; text-offset: 0; text: capacity; z-index: 20; } 
    7980node[amenity=parking] { icon-image: icons/transport_parking_car.n.16.png; z-index: 20; } 
    8081node[amenity=ferry_terminal] { icon-image: icons/transport_port.n.16.png; z-index: 20; } 
    … …  
    8283node[amenity=car_rental] { icon-image: icons/transport_rental_car.n.16.png; z-index: 20; } 
    8384node[amenity=taxi] { icon-image: icons/transport_taxi_rank.n.16.png; z-index: 20; } 
    84 node[railway=station] { icon-image: icons/transport_train_station.n.16.png; text-offset:15; text: name; z-index: 20; } 
     85node[railway=station] { icon-image: icons/transport_train_station.n.16.png; text-offset:0; text: auto; z-index: 20; } 
    8586node[railway=tram_stop] { icon-image: icons/transport_tram_stop.n.16.png; z-index: 20; } 
    8687node[leisure=marina] { icon-image: icons/transport_marina.n.16.png; z-index: 20; } 
    … …  
    8990 
    9091node["addr:housenumber"], 
    91 node["addr:housename"] { icon-image: circle; icon-width: 4; color: #B0E0E6; casing-color:blue; casing-width: 1; } 
     92node["addr:housename"] { symbol-shape: circle; symbol-size: 8; symbol-fill-color: #B0E0E6; } 
     93node["addr:housenumber"]::hn_casing, 
     94node["addr:housename"]::hn_casing { z-index: -100; symbol-shape: circle; symbol-size: 10; symbol-fill-color: blue; } 
    9295way["addr:interpolation"] { color: #B0E0E6; width: 3; dashes: 3,3;} 

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

    r3898 r3900  
    7272way[waterway=river], 
    7373way[waterway=canal], 
    74 way[waterway=stream]   { color: blue; width: 2; text:auto; text-color:blue; font-size:9; text-position: offset; text-offset: 7;} 
    75 way[waterway=drain]                      {color: blue; width: 1; text:auto; text-color: blue; text-position: offset; text-offset: 3;} 
     74way[waterway=stream]   { color: blue; width: 2; text:auto; text-color:blue; font-size:9; text-position: line; text-offset: 7;} 
     75way[waterway=drain]                      {color: blue; width: 1; text:auto; text-color: blue; text-position: line; text-offset: 3;} 
    7676way[waterway][tunnel=yes]                {dashes: 8,4;} 
    7777 

  • trunk/styles_nodist/potlatch2/prelude.css

    r3898 r3900  
    1818 
    1919canvas { 
    20     background-color: white; 
     20    background-color: #ffffea; 
    2121} 
     22 
     23node, area { 
     24    text-color: black; 
     25} 
     26 
     27relation[restriction=no_left_turn] { 
     28    icon-image: "vehicle/restriction/turn_restrictions/no_left_turn.png"; 
     29} 
     30relation[restriction=no_right_turn] { 
     31    icon-image: "vehicle/restriction/turn_restrictions/no_right_turn.png"; 
     32} 
     33relation[restriction=no_straight_on] { 
     34    icon-image: "vehicle/restriction/turn_restrictions/no_straight_on.png"; 
     35} 
     36relation[restriction=no_u_turn] { 
     37    icon-image: "vehicle/restriction/turn_restrictions/no_u_turn.png"; 
     38} 
     39relation[restriction=only_left_turn] { 
     40    icon-image: "vehicle/restriction/turn_restrictions/only_left_turn.png"; 
     41} 
     42relation[restriction=only_right_turn] { 
     43    icon-image: "vehicle/restriction/turn_restrictions/only_right_turn.png"; 
     44} 
     45relation[restriction=only_straight_on] { 
     46    icon-image: "vehicle/restriction/turn_restrictions/only_straight_on.png"; 
     47} 
     48 
Note: See TracChangeset for help on using the changeset viewer.