Update Potlatch 2 to 2.3-367-ga54da3b build

This commit is contained in:
Tom Hughes 2012-03-25 22:42:18 +01:00
parent 365163929d
commit 076755f502
50 changed files with 198 additions and 70 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -48,7 +48,7 @@
</inputSet>
<inputSet id="source">
<input type="freetext" category="Details" presence="onTagMatch" name="Source" key="source" description="The primary source of information for this object (GPS, survey, Yahoo, ...)" priority="lowest"/>
<input type="freetext" category="Details" presence="onTagMatch" name="Source" key="source" description="The primary source of information for this object (GPS, survey, Bing, ...)" priority="lowest"/>
</inputSet>
<inputSet id="designation">
@ -142,6 +142,7 @@
<inputSet ref="cycle"/>
<inputSet ref="bicycle-lane"/>
<inputSet ref="bus-route"/>
<inputSet ref="tram-route"/>
<inputSet ref="pedestrians"/>
<inputSet ref="roadLanes"/>
<inputSet ref="roadRoundabout"/>
@ -156,6 +157,7 @@
<inputSet ref="cycle"/>
<inputSet ref="bicycle-lane"/>
<inputSet ref="bus-route"/>
<inputSet ref="tram-route"/>
<inputSet ref="pedestrians"/>
<inputSet ref="roadLanes"/>
<inputSet ref="roadRoundabout"/>
@ -267,6 +269,7 @@
<choice value="750" text="750V"/>
<choice value="1500" text="1500V"/>
<choice value="3000" text="3000V"/>
<choice value="12000" text="12kV"/>
<choice value="15000" text="15kV"/>
<choice value="25000" text="25kV"/>
</input>
@ -316,6 +319,13 @@
</input>
</inputSet>
<inputSet id="trafficSignals">
<!-- can't add as standalone feature due to current limitations, would conflict with junction node feature -->
<input type="choice" key="highway" name="Traffic signals" description="Intersection controlled by traffic lights" category="Restrictions" presence="always">
<choice value="traffic_signals" text="Yes"/>
</input>
</inputSet>
<inputSet id="pedestrians">
<input type="choice" name="Pedestrians" description="Can pedestrians use this road, including footpaths if any?" category="Walk" key="foot">
<choice value="yes" text="Allowed"/>
@ -368,6 +378,16 @@
</input>
</inputSet>
<inputSet id="train-route">
<input type="route" name="Train Route" description="Train route" category="Transport" priority="low" presence="onTagMatch">
<match k="type" v="route"/>
<match k="route" v="train"/>
<icon image="features/transport__railway.png">
<font size="12pt">${name|operator} <b>(${ref})</b></font>
</icon>
</input>
</inputSet>
<inputSet id="cycle">
<inputSet ref="bicycle-permission"/>
<input type="route" name="National Cycle Routes" description="A signposted route in a National Cycle Network, or nearest equivalent." category="Cycle" priority="low">
@ -503,14 +523,18 @@
<choice value="designated" text="Designated" description="Permitted, according to signs or specific local laws."/>
</input>
<input type="choice" name="Horses" category="Restrictions" key="horse" description="Are cars and other private vehicles allowed?">
<inputSet ref="hores-permission" />
</inputSet>
<inputSet id="horse-permission">
<input type="choice" name="Horses" category="Restrictions" key="horse" description="Are horses allowed?">
<choice value="yes" text="Allowed" description="General right of way."/>
<choice value="no" text="Prohibited" description="No access to the public."/>
<choice value="permissive" text="Permissive" description="Access permitted through private land."/>
<choice value="private" text="Private" description="No access to the public, except individual exceptions."/>
<choice value="designated" text="Designated" description="Permitted, according to signs or specific local laws."/>
</input>
</inputSet>
<inputSet id="places">
@ -582,9 +606,10 @@
<choice value="35000" text="35 kV"/>
<choice value="110000" text="110 kV"/>
<choice value="132000" text="132 kV"/>
<choice value="138000" text="238 kV"/>
<choice value="138000" text="138 kV"/>
<choice value="220000" text="220 kV"/>
<choice value="380000" text="380 kV"/>
<choice value="500000" text="500 kV"/>
</input>
</inputSet>
@ -626,6 +651,14 @@
</input>
</inputSet>
<inputSet id="wheelchair-basic">
<input type="choice" name="Wheelchair" key="wheelchair" presence="onTagMatch" category="Details">
<choice value="yes" text="Yes: ramps/elevators/etc" />
<choice value="no" text="No: inaccessible to wheelchairs" />
<choice value="limited" text="Limited accessibility" />
</input>
</inputSet>
<!-- Features -->
<include file="map_features/roads.xml" /> <!-- includes traffic calming, roundabouts, race track -->

