Merge remote-tracking branch 'gravitystorm/cartography'
authorRichard Fairhurst <richard@systemeD.net>
Sun, 25 Mar 2012 16:44:08 +0000 (17:44 +0100)
committerRichard Fairhurst <richard@systemeD.net>
Sun, 25 Mar 2012 16:44:08 +0000 (17:44 +0100)
1  2 
resources/stylesheets/core_interactive.css
resources/stylesheets/core_pois.css

index 9266db0a02df6605cf764eb59cc2dad2efb939bb,706ae1989ce1e293b239d16a2924c80f6e5be3d1..addf821cd0957507971e44df10b17bb26056ae7b
@@@ -17,12 -17,12 +17,12 @@@ way :tiger { casing-color: #ff00ff;
  /* Interactive node behaviour */
  
  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 :hasTags :poi { z-index: 2; icon-image: circle; icon-width: 8; color: green; casing-color: black; casing-width: 1; }
 -node :hoverway { z-index: 9; icon-image: circle; icon-width: 4; color: blue; layer: 5; }
 -node !:drawn :hasTags :poi { z-index: 2; icon-image: circle; icon-width: 4; color: #00ac00; casing-color: #004400; casing-width: 1; }
 -node !:drawn :poi { z-index: 2; icon-image: circle; icon-width: 4; color: #BBB; casing-color: #333; casing-width: 1; }
 -node !:drawn :hasTags :selectedway { z-index: 9; icon-image: circle; icon-width: 5; color: black; layer: 5; }
 -node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 4; color: black; }
 -node !:drawn :selectedway { z-index: 9; icon-image: circle; icon-width: 4; color: red; casing-color: #cc0000; 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: square; icon-width: 8; color: black; layer: 5; }
++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: square; icon-width: 8; color: red; casing-color: #cc0000; casing-width: 1; layer: 5; }
++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: square; icon-width: 12; casing-color: black; casing-width: 1; layer: 5; }
 -node::junctionNode :junction :selectedway { z-index: 8; icon-image: circle; icon-width: 6; casing-color: black; casing-width: 1; layer: 5; }
++node::junctionNode :junction :selectedway { z-index: 8; icon-image: circle; icon-width: 12; casing-color: black; casing-width: 1; layer: 5; }
index 3cd4d7ff3286a6acc7cf8d0ce984a26e171dc7d8,6a8777dbced720138af8df76676e199165232be5..439c06c16499c961825c471d5bb78b06948f52d9
@@@ -1,4 -1,4 +1,4 @@@
- 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; }
  node[tourism=guesthouse] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; }
@@@ -6,7 -6,7 +6,7 @@@ node[tourism=alpine_hut] { icon-image: 
  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=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[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; }
@@@ -21,13 -21,13 +21,13 @@@ node[barrier=kissing_gate] { icon-image
  node[barrier=cycle_barrier] { icon-image: icons/barrier_cycle_barrier.16.png; z-index: 20; }
  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; }
@@@ -56,11 -56,11 +56,11 @@@ node[shop=music] { icon-image: icons/sh
  node[shop=supermarket] { icon-image: icons/shopping_supermarket.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=picnic_site] { icon-image: icons/tourist_picnic.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; }
@@@ -71,18 -71,18 +71,18 @@@ node[amenity=bus_station] { icon-image
  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=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; 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; }
  node[amenity=bicycle_rental] { icon-image: icons/transport_rental_bicycle.n.16.png; z-index: 20; }
  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; }
  
  /* 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;}