View file

@ -52,6 +52,20 @@
<inputSet ref="common"/>
</feature>
<feature name="Veterinarian">
<category>amenity</category>
<icon image="features/pois/health_veterinary.n.8E7409.24.png">
${name}
</icon>
<help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dveterinary</help>
<point/>
<area/>
<tag k="amenity" v="veterinary"/>
<inputSet ref="names"/>
<inputSet ref="web"/>
<inputSet ref="buildingAddress"/>
<inputSet ref="common"/>
</feature>
<feature name="Place of Worship">
<category>amenity</category>
@ -74,7 +88,6 @@
<inputSet ref="common"/>
</feature>
<feature name="ATM">
<category>amenity</category>
<icon image="features/pois/money_atm.n.24.png"/>
@ -315,12 +328,12 @@
<point/>
<area/>
<tag k="amenity" v="shelter"/>
<input type="choice" presence="always" name="Type of shelter" key="shelter_type" description="The intended use of the shelter.">
<choice value="picnic_shelter" text="Picnic shelter"/>
<choice value="public_transport" text="Public transport"/>
<choice value="weather_shelter" text="Weather shelter"/>
<choice value="wildlife_hide" text="Wildlife hide"/>
</input>
<input type="choice" presence="always" name="Type of shelter" key="shelter_type" description="The intended use of the shelter.">
<choice value="picnic_shelter" text="Picnic shelter"/>
<choice value="public_transport" text="Public transport"/>
<choice value="weather_shelter" text="Weather shelter"/>
<choice value="wildlife_hide" text="Wildlife hide"/>
</input>
<inputSet ref="names"/>
<inputSet ref="common"/>
</feature>
@ -381,8 +394,15 @@
<point/>
<area/>
<tag k="amenity" v="swimming_pool"/>
<tag k="sport" v="swimming"/>
<inputSet ref="simpleName"/>
<inputSet ref="common"/>
<inputSet ref="permissions"/>
<input type="choice" presence="always" name="Indoor" key="covered" description="Indoor or outdoor?">
<choice value="yes" text="Indoor"/>
<choice value="no" text="Outdoor"/>
</input>
<input type="freetext" presence="onTagMatch" category="Details" name="Operator" key="operator" description="The organisation that runs the swimming pool." />
</feature>

View file

@ -123,6 +123,28 @@
<inputSet ref="common"/>
</feature>
<feature name="Beach">
<category>natural</category>
<icon image="features/natural__beach.png"/>
<area/>
<tag k="natural" v="beach"/>
<input type="choice" presence="always" category="Details" name="Beach surface" key="surface" description="What material is the ground mostly?">
<choice value="sand" text="Sand"/>
<choice value="pebbles" text="Pebbles"/>
<choice value="stone" text="Pebbles"/>
<choice value="rocky" text="Rocky"/>
</input>
<input type="choice" presence="always" category="Details" name="Access" key="access" description="Accessible to the public?">
<choice value="yes" text="Public access"/>
<choice value="permissive" text="Privately owned, but publicly accessible"/>
<choice value="private" text="Private access only"/>
</input>
<input type="freetext" presence="always" category="Details" name="Operator" key="Operator" description="Organisation that manages or owns the beach.">
</input>
<inputSet ref="simpleName"/>
<inputSet ref="common"/>
</feature>

View file

@ -302,6 +302,28 @@
<inputSet ref="common"/>
</feature>
<feature name="Pedestrian crossing">
<category>transport</category>
<icon image="features/pois/transport_zebracrossing.n.24.png"/>
<point />
<within entity="way" k="highway"/>
<tag k="highway" v="crossing"/>
<input type="choice" key="crossing" name="Type of crossing" presence="always">
<choice value="yes" text="Generic" vmatch="unknown" />
<choice value="uncontrolled" text="Uncontrolled (no lights)" />
<choice value="traffic_signals" text="Traffic lights" />
<choice value="island" text="Traffic island" />
<choice value="unmarked" text="Unmarked" />
<choice value="no" text="None" />
</input>
<inputSet ref="common"/>
<inputSet ref="bicycle-permission"/>
<inputSet ref="horse-permission"/>
<input type="checkbox" key="supervised" name="Supervised by crossing guard" category="Details" presence="onTagMatch" />
<input type="checkbox" key="segregated" name="Horses, pedestrians etc segregated from each other" category="Details" presence="onTagMatch" />
<input type="freetext" key="crossing_ref" name="Crossing category reference" category="Details" presence="onTagMatch" />
</feature>
<feature name="Turn restriction">
<category>advanced</category>
<help>http://wiki.openstreetmap.org/wiki/Turn_restrictions</help>
@ -332,10 +354,11 @@
<!-- Junction nodes (for turn restrictions) -->
<feature>
<feature name="Intersection">
<point/>
<within entity="way" k="highway" minimum="2"/>
<inputSet ref="junctionNode"/>
<inputSet ref="trafficSignals"/>
<inputSet ref="common"/>
</feature>

View file

@ -14,6 +14,8 @@
<inputSet ref="embankment-cutting"/>
<inputSet ref="rail-electrification"/>
<inputSet ref="common"/>
<inputSet ref="train-route"/>
</feature>
@ -29,6 +31,7 @@
<tag k="railway" v="rail"/>
<tag k="service" v="spur"/>
<inputSet ref="common"/>
<inputSet ref="train-route"/>
</feature>
@ -44,6 +47,7 @@
<tag k="railway" v="rail"/>
<tag k="service" v="siding"/>
<inputSet ref="common"/>
<inputSet ref="train-route"/>
</feature>
@ -56,6 +60,7 @@
<line/>
<tag k="railway" v="preserved"/>
<inputSet ref="common"/>
<inputSet ref="train-route"/>
</feature>
@ -70,6 +75,7 @@
<line/>
<tag k="railway" v="disused"/>
<inputSet ref="common"/>
<inputSet ref="train-route"/>
</feature>
@ -82,6 +88,7 @@
<line/>
<tag k="railway" v="abandoned"/>
<inputSet ref="common"/>
<inputSet ref="train-route"/>
</feature>
@ -100,6 +107,8 @@
<inputSet ref="embankment-cutting"/>
<inputSet ref="rail-electrification"/>
<inputSet ref="common"/>
<inputSet ref="tram-route"/>
<inputSet ref="train-route"/>
</feature>
@ -111,7 +120,7 @@
<line/>
<tag k="railway" v="tram"/>
<input ref="tram-route"/>
<inputSet ref="tram-route"/>
<inputSet ref="bridge"/>
<inputSet ref="tunnel"/>
<inputSet ref="embankment-cutting"/>
@ -135,6 +144,7 @@
<inputSet ref="embankment-cutting"/>
<inputSet ref="rail-electrification"/>
<inputSet ref="common"/>
<inputSet ref="train-route"/>
</feature>
@ -356,6 +366,8 @@
<input type="freetext" presence="onTagMatch" category="Details" name="Operator" key="operator" description="The provider of the service" priority="low"/>
<input type="number" minimum="1" maximum="99999" stepSize="1" presence="onTagMatch" category="Details" name="Platforms" key="platforms" description="The number of passenger platforms at the station" priority="low"/>
<inputSet ref="common"/>
<inputSet ref="train-route"/>
</feature>
@ -535,5 +547,25 @@
<inputSet ref="common"/>
</feature>
<feature name="Train Route">
<category>transport</category>
<icon image="features/transport__railway.png">
<font size="12pt">
${name|operator} <b>(${ref})</b>
</font>
</icon>
<relation/>
<tag k="type" v="route"/>
<tag k="route" v="train"/>
<input type="freetext" presence="always" category="Details" name="Name" priority="high" key="name" description="Official route name"/>
<input type="freetext" presence="always" category="Details" name="Reference" priority="high" key="ref" description="The official reference number"/>
<input type="freetext" presence="always" category="Details" name="Network" key="network" description="The network of the train service" priority="high"/>
<input type="freetext" presence="always" category="Details" name="Operator" key="operator" description="The provider of the train service" priority="low"/>
<input type="freetext" presence="onTagMatch" category="Details" name="Colour code" key="colour" description="Official colour designation for the route, if any." priority="low" />
<inputSet ref="source"/>
<inputSet ref="wheelchair-basic" />
</feature>
</featureGroup>

Binary file not shown.

View file

@ -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: 4; color: green; casing-color: black; 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: square; icon-width: 8; 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: square; icon-width: 8; 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: 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: square; icon-width: 12; 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; }

View file

@ -14,13 +14,13 @@ way[leisure] :area { color: #8CD6B5; width: 1; fill-colo
way[tourism] :area { color: #F7CECE; width: 1; fill-color: #F7CECE; 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;}
way[leisure=garden] :area { color: #66ff44; width: 1; fill-color: #66ff44; fill-opacity: 0.2; set .area_small_name;}
@ -31,7 +31,7 @@ way[public_transport=pay_scale_area] :area { color: gray; width: 1; fill-col
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: 2; }
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;}
/* Perhaps should be filled, on lower zooms. */

View file

@ -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 @@ node[tourism=alpine_hut] { icon-image: icons/accommodation_alpinehut.n.16.png; z
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 @@ node[barrier=kissing_gate] { icon-image: icons/barrier_kissing_gate.16.png; z-in
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 @@ 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[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 @@ node[amenity=bus_station] { icon-image: icons/transport_bus_station.n.16.png; z-
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;}

View file

@ -6,14 +6,13 @@ way[highway=trunk],way[highway=trunk_link],
way[highway=primary],way[highway=primary_link],
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: 1; }
way[highway=trunk],way[highway=trunk_link] { z-index: 9; color: #7FC97F; width: 7; casing-color: black; casing-width: 1; }
way[highway=primary],way[highway=primary_link] { z-index: 8; color: #E46D71; width: 7; casing-color: black; casing-width: 1; }
way[highway=secondary],way[highway=secondary_link] { z-index: 7; color: #FDBF6F; width: 7; casing-width: 1; }
way[highway=tertiary] { z-index: 6; color: #FEFECB; width: 5; casing-width: 1; }
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=tertiary_link] { z-index: 5; color: #FEFECB; width: 4; 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; }
@ -35,8 +34,7 @@ way[highway=bridleway] { z-index:9; color: #996644; width: 2; dashes: 4, 2, 2, 2
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: 2; }
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 */
@ -45,8 +43,8 @@ way[highway=construction] { color: #ffffbb; width: 6; dashes: 8, 4; casing-color
/* Railways */
way[railway=rail] { z-index: 6; color: black; width: 5; }
way[railway=rail]::dashes { 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; }
@ -75,8 +73,8 @@ way[construction=light_rail]::dashes { z-index: 7; color: #999999; width: 2; das
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;}
/* Aeroways */
@ -126,11 +124,11 @@ way[leisure=sports_centre] :area { color: #66ddcc; fill-color: #66ddcc; set .are
/* Physical decoration */
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'); }
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]::arrows, way[junction=roundabout]::arrows { z-index: 15; color: #444444; width: 2; dashes: 15,35; line-style: arrows; }
way[oneway=-1]::arrows { 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; }

View file

@ -6,7 +6,7 @@
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; }

View file

@ -72,7 +72,7 @@ way[public_transport=pay_scale_area] :area { color: gray; width: 1; fill-col
/* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */
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;}
/* POIs, too, can have bitmap icons - they can even be transparent */

View file

@ -15,7 +15,7 @@
@import("stylesheets/core_pois.css");
@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 */

View file

@ -8,18 +8,18 @@ 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: 8; color: green; }
node :hoverway { z-index: 9; icon-image: circle; icon-width: 8; color: blue; }
node :selected { z-index: 9; icon-image: circle; icon-width: 8; color: red; casing-color: black; casing-width: 1; }
node !:drawn :poi { z-index: 6; icon-image: circle; icon-width: 8; color: green; casing-color: black; casing-width: 1; }
node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 8; color: black; }
node :hasTags :selectedway { z-index: 9; icon-image: circle; icon-width: 8; color: black; }
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: 12; color: #d95f02; }
node[_status=complete]::statushighlight :hasTags { z-index: 5; icon-image: circle; icon-width: 10; color: #1b9e77; opacity: 0.4; }
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; }

View file

@ -12,6 +12,6 @@ node :selectedway { z-index: 8; icon-image: square; icon-width: 6; color: green;
node :hoverway { z-index: 9; icon-image: square; icon-width: 6; color: blue; }
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; }