[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Maposmatic-dev] [PATCH 1/9] B&W stylesheet: restore original mapnik-osm
|
From: |
David MENTRE |
|
Subject: |
[Maposmatic-dev] [PATCH 1/9] B&W stylesheet: restore original mapnik-osm stylesheet |
|
Date: |
Fri, 30 Mar 2012 17:59:21 +0200 |
Signed-off-by: David MENTRE <address@hidden>
---
.../black-and-white/inc/layer-addressing.xml.inc | 114 +-
.../black-and-white/inc/layer-aerialways.xml.inc | 48 +-
.../inc/layer-amenity-points.xml.inc | 810 ++++----
.../inc/layer-amenity-stations.xml.inc | 190 +-
.../inc/layer-amenity-symbols.xml.inc | 302 ++--
.../black-and-white/inc/layer-buildings.xml.inc | 184 +-
.../black-and-white/inc/layer-citywall.xml.inc | 104 +-
.../black-and-white/inc/layer-landcover.xml.inc | 171 ++-
.../black-and-white/inc/layer-placenames.xml.inc | 386 ++--
stylesheet/black-and-white/inc/layer-power.xml.inc | 136 +-
.../black-and-white/inc/layer-shapefiles.xml.inc | 146 +-
stylesheet/black-and-white/inc/layer-water.xml.inc | 748 ++++----
.../inc/layer-water_features.xml.inc | 240 +-
stylesheet/black-and-white/inc/layers.xml.inc | 4 +-
stylesheet/black-and-white/osm.xml | 2314 +++++++++++++++++---
15 files changed, 3813 insertions(+), 2084 deletions(-)
diff --git a/stylesheet/black-and-white/inc/layer-addressing.xml.inc
b/stylesheet/black-and-white/inc/layer-addressing.xml.inc
index dff712b..7c8ee76 100644
--- a/stylesheet/black-and-white/inc/layer-addressing.xml.inc
+++ b/stylesheet/black-and-white/inc/layer-addressing.xml.inc
@@ -1,57 +1,57 @@
-<Style name="interpolation">
- <Rule>
- &maxscale_zoom17;
- <LineSymbolizer stroke="#888" stroke-width="1" stroke-dasharray="2,4"/>
- </Rule>
-</Style>
-<Style name="housenumbers">
- <Rule>
- &maxscale_zoom17;
- <TextSymbolizer size="9" fill="#444" dy="0" fontset-name="book-fonts"
wrap-width="0" minimum-distance="1"
placement="interior">[addr:housenumber]</TextSymbolizer>
- </Rule>
-</Style>
-<Style name="housenames">
- <Rule>
- &maxscale_zoom17;
- &minscale_zoom17;
- <TextSymbolizer size="8" fill="#444" dy="0" fontset-name="book-fonts"
wrap-width="20" placement="interior">[addr:housename]</TextSymbolizer>
- </Rule>
- <Rule>
- &maxscale_zoom18;
- <TextSymbolizer size="9" fill="#444" dy="0" fontset-name="book-fonts"
wrap-width="20" placement="interior">[addr:housename]</TextSymbolizer>
- </Rule>
-</Style>
-<Layer name="interpolation_lines" status="on" srs="&osm2pgsql_projection;">
- <StyleName>interpolation</StyleName>
- <Datasource>
- <Parameter name="table">
- (select way from &prefix;_line where "addr:interpolation" is not null)
as interpolation
- </Parameter>
- &datasource-settings;
- </Datasource>
-</Layer>
-<Layer name="housenumbers" status="on" srs="&osm2pgsql_projection;">
- <StyleName>housenumbers</StyleName>
- <Datasource>
- <Parameter name="table">
- (select way,"addr:housenumber" from &prefix;_polygon where
"addr:housenumber" is not null and building is not null
- union
- select way,"addr:housenumber" from &prefix;_point where
"addr:housenumber" is not null
- ) as housenumbers
- </Parameter>
- &datasource-settings;
- </Datasource>
-</Layer>
-<Layer name="housenames" status="on" srs="&osm2pgsql_projection;">
- <StyleName>housenames</StyleName>
- <Datasource>
- <Parameter name="table">
- (select way,"addr:housename" from &prefix;_polygon where
"addr:housename" is not null and building is not null
- union
- select way,"addr:housename" from &prefix;_point where "addr:housename"
is not null
- ) as housenames
- </Parameter>
- &datasource-settings;
- </Datasource>
-</Layer>
-
+<Style name="interpolation">
+ <Rule>
+ &maxscale_zoom17;
+ <LineSymbolizer stroke="#888" stroke-width="1" stroke-dasharray="2,4"/>
+ </Rule>
+</Style>
+<Style name="housenumbers">
+ <Rule>
+ &maxscale_zoom17;
+ <TextSymbolizer size="9" fill="#444" dy="0" fontset-name="book-fonts"
wrap-width="0" minimum-distance="1"
placement="interior">[addr:housenumber]</TextSymbolizer>
+ </Rule>
+</Style>
+<Style name="housenames">
+ <Rule>
+ &maxscale_zoom17;
+ &minscale_zoom17;
+ <TextSymbolizer size="8" fill="#444" dy="0" fontset-name="book-fonts"
wrap-width="20" placement="interior">[addr:housename]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ &maxscale_zoom18;
+ <TextSymbolizer size="9" fill="#444" dy="0" fontset-name="book-fonts"
wrap-width="20" placement="interior">[addr:housename]</TextSymbolizer>
+ </Rule>
+</Style>
+<Layer name="interpolation_lines" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>interpolation</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (select way from &prefix;_line where "addr:interpolation" is not null)
as interpolation
+ </Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+<Layer name="housenumbers" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>housenumbers</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (select way,"addr:housenumber" from &prefix;_polygon where
"addr:housenumber" is not null and building is not null
+ union
+ select way,"addr:housenumber" from &prefix;_point where
"addr:housenumber" is not null
+ ) as housenumbers
+ </Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+<Layer name="housenames" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>housenames</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (select way,"addr:housename" from &prefix;_polygon where
"addr:housename" is not null and building is not null
+ union
+ select way,"addr:housename" from &prefix;_point where "addr:housename"
is not null
+ ) as housenames
+ </Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+
diff --git a/stylesheet/black-and-white/inc/layer-aerialways.xml.inc
b/stylesheet/black-and-white/inc/layer-aerialways.xml.inc
index de73e6a..881b468 100644
--- a/stylesheet/black-and-white/inc/layer-aerialways.xml.inc
+++ b/stylesheet/black-and-white/inc/layer-aerialways.xml.inc
@@ -1,24 +1,24 @@
-<Style name="aerialways">
- <Rule>
- <Filter>[aerialway] = 'cable_car' or [aerialway]='gondola' or
[aerialway]='goods'</Filter>
- &maxscale_zoom12;
- &minscale_zoom18;
- <LinePatternSymbolizer file="&symbols;/cable_car.png"/>
- </Rule>
- <Rule>
- <Filter>[aerialway] = 'chair_lift' or [aerialway]='drag_lift' or
[aerialway]='t-bar' or [aerialway]='j-bar' or [aerialway]='platter' or
[aerialway]='rope_tow'</Filter>
- &maxscale_zoom12;
- &minscale_zoom18;
- <LinePatternSymbolizer file="&symbols;/chair_lift.png"/>
- </Rule>
-</Style>
-
-<Layer name="aerialways" status="on" srs="&osm2pgsql_projection;">
- <StyleName>aerialways</StyleName>
- <Datasource>
- <Parameter name="table">
- (select way,aerialway from &prefix;_line where aerialway is not null) as
aerialways
- </Parameter>
- &datasource-settings;
- </Datasource>
-</Layer>
+<Style name="aerialways">
+ <Rule>
+ <Filter>[aerialway] = 'cable_car' or [aerialway]='gondola' or
[aerialway]='goods'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom18;
+ <LinePatternSymbolizer file="&symbols;/cable_car.png"/>
+ </Rule>
+ <Rule>
+ <Filter>[aerialway] = 'chair_lift' or [aerialway]='drag_lift' or
[aerialway]='t-bar' or [aerialway]='j-bar' or [aerialway]='platter' or
[aerialway]='rope_tow'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom18;
+ <LinePatternSymbolizer file="&symbols;/chair_lift.png"/>
+ </Rule>
+</Style>
+
+<Layer name="aerialways" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>aerialways</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (select way,aerialway from &prefix;_line where aerialway is not null) as
aerialways
+ </Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
diff --git a/stylesheet/black-and-white/inc/layer-amenity-points.xml.inc
b/stylesheet/black-and-white/inc/layer-amenity-points.xml.inc
index da8e4c2..d76c150 100644
--- a/stylesheet/black-and-white/inc/layer-amenity-points.xml.inc
+++ b/stylesheet/black-and-white/inc/layer-amenity-points.xml.inc
@@ -1,405 +1,405 @@
-<Style name="points">
- <Rule>
- &maxscale_zoom13;
- <Filter>[tourism]='alpine_hut'</Filter>
- <PointSymbolizer file="&symbols;/alpinehut.p.16.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom16;
- <Filter>[amenity]='shelter'</Filter>
- <PointSymbolizer file="&symbols;/shelter2.p.16.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[amenity]='atm'</Filter>
- <PointSymbolizer file="&symbols;/atm2.p.16.png" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[amenity]='bank'</Filter>
- <PointSymbolizer file="&symbols;/bank2.p.16.png" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[amenity]='bar'</Filter>
- <PointSymbolizer file="&symbols;/bar.p.20.png" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[amenity]='bicycle_rental'</Filter>
- <PointSymbolizer file="&symbols;/rental_bicycle.p.20.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom16;
- &minscale_zoom16;
- <Filter>[amenity]='bus_stop' or [highway]='bus_stop'</Filter>
- <PointSymbolizer file="&symbols;/bus_stop_small.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[amenity]='bus_stop' or [highway]='bus_stop'</Filter>
- <PointSymbolizer file="&symbols;/bus_stop.p.12.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom16;
- <Filter>[amenity]='bus_station'</Filter>
- <PointSymbolizer file="&symbols;/bus_station.n.16.png"
allow-overlap="false" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[highway]='traffic_signals'</Filter>
- <PointSymbolizer file="&symbols;/traffic_light.png" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[amenity]='cafe'</Filter>
- <PointSymbolizer file="&symbols;/cafe.p.16.png" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom16;
- <Filter>[tourism]='camp_site'</Filter>
- <PointSymbolizer file="&symbols;/camping.n.16.png" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom16;
- <Filter>[highway]='ford'</Filter>
- <PointSymbolizer file="&symbols;/transport_ford.p.16.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom16;
- <Filter>[tourism]='caravan_site'</Filter>
- <PointSymbolizer file="&symbols;/caravan_park.p.24.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom16;
- <Filter>[amenity]='car_sharing'</Filter>
- <PointSymbolizer file="&symbols;/car_share.p.16.png"
allow-overlap="false" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[tourism]='chalet'</Filter>
- <PointSymbolizer file="&symbols;/chalet.p.16.png" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[amenity]='cinema'</Filter>
- <PointSymbolizer file="&symbols;/cinema.p.24.png" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[amenity]='fire_station'</Filter>
- <PointSymbolizer file="&symbols;/firestation.p.16.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[amenity]='fuel'</Filter>
- <PointSymbolizer file="&symbols;/fuel.p.16.png" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[tourism]='guest_house'</Filter>
- <PointSymbolizer file="&symbols;/guest_house.p.16.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[tourism]='bed_and_breakfast'</Filter>
- <PointSymbolizer file="&symbols;/bandb.p.20.png" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom15;
- <Filter>[amenity]='hospital'</Filter>
- <PointSymbolizer file="&symbols;/hospital.p.16.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[tourism]='hostel'</Filter>
- <PointSymbolizer file="&symbols;/hostel.p.20.png" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[tourism]='hotel'</Filter>
- <PointSymbolizer file="&symbols;/hotel2.p.20.png" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[tourism]='motel'</Filter>
- <PointSymbolizer file="&symbols;/motel.p.20.png" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom16;
- <Filter>[tourism]='information'</Filter>
- <PointSymbolizer file="&symbols;/information.p.16.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[amenity]='embassy'</Filter>
- <PointSymbolizer file="&symbols;/embassy.png" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[amenity]='library'</Filter>
- <PointSymbolizer file="&symbols;/library.p.20.png" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[amenity]='courthouse'</Filter>
- <PointSymbolizer file="&symbols;/amenity_court.p.20.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom15;
- <Filter>[waterway]='lock' or [lock]='yes'</Filter>
- <PointSymbolizer file="&symbols;/lock_gate.png" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[man_made]='mast'</Filter>
- <PointSymbolizer file="&symbols;/communications.p.20.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[tourism]='museum'</Filter>
- <PointSymbolizer file="&symbols;/museum.p.16.png" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom15;
- <Filter>[amenity] = 'parking' and ([access] = 'public' or [access] =
'yes' or not [access] != '')</Filter>
- <PointSymbolizer file="&symbols;/parking.p.16.png" allow-overlap="false"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom15;
- <Filter>[amenity] = 'parking' and ([access] != '' and not [access] =
'public' and not [access] = 'yes')</Filter>
- <PointSymbolizer file="&symbols;/parking_private.p.16.png"
allow-overlap="false" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[amenity]='pharmacy'</Filter>
- <PointSymbolizer file="&symbols;/pharmacy.p.16.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom16;
- <Filter>[amenity]='place_of_worship' and [religion] =
'christian'</Filter>
- <PointSymbolizer file="&symbols;/christian3.p.14.png"
allow-overlap="false" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom16;
- <Filter>[amenity]='place_of_worship' and [religion] = 'muslim'</Filter>
- <PointSymbolizer file="&symbols;/islamic3.p.16.png"
allow-overlap="false" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom16;
- <Filter>[amenity]='place_of_worship' and [religion] = 'sikh'</Filter>
- <PointSymbolizer file="&symbols;/sikh3.p.16.png" allow-overlap="false"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom16;
- <Filter>[amenity]='place_of_worship' and [religion] = 'jewish'</Filter>
- <PointSymbolizer file="&symbols;/jewish3.p.16.png" allow-overlap="false"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom16;
- <Filter>[amenity]='place_of_worship'</Filter>
- <PointSymbolizer file="&symbols;/place_of_worship3.p.16.png"
allow-overlap="false" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[amenity]='police'</Filter>
- <PointSymbolizer file="&symbols;/police.p.16.png" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[amenity]='post_box'</Filter>
- <PointSymbolizer file="&symbols;/post_box.p.16.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[amenity]='post_office'</Filter>
- <PointSymbolizer file="&symbols;/post_office.p.16.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom16;
- <Filter>[amenity]='pub'</Filter>
- <PointSymbolizer file="&symbols;/pub.p.16.png" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom16;
- <Filter>[amenity]='biergarten'</Filter>
- <PointSymbolizer file="&symbols;/biergarten.p.16.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom16;
- <Filter>[amenity]='recycling'</Filter>
- <PointSymbolizer file="&symbols;/recycling.p.16.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[amenity]='restaurant'</Filter>
- <PointSymbolizer file="&symbols;/restaurant.p.16.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[amenity]='fast_food'</Filter>
- <PointSymbolizer file="&symbols;/fast_food.png" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[amenity]='telephone'</Filter>
- <PointSymbolizer file="&symbols;/telephone.p.16.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[amenity]='emergency_phone'</Filter>
- <PointSymbolizer file="&symbols;/sosphone.png" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[amenity]='theatre'</Filter>
- <PointSymbolizer file="&symbols;/theatre.p.20.png" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[amenity]='toilets'</Filter>
- <PointSymbolizer file="&symbols;/toilets.p.20.png" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[amenity]='drinking_water'</Filter>
- <PointSymbolizer file="&symbols;/food_drinkingtap.p.20.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom16;
- <Filter>[amenity]='prison'</Filter>
- <PointSymbolizer file="&symbols;/amenity_prison.p.20.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom16;
- <Filter>[tourism]='viewpoint'</Filter>
- <PointSymbolizer file="&symbols;/view_point.p.16.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[man_made]='water_tower'</Filter>
- <PointSymbolizer file="&symbols;/tower_water.p.20.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[historic]='memorial'</Filter>
- <PointSymbolizer file="&symbols;/tourist_memorial.p.20.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom16;
- <Filter>[historic]='archaeological_site'</Filter>
- <PointSymbolizer file="&symbols;/tourist_archaeological2.glow.16.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom16;
- <Filter>[shop]='supermarket'</Filter>
- <PointSymbolizer file="&symbols;/shop_supermarket.p.16.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[shop]='bakery'</Filter>
- <PointSymbolizer file="&symbols;/shop_bakery.p.16.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[shop]='butcher'</Filter>
- <PointSymbolizer file="&symbols;/shop_butcher.png" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[shop]='clothes' or [shop]='fashion'</Filter>
- <PointSymbolizer file="&symbols;/shop_clothes.p.16.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[shop]='convenience'</Filter>
- <PointSymbolizer file="&symbols;/shop_convenience.p.16.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom16;
- <Filter>[shop]='department_store'</Filter>
- <PointSymbolizer file="&symbols;/department_store.p.16.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[shop]='doityourself'</Filter>
- <PointSymbolizer file="&symbols;/shop_diy.p.16.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[shop]='florist'</Filter>
- <PointSymbolizer file="&symbols;/florist.p.16.png" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[shop]='hairdresser'</Filter>
- <PointSymbolizer file="&symbols;/shop_hairdresser.p.16.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[shop]='car'</Filter>
- <PointSymbolizer file="&symbols;/shopping_car.p.16.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[shop]='car_repair'</Filter>
- <PointSymbolizer file="&symbols;/shopping_car_repair.p.16.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[shop]='bicycle'</Filter>
- <PointSymbolizer file="&symbols;/shopping_bicycle.p.16.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[leisure]='playground'</Filter>
- <PointSymbolizer file="&symbols;/playground.p.20.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom16;
- <Filter>[amenity]='picnic_site'</Filter>
- <PointSymbolizer file="&symbols;/picnic.p.16.png" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[leisure]='slipway'</Filter>
- <PointSymbolizer file="&symbols;/transport_slipway.p.20.png"
placement="interior"/>
- </Rule>
-</Style>
-
-<Layer name="amenity-points" status="on" srs="&osm2pgsql_projection;">
- <StyleName>points</StyleName>
- <Datasource>
- <Parameter name="table">
- (select
way,amenity,shop,tourism,highway,man_made,access,religion,waterway,lock,historic,leisure
- from &prefix;_point
- where amenity is not null
- or shop is not null
- or tourism in
('alpine_hut','camp_site','caravan_site','guest_house','hostel','hotel','motel','museum','viewpoint','bed_and_breakfast','information','chalet')
- or highway in ('bus_stop','traffic_signals','ford')
- or man_made in ('mast','water_tower')
- or historic in ('memorial','archaeological_site')
- or waterway='lock'
- or lock='yes'
- or leisure in ('playground','slipway')
- ) as points</Parameter>
- &datasource-settings;
- </Datasource>
-</Layer>
-<Layer name="amenity-points-poly" status="on" srs="&osm2pgsql_projection;">
- <StyleName>points</StyleName>
- <Datasource>
- <Parameter name="table">
- (select
way,amenity,shop,tourism,highway,man_made,access,religion,waterway,lock,historic,leisure
- from &prefix;_polygon
- where amenity is not null
- or shop is not null
- or tourism in
('alpine_hut','camp_site','caravan_site','guest_house','hostel','hotel','motel','museum','viewpoint','bed_and_breakfast','information','chalet')
- or highway in ('bus_stop','traffic_signals')
- or man_made in ('mast','water_tower')
- or historic in ('memorial','archaeological_site')
- or leisure='playground'
- ) as points</Parameter>
- &datasource-settings;
- </Datasource>
-</Layer>
+<Style name="points">
+ <Rule>
+ &maxscale_zoom13;
+ <Filter>[tourism]='alpine_hut'</Filter>
+ <PointSymbolizer file="&symbols;/alpinehut.p.16.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ <Filter>[amenity]='shelter'</Filter>
+ <PointSymbolizer file="&symbols;/shelter2.p.16.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[amenity]='atm'</Filter>
+ <PointSymbolizer file="&symbols;/atm2.p.16.png" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[amenity]='bank'</Filter>
+ <PointSymbolizer file="&symbols;/bank2.p.16.png" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[amenity]='bar'</Filter>
+ <PointSymbolizer file="&symbols;/bar.p.20.png" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[amenity]='bicycle_rental'</Filter>
+ <PointSymbolizer file="&symbols;/rental_bicycle.p.20.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ &minscale_zoom16;
+ <Filter>[amenity]='bus_stop' or [highway]='bus_stop'</Filter>
+ <PointSymbolizer file="&symbols;/bus_stop_small.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[amenity]='bus_stop' or [highway]='bus_stop'</Filter>
+ <PointSymbolizer file="&symbols;/bus_stop.p.12.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ <Filter>[amenity]='bus_station'</Filter>
+ <PointSymbolizer file="&symbols;/bus_station.n.16.png"
allow-overlap="false" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[highway]='traffic_signals'</Filter>
+ <PointSymbolizer file="&symbols;/traffic_light.png" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[amenity]='cafe'</Filter>
+ <PointSymbolizer file="&symbols;/cafe.p.16.png" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ <Filter>[tourism]='camp_site'</Filter>
+ <PointSymbolizer file="&symbols;/camping.n.16.png" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ <Filter>[highway]='ford'</Filter>
+ <PointSymbolizer file="&symbols;/transport_ford.p.16.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ <Filter>[tourism]='caravan_site'</Filter>
+ <PointSymbolizer file="&symbols;/caravan_park.p.24.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ <Filter>[amenity]='car_sharing'</Filter>
+ <PointSymbolizer file="&symbols;/car_share.p.16.png"
allow-overlap="false" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[tourism]='chalet'</Filter>
+ <PointSymbolizer file="&symbols;/chalet.p.16.png" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[amenity]='cinema'</Filter>
+ <PointSymbolizer file="&symbols;/cinema.p.24.png" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[amenity]='fire_station'</Filter>
+ <PointSymbolizer file="&symbols;/firestation.p.16.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[amenity]='fuel'</Filter>
+ <PointSymbolizer file="&symbols;/fuel.p.16.png" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[tourism]='guest_house'</Filter>
+ <PointSymbolizer file="&symbols;/guest_house.p.16.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[tourism]='bed_and_breakfast'</Filter>
+ <PointSymbolizer file="&symbols;/bandb.p.20.png" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom15;
+ <Filter>[amenity]='hospital'</Filter>
+ <PointSymbolizer file="&symbols;/hospital.p.16.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[tourism]='hostel'</Filter>
+ <PointSymbolizer file="&symbols;/hostel.p.20.png" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[tourism]='hotel'</Filter>
+ <PointSymbolizer file="&symbols;/hotel2.p.20.png" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[tourism]='motel'</Filter>
+ <PointSymbolizer file="&symbols;/motel.p.20.png" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ <Filter>[tourism]='information'</Filter>
+ <PointSymbolizer file="&symbols;/information.p.16.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[amenity]='embassy'</Filter>
+ <PointSymbolizer file="&symbols;/embassy.png" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[amenity]='library'</Filter>
+ <PointSymbolizer file="&symbols;/library.p.20.png" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[amenity]='courthouse'</Filter>
+ <PointSymbolizer file="&symbols;/amenity_court.p.20.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom15;
+ <Filter>[waterway]='lock' or [lock]='yes'</Filter>
+ <PointSymbolizer file="&symbols;/lock_gate.png" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[man_made]='mast'</Filter>
+ <PointSymbolizer file="&symbols;/communications.p.20.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[tourism]='museum'</Filter>
+ <PointSymbolizer file="&symbols;/museum.p.16.png" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom15;
+ <Filter>[amenity] = 'parking' and ([access] = 'public' or [access] =
'yes' or not [access] != '')</Filter>
+ <PointSymbolizer file="&symbols;/parking.p.16.png" allow-overlap="false"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom15;
+ <Filter>[amenity] = 'parking' and ([access] != '' and not [access] =
'public' and not [access] = 'yes')</Filter>
+ <PointSymbolizer file="&symbols;/parking_private.p.16.png"
allow-overlap="false" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[amenity]='pharmacy'</Filter>
+ <PointSymbolizer file="&symbols;/pharmacy.p.16.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ <Filter>[amenity]='place_of_worship' and [religion] =
'christian'</Filter>
+ <PointSymbolizer file="&symbols;/christian3.p.14.png"
allow-overlap="false" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ <Filter>[amenity]='place_of_worship' and [religion] = 'muslim'</Filter>
+ <PointSymbolizer file="&symbols;/islamic3.p.16.png"
allow-overlap="false" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ <Filter>[amenity]='place_of_worship' and [religion] = 'sikh'</Filter>
+ <PointSymbolizer file="&symbols;/sikh3.p.16.png" allow-overlap="false"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ <Filter>[amenity]='place_of_worship' and [religion] = 'jewish'</Filter>
+ <PointSymbolizer file="&symbols;/jewish3.p.16.png" allow-overlap="false"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ <Filter>[amenity]='place_of_worship'</Filter>
+ <PointSymbolizer file="&symbols;/place_of_worship3.p.16.png"
allow-overlap="false" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[amenity]='police'</Filter>
+ <PointSymbolizer file="&symbols;/police.p.16.png" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[amenity]='post_box'</Filter>
+ <PointSymbolizer file="&symbols;/post_box.p.16.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[amenity]='post_office'</Filter>
+ <PointSymbolizer file="&symbols;/post_office.p.16.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ <Filter>[amenity]='pub'</Filter>
+ <PointSymbolizer file="&symbols;/pub.p.16.png" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ <Filter>[amenity]='biergarten'</Filter>
+ <PointSymbolizer file="&symbols;/biergarten.p.16.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ <Filter>[amenity]='recycling'</Filter>
+ <PointSymbolizer file="&symbols;/recycling.p.16.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[amenity]='restaurant'</Filter>
+ <PointSymbolizer file="&symbols;/restaurant.p.16.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[amenity]='fast_food'</Filter>
+ <PointSymbolizer file="&symbols;/fast_food.png" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[amenity]='telephone'</Filter>
+ <PointSymbolizer file="&symbols;/telephone.p.16.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[amenity]='emergency_phone'</Filter>
+ <PointSymbolizer file="&symbols;/sosphone.png" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[amenity]='theatre'</Filter>
+ <PointSymbolizer file="&symbols;/theatre.p.20.png" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[amenity]='toilets'</Filter>
+ <PointSymbolizer file="&symbols;/toilets.p.20.png" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[amenity]='drinking_water'</Filter>
+ <PointSymbolizer file="&symbols;/food_drinkingtap.p.20.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ <Filter>[amenity]='prison'</Filter>
+ <PointSymbolizer file="&symbols;/amenity_prison.p.20.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ <Filter>[tourism]='viewpoint'</Filter>
+ <PointSymbolizer file="&symbols;/view_point.p.16.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[man_made]='water_tower'</Filter>
+ <PointSymbolizer file="&symbols;/tower_water.p.20.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[historic]='memorial'</Filter>
+ <PointSymbolizer file="&symbols;/tourist_memorial.p.20.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ <Filter>[historic]='archaeological_site'</Filter>
+ <PointSymbolizer file="&symbols;/tourist_archaeological2.glow.16.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ <Filter>[shop]='supermarket'</Filter>
+ <PointSymbolizer file="&symbols;/shop_supermarket.p.16.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[shop]='bakery'</Filter>
+ <PointSymbolizer file="&symbols;/shop_bakery.p.16.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[shop]='butcher'</Filter>
+ <PointSymbolizer file="&symbols;/shop_butcher.png" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[shop]='clothes' or [shop]='fashion'</Filter>
+ <PointSymbolizer file="&symbols;/shop_clothes.p.16.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[shop]='convenience'</Filter>
+ <PointSymbolizer file="&symbols;/shop_convenience.p.16.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ <Filter>[shop]='department_store'</Filter>
+ <PointSymbolizer file="&symbols;/department_store.p.16.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[shop]='doityourself'</Filter>
+ <PointSymbolizer file="&symbols;/shop_diy.p.16.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[shop]='florist'</Filter>
+ <PointSymbolizer file="&symbols;/florist.p.16.png" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[shop]='hairdresser'</Filter>
+ <PointSymbolizer file="&symbols;/shop_hairdresser.p.16.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[shop]='car'</Filter>
+ <PointSymbolizer file="&symbols;/shopping_car.p.16.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[shop]='car_repair'</Filter>
+ <PointSymbolizer file="&symbols;/shopping_car_repair.p.16.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[shop]='bicycle'</Filter>
+ <PointSymbolizer file="&symbols;/shopping_bicycle.p.16.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[leisure]='playground'</Filter>
+ <PointSymbolizer file="&symbols;/playground.p.20.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ <Filter>[amenity]='picnic_site'</Filter>
+ <PointSymbolizer file="&symbols;/picnic.p.16.png" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[leisure]='slipway'</Filter>
+ <PointSymbolizer file="&symbols;/transport_slipway.p.20.png"
placement="interior"/>
+ </Rule>
+</Style>
+
+<Layer name="amenity-points" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>points</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (select
way,amenity,shop,tourism,highway,man_made,access,religion,waterway,lock,historic,leisure
+ from &prefix;_point
+ where amenity is not null
+ or shop is not null
+ or tourism in
('alpine_hut','camp_site','caravan_site','guest_house','hostel','hotel','motel','museum','viewpoint','bed_and_breakfast','information','chalet')
+ or highway in ('bus_stop','traffic_signals','ford')
+ or man_made in ('mast','water_tower')
+ or historic in ('memorial','archaeological_site')
+ or waterway='lock'
+ or lock='yes'
+ or leisure in ('playground','slipway')
+ ) as points</Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+<Layer name="amenity-points-poly" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>points</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (select
way,amenity,shop,tourism,highway,man_made,access,religion,waterway,lock,historic,leisure
+ from &prefix;_polygon
+ where amenity is not null
+ or shop is not null
+ or tourism in
('alpine_hut','camp_site','caravan_site','guest_house','hostel','hotel','motel','museum','viewpoint','bed_and_breakfast','information','chalet')
+ or highway in ('bus_stop','traffic_signals')
+ or man_made in ('mast','water_tower')
+ or historic in ('memorial','archaeological_site')
+ or leisure='playground'
+ ) as points</Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
diff --git a/stylesheet/black-and-white/inc/layer-amenity-stations.xml.inc
b/stylesheet/black-and-white/inc/layer-amenity-stations.xml.inc
index 75a3ff2..3a918fc 100644
--- a/stylesheet/black-and-white/inc/layer-amenity-stations.xml.inc
+++ b/stylesheet/black-and-white/inc/layer-amenity-stations.xml.inc
@@ -1,95 +1,95 @@
-<Style name="stations">
- <Rule>
- &maxscale_zoom18;
- <Filter>[railway]='subway_entrance'</Filter>
- <PointSymbolizer file="&symbols;/walking.n.12.png" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom12;
- &minscale_zoom12;
- <Filter>[railway]='station' and not [disused]='yes'</Filter>
- <PointSymbolizer file="&symbols;/halt.png" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom13;
- &minscale_zoom14;
- <Filter>[railway]='station' and not [disused]='yes'</Filter>
- <PointSymbolizer file="&symbols;/station_small.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom13;
- <Filter>[railway]='station' and [disused]='yes'</Filter>
- <PointSymbolizer file="&symbols;/station_disused.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom15;
- <Filter>[railway]='station' and not [disused]='yes'</Filter>
- <PointSymbolizer file="&symbols;/station.png" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom13;
- &minscale_zoom14;
- <Filter>[railway]='halt' or [railway]='tram_stop' or
[aerialway]='station'</Filter>
- <PointSymbolizer file="&symbols;/halt.png" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom15;
- <Filter>[railway]='halt' or [railway]='tram_stop' or
[aerialway]='station'</Filter>
- <PointSymbolizer file="&symbols;/station_small.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom14;
- &minscale_zoom14;
- <Filter>[railway]='halt' or [railway]='tram_stop' or
[aerialway]='station'</Filter>
- <TextSymbolizer size="8" fill="#66f" dy="-8" fontset-name="book-fonts"
halo-radius="1" wrap-width="0" placement="interior">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- &maxscale_zoom15;
- <Filter>[railway] ='halt' or [railway]='tram_stop' or
[aerialway]='station'</Filter>
- <TextSymbolizer size="10" fill="#66f" dy="-10" fontset-name="book-fonts"
halo-radius="1" wrap-width="0" placement="interior">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- &maxscale_zoom14;
- &minscale_zoom14;
- <Filter>[railway]='station' and not [disused]='yes'</Filter>
- <TextSymbolizer size="9" fill="#66f" dy="-8" fontset-name="bold-fonts"
halo-radius="1" wrap-width="0" placement="interior">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- &maxscale_zoom15;
- <Filter>[railway]='station' and not [disused]='yes'</Filter>
- <TextSymbolizer size="11" fill="#66f" dy="-10" fontset-name="bold-fonts"
halo-radius="1" wrap-width="0" placement="interior">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- &maxscale_zoom15;
- <Filter>[railway]='station' and [disused]='yes'</Filter>
- <TextSymbolizer size="9" fill="grey" dy="-9" fontset-name="bold-fonts"
halo-radius="1" wrap-width="0" placement="interior">[name]</TextSymbolizer>
- </Rule>
-</Style>
-
-<Layer name="amenity-stations" status="on" srs="&osm2pgsql_projection;">
- <StyleName>stations</StyleName>
- <Datasource>
- <Parameter name="table">
- (select way,name,railway,aerialway,disused
- from &prefix;_point
- where railway in ('station','halt','tram_stop','subway_entrance')
- or aerialway='station'
- ) as stations
- </Parameter>
- &datasource-settings;
- </Datasource>
-</Layer>
-<Layer name="amenity-stations-poly" status="on" srs="&osm2pgsql_projection;">
- <StyleName>stations</StyleName>
- <Datasource>
- <Parameter name="table">
- (select way,name,railway,aerialway,disused
- from &prefix;_polygon
- where railway in ('station','halt','tram_stop')
- or aerialway='station'
- ) as stations
- </Parameter>
- &datasource-settings;
- </Datasource>
-</Layer>
-
+<Style name="stations">
+ <Rule>
+ &maxscale_zoom18;
+ <Filter>[railway]='subway_entrance'</Filter>
+ <PointSymbolizer file="&symbols;/walking.n.12.png" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <Filter>[railway]='station' and not [disused]='yes'</Filter>
+ <PointSymbolizer file="&symbols;/halt.png" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <Filter>[railway]='station' and not [disused]='yes'</Filter>
+ <PointSymbolizer file="&symbols;/station_small.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom13;
+ <Filter>[railway]='station' and [disused]='yes'</Filter>
+ <PointSymbolizer file="&symbols;/station_disused.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom15;
+ <Filter>[railway]='station' and not [disused]='yes'</Filter>
+ <PointSymbolizer file="&symbols;/station.png" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <Filter>[railway]='halt' or [railway]='tram_stop' or
[aerialway]='station'</Filter>
+ <PointSymbolizer file="&symbols;/halt.png" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom15;
+ <Filter>[railway]='halt' or [railway]='tram_stop' or
[aerialway]='station'</Filter>
+ <PointSymbolizer file="&symbols;/station_small.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom14;
+ &minscale_zoom14;
+ <Filter>[railway]='halt' or [railway]='tram_stop' or
[aerialway]='station'</Filter>
+ <TextSymbolizer size="8" fill="#66f" dy="-8" fontset-name="book-fonts"
halo-radius="1" wrap-width="0" placement="interior">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ &maxscale_zoom15;
+ <Filter>[railway] ='halt' or [railway]='tram_stop' or
[aerialway]='station'</Filter>
+ <TextSymbolizer size="10" fill="#66f" dy="-10" fontset-name="book-fonts"
halo-radius="1" wrap-width="0" placement="interior">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ &maxscale_zoom14;
+ &minscale_zoom14;
+ <Filter>[railway]='station' and not [disused]='yes'</Filter>
+ <TextSymbolizer size="9" fill="#66f" dy="-8" fontset-name="bold-fonts"
halo-radius="1" wrap-width="0" placement="interior">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ &maxscale_zoom15;
+ <Filter>[railway]='station' and not [disused]='yes'</Filter>
+ <TextSymbolizer size="11" fill="#66f" dy="-10" fontset-name="bold-fonts"
halo-radius="1" wrap-width="0" placement="interior">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ &maxscale_zoom15;
+ <Filter>[railway]='station' and [disused]='yes'</Filter>
+ <TextSymbolizer size="9" fill="grey" dy="-9" fontset-name="bold-fonts"
halo-radius="1" wrap-width="0" placement="interior">[name]</TextSymbolizer>
+ </Rule>
+</Style>
+
+<Layer name="amenity-stations" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>stations</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (select way,name,railway,aerialway,disused
+ from &prefix;_point
+ where railway in ('station','halt','tram_stop','subway_entrance')
+ or aerialway='station'
+ ) as stations
+ </Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+<Layer name="amenity-stations-poly" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>stations</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (select way,name,railway,aerialway,disused
+ from &prefix;_polygon
+ where railway in ('station','halt','tram_stop')
+ or aerialway='station'
+ ) as stations
+ </Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+
diff --git a/stylesheet/black-and-white/inc/layer-amenity-symbols.xml.inc
b/stylesheet/black-and-white/inc/layer-amenity-symbols.xml.inc
index 23eca66..802aaa1 100644
--- a/stylesheet/black-and-white/inc/layer-amenity-symbols.xml.inc
+++ b/stylesheet/black-and-white/inc/layer-amenity-symbols.xml.inc
@@ -1,151 +1,151 @@
-<Style name="symbols">
- <Rule>
- &maxscale_zoom16;
- <Filter>[aeroway]='helipad'</Filter>
- <PointSymbolizer file="&symbols;/helipad.p.16.png"/>
- <TextSymbolizer size="8" fill="#6692da" dy="-10"
fontset-name="bold-fonts" halo-radius="1" wrap-width="0"
placement="interior">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- &maxscale_zoom9;
- &minscale_zoom10;
- <Filter>[aeroway]='airport'</Filter>
- <PointSymbolizer file="&symbols;/airport.p.16.png"/>
- <TextSymbolizer size="8" fill="#6692da" dy="-12"
fontset-name="bold-fonts" halo-radius="1" wrap-width="0"
placement="interior">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- &maxscale_zoom11;
- &minscale_zoom12;
- <Filter>[aeroway]='airport'</Filter>
- <TextSymbolizer size="9" fill="#6692da" fontset-name="bold-fonts"
halo-radius="1" wrap-width="0" placement="interior">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- &maxscale_zoom10;
- &minscale_zoom10;
- <Filter>[aeroway]='aerodrome'</Filter>
- <PointSymbolizer file="&symbols;/aerodrome.p.16.png"/>
- <TextSymbolizer size="8" fill="#6692da" dy="-12"
fontset-name="oblique-fonts" halo-radius="1" wrap-width="0"
placement="interior">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- &maxscale_zoom11;
- &minscale_zoom12;
- <Filter>[aeroway]='aerodrome'</Filter>
- <TextSymbolizer size="8" fill="#6692da" fontset-name="oblique-fonts"
halo-radius="1" wrap-width="0" placement="interior">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- &maxscale_zoom14;
- &minscale_zoom15;
- <Filter>[railway]='level_crossing'</Filter>
- <PointSymbolizer file="&symbols;/level_crossing.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom16;
- <Filter>[railway]='level_crossing'</Filter>
- <PointSymbolizer file="&symbols;/level_crossing2.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom15;
- <Filter>[man_made]='lighthouse'</Filter>
- <PointSymbolizer file="&symbols;/lighthouse.p.20.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom11;
- <Filter>[natural]='peak'</Filter>
- <PointSymbolizer file="&symbols;/peak.png" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom11;
- <Filter>[natural]='volcano'</Filter>
- <PointSymbolizer file="&symbols;/volcano.png" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom15;
- <Filter>[natural]='cave_entrance'</Filter>
- <PointSymbolizer file="&symbols;/poi_cave.p.16.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom14;
- <Filter>[natural]='spring'</Filter>
- <PointSymbolizer file="&symbols;/spring.png" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom16;
- &minscale_zoom16;
- <Filter>[natural]='tree'</Filter>
- <PointSymbolizer file="&symbols;/tree.png" ignore-placement="true"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[natural]='tree'</Filter>
- <PointSymbolizer file="&symbols;/tree2.png" ignore-placement="true"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom15;
- <Filter>([power]='generator' and ([generator:source] = 'wind' or
[power_source] = 'wind')) or [man_made]='power_wind'</Filter>
- <PointSymbolizer file="&symbols;/power_wind.png" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom16;
- <Filter>[man_made]='windmill'</Filter>
- <PointSymbolizer file="&symbols;/windmill.png" placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <Filter>[man_made]='mast'</Filter>
- <PointSymbolizer file="&symbols;/communications.p.20.png"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom15;
- <Filter>[highway]='mini_roundabout'</Filter>
- <PointSymbolizer file="&symbols;/mini_round.png" allow-overlap="false"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom15;
- <Filter>[highway]='gate' or [barrier]='gate'</Filter>
- <PointSymbolizer file="&symbols;/gate2.png" allow-overlap="false"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom16;
- <Filter>[barrier]='lift_gate'</Filter>
- <PointSymbolizer file="&symbols;/liftgate.png" allow-overlap="false"
placement="interior"/>
- </Rule>
- <Rule>
- &maxscale_zoom16;
- <Filter>[barrier]='bollard' or [barrier]='block'</Filter>
- <PointSymbolizer file="&symbols;/bollard.png" allow-overlap="false"
placement="interior"/>
- </Rule>
-</Style>
-
-<Layer name="amenity-symbols" status="on" srs="&osm2pgsql_projection;">
- <StyleName>symbols</StyleName>
- <Datasource>
- <Parameter name="table">
- (select *
- from &prefix;_point
- where aeroway in ('airport','aerodrome','helipad')
- or barrier in ('bollard','gate','lift_gate','block')
- or highway in ('mini_roundabout','gate')
- or man_made in ('lighthouse','power_wind','windmill','mast')
- or (power='generator' and ("generator:source"='wind' or
power_source='wind'))
- or "natural" in ('peak','volcano','spring','tree','cave_entrance')
- or railway='level_crossing'
- ) as symbols</Parameter>
- &datasource-settings;
- </Datasource>
-</Layer>
-<Layer name="amenity-symbols-poly" status="on" srs="&osm2pgsql_projection;">
- <StyleName>symbols</StyleName>
- <Datasource>
- <Parameter name="table">
- (select *
- from &prefix;_polygon
- where aeroway in ('airport','aerodrome','helipad')
- or barrier in ('bollard','gate','lift_gate','block')
- or highway in ('mini_roundabout','gate')
- or man_made in ('lighthouse','power_wind','windmill','mast')
- or (power='generator' and ("generator:source"='wind' or
power_source='wind'))
- or "natural" in ('peak','volcano','spring','tree')
- or railway='level_crossing'
- ) as symbols</Parameter>
- &datasource-settings;
- </Datasource>
-</Layer>
+<Style name="symbols">
+ <Rule>
+ &maxscale_zoom16;
+ <Filter>[aeroway]='helipad'</Filter>
+ <PointSymbolizer file="&symbols;/helipad.p.16.png"/>
+ <TextSymbolizer size="8" fill="#6692da" dy="-10"
fontset-name="bold-fonts" halo-radius="1" wrap-width="0"
placement="interior">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ &maxscale_zoom9;
+ &minscale_zoom10;
+ <Filter>[aeroway]='airport'</Filter>
+ <PointSymbolizer file="&symbols;/airport.p.16.png"/>
+ <TextSymbolizer size="8" fill="#6692da" dy="-12"
fontset-name="bold-fonts" halo-radius="1" wrap-width="0"
placement="interior">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ &maxscale_zoom11;
+ &minscale_zoom12;
+ <Filter>[aeroway]='airport'</Filter>
+ <TextSymbolizer size="9" fill="#6692da" fontset-name="bold-fonts"
halo-radius="1" wrap-width="0" placement="interior">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ &maxscale_zoom10;
+ &minscale_zoom10;
+ <Filter>[aeroway]='aerodrome'</Filter>
+ <PointSymbolizer file="&symbols;/aerodrome.p.16.png"/>
+ <TextSymbolizer size="8" fill="#6692da" dy="-12"
fontset-name="oblique-fonts" halo-radius="1" wrap-width="0"
placement="interior">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ &maxscale_zoom11;
+ &minscale_zoom12;
+ <Filter>[aeroway]='aerodrome'</Filter>
+ <TextSymbolizer size="8" fill="#6692da" fontset-name="oblique-fonts"
halo-radius="1" wrap-width="0" placement="interior">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ &maxscale_zoom14;
+ &minscale_zoom15;
+ <Filter>[railway]='level_crossing'</Filter>
+ <PointSymbolizer file="&symbols;/level_crossing.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ <Filter>[railway]='level_crossing'</Filter>
+ <PointSymbolizer file="&symbols;/level_crossing2.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom15;
+ <Filter>[man_made]='lighthouse'</Filter>
+ <PointSymbolizer file="&symbols;/lighthouse.p.20.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom11;
+ <Filter>[natural]='peak'</Filter>
+ <PointSymbolizer file="&symbols;/peak.png" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom11;
+ <Filter>[natural]='volcano'</Filter>
+ <PointSymbolizer file="&symbols;/volcano.png" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom15;
+ <Filter>[natural]='cave_entrance'</Filter>
+ <PointSymbolizer file="&symbols;/poi_cave.p.16.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom14;
+ <Filter>[natural]='spring'</Filter>
+ <PointSymbolizer file="&symbols;/spring.png" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ &minscale_zoom16;
+ <Filter>[natural]='tree'</Filter>
+ <PointSymbolizer file="&symbols;/tree.png" ignore-placement="true"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[natural]='tree'</Filter>
+ <PointSymbolizer file="&symbols;/tree2.png" ignore-placement="true"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom15;
+ <Filter>([power]='generator' and ([generator:source] = 'wind' or
[power_source] = 'wind')) or [man_made]='power_wind'</Filter>
+ <PointSymbolizer file="&symbols;/power_wind.png" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ <Filter>[man_made]='windmill'</Filter>
+ <PointSymbolizer file="&symbols;/windmill.png" placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[man_made]='mast'</Filter>
+ <PointSymbolizer file="&symbols;/communications.p.20.png"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom15;
+ <Filter>[highway]='mini_roundabout'</Filter>
+ <PointSymbolizer file="&symbols;/mini_round.png" allow-overlap="false"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom15;
+ <Filter>[highway]='gate' or [barrier]='gate'</Filter>
+ <PointSymbolizer file="&symbols;/gate2.png" allow-overlap="false"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ <Filter>[barrier]='lift_gate'</Filter>
+ <PointSymbolizer file="&symbols;/liftgate.png" allow-overlap="false"
placement="interior"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ <Filter>[barrier]='bollard' or [barrier]='block'</Filter>
+ <PointSymbolizer file="&symbols;/bollard.png" allow-overlap="false"
placement="interior"/>
+ </Rule>
+</Style>
+
+<Layer name="amenity-symbols" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>symbols</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (select *
+ from &prefix;_point
+ where aeroway in ('airport','aerodrome','helipad')
+ or barrier in ('bollard','gate','lift_gate','block')
+ or highway in ('mini_roundabout','gate')
+ or man_made in ('lighthouse','power_wind','windmill','mast')
+ or (power='generator' and ("generator:source"='wind' or
power_source='wind'))
+ or "natural" in ('peak','volcano','spring','tree','cave_entrance')
+ or railway='level_crossing'
+ ) as symbols</Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+<Layer name="amenity-symbols-poly" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>symbols</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (select *
+ from &prefix;_polygon
+ where aeroway in ('airport','aerodrome','helipad')
+ or barrier in ('bollard','gate','lift_gate','block')
+ or highway in ('mini_roundabout','gate')
+ or man_made in ('lighthouse','power_wind','windmill','mast')
+ or (power='generator' and ("generator:source"='wind' or
power_source='wind'))
+ or "natural" in ('peak','volcano','spring','tree')
+ or railway='level_crossing'
+ ) as symbols</Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
diff --git a/stylesheet/black-and-white/inc/layer-buildings.xml.inc
b/stylesheet/black-and-white/inc/layer-buildings.xml.inc
index b5376b0..2377a19 100644
--- a/stylesheet/black-and-white/inc/layer-buildings.xml.inc
+++ b/stylesheet/black-and-white/inc/layer-buildings.xml.inc
@@ -1,92 +1,92 @@
-<Style name="buildings-lz">
- <Rule>
- <Filter>[railway] = 'station' or [building] = 'station'</Filter>
- &maxscale_zoom10;
- <PolygonSymbolizer fill="#d4aaaa"/>
- </Rule>
- <Rule>
- <Filter>[building] = 'supermarket'</Filter>
- &maxscale_zoom10;
- <PolygonSymbolizer fill-opacity="0.5" fill="pink"/>
- </Rule>
- <Rule>
- <Filter>[amenity] = 'place_of_worship'</Filter>
- &maxscale_zoom10;
- &minscale_zoom14;
- <PolygonSymbolizer fill-opacity="0.5" fill="#777"/>
- </Rule>
- <Rule>
- <Filter>[amenity] = 'place_of_worship'</Filter>
- &maxscale_zoom15;
- <PolygonSymbolizer fill-opacity="0.9" fill="#aaa"/>
- <LineSymbolizer stroke="#111" stroke-width="0.3"/>
- </Rule>
-</Style>
-
-<Style name="buildings">
- <Rule>
- <Filter>[building] = 'INT-light'</Filter>
- &maxscale_zoom12;
- <PolygonSymbolizer fill-opacity="0.7" fill="#bca9a9"/>
- </Rule>
- <Rule>
- <Filter>[building] != 'INT-light' and [building] != ''</Filter>
- &maxscale_zoom12;
- <PolygonSymbolizer fill-opacity="0.9" fill="#bca9a9"/>
- </Rule>
- <Rule>
- <Filter>[building] != 'INT-light' and [building] != ''</Filter>
- &maxscale_zoom16;
- <LineSymbolizer stroke="#330066" stroke-width="0.2"/>
- </Rule>
- <Rule>
- <Filter>[aeroway] = 'terminal'</Filter>
- &maxscale_zoom12;
- <PolygonSymbolizer fill="#cc99ff"/>
- </Rule>
- <Rule>
- <Filter>[aeroway] = 'terminal'</Filter>
- &maxscale_zoom14;
- <LineSymbolizer stroke="#330066" stroke-width="0.2"/>
- </Rule>
-</Style>
-
-<!-- Render only select building types starting at z10. -->
-<Layer name="buildings-lz" status="on" srs="&osm2pgsql_projection;">
- <StyleName>buildings-lz</StyleName>
- <Datasource>
- <Parameter name="table">
- (select way,building,railway,amenity from &prefix;_polygon
- where railway='station'
- or building in ('station','supermarket')
- or amenity='place_of_worship'
- order by z_order,way_area desc) as buildings
- </Parameter>
- &datasource-settings;
- </Datasource>
-</Layer>
-
-<!-- Render the other building types. Some sql filtering is needed to exclude
- any type not already specifically rendered in buildings-lz. -->
-<Layer name="buildings" status="on" srs="&osm2pgsql_projection;">
- <StyleName>buildings</StyleName>
- <Datasource>
- <Parameter name="table">
- (select way,aeroway,
- case
- when building in
('residential','house','garage','garages','detached','terrace','apartments')
then 'INT-light'::text
- else building
- end as building
- from &prefix;_polygon
- where (building is not null
- and building not in ('no','station','supermarket','planned')
- and (railway is null or railway != 'station')
- and (amenity is null or amenity != 'place_of_worship'))
- or aeroway = 'terminal'
- order by z_order,way_area desc) as buildings
- </Parameter>
- &datasource-settings;
- </Datasource>
-</Layer>
-
-
+<Style name="buildings-lz">
+ <Rule>
+ <Filter>[railway] = 'station' or [building] = 'station'</Filter>
+ &maxscale_zoom10;
+ <PolygonSymbolizer fill="#d4aaaa"/>
+ </Rule>
+ <Rule>
+ <Filter>[building] = 'supermarket'</Filter>
+ &maxscale_zoom10;
+ <PolygonSymbolizer fill-opacity="0.5" fill="pink"/>
+ </Rule>
+ <Rule>
+ <Filter>[amenity] = 'place_of_worship'</Filter>
+ &maxscale_zoom10;
+ &minscale_zoom14;
+ <PolygonSymbolizer fill-opacity="0.5" fill="#777"/>
+ </Rule>
+ <Rule>
+ <Filter>[amenity] = 'place_of_worship'</Filter>
+ &maxscale_zoom15;
+ <PolygonSymbolizer fill-opacity="0.9" fill="#aaa"/>
+ <LineSymbolizer stroke="#111" stroke-width="0.3"/>
+ </Rule>
+</Style>
+
+<Style name="buildings">
+ <Rule>
+ <Filter>[building] = 'INT-light'</Filter>
+ &maxscale_zoom12;
+ <PolygonSymbolizer fill-opacity="0.7" fill="#bca9a9"/>
+ </Rule>
+ <Rule>
+ <Filter>[building] != 'INT-light' and [building] != ''</Filter>
+ &maxscale_zoom12;
+ <PolygonSymbolizer fill-opacity="0.9" fill="#bca9a9"/>
+ </Rule>
+ <Rule>
+ <Filter>[building] != 'INT-light' and [building] != ''</Filter>
+ &maxscale_zoom16;
+ <LineSymbolizer stroke="#330066" stroke-width="0.2"/>
+ </Rule>
+ <Rule>
+ <Filter>[aeroway] = 'terminal'</Filter>
+ &maxscale_zoom12;
+ <PolygonSymbolizer fill="#cc99ff"/>
+ </Rule>
+ <Rule>
+ <Filter>[aeroway] = 'terminal'</Filter>
+ &maxscale_zoom14;
+ <LineSymbolizer stroke="#330066" stroke-width="0.2"/>
+ </Rule>
+</Style>
+
+<!-- Render only select building types starting at z10. -->
+<Layer name="buildings-lz" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>buildings-lz</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (select way,building,railway,amenity from &prefix;_polygon
+ where railway='station'
+ or building in ('station','supermarket')
+ or amenity='place_of_worship'
+ order by z_order,way_area desc) as buildings
+ </Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+
+<!-- Render the other building types. Some sql filtering is needed to exclude
+ any type not already specifically rendered in buildings-lz. -->
+<Layer name="buildings" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>buildings</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (select way,aeroway,
+ case
+ when building in
('residential','house','garage','garages','detached','terrace','apartments')
then 'INT-light'::text
+ else building
+ end as building
+ from &prefix;_polygon
+ where (building is not null
+ and building not in ('no','station','supermarket','planned')
+ and (railway is null or railway != 'station')
+ and (amenity is null or amenity != 'place_of_worship'))
+ or aeroway = 'terminal'
+ order by z_order,way_area desc) as buildings
+ </Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+
+
diff --git a/stylesheet/black-and-white/inc/layer-citywall.xml.inc
b/stylesheet/black-and-white/inc/layer-citywall.xml.inc
index dc307f0..5727789 100644
--- a/stylesheet/black-and-white/inc/layer-citywall.xml.inc
+++ b/stylesheet/black-and-white/inc/layer-citywall.xml.inc
@@ -1,52 +1,52 @@
-<Style name="citywalls">
- <Rule>
- &maxscale_zoom14;
- &minscale_zoom14;
- <LineSymbolizer stroke-linejoin="round" stroke="grey" stroke-width="4"
stroke-opacity="0.8"/>
- </Rule>
- <Rule>
- &maxscale_zoom15;
- &minscale_zoom15;
- <LineSymbolizer stroke-linejoin="round" stroke="grey" stroke-width="6"
stroke-opacity="0.8"/>
- </Rule>
- <Rule>
- &maxscale_zoom16;
- &minscale_zoom18;
- <LineSymbolizer stroke-linejoin="round" stroke="grey" stroke-width="9"
stroke-opacity="0.8"/>
- </Rule>
-</Style>
-<Style name="castle_walls">
-<Rule>
- &maxscale_zoom14;
- &minscale_zoom15;
- <LineSymbolizer stroke="#999" stroke-width="1"/>
- </Rule>
- <Rule>
- &maxscale_zoom16;
- <LineSymbolizer stroke="#888" stroke-width="2"/>
- </Rule>
-</Style>
-<Layer name="citywalls" status="on" srs="&osm2pgsql_projection;">
- <StyleName>citywalls</StyleName>
- <Datasource>
- <Parameter name="table">(select way from &prefix;_line where
"historic"='citywalls') as citywalls</Parameter>
- &datasource-settings;
- </Datasource>
-</Layer>
-<Layer name="castle_walls" status="on" srs="&osm2pgsql_projection;">
- <StyleName>castle_walls</StyleName>
- <Datasource>
- <Parameter name="table">(select way from &prefix;_line where
"historic"='castle_walls') as castle_walls</Parameter>
- &datasource-settings;
- </Datasource>
-</Layer>
-<Layer name="castle_walls" status="on" srs="&osm2pgsql_projection;">
- <StyleName>castle_walls</StyleName>
- <Datasource>
- <Parameter name="table">(select way from &prefix;_polygon where
"historic"='castle_walls') as castle_walls</Parameter>
- &datasource-settings;
- </Datasource>
-</Layer>
-
-
-
+<Style name="citywalls">
+ <Rule>
+ &maxscale_zoom14;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="grey" stroke-width="4"
stroke-opacity="0.8"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom15;
+ &minscale_zoom15;
+ <LineSymbolizer stroke-linejoin="round" stroke="grey" stroke-width="6"
stroke-opacity="0.8"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="grey" stroke-width="9"
stroke-opacity="0.8"/>
+ </Rule>
+</Style>
+<Style name="castle_walls">
+<Rule>
+ &maxscale_zoom14;
+ &minscale_zoom15;
+ <LineSymbolizer stroke="#999" stroke-width="1"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ <LineSymbolizer stroke="#888" stroke-width="2"/>
+ </Rule>
+</Style>
+<Layer name="citywalls" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>citywalls</StyleName>
+ <Datasource>
+ <Parameter name="table">(select way from &prefix;_line where
"historic"='citywalls') as citywalls</Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+<Layer name="castle_walls" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>castle_walls</StyleName>
+ <Datasource>
+ <Parameter name="table">(select way from &prefix;_line where
"historic"='castle_walls') as castle_walls</Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+<Layer name="castle_walls" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>castle_walls</StyleName>
+ <Datasource>
+ <Parameter name="table">(select way from &prefix;_polygon where
"historic"='castle_walls') as castle_walls</Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+
+
+
diff --git a/stylesheet/black-and-white/inc/layer-landcover.xml.inc
b/stylesheet/black-and-white/inc/layer-landcover.xml.inc
index e4ec61f..2abe83b 100644
--- a/stylesheet/black-and-white/inc/layer-landcover.xml.inc
+++ b/stylesheet/black-and-white/inc/layer-landcover.xml.inc
@@ -1,17 +1,92 @@
<Style name="landcover">
- <!-- <Rule> -->
- <!-- &maxscale_zoom10; -->
- <!-- &minscale_zoom18; -->
- <!-- <Filter>[landuse] = 'residential'</Filter> -->
- <!-- <PolygonSymbolizer fill="#ddd"/> -->
- <!-- </Rule> -->
- <!-- <Rule> -->
- <!-- &maxscale_zoom14; -->
- <!-- &minscale_zoom18; -->
- <!-- <Filter>[landuse]='field' or [natural]='field'</Filter> -->
- <!-- <PolygonSymbolizer fill-opacity="0.2" fill="#666600"/> -->
- <!-- <LineSymbolizer stroke="#660" stroke-width="0.3"
stroke-opacity="0.4"/> -->
- <!-- </Rule> -->
+ <Rule>
+ <Filter>[leisure] = 'swimming_pool'</Filter>
+ &maxscale_zoom14;
+ <PolygonSymbolizer fill="#b5d0d0"/>
+ <LineSymbolizer stroke="blue" stroke-width="0.5"/>
+ </Rule>
+ <Rule>
+ <Filter>[leisure] = 'playground'</Filter>
+ &maxscale_zoom13;
+ <PolygonSymbolizer fill="#ccfff1"/>
+ <LineSymbolizer stroke="#666" stroke-width="0.3"/>
+ </Rule>
+ <Rule>
+ <Filter>[tourism] = 'camp_site' or [tourism]='caravan_site' or [tourism]
= 'picnic_site'</Filter>
+ &maxscale_zoom13;
+ <PolygonSymbolizer fill-opacity="0.5" fill="#ccff99"/>
+ <LineSymbolizer stroke="#666" stroke-width="0.3"/>
+ </Rule>
+ <Rule>
+ <Filter>[tourism] = 'attraction'</Filter>
+ &maxscale_zoom10;
+ <PolygonSymbolizer fill="#f2caea"/>
+ </Rule>
+ <Rule>
+ <Filter>[landuse] = 'quarry'</Filter>
+ &maxscale_zoom11;
+ <PolygonPatternSymbolizer file="&symbols;/quarry2.png" />
+ <LineSymbolizer stroke="grey" stroke-width="0.5"/>
+ </Rule>
+ <Rule>
+ <Filter>[landuse] = 'vineyard'</Filter>
+ &maxscale_zoom10;
+ &minscale_zoom12;
+ <PolygonSymbolizer fill="#abdf96"/>
+ </Rule>
+ <Rule>
+ <Filter>[landuse] = 'orchard'</Filter>
+ &maxscale_zoom10;
+ <PolygonPatternSymbolizer file="&symbols;/orchard.png" />
+ </Rule>
+ <Rule>
+ <Filter>[landuse] = 'vineyard'</Filter>
+ &maxscale_zoom13;
+ <PolygonPatternSymbolizer file="&symbols;/vineyard.png" />
+ </Rule>
+ <Rule>
+ &maxscale_zoom10;
+ &minscale_zoom14;
+ <Filter>[landuse] = 'cemetery' or [landuse] = 'grave_yard' or
[amenity]='grave_yard'</Filter>
+ <PolygonSymbolizer fill="#aacbaf"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom10;
+ &minscale_zoom18;
+ <Filter>[landuse] = 'residential'</Filter>
+ <PolygonSymbolizer fill="#ddd"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom12;
+ &minscale_zoom18;
+ <Filter>[landuse] = 'garages'</Filter>
+ <PolygonSymbolizer fill-opacity="0.2" fill="#996"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom10;
+ &minscale_zoom18;
+ <Filter>[military] = 'barracks'</Filter>
+ <PolygonSymbolizer fill="#ff8f8f"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom10;
+ &minscale_zoom13;
+ <Filter>[landuse]='field' or [natural]='field'</Filter>
+ <PolygonSymbolizer fill-opacity="0.2" fill="#666600"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom14;
+ &minscale_zoom18;
+ <Filter>[landuse]='field' or [natural]='field'</Filter>
+ <PolygonSymbolizer fill-opacity="0.2" fill="#666600"/>
+ <LineSymbolizer stroke="#660" stroke-width="0.3" stroke-opacity="0.4"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom9;
+ &minscale_zoom10;
+ <Filter>[military] = 'danger_area'</Filter>
+ <PolygonSymbolizer fill-opacity="0.3" fill="pink"/>
+ </Rule>
<Rule>
&maxscale_zoom11;
&minscale_zoom18;
@@ -21,17 +96,17 @@
<Rule>
&maxscale_zoom14;
<Filter>([landuse] = 'cemetery' or [landuse] = 'grave_yard' or
[amenity]='grave_yard') and [religion] = 'jewish'</Filter>
- <PolygonPatternSymbolizer file="&symbols;/maposmatic_grave.png" />
+ <PolygonPatternSymbolizer file="&symbols;/cemetery_jewish.18.png" />
</Rule>
<Rule>
&maxscale_zoom14;
<Filter>([landuse] = 'cemetery' or [landuse] = 'grave_yard' or
[amenity]='grave_yard') and [religion] = 'christian'</Filter>
- <PolygonPatternSymbolizer file="&symbols;/maposmatic_grave.png" />
+ <PolygonPatternSymbolizer file="&symbols;/grave_yard.png" />
</Rule>
<Rule>
&maxscale_zoom14;
<Filter>([landuse] = 'cemetery' or [landuse] = 'grave_yard' or
[amenity]='grave_yard') and [religion] = 'INT-generic'</Filter>
- <PolygonPatternSymbolizer file="&symbols;/maposmatic_grave.png" />
+ <PolygonPatternSymbolizer file="&symbols;/grave_yard_generic.png" />
</Rule>
<Rule>
&maxscale_zoom10;
@@ -76,6 +151,12 @@
</Rule>
<Rule>
<Filter>[landuse] = 'forest'</Filter>
+ &maxscale_zoom8;
+ &minscale_zoom13;
+ <PolygonSymbolizer fill="#8dc56c"/>
+ </Rule>
+ <Rule>
+ <Filter>[landuse] = 'forest'</Filter>
&maxscale_zoom14;
<PolygonPatternSymbolizer file="&symbols;/forest.png" />
</Rule>
@@ -101,16 +182,27 @@
</Rule>
<Rule>
<Filter>[landuse] = 'retail'</Filter>
+ &maxscale_zoom10;
+ <PolygonSymbolizer fill="#f1dada"/>
+ </Rule>
+ <Rule>
+ <Filter>[landuse] = 'retail'</Filter>
&maxscale_zoom15;
<LineSymbolizer stroke="red" stroke-width="0.3"/>
</Rule>
<Rule>
- <Filter>[landuse]='railway'</Filter>
+ <Filter>[landuse] = 'industrial' or [landuse]='railway'</Filter>
&maxscale_zoom10;
<PolygonSymbolizer fill="#dfd1d6"/>
</Rule>
<Rule>
<Filter>[power] = 'station' or [power]='generator'</Filter>
+ &maxscale_zoom10;
+ &minscale_zoom11;
+ <PolygonSymbolizer fill="#bbb"/>
+ </Rule>
+ <Rule>
+ <Filter>[power] = 'station' or [power]='generator'</Filter>
&maxscale_zoom12;
<PolygonSymbolizer fill="#bbb"/>
<LineSymbolizer stroke="#555" stroke-width="0.4"/>
@@ -122,6 +214,11 @@
<LineSymbolizer stroke="#555" stroke-width="0.4"/>
</Rule>
<Rule>
+ <Filter>[landuse] = 'commercial'</Filter>
+ &maxscale_zoom10;
+ <PolygonSymbolizer fill="#efc8c8"/>
+ </Rule>
+ <Rule>
<Filter>[landuse] = 'brownfield' or [landuse]='landfill' or [landuse] =
'greenfield' or [landuse]='construction'</Filter>
&maxscale_zoom10;
<PolygonSymbolizer fill-opacity="0.7" fill="#9d9d6c"/>
@@ -152,29 +249,35 @@
<PolygonSymbolizer fill="#c6e4b4"/>
</Rule>
<Rule>
+ <Filter>[natural] = 'scrub'</Filter>
+ &maxscale_zoom10;
+ &minscale_zoom13;
+ <PolygonSymbolizer fill="#b5e3b5"/>
+ </Rule>
+ <Rule>
&maxscale_zoom14;
<Filter>[natural] = 'scrub'</Filter>
<PolygonPatternSymbolizer file="&symbols;/scrub.png" />
</Rule>
<Rule>
- <Filter>[amenity] = 'university' or [amenity] = 'college' or [amenity] =
'school' or [amenity]='hospital' or [amenity]='kindergarten' or
[amenity]='place_of_worship' or [amenity]='library' or [amenity]='townhall' or
[amenity]='post_office' or [amenity]='public_building' or
[amenity]='police'</Filter>
+ <Filter>[amenity] = 'university' or [amenity] = 'college' or [amenity] =
'school' or [amenity]='hospital' or [amenity]='kindergarten'</Filter>
&maxscale_zoom10;
- <PolygonSymbolizer fill="lightgrey"/>
+ <PolygonSymbolizer fill="#f0f0d8"/>
</Rule>
<Rule>
- <Filter>[amenity] = 'university' or [amenity] = 'college' or [amenity] =
'school' or [amenity]='hospital' or [amenity]='kindergarten' or
[amenity]='place_of_worship' or [amenity]='library' or [amenity]='townhall' or
[amenity]='post_office' or [amenity]='public_building' or [amenity]='police'
</Filter>
+ <Filter>[amenity] = 'university' or [amenity] = 'college' or [amenity] =
'school' or [amenity]='hospital' or [amenity]='kindergarten'</Filter>
&maxscale_zoom12;
- <LineSymbolizer stroke="black" stroke-width="0.3"/>
+ <LineSymbolizer stroke="brown" stroke-width="0.3"/>
+ </Rule>
+ <Rule>
+ <Filter>[amenity] = 'parking'</Filter>
+ &maxscale_zoom10;
+ <PolygonSymbolizer fill="#f7efb7"/>
</Rule>
- <!-- <Rule> -->
- <!-- <Filter>[amenity] = 'parking'</Filter> -->
- <!-- &maxscale_zoom10; -->
- <!-- <PolygonSymbolizer fill="#f7efb7"/> -->
- <!-- </Rule> -->
<Rule>
<Filter>[amenity] = 'parking'</Filter>
&maxscale_zoom15;
- <LineSymbolizer stroke="black" stroke-width="0.3"/>
+ <LineSymbolizer stroke="#eeeed1" stroke-width="0.3"/>
</Rule>
<Rule>
<Filter>[aeroway] = 'apron'</Filter>
@@ -192,9 +295,19 @@
&maxscale_zoom13;
<PolygonPatternSymbolizer file="&symbols;/beach.png" />
</Rule>
+ <Rule>
+ <Filter>[highway] = 'services' or [highway] = 'rest_area'</Filter>
+ &maxscale_zoom14;
+ <PolygonSymbolizer fill="#efc8c8"/>
+ </Rule>
</Style>
<Style name="landcover_line">
<Rule>
+ &maxscale_zoom14;
+ &minscale_zoom15;
+ <LineSymbolizer stroke-linejoin="round" stroke="#f2efe9"
stroke-width="3" stroke-linecap="square"/>
+ </Rule>
+ <Rule>
&maxscale_zoom16;
<LineSymbolizer stroke-linejoin="round" stroke="#f2efe9"
stroke-width="6" stroke-linecap="square"/>
</Rule>
@@ -203,7 +316,7 @@
<Rule>
<Filter>[leisure] = 'sports_centre' or [leisure] = 'stadium'</Filter>
&maxscale_zoom10;
- <LineSymbolizer stroke="#888" stroke-width="0.5"/>
+ <PolygonSymbolizer fill="#33cc99"/>
</Rule>
<Rule>
<Filter>[leisure]='track'</Filter>
@@ -229,7 +342,7 @@
where landuse is not null
or leisure is not null
or aeroway in ('apron','aerodrome')
- or amenity in
('parking','university','college','school','hospital','kindergarten','grave_yard','place_of_worship','library','townhall','post_office','public_building','police')
+ or amenity in
('parking','university','college','school','hospital','kindergarten','grave_yard')
or military in ('barracks','danger_area')
or "natural" in
('field','beach','desert','heath','mud','grassland','wood','sand','scrub')
or power in ('station','sub_station','generator')
diff --git a/stylesheet/black-and-white/inc/layer-placenames.xml.inc
b/stylesheet/black-and-white/inc/layer-placenames.xml.inc
index 9071fdb..afbd3ee 100644
--- a/stylesheet/black-and-white/inc/layer-placenames.xml.inc
+++ b/stylesheet/black-and-white/inc/layer-placenames.xml.inc
@@ -1,193 +1,193 @@
-<Style name="continent">
- <Rule>
- <Filter>[place] = 'continent'</Filter>
- &maxscale_zoom1;
- &minscale_zoom2;
- <TextSymbolizer size="10" fill="#9d6c9d" dy="0"
fontset-name="book-fonts" halo-radius="1"
wrap-width="20">[name]</TextSymbolizer>
- </Rule>
-</Style>
-<Style name="country">
- <Rule>
- <Filter>[place] = 'country'</Filter>
- &maxscale_zoom2;
- &minscale_zoom3;
- <TextSymbolizer size="8" fill="#9d6c9d" dy="0" fontset-name="book-fonts"
halo-radius="1" wrap-width="20">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- <Filter>[place] = 'country'</Filter>
- &maxscale_zoom4;
- &minscale_zoom6;
- <TextSymbolizer size="10" fill="#9d6c9d" dy="0"
fontset-name="book-fonts" halo-radius="1"
wrap-width="20">[name]</TextSymbolizer>
- </Rule>
-</Style>
-<Style name="state">
- <Rule>
- <Filter>[place] = 'state'</Filter>
- &maxscale_zoom4;
- &minscale_zoom4;
- <TextSymbolizer size="9" fill="#9d6c9d" dy="0"
fontset-name="oblique-fonts" halo-radius="1"
wrap-width="0">[ref]</TextSymbolizer>
- </Rule>
- <Rule>
- <Filter>[place] = 'state'</Filter>
- &maxscale_zoom5;
- &minscale_zoom6;
- <TextSymbolizer size="9" fill="#9d6c9d" dy="0"
fontset-name="oblique-fonts" halo-radius="1"
wrap-width="0">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- <Filter>[place] = 'state'</Filter>
- &maxscale_zoom7;
- &minscale_zoom8;
- <TextSymbolizer size="11" fill="#9d6c9d" dy="0"
fontset-name="oblique-fonts" halo-radius="1"
wrap-width="0">[name]</TextSymbolizer>
- </Rule>
-</Style>
-<Style name="capital">
- <Rule>
- &maxscale_zoom5;
- &minscale_zoom5;
- <TextSymbolizer size="9" fill="#000" dy="0" fontset-name="book-fonts"
halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- &maxscale_zoom6;
- &minscale_zoom8;
- <TextSymbolizer size="11" fill="#000" dy="0" fontset-name="book-fonts"
halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- &maxscale_zoom9;
- &minscale_zoom10;
- <TextSymbolizer size="11" fill="#000" dy="0" fontset-name="book-fonts"
halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- &maxscale_zoom11;
- &minscale_zoom14;
- <TextSymbolizer size="14" fill="#000" dy="0" fontset-name="book-fonts"
halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
- </Rule>
-</Style>
-<Style name="city">
- <Rule>
- <Filter>[place] = 'city' or [place]='metropolis'</Filter>
- &maxscale_zoom6;
- &minscale_zoom8;
- <TextSymbolizer size="8" fill="#000" dy="0" fontset-name="book-fonts"
halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- <Filter>[place] = 'city' or [place]='metropolis'</Filter>
- &maxscale_zoom9;
- &minscale_zoom10;
- <TextSymbolizer size="11" fill="#000" dy="0" fontset-name="book-fonts"
halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- <Filter>[place] = 'city' or [place]='metropolis'</Filter>
- &maxscale_zoom11;
- &minscale_zoom14;
- <TextSymbolizer size="14" fill="#000" dy="0" fontset-name="book-fonts"
halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
- </Rule>
-</Style>
-<Style name="town">
- <Rule>
- <Filter>[place] = 'town' or [place]='large_town' or
[place]='small_town'</Filter>
- &maxscale_zoom9;
- &minscale_zoom10;
- <TextSymbolizer size="8" fill="#000" fontset-name="book-fonts"
halo-radius="1" wrap-width="20">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- <Filter>[place] = 'town' or [place]='large_town' or
[place]='small_town'</Filter>
- &maxscale_zoom11;
- &minscale_zoom13;
- <TextSymbolizer size="10" fill="#000" fontset-name="book-fonts"
halo-radius="1" wrap-width="20">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- <Filter>[place] = 'town' or [place]='large_town' or
[place]='small_town'</Filter>
- &maxscale_zoom14;
- <TextSymbolizer size="14" fill="#777777" fontset-name="book-fonts"
halo-radius="1" wrap-width="20">[name]</TextSymbolizer>
- </Rule>
-</Style>
-<Style name="suburb">
- <Rule>
- <Filter>[place] = 'suburb'</Filter>
- &maxscale_zoom12;
- &minscale_zoom13;
- <TextSymbolizer size="10" fill="#000" fontset-name="book-fonts"
halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- <Filter>[place] = 'suburb'</Filter>
- &maxscale_zoom14;
- <TextSymbolizer size="13" fill="#777777" fontset-name="book-fonts"
halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
- </Rule>
-</Style>
-<Style name="village">
- <Rule>
- <Filter>[place] = 'village' or [place]='large_village'</Filter>
- &maxscale_zoom12;
- &minscale_zoom14;
- <TextSymbolizer size="9" fill="#000" fontset-name="book-fonts"
halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- <Filter>[place] = 'village' or [place]='large_village'</Filter>
- &maxscale_zoom15;
- <TextSymbolizer size="12" fill="#777777" fontset-name="book-fonts"
halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
- </Rule>
-</Style>
-<Style name="hamlet">
- <Rule>
- <Filter>[place] = 'hamlet' or [place] = 'locality' or [place] =
'isolated_dwelling' or [place] = 'farm'</Filter>
- &maxscale_zoom14;
- &minscale_zoom15;
- <TextSymbolizer size="8" fill="#000" fontset-name="book-fonts"
halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- <Filter>[place] = 'hamlet' or [place] = 'locality' or [place] =
'isolated_dwelling' or [place] = 'farm'</Filter>
- &maxscale_zoom16;
- <TextSymbolizer size="11" fill="#777777" fontset-name="book-fonts"
halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
- </Rule>
-</Style>
-
-<Layer name="placenames-large" status="on" srs="&osm2pgsql_projection;">
- <StyleName>country</StyleName>
- <StyleName>state</StyleName>
- <Datasource>
- <Parameter name="table">
- (select way,place,name,ref
- from &prefix;_point
- where place in ('country','state')
- ) as placenames</Parameter>
- &datasource-settings;
- </Datasource>
-</Layer>
-<Layer name="placenames-capital" status="on" srs="&osm2pgsql_projection;">
- <StyleName>capital</StyleName>
- <Datasource>
- <Parameter name="table">
- (select way,place,name,ref
- from &prefix;_point
- where place in ('city','metropolis','town') and capital='yes'
- ) as placenames</Parameter>
- &datasource-settings;
- </Datasource>
-</Layer>
-<Layer name="placenames-medium" status="on" srs="&osm2pgsql_projection;">
- <StyleName>city</StyleName>
- <StyleName>town</StyleName>
- <Datasource>
- <Parameter name="table">
- (select way,place,name
- from &prefix;_point
- where place in ('city','metropolis','town','large_town','small_town')
- and (capital is null or capital != 'yes')
- ) as placenames</Parameter>
- &datasource-settings;
- </Datasource>
-</Layer>
-<Layer name="placenames-small" status="on" srs="&osm2pgsql_projection;">
- <StyleName>suburb</StyleName>
- <StyleName>village</StyleName>
- <StyleName>hamlet</StyleName>
- <Datasource>
- <Parameter name="table">
- (select way,place,name
- from &prefix;_point
- where place in
('suburb','village','large_village','hamlet','locality','isolated_dwelling','farm')
- ) as placenames</Parameter>
- &datasource-settings;
- </Datasource>
-</Layer>
-
+<Style name="continent">
+ <Rule>
+ <Filter>[place] = 'continent'</Filter>
+ &maxscale_zoom1;
+ &minscale_zoom2;
+ <TextSymbolizer size="10" fill="#9d6c9d" dy="0"
fontset-name="book-fonts" halo-radius="1"
wrap-width="20">[name]</TextSymbolizer>
+ </Rule>
+</Style>
+<Style name="country">
+ <Rule>
+ <Filter>[place] = 'country'</Filter>
+ &maxscale_zoom2;
+ &minscale_zoom3;
+ <TextSymbolizer size="8" fill="#9d6c9d" dy="0" fontset-name="book-fonts"
halo-radius="1" wrap-width="20">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[place] = 'country'</Filter>
+ &maxscale_zoom4;
+ &minscale_zoom6;
+ <TextSymbolizer size="10" fill="#9d6c9d" dy="0"
fontset-name="book-fonts" halo-radius="1"
wrap-width="20">[name]</TextSymbolizer>
+ </Rule>
+</Style>
+<Style name="state">
+ <Rule>
+ <Filter>[place] = 'state'</Filter>
+ &maxscale_zoom4;
+ &minscale_zoom4;
+ <TextSymbolizer size="9" fill="#9d6c9d" dy="0"
fontset-name="oblique-fonts" halo-radius="1"
wrap-width="0">[ref]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[place] = 'state'</Filter>
+ &maxscale_zoom5;
+ &minscale_zoom6;
+ <TextSymbolizer size="9" fill="#9d6c9d" dy="0"
fontset-name="oblique-fonts" halo-radius="1"
wrap-width="0">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[place] = 'state'</Filter>
+ &maxscale_zoom7;
+ &minscale_zoom8;
+ <TextSymbolizer size="11" fill="#9d6c9d" dy="0"
fontset-name="oblique-fonts" halo-radius="1"
wrap-width="0">[name]</TextSymbolizer>
+ </Rule>
+</Style>
+<Style name="capital">
+ <Rule>
+ &maxscale_zoom5;
+ &minscale_zoom5;
+ <TextSymbolizer size="9" fill="#000" dy="0" fontset-name="book-fonts"
halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ &maxscale_zoom6;
+ &minscale_zoom8;
+ <TextSymbolizer size="11" fill="#000" dy="0" fontset-name="book-fonts"
halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ &maxscale_zoom9;
+ &minscale_zoom10;
+ <TextSymbolizer size="11" fill="#000" dy="0" fontset-name="book-fonts"
halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ &maxscale_zoom11;
+ &minscale_zoom14;
+ <TextSymbolizer size="14" fill="#000" dy="0" fontset-name="book-fonts"
halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
+ </Rule>
+</Style>
+<Style name="city">
+ <Rule>
+ <Filter>[place] = 'city' or [place]='metropolis'</Filter>
+ &maxscale_zoom6;
+ &minscale_zoom8;
+ <TextSymbolizer size="8" fill="#000" dy="0" fontset-name="book-fonts"
halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[place] = 'city' or [place]='metropolis'</Filter>
+ &maxscale_zoom9;
+ &minscale_zoom10;
+ <TextSymbolizer size="11" fill="#000" dy="0" fontset-name="book-fonts"
halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[place] = 'city' or [place]='metropolis'</Filter>
+ &maxscale_zoom11;
+ &minscale_zoom14;
+ <TextSymbolizer size="14" fill="#000" dy="0" fontset-name="book-fonts"
halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
+ </Rule>
+</Style>
+<Style name="town">
+ <Rule>
+ <Filter>[place] = 'town' or [place]='large_town' or
[place]='small_town'</Filter>
+ &maxscale_zoom9;
+ &minscale_zoom10;
+ <TextSymbolizer size="8" fill="#000" fontset-name="book-fonts"
halo-radius="1" wrap-width="20">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[place] = 'town' or [place]='large_town' or
[place]='small_town'</Filter>
+ &maxscale_zoom11;
+ &minscale_zoom13;
+ <TextSymbolizer size="10" fill="#000" fontset-name="book-fonts"
halo-radius="1" wrap-width="20">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[place] = 'town' or [place]='large_town' or
[place]='small_town'</Filter>
+ &maxscale_zoom14;
+ <TextSymbolizer size="14" fill="#777777" fontset-name="book-fonts"
halo-radius="1" wrap-width="20">[name]</TextSymbolizer>
+ </Rule>
+</Style>
+<Style name="suburb">
+ <Rule>
+ <Filter>[place] = 'suburb'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom13;
+ <TextSymbolizer size="10" fill="#000" fontset-name="book-fonts"
halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[place] = 'suburb'</Filter>
+ &maxscale_zoom14;
+ <TextSymbolizer size="13" fill="#777777" fontset-name="book-fonts"
halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
+ </Rule>
+</Style>
+<Style name="village">
+ <Rule>
+ <Filter>[place] = 'village' or [place]='large_village'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom14;
+ <TextSymbolizer size="9" fill="#000" fontset-name="book-fonts"
halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[place] = 'village' or [place]='large_village'</Filter>
+ &maxscale_zoom15;
+ <TextSymbolizer size="12" fill="#777777" fontset-name="book-fonts"
halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
+ </Rule>
+</Style>
+<Style name="hamlet">
+ <Rule>
+ <Filter>[place] = 'hamlet' or [place] = 'locality' or [place] =
'isolated_dwelling' or [place] = 'farm'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom15;
+ <TextSymbolizer size="8" fill="#000" fontset-name="book-fonts"
halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[place] = 'hamlet' or [place] = 'locality' or [place] =
'isolated_dwelling' or [place] = 'farm'</Filter>
+ &maxscale_zoom16;
+ <TextSymbolizer size="11" fill="#777777" fontset-name="book-fonts"
halo-radius="1" wrap-width="0">[name]</TextSymbolizer>
+ </Rule>
+</Style>
+
+<Layer name="placenames-large" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>country</StyleName>
+ <StyleName>state</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (select way,place,name,ref
+ from &prefix;_point
+ where place in ('country','state')
+ ) as placenames</Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+<Layer name="placenames-capital" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>capital</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (select way,place,name,ref
+ from &prefix;_point
+ where place in ('city','metropolis','town') and capital='yes'
+ ) as placenames</Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+<Layer name="placenames-medium" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>city</StyleName>
+ <StyleName>town</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (select way,place,name
+ from &prefix;_point
+ where place in ('city','metropolis','town','large_town','small_town')
+ and (capital is null or capital != 'yes')
+ ) as placenames</Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+<Layer name="placenames-small" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>suburb</StyleName>
+ <StyleName>village</StyleName>
+ <StyleName>hamlet</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (select way,place,name
+ from &prefix;_point
+ where place in
('suburb','village','large_village','hamlet','locality','isolated_dwelling','farm')
+ ) as placenames</Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+
diff --git a/stylesheet/black-and-white/inc/layer-power.xml.inc
b/stylesheet/black-and-white/inc/layer-power.xml.inc
index 848d7c9..77ad41a 100644
--- a/stylesheet/black-and-white/inc/layer-power.xml.inc
+++ b/stylesheet/black-and-white/inc/layer-power.xml.inc
@@ -1,68 +1,68 @@
-<Style name="power_line">
- <Rule>
- &maxscale_zoom14;
- &minscale_zoom15;
- <LineSymbolizer stroke="#777" stroke-width="1"/>
- </Rule>
- <Rule>
- &maxscale_zoom16;
- <LineSymbolizer stroke="#777" stroke-width="1.5"/>
- </Rule>
-</Style>
-<Style name="power_minorline">
- <Rule>
- &maxscale_zoom16;
- <LineSymbolizer stroke="#777" stroke-width="0.5"/>
- </Rule>
-</Style>
-<Style name="power_towers">
- <Rule>
- &maxscale_zoom14;
- &minscale_zoom14;
- <PointSymbolizer file="&symbols;/power_tower_3x3.png"
allow-overlap="false"/>
- </Rule>
- <Rule>
- &maxscale_zoom15;
- &minscale_zoom16;
- <PointSymbolizer file="&symbols;/power_tower_5x5.png"
allow-overlap="false"/>
- </Rule>
- <Rule>
- &maxscale_zoom17;
- <PointSymbolizer file="&symbols;/power_tower.png" allow-overlap="false"/>
- </Rule>
-</Style>
-<Style name="power_poles">
- <Rule>
- &maxscale_zoom16;
- <PointSymbolizer file="&symbols;/power_pole.png" allow-overlap="false"/>
- </Rule>
-</Style>
-<Layer name="power_line" status="on" srs="&osm2pgsql_projection;">
- <StyleName>power_line</StyleName>
- <Datasource>
- <Parameter name="table">(select way from &prefix;_line where
"power"='line') as power_line</Parameter>
- &datasource-settings;
- </Datasource>
-</Layer>
-<Layer name="power_minorline" status="on" srs="&osm2pgsql_projection;">
- <StyleName>power_minorline</StyleName>
- <Datasource>
- <Parameter name="table">(select way from &prefix;_line where
"power"='minor_line') as power_minorline</Parameter>
- &datasource-settings;
- </Datasource>
-</Layer>
-<Layer name="power_towers" status="on" srs="&osm2pgsql_projection;">
- <StyleName>power_towers</StyleName>
- <Datasource>
- <Parameter name="table">(select way from &prefix;_point where
power='tower') as power_towers</Parameter>
- &datasource-settings;
- </Datasource>
-</Layer>
-<Layer name="power_poles" status="on" srs="&osm2pgsql_projection;">
- <StyleName>power_poles</StyleName>
- <Datasource>
- <Parameter name="table">(select way from &prefix;_point where
power='pole') as power_poles</Parameter>
- &datasource-settings;
- </Datasource>
-</Layer>
-
+<Style name="power_line">
+ <Rule>
+ &maxscale_zoom14;
+ &minscale_zoom15;
+ <LineSymbolizer stroke="#777" stroke-width="1"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ <LineSymbolizer stroke="#777" stroke-width="1.5"/>
+ </Rule>
+</Style>
+<Style name="power_minorline">
+ <Rule>
+ &maxscale_zoom16;
+ <LineSymbolizer stroke="#777" stroke-width="0.5"/>
+ </Rule>
+</Style>
+<Style name="power_towers">
+ <Rule>
+ &maxscale_zoom14;
+ &minscale_zoom14;
+ <PointSymbolizer file="&symbols;/power_tower_3x3.png"
allow-overlap="false"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom15;
+ &minscale_zoom16;
+ <PointSymbolizer file="&symbols;/power_tower_5x5.png"
allow-overlap="false"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <PointSymbolizer file="&symbols;/power_tower.png" allow-overlap="false"/>
+ </Rule>
+</Style>
+<Style name="power_poles">
+ <Rule>
+ &maxscale_zoom16;
+ <PointSymbolizer file="&symbols;/power_pole.png" allow-overlap="false"/>
+ </Rule>
+</Style>
+<Layer name="power_line" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>power_line</StyleName>
+ <Datasource>
+ <Parameter name="table">(select way from &prefix;_line where
"power"='line') as power_line</Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+<Layer name="power_minorline" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>power_minorline</StyleName>
+ <Datasource>
+ <Parameter name="table">(select way from &prefix;_line where
"power"='minor_line') as power_minorline</Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+<Layer name="power_towers" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>power_towers</StyleName>
+ <Datasource>
+ <Parameter name="table">(select way from &prefix;_point where
power='tower') as power_towers</Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+<Layer name="power_poles" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>power_poles</StyleName>
+ <Datasource>
+ <Parameter name="table">(select way from &prefix;_point where
power='pole') as power_poles</Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+
diff --git a/stylesheet/black-and-white/inc/layer-shapefiles.xml.inc
b/stylesheet/black-and-white/inc/layer-shapefiles.xml.inc
index 1dcb824..562200f 100644
--- a/stylesheet/black-and-white/inc/layer-shapefiles.xml.inc
+++ b/stylesheet/black-and-white/inc/layer-shapefiles.xml.inc
@@ -1,73 +1,73 @@
-<Style name="necountries">
- <Rule>
- &maxscale_zoom1;
- &minscale_zoom3;
- <LineSymbolizer stroke="grey" stroke-width="0.5"/>
- </Rule>
-</Style>
-<Style name="nepopulated">
- <Rule>
- &maxscale_zoom3;
- &minscale_zoom4;
- <Filter>[SCALERANK]=1</Filter>
- <TextSymbolizer size="8" dy="2" fill="grey" fontset-name="book-fonts"
halo-radius="1">[NAMEASCII]</TextSymbolizer>
- </Rule>
-</Style>
-<Style name="world">
- <Rule>
- &maxscale_zoom0;
- &minscale_zoom9;
- <PolygonSymbolizer fill="#f2efe9"/>
- </Rule>
-</Style>
-<Style name="coast-poly">
- <Rule>
- &maxscale_zoom10;
- <PolygonSymbolizer fill="#f5f5f5"/>
- </Rule>
-</Style>
- <!-- BUILTUP VMAP0 -->
-<Style name="builtup">
- <Rule>
- &maxscale_zoom8;
- &minscale_zoom10;
- <PolygonSymbolizer fill="#ddd"/>
- </Rule>
-</Style>
-<Layer name="world" status="on" srs="&srs900913;">
- <StyleName>world</StyleName>
- <Datasource>
- <Parameter name="type">shape</Parameter>
- <Parameter name="file">&world_boundaries;/shoreline_300</Parameter>
- </Datasource>
-</Layer>
-<Layer name="coast-poly" status="on" srs="&srs900913;">
- <StyleName>coast-poly</StyleName>
- <Datasource>
- <Parameter name="type">shape</Parameter>
- <Parameter name="file">&world_boundaries;/processed_p</Parameter>
- </Datasource>
-</Layer>
-<Layer name="builtup" status="on" srs="&srsmercator;">
- <StyleName>builtup</StyleName>
- <Datasource>
- <Parameter name="type">shape</Parameter>
- <Parameter name="file">&world_boundaries;/builtup_area</Parameter>
- </Datasource>
-</Layer>
-<Layer name="necountries" status="on" srs="&srs4326;">
- <StyleName>necountries</StyleName>
- <Datasource>
- <Parameter name="type">shape</Parameter>
- <Parameter
name="file">&world_boundaries;/110m_admin_0_boundary_lines_land.shp</Parameter>
- </Datasource>
-</Layer>
-<Layer name="nepopulated" status="on" srs="&srs4326;">
- <StyleName>nepopulated</StyleName>
- <Datasource>
- <Parameter name="type">shape</Parameter>
- <Parameter
name="file">&world_boundaries;/ne_10m_populated_places.shp</Parameter>
- <Parameter name="encoding">latin1</Parameter>
- </Datasource>
-</Layer>
-
+<Style name="necountries">
+ <Rule>
+ &maxscale_zoom1;
+ &minscale_zoom3;
+ <LineSymbolizer stroke="grey" stroke-width="0.5"/>
+ </Rule>
+</Style>
+<Style name="nepopulated">
+ <Rule>
+ &maxscale_zoom3;
+ &minscale_zoom4;
+ <Filter>[SCALERANK]=1</Filter>
+ <TextSymbolizer size="8" dy="2" fill="grey" fontset-name="book-fonts"
halo-radius="1">[NAMEASCII]</TextSymbolizer>
+ </Rule>
+</Style>
+<Style name="world">
+ <Rule>
+ &maxscale_zoom0;
+ &minscale_zoom9;
+ <PolygonSymbolizer fill="#f2efe9"/>
+ </Rule>
+</Style>
+<Style name="coast-poly">
+ <Rule>
+ &maxscale_zoom10;
+ <PolygonSymbolizer fill="#f2efe9"/>
+ </Rule>
+</Style>
+ <!-- BUILTUP VMAP0 -->
+<Style name="builtup">
+ <Rule>
+ &maxscale_zoom8;
+ &minscale_zoom10;
+ <PolygonSymbolizer fill="#ddd"/>
+ </Rule>
+</Style>
+<Layer name="world" status="on" srs="&srs900913;">
+ <StyleName>world</StyleName>
+ <Datasource>
+ <Parameter name="type">shape</Parameter>
+ <Parameter name="file">&world_boundaries;/shoreline_300</Parameter>
+ </Datasource>
+</Layer>
+<Layer name="coast-poly" status="on" srs="&srs900913;">
+ <StyleName>coast-poly</StyleName>
+ <Datasource>
+ <Parameter name="type">shape</Parameter>
+ <Parameter name="file">&world_boundaries;/processed_p</Parameter>
+ </Datasource>
+</Layer>
+<Layer name="builtup" status="on" srs="&srsmercator;">
+ <StyleName>builtup</StyleName>
+ <Datasource>
+ <Parameter name="type">shape</Parameter>
+ <Parameter name="file">&world_boundaries;/builtup_area</Parameter>
+ </Datasource>
+</Layer>
+<Layer name="necountries" status="on" srs="&srs4326;">
+ <StyleName>necountries</StyleName>
+ <Datasource>
+ <Parameter name="type">shape</Parameter>
+ <Parameter
name="file">&world_boundaries;/110m_admin_0_boundary_lines_land.shp</Parameter>
+ </Datasource>
+</Layer>
+<Layer name="nepopulated" status="on" srs="&srs4326;">
+ <StyleName>nepopulated</StyleName>
+ <Datasource>
+ <Parameter name="type">shape</Parameter>
+ <Parameter
name="file">&world_boundaries;/ne_10m_populated_places.shp</Parameter>
+ <Parameter name="encoding">latin1</Parameter>
+ </Datasource>
+</Layer>
+
diff --git a/stylesheet/black-and-white/inc/layer-water.xml.inc
b/stylesheet/black-and-white/inc/layer-water.xml.inc
index d5ff649..f819bc4 100644
--- a/stylesheet/black-and-white/inc/layer-water.xml.inc
+++ b/stylesheet/black-and-white/inc/layer-water.xml.inc
@@ -1,374 +1,374 @@
-<Style name="water_areas">
- <Rule>
- <Filter>[natural] = 'glacier'</Filter>
- &maxscale_zoom6;
- &minscale_zoom7;
- <LineSymbolizer stroke="#9cf" stroke-width="1.5" stroke-dasharray="4,2"/>
- <PolygonPatternSymbolizer file="&symbols;/glacier.png" />
- </Rule>
- <Rule>
- <Filter>[natural] = 'glacier'</Filter>
- &maxscale_zoom8;
- <LineSymbolizer stroke="#9cf" stroke-width="1.5" stroke-dasharray="4,2"/>
- <PolygonPatternSymbolizer file="&symbols;/glacier2.png" />
- </Rule>
- <Rule>
- <Filter>[waterway] = 'dock' or [waterway] = 'mill_pond' or
[waterway]='canal'</Filter>
- &maxscale_zoom9;
- <PolygonSymbolizer gamma=".75" fill="#b5d0d0"/>
- </Rule>
- <Rule>
- <Filter>[landuse] = 'basin'</Filter>
- &maxscale_zoom7;
- <PolygonSymbolizer gamma=".75" fill="#b5d0d0"/>
- </Rule>
- <Rule>
- <Filter>[natural] = 'lake' or [natural] = 'water' or [landuse] =
'reservoir' or [waterway] = 'riverbank' or [landuse] = 'water' or
[natural]='bay'</Filter>
- &maxscale_zoom6;
- <PolygonSymbolizer gamma=".75" fill="#b5d0d0"/>
- </Rule>
- <Rule>
- <Filter>[natural] = 'mud'</Filter>
- &maxscale_zoom13;
- <PolygonPatternSymbolizer file="&symbols;/mud.png" />
- </Rule>
- <Rule>
- <Filter>[natural] = 'land'</Filter>
- &maxscale_zoom10;
- <PolygonSymbolizer fill="#f2efe9"/>
- </Rule>
-</Style>
-<Style name="water-areas-overlay">
- <Rule>
- &maxscale_zoom13;
- <Filter>[natural] = 'marsh' or [natural] = 'wetland'</Filter>
- <PolygonPatternSymbolizer file="&symbols;/marsh.png" />
- </Rule>
-</Style>
-<Style name="glaciers-text">
- <Rule>
- <Filter>[way_area] >= 10000000</Filter>
- &maxscale_zoom10;
- <TextSymbolizer size="9" fill="#99f" fontset-name="book-fonts"
halo-radius="1" wrap-width="20">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- <Filter>[way_area] >= 5000000 and [way_area] < 10000000</Filter>
- &maxscale_zoom11;
- <TextSymbolizer size="9" fill="#99f" fontset-name="book-fonts"
halo-radius="1" wrap-width="20">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- <Filter>[way_area] < 5000000</Filter>
- &maxscale_zoom12;
- <TextSymbolizer size="9" fill="#99f" fontset-name="book-fonts"
halo-radius="1" wrap-width="20">[name]</TextSymbolizer>
- </Rule>
-</Style>
-
-<Style name="water-lines-casing">
- <Rule>
- <Filter>[waterway]='stream' or [waterway]='ditch' or
[waterway]='drain'</Filter>
- &maxscale_zoom13;
- &minscale_zoom14;
- <LineSymbolizer stroke="white" stroke-width="1.5"/>
- </Rule>
- <Rule>
- <Filter>[waterway]='stream'</Filter>
- &maxscale_zoom15;
- &minscale_zoom18;
- <LineSymbolizer stroke="white" stroke-width="2.5"/>
- </Rule>
-</Style>
-
-<Style name="water-lines-low-zoom">
- <Rule>
- <Filter>[waterway]='river'</Filter>
- &maxscale_zoom8;
- &minscale_zoom8;
- <LineSymbolizer stroke="#b5d0d0" stroke-width="0.7"/>
- </Rule>
- <Rule>
- <Filter>[waterway]='river'</Filter>
- &maxscale_zoom9;
- &minscale_zoom9;
- <LineSymbolizer stroke="#b5d0d0" stroke-width="1.2"/>
- </Rule>
- <Rule>
- <Filter>[waterway]='river'</Filter>
- &maxscale_zoom10;
- &minscale_zoom11;
- <LineSymbolizer stroke="#b5d0d0" stroke-width="1.6"/>
- </Rule>
-</Style>
-
-<Style name="water_lines">
- <Rule>
- <Filter>[waterway]='weir'</Filter>
- &maxscale_zoom15;
- &minscale_zoom18;
- <LineSymbolizer stroke-linejoin="round" stroke="#aaa" stroke-width="2"
stroke-linecap="round"/>
- </Rule>
- <Rule>
- <Filter>[waterway]='wadi'</Filter>
- &maxscale_zoom13;
- &minscale_zoom15;
- <LineSymbolizer stroke-linejoin="round" stroke-dasharray="4,4"
stroke="#b5d0d0" stroke-width="1" stroke-linecap="round"/>
- </Rule>
- <Rule>
- <Filter>[waterway]='wadi'</Filter>
- &maxscale_zoom16;
- <LineSymbolizer stroke-linejoin="round" stroke-dasharray="4,4"
stroke="#b5d0d0" stroke-width="2" stroke-linecap="round"/>
- </Rule>
- <Rule>
- <Filter>[waterway]='river'</Filter>
- &maxscale_zoom12;
- &minscale_zoom12;
- <LineSymbolizer stroke-linejoin="round" stroke="#b5d0d0"
stroke-width="2" stroke-linecap="round"/>
- </Rule>
- <Rule>
- <Filter>[waterway]='river'</Filter>
- &maxscale_zoom13;
- &minscale_zoom13;
- <LineSymbolizer stroke-linejoin="round" stroke="#b5d0d0"
stroke-width="3" stroke-linecap="round"/>
- <TextSymbolizer size="9" fill="#6699cc" placement="line" spacing="400"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- <Filter>[waterway]='river'</Filter>
- &maxscale_zoom14;
- &minscale_zoom14;
- <LineSymbolizer stroke-linejoin="round" stroke="#b5d0d0"
stroke-width="5" stroke-linecap="round"/>
- <TextSymbolizer size="10" fill="#6699cc" placement="line" spacing="400"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
- </Rule><Rule>
- <Filter>[waterway]='river'</Filter>
- &maxscale_zoom15;
- &minscale_zoom16;
- <LineSymbolizer stroke-linejoin="round" stroke="#b5d0d0"
stroke-width="6" stroke-linecap="round"/>
- <TextSymbolizer size="10" fill="#6699cc" placement="line" spacing="400"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- <Filter>[waterway]='river'</Filter>
- &maxscale_zoom17;
- &minscale_zoom17;
- <LineSymbolizer stroke-linejoin="round" stroke="#b5d0d0"
stroke-width="10" stroke-linecap="round"/>
- <TextSymbolizer size="10" fill="#6699cc" placement="line" spacing="400"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- <Filter>[waterway]='river'</Filter>
- &maxscale_zoom18;
- &minscale_zoom18;
- <LineSymbolizer stroke-linejoin="round" stroke="#b5d0d0"
stroke-width="12" stroke-linecap="round"/>
- <TextSymbolizer size="10" fill="#6699cc" placement="line" spacing="400"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- <Filter>[waterway]='canal' and not [disused]='yes'</Filter>
- &maxscale_zoom12;
- &minscale_zoom12;
- <LineSymbolizer stroke-linejoin="round" stroke="#b5d0d0"
stroke-width="3" stroke-linecap="round"/>
- </Rule>
- <Rule>
- <Filter>[waterway]='canal' and not [disused]='yes'</Filter>
- &maxscale_zoom13;
- &minscale_zoom13;
- <LineSymbolizer stroke-linejoin="round" stroke="#b5d0d0"
stroke-width="4" stroke-linecap="round"/>
- <TextSymbolizer size="8" fill="#6699cc" placement="line"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- <Filter>[waterway]='stream' or [waterway]='ditch' or
[waterway]='drain'</Filter>
- &maxscale_zoom13;
- &minscale_zoom14;
- <LineSymbolizer stroke="#b5d0d0" stroke-width="1"/>
- </Rule>
- <Rule>
- <Filter>[waterway]='river' and [tunnel] = 'yes'</Filter>
- &maxscale_zoom14;
- &minscale_zoom14;
- <LineSymbolizer stroke="#b5d0d0" stroke-width="6"
stroke-dasharray="4,2"/>
- <LineSymbolizer stroke="white" stroke-width="4"/>
- <TextSymbolizer size="10" fill="#6699cc" placement="line"
minimum-distance="200" fontset-name="book-fonts"
halo-radius="1">[name]</TextSymbolizer>
- </Rule><Rule>
- <Filter>[waterway]='river' and [tunnel] = 'yes'</Filter>
- &maxscale_zoom15;
- &minscale_zoom16;
- <LineSymbolizer stroke="#b5d0d0" stroke-width="7"
stroke-dasharray="4,2"/>
- <LineSymbolizer stroke="white" stroke-width="4"/>
- <TextSymbolizer size="10" fill="#6699cc" placement="line"
minimum-distance="200" fontset-name="book-fonts"
halo-radius="1">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- <Filter>[waterway]='river' and [tunnel] = 'yes'</Filter>
- &maxscale_zoom17;
- &minscale_zoom17;
- <LineSymbolizer stroke="#b5d0d0" stroke-width="11"
stroke-dasharray="4,2"/>
- <LineSymbolizer stroke="white" stroke-width="7"/>
- <TextSymbolizer size="10" fill="#6699cc" placement="line"
minimum-distance="200" fontset-name="book-fonts"
halo-radius="1">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- <Filter>[waterway]='river' and [tunnel] = 'yes'</Filter>
- &maxscale_zoom18;
- <LineSymbolizer stroke="#b5d0d0" stroke-width="13"
stroke-dasharray="4,2"/>
- <LineSymbolizer stroke="white" stroke-width="9"/>
- <TextSymbolizer size="10" fill="#6699cc" placement="line"
minimum-distance="200" fontset-name="book-fonts"
halo-radius="1">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- <Filter>[waterway]='canal' and [tunnel] = 'yes'</Filter>
- &maxscale_zoom14;
- &minscale_zoom16;
- <LineSymbolizer stroke="#b5d0d0" stroke-width="7"
stroke-dasharray="4,2"/>
- <LineSymbolizer stroke="white" stroke-width="3"/>
- <TextSymbolizer size="9" fill="#6699cc" placement="line"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- <Filter>[waterway]='canal' and not ([tunnel] = 'yes' or
[disused]='yes')</Filter>
- &maxscale_zoom14;
- &minscale_zoom16;
- <LineSymbolizer stroke-linejoin="round" stroke="#b5d0d0"
stroke-width="7" stroke-linecap="round"/>
- <TextSymbolizer size="9" fill="#6699cc" placement="line"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- <Filter>[waterway]='canal' and [tunnel] = 'yes'</Filter>
- &maxscale_zoom17;
- &minscale_zoom18;
- <LineSymbolizer stroke="#b5d0d0" stroke-width="11"
stroke-dasharray="4,2"/>
- <LineSymbolizer stroke="white" stroke-width="7"/>
- <TextSymbolizer size="9" fill="#6699cc" placement="line"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- <Filter>[waterway]='canal' and not ([tunnel] = 'yes' or [disused]='yes'
or [lock]='yes')</Filter>
- &maxscale_zoom17;
- &minscale_zoom18;
- <LineSymbolizer stroke-linejoin="round" stroke="#b5d0d0"
stroke-width="11" stroke-linecap="round"/>
- <TextSymbolizer size="9" fill="#6699cc" placement="line"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- <Filter>[waterway]='canal' and not ([tunnel] = 'yes' or [disused]='yes')
and [lock]='yes'</Filter>
- &maxscale_zoom17;
- &minscale_zoom18;
- <LineSymbolizer stroke-linejoin="round" stroke="#b5d0d0"
stroke-width="7" stroke-linecap="round"/>
- <TextSymbolizer size="9" fill="#6699cc" fontset-name="book-fonts"
halo-radius="1" wrap-width="20">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- <Filter>[waterway]='derelict_canal' or ([waterway]='canal' and
[disused]='yes')</Filter>
- &maxscale_zoom12;
- &minscale_zoom12;
- <LineSymbolizer stroke-linejoin="round" stroke-opacity="0.5"
stroke="#b5e4d0" stroke-linecap="round" stroke-dasharray="4,4"
stroke-width="1.5"/>
- </Rule>
- <Rule>
- <Filter>[waterway]='derelict_canal' or ([waterway]='canal' and
[disused]='yes')</Filter>
- &maxscale_zoom13;
- &minscale_zoom13;
- <LineSymbolizer stroke-linejoin="round" stroke-opacity="0.5"
stroke="#b5e4d0" stroke-linecap="round" stroke-dasharray="4,6"
stroke-width="2.5"/>
- <TextSymbolizer size="9" fill="#80d1ae" spacing="600" placement="line"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- <Filter>[waterway]='derelict_canal' or ([waterway]='canal' and
[disused]='yes')</Filter>
- &maxscale_zoom14;
- &minscale_zoom18;
- <LineSymbolizer stroke-linejoin="round" stroke-opacity="0.5"
stroke="#b5e4d0" stroke-linecap="round" stroke-dasharray="4,8"
stroke-width="4.5"/>
- <TextSymbolizer size="10" fill="#80d1ae" spacing="600" placement="line"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- <Filter>[waterway]='stream' and [tunnel]='yes'</Filter>
- &maxscale_zoom15;
- &minscale_zoom18;
- <LineSymbolizer stroke="#b5d0d0" stroke-width="2.4"
stroke-dasharray="4,2"/>
- <LineSymbolizer stroke="#f3f7f7" stroke-width="1.2"/>
- </Rule>
- <Rule>
- <Filter>[waterway]='stream' and not [tunnel]='yes'</Filter>
- &maxscale_zoom15;
- &minscale_zoom18;
- <LineSymbolizer stroke="#b5d0d0" stroke-width="2"/>
- <TextSymbolizer size="8" fill="#6699cc" spacing="600" placement="line"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
- </Rule>
- <Rule>
- <Filter>([waterway]='drain' or [waterway]='ditch') and
[tunnel]='yes'</Filter>
- &maxscale_zoom15;
- &minscale_zoom18;
- <LineSymbolizer stroke="#b5d0d0" stroke-width="2"
stroke-dasharray="4,2"/>
- <LineSymbolizer stroke="#f3f7f7" stroke-width="1"/>
- </Rule>
- <Rule>
- <Filter>([waterway]='drain' or [waterway]='ditch') and not
[tunnel]='yes'</Filter>
- &maxscale_zoom15;
- &minscale_zoom18;
- <LineSymbolizer stroke="#b5d0d0" stroke-width="1"/>
- <TextSymbolizer size="8" fill="#6699cc" spacing="600" placement="line"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
- </Rule>
-</Style>
-
-<Layer name="water-lines-casing" status="on" srs="&osm2pgsql_projection;">
- <StyleName>water-lines-casing</StyleName>
- <Datasource>
- <Parameter name="table">
- (select way,waterway
- from &prefix;_line
- where waterway in ('stream','drain','ditch')
- and (tunnel is null or tunnel != 'yes')
- ) as water_lines</Parameter>
- &datasource-settings;
- </Datasource>
-</Layer>
-<Layer name="water_areas" status="on" srs="&osm2pgsql_projection;">
- <StyleName>water_areas</StyleName>
- <Datasource>
- <Parameter name="table">
- (select way,"natural",waterway,landuse,name
- from &prefix;_polygon
- where (waterway in ('dock','mill_pond','riverbank','canal')
- or landuse in ('reservoir','water','basin')
- or "natural" in ('lake','water','land','glacier','mud','bay'))
- and building is null
- order by z_order,way_area desc
- ) as water_areas</Parameter>
- &datasource-settings;
- </Datasource>
-</Layer>
-<!-- Make sure overlay styles are always rendered on top of solid areas. -->
-<Layer name="water-areas-overlay" status="on" srs="&osm2pgsql_projection;">
- <StyleName>water-areas-overlay</StyleName>
- <Datasource>
- <Parameter name="table">
- (select way,"natural"
- from &prefix;_polygon
- where "natural" in ('marsh','wetland') and building is null
- order by z_order,way_area desc
- ) as water_areas</Parameter>
- &datasource-settings;
- </Datasource>
-</Layer>
-<Layer name="glaciers-text" status="on" srs="&osm2pgsql_projection;">
- <StyleName>glaciers-text</StyleName>
- <Datasource>
- <Parameter name="table">
- (select way,name,way_area
- from &prefix;_polygon
- where "natural"='glacier' and building is null
- order by way_area desc
- ) as glaciers</Parameter>
- &datasource-settings;
- </Datasource>
-</Layer>
-
-<Layer name="water-lines-low-zoom" status="on" srs="&osm2pgsql_projection;">
- <StyleName>water-lines-low-zoom</StyleName>
- <Datasource>
- <Parameter name="table">
- (select way,waterway
- from &prefix;_line
- where waterway='river'
- ) as water_lines</Parameter>
- &datasource-settings;
- </Datasource>
-</Layer>
-
-<Layer name="water_lines" status="on" srs="&osm2pgsql_projection;">
- <StyleName>water_lines</StyleName>
- <Datasource>
- <Parameter name="table">
- (select way,waterway,disused,lock,name,
- case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end
as tunnel
- from &prefix;_line
- where waterway in
('weir','river','canal','derelict_canal','stream','drain','ditch','wadi')
- and (bridge is null or bridge not in ('yes','true','1','aqueduct'))
- order by z_order
- ) as water_lines</Parameter>
- &datasource-settings;
- </Datasource>
-</Layer>
+<Style name="water_areas">
+ <Rule>
+ <Filter>[natural] = 'glacier'</Filter>
+ &maxscale_zoom6;
+ &minscale_zoom7;
+ <LineSymbolizer stroke="#9cf" stroke-width="1.5" stroke-dasharray="4,2"/>
+ <PolygonPatternSymbolizer file="&symbols;/glacier.png" />
+ </Rule>
+ <Rule>
+ <Filter>[natural] = 'glacier'</Filter>
+ &maxscale_zoom8;
+ <LineSymbolizer stroke="#9cf" stroke-width="1.5" stroke-dasharray="4,2"/>
+ <PolygonPatternSymbolizer file="&symbols;/glacier2.png" />
+ </Rule>
+ <Rule>
+ <Filter>[waterway] = 'dock' or [waterway] = 'mill_pond' or
[waterway]='canal'</Filter>
+ &maxscale_zoom9;
+ <PolygonSymbolizer gamma=".75" fill="#b5d0d0"/>
+ </Rule>
+ <Rule>
+ <Filter>[landuse] = 'basin'</Filter>
+ &maxscale_zoom7;
+ <PolygonSymbolizer gamma=".75" fill="#b5d0d0"/>
+ </Rule>
+ <Rule>
+ <Filter>[natural] = 'lake' or [natural] = 'water' or [landuse] =
'reservoir' or [waterway] = 'riverbank' or [landuse] = 'water' or
[natural]='bay'</Filter>
+ &maxscale_zoom6;
+ <PolygonSymbolizer gamma=".75" fill="#b5d0d0"/>
+ </Rule>
+ <Rule>
+ <Filter>[natural] = 'mud'</Filter>
+ &maxscale_zoom13;
+ <PolygonPatternSymbolizer file="&symbols;/mud.png" />
+ </Rule>
+ <Rule>
+ <Filter>[natural] = 'land'</Filter>
+ &maxscale_zoom10;
+ <PolygonSymbolizer fill="#f2efe9"/>
+ </Rule>
+</Style>
+<Style name="water-areas-overlay">
+ <Rule>
+ &maxscale_zoom13;
+ <Filter>[natural] = 'marsh' or [natural] = 'wetland'</Filter>
+ <PolygonPatternSymbolizer file="&symbols;/marsh.png" />
+ </Rule>
+</Style>
+<Style name="glaciers-text">
+ <Rule>
+ <Filter>[way_area] >= 10000000</Filter>
+ &maxscale_zoom10;
+ <TextSymbolizer size="9" fill="#99f" fontset-name="book-fonts"
halo-radius="1" wrap-width="20">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[way_area] >= 5000000 and [way_area] < 10000000</Filter>
+ &maxscale_zoom11;
+ <TextSymbolizer size="9" fill="#99f" fontset-name="book-fonts"
halo-radius="1" wrap-width="20">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[way_area] < 5000000</Filter>
+ &maxscale_zoom12;
+ <TextSymbolizer size="9" fill="#99f" fontset-name="book-fonts"
halo-radius="1" wrap-width="20">[name]</TextSymbolizer>
+ </Rule>
+</Style>
+
+<Style name="water-lines-casing">
+ <Rule>
+ <Filter>[waterway]='stream' or [waterway]='ditch' or
[waterway]='drain'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke="white" stroke-width="1.5"/>
+ </Rule>
+ <Rule>
+ <Filter>[waterway]='stream'</Filter>
+ &maxscale_zoom15;
+ &minscale_zoom18;
+ <LineSymbolizer stroke="white" stroke-width="2.5"/>
+ </Rule>
+</Style>
+
+<Style name="water-lines-low-zoom">
+ <Rule>
+ <Filter>[waterway]='river'</Filter>
+ &maxscale_zoom8;
+ &minscale_zoom8;
+ <LineSymbolizer stroke="#b5d0d0" stroke-width="0.7"/>
+ </Rule>
+ <Rule>
+ <Filter>[waterway]='river'</Filter>
+ &maxscale_zoom9;
+ &minscale_zoom9;
+ <LineSymbolizer stroke="#b5d0d0" stroke-width="1.2"/>
+ </Rule>
+ <Rule>
+ <Filter>[waterway]='river'</Filter>
+ &maxscale_zoom10;
+ &minscale_zoom11;
+ <LineSymbolizer stroke="#b5d0d0" stroke-width="1.6"/>
+ </Rule>
+</Style>
+
+<Style name="water_lines">
+ <Rule>
+ <Filter>[waterway]='weir'</Filter>
+ &maxscale_zoom15;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#aaa" stroke-width="2"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[waterway]='wadi'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom15;
+ <LineSymbolizer stroke-linejoin="round" stroke-dasharray="4,4"
stroke="#b5d0d0" stroke-width="1" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[waterway]='wadi'</Filter>
+ &maxscale_zoom16;
+ <LineSymbolizer stroke-linejoin="round" stroke-dasharray="4,4"
stroke="#b5d0d0" stroke-width="2" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[waterway]='river'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <LineSymbolizer stroke-linejoin="round" stroke="#b5d0d0"
stroke-width="2" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[waterway]='river'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom13;
+ <LineSymbolizer stroke-linejoin="round" stroke="#b5d0d0"
stroke-width="3" stroke-linecap="round"/>
+ <TextSymbolizer size="9" fill="#6699cc" placement="line" spacing="400"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[waterway]='river'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#b5d0d0"
stroke-width="5" stroke-linecap="round"/>
+ <TextSymbolizer size="10" fill="#6699cc" placement="line" spacing="400"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
+ </Rule><Rule>
+ <Filter>[waterway]='river'</Filter>
+ &maxscale_zoom15;
+ &minscale_zoom16;
+ <LineSymbolizer stroke-linejoin="round" stroke="#b5d0d0"
stroke-width="6" stroke-linecap="round"/>
+ <TextSymbolizer size="10" fill="#6699cc" placement="line" spacing="400"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[waterway]='river'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom17;
+ <LineSymbolizer stroke-linejoin="round" stroke="#b5d0d0"
stroke-width="10" stroke-linecap="round"/>
+ <TextSymbolizer size="10" fill="#6699cc" placement="line" spacing="400"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[waterway]='river'</Filter>
+ &maxscale_zoom18;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#b5d0d0"
stroke-width="12" stroke-linecap="round"/>
+ <TextSymbolizer size="10" fill="#6699cc" placement="line" spacing="400"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[waterway]='canal' and not [disused]='yes'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <LineSymbolizer stroke-linejoin="round" stroke="#b5d0d0"
stroke-width="3" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[waterway]='canal' and not [disused]='yes'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom13;
+ <LineSymbolizer stroke-linejoin="round" stroke="#b5d0d0"
stroke-width="4" stroke-linecap="round"/>
+ <TextSymbolizer size="8" fill="#6699cc" placement="line"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[waterway]='stream' or [waterway]='ditch' or
[waterway]='drain'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke="#b5d0d0" stroke-width="1"/>
+ </Rule>
+ <Rule>
+ <Filter>[waterway]='river' and [tunnel] = 'yes'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom14;
+ <LineSymbolizer stroke="#b5d0d0" stroke-width="6"
stroke-dasharray="4,2"/>
+ <LineSymbolizer stroke="white" stroke-width="4"/>
+ <TextSymbolizer size="10" fill="#6699cc" placement="line"
minimum-distance="200" fontset-name="book-fonts"
halo-radius="1">[name]</TextSymbolizer>
+ </Rule><Rule>
+ <Filter>[waterway]='river' and [tunnel] = 'yes'</Filter>
+ &maxscale_zoom15;
+ &minscale_zoom16;
+ <LineSymbolizer stroke="#b5d0d0" stroke-width="7"
stroke-dasharray="4,2"/>
+ <LineSymbolizer stroke="white" stroke-width="4"/>
+ <TextSymbolizer size="10" fill="#6699cc" placement="line"
minimum-distance="200" fontset-name="book-fonts"
halo-radius="1">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[waterway]='river' and [tunnel] = 'yes'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom17;
+ <LineSymbolizer stroke="#b5d0d0" stroke-width="11"
stroke-dasharray="4,2"/>
+ <LineSymbolizer stroke="white" stroke-width="7"/>
+ <TextSymbolizer size="10" fill="#6699cc" placement="line"
minimum-distance="200" fontset-name="book-fonts"
halo-radius="1">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[waterway]='river' and [tunnel] = 'yes'</Filter>
+ &maxscale_zoom18;
+ <LineSymbolizer stroke="#b5d0d0" stroke-width="13"
stroke-dasharray="4,2"/>
+ <LineSymbolizer stroke="white" stroke-width="9"/>
+ <TextSymbolizer size="10" fill="#6699cc" placement="line"
minimum-distance="200" fontset-name="book-fonts"
halo-radius="1">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[waterway]='canal' and [tunnel] = 'yes'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom16;
+ <LineSymbolizer stroke="#b5d0d0" stroke-width="7"
stroke-dasharray="4,2"/>
+ <LineSymbolizer stroke="white" stroke-width="3"/>
+ <TextSymbolizer size="9" fill="#6699cc" placement="line"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[waterway]='canal' and not ([tunnel] = 'yes' or
[disused]='yes')</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom16;
+ <LineSymbolizer stroke-linejoin="round" stroke="#b5d0d0"
stroke-width="7" stroke-linecap="round"/>
+ <TextSymbolizer size="9" fill="#6699cc" placement="line"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[waterway]='canal' and [tunnel] = 'yes'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke="#b5d0d0" stroke-width="11"
stroke-dasharray="4,2"/>
+ <LineSymbolizer stroke="white" stroke-width="7"/>
+ <TextSymbolizer size="9" fill="#6699cc" placement="line"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[waterway]='canal' and not ([tunnel] = 'yes' or [disused]='yes'
or [lock]='yes')</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#b5d0d0"
stroke-width="11" stroke-linecap="round"/>
+ <TextSymbolizer size="9" fill="#6699cc" placement="line"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[waterway]='canal' and not ([tunnel] = 'yes' or [disused]='yes')
and [lock]='yes'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#b5d0d0"
stroke-width="7" stroke-linecap="round"/>
+ <TextSymbolizer size="9" fill="#6699cc" fontset-name="book-fonts"
halo-radius="1" wrap-width="20">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[waterway]='derelict_canal' or ([waterway]='canal' and
[disused]='yes')</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <LineSymbolizer stroke-linejoin="round" stroke-opacity="0.5"
stroke="#b5e4d0" stroke-linecap="round" stroke-dasharray="4,4"
stroke-width="1.5"/>
+ </Rule>
+ <Rule>
+ <Filter>[waterway]='derelict_canal' or ([waterway]='canal' and
[disused]='yes')</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom13;
+ <LineSymbolizer stroke-linejoin="round" stroke-opacity="0.5"
stroke="#b5e4d0" stroke-linecap="round" stroke-dasharray="4,6"
stroke-width="2.5"/>
+ <TextSymbolizer size="9" fill="#80d1ae" spacing="600" placement="line"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[waterway]='derelict_canal' or ([waterway]='canal' and
[disused]='yes')</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke-opacity="0.5"
stroke="#b5e4d0" stroke-linecap="round" stroke-dasharray="4,8"
stroke-width="4.5"/>
+ <TextSymbolizer size="10" fill="#80d1ae" spacing="600" placement="line"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[waterway]='stream' and [tunnel]='yes'</Filter>
+ &maxscale_zoom15;
+ &minscale_zoom18;
+ <LineSymbolizer stroke="#b5d0d0" stroke-width="2.4"
stroke-dasharray="4,2"/>
+ <LineSymbolizer stroke="#f3f7f7" stroke-width="1.2"/>
+ </Rule>
+ <Rule>
+ <Filter>[waterway]='stream' and not [tunnel]='yes'</Filter>
+ &maxscale_zoom15;
+ &minscale_zoom18;
+ <LineSymbolizer stroke="#b5d0d0" stroke-width="2"/>
+ <TextSymbolizer size="8" fill="#6699cc" spacing="600" placement="line"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>([waterway]='drain' or [waterway]='ditch') and
[tunnel]='yes'</Filter>
+ &maxscale_zoom15;
+ &minscale_zoom18;
+ <LineSymbolizer stroke="#b5d0d0" stroke-width="2"
stroke-dasharray="4,2"/>
+ <LineSymbolizer stroke="#f3f7f7" stroke-width="1"/>
+ </Rule>
+ <Rule>
+ <Filter>([waterway]='drain' or [waterway]='ditch') and not
[tunnel]='yes'</Filter>
+ &maxscale_zoom15;
+ &minscale_zoom18;
+ <LineSymbolizer stroke="#b5d0d0" stroke-width="1"/>
+ <TextSymbolizer size="8" fill="#6699cc" spacing="600" placement="line"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
+ </Rule>
+</Style>
+
+<Layer name="water-lines-casing" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>water-lines-casing</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (select way,waterway
+ from &prefix;_line
+ where waterway in ('stream','drain','ditch')
+ and (tunnel is null or tunnel != 'yes')
+ ) as water_lines</Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+<Layer name="water_areas" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>water_areas</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (select way,"natural",waterway,landuse,name
+ from &prefix;_polygon
+ where (waterway in ('dock','mill_pond','riverbank','canal')
+ or landuse in ('reservoir','water','basin')
+ or "natural" in ('lake','water','land','glacier','mud','bay'))
+ and building is null
+ order by z_order,way_area desc
+ ) as water_areas</Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+<!-- Make sure overlay styles are always rendered on top of solid areas. -->
+<Layer name="water-areas-overlay" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>water-areas-overlay</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (select way,"natural"
+ from &prefix;_polygon
+ where "natural" in ('marsh','wetland') and building is null
+ order by z_order,way_area desc
+ ) as water_areas</Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+<Layer name="glaciers-text" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>glaciers-text</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (select way,name,way_area
+ from &prefix;_polygon
+ where "natural"='glacier' and building is null
+ order by way_area desc
+ ) as glaciers</Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+
+<Layer name="water-lines-low-zoom" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>water-lines-low-zoom</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (select way,waterway
+ from &prefix;_line
+ where waterway='river'
+ ) as water_lines</Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+
+<Layer name="water_lines" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>water_lines</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (select way,waterway,disused,lock,name,
+ case when tunnel in ('yes','true','1') then 'yes'::text else tunnel end
as tunnel
+ from &prefix;_line
+ where waterway in
('weir','river','canal','derelict_canal','stream','drain','ditch','wadi')
+ and (bridge is null or bridge not in ('yes','true','1','aqueduct'))
+ order by z_order
+ ) as water_lines</Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
diff --git a/stylesheet/black-and-white/inc/layer-water_features.xml.inc
b/stylesheet/black-and-white/inc/layer-water_features.xml.inc
index 4c312f2..f08e503 100644
--- a/stylesheet/black-and-white/inc/layer-water_features.xml.inc
+++ b/stylesheet/black-and-white/inc/layer-water_features.xml.inc
@@ -1,120 +1,120 @@
-<Style name="dam">
- <Rule>
- &maxscale_zoom13;
- &minscale_zoom18;
- <LineSymbolizer stroke-linejoin="round" stroke="#444" stroke-width="2"
stroke-linecap="round"/>
- </Rule>
- <Rule>
- &maxscale_zoom15;
- <TextSymbolizer size="8" fill="#222" fontset-name="book-fonts"
halo-radius="1">[name]</TextSymbolizer>
- </Rule>
-</Style>
-<Style name="marinas-area">
- <Rule>
- &maxscale_zoom14;
- &minscale_zoom15;
- <LineSymbolizer stroke="blue" stroke-width="1" stroke-dasharray="6,2"
stroke-opacity="0.5"/>
- </Rule>
- <Rule>
- &maxscale_zoom16;
- <LineSymbolizer stroke="blue" stroke-width="2" stroke-dasharray="6,2"
stroke-opacity="0.5"/>
- </Rule>
-</Style>
-<Style name="piers-area">
- <Rule>
- &maxscale_zoom12;
- <PolygonSymbolizer fill="#f2efe9"/>
- </Rule>
-</Style>
-<Style name="piers">
- <Rule>
- &maxscale_zoom11;
- &minscale_zoom12;
- <Filter>[man_made]='breakwater' or [man_made]='groyne'</Filter>
- <LineSymbolizer stroke="#aaa" stroke-width="1"/>
- </Rule>
- <Rule>
- &maxscale_zoom11;
- &minscale_zoom12;
- <Filter>[man_made]='pier'</Filter>
- <LineSymbolizer stroke="#f2efe9" stroke-width="1.5"/>
- </Rule>
- <Rule>
- &maxscale_zoom13;
- &minscale_zoom15;
- <Filter>[man_made]='breakwater' or [man_made]='groyne'</Filter>
- <LineSymbolizer stroke="#aaa" stroke-width="2"/>
- </Rule>
- <Rule>
- &maxscale_zoom13;
- &minscale_zoom15;
- <Filter>[man_made]='pier'</Filter>
- <LineSymbolizer stroke="#f2efe9" stroke-width="3"/>
- </Rule>
- <Rule>
- &maxscale_zoom16;
- &minscale_zoom18;
- <Filter>[man_made]='breakwater' or [man_made]='groyne'</Filter>
- <LineSymbolizer stroke="#aaa" stroke-width="4"/>
- </Rule>
- <Rule>
- &maxscale_zoom16;
- &minscale_zoom18;
- <Filter>[man_made]='pier'</Filter>
- <LineSymbolizer stroke="#f2efe9" stroke-width="7"/>
- </Rule>
-</Style>
-<Style name="locks">
-<Rule>
- &maxscale_zoom17;
- &minscale_zoom18;
- <Filter>[waterway]='lock_gate'</Filter>
- <PointSymbolizer file="&symbols;/lock_gate.png"/>
-</Rule>
-</Style>
-<Layer name="dam" status="on" srs="&osm2pgsql_projection;">
- <StyleName>dam</StyleName>
- <Datasource>
- <Parameter name="table">
- (select way,name from &prefix;_line where waterway='dam') as
dam</Parameter>
- &datasource-settings;
- </Datasource>
-</Layer>
-<Layer name="marinas-area" status="on" srs="&osm2pgsql_projection;">
- <StyleName>marinas-area</StyleName>
- <Datasource>
- <Parameter name="table">
- (select way from &prefix;_polygon where leisure ='marina') as marinas
- </Parameter>
- &datasource-settings;
- </Datasource>
-</Layer>
-<Layer name="piers-area" status="on" srs="&osm2pgsql_projection;">
- <StyleName>piers-area</StyleName>
- <Datasource>
- <Parameter name="table">
- (select way,man_made from &prefix;_polygon where man_made in
('pier','breakwater','groyne')) as piers
- </Parameter>
- &datasource-settings;
- </Datasource>
-</Layer>
-<Layer name="piers" status="on" srs="&osm2pgsql_projection;">
- <StyleName>piers</StyleName>
- <Datasource>
- <Parameter name="table">
- (select way,man_made from &prefix;_line where man_made in
('pier','breakwater','groyne')) as piers
- </Parameter>
- &datasource-settings;
- </Datasource>
-</Layer>
-<Layer name="locks" status="on" srs="&osm2pgsql_projection;">
- <StyleName>locks</StyleName>
- <Datasource>
- <Parameter name="table">
- (select way,waterway from &prefix;_point where waterway='lock_gate') as
locks
- </Parameter>
- &datasource-settings;
- </Datasource>
-</Layer>
-
-
+<Style name="dam">
+ <Rule>
+ &maxscale_zoom13;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#444" stroke-width="2"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom15;
+ <TextSymbolizer size="8" fill="#222" fontset-name="book-fonts"
halo-radius="1">[name]</TextSymbolizer>
+ </Rule>
+</Style>
+<Style name="marinas-area">
+ <Rule>
+ &maxscale_zoom14;
+ &minscale_zoom15;
+ <LineSymbolizer stroke="blue" stroke-width="1" stroke-dasharray="6,2"
stroke-opacity="0.5"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ <LineSymbolizer stroke="blue" stroke-width="2" stroke-dasharray="6,2"
stroke-opacity="0.5"/>
+ </Rule>
+</Style>
+<Style name="piers-area">
+ <Rule>
+ &maxscale_zoom12;
+ <PolygonSymbolizer fill="#f2efe9"/>
+ </Rule>
+</Style>
+<Style name="piers">
+ <Rule>
+ &maxscale_zoom11;
+ &minscale_zoom12;
+ <Filter>[man_made]='breakwater' or [man_made]='groyne'</Filter>
+ <LineSymbolizer stroke="#aaa" stroke-width="1"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom11;
+ &minscale_zoom12;
+ <Filter>[man_made]='pier'</Filter>
+ <LineSymbolizer stroke="#f2efe9" stroke-width="1.5"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom13;
+ &minscale_zoom15;
+ <Filter>[man_made]='breakwater' or [man_made]='groyne'</Filter>
+ <LineSymbolizer stroke="#aaa" stroke-width="2"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom13;
+ &minscale_zoom15;
+ <Filter>[man_made]='pier'</Filter>
+ <LineSymbolizer stroke="#f2efe9" stroke-width="3"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ &minscale_zoom18;
+ <Filter>[man_made]='breakwater' or [man_made]='groyne'</Filter>
+ <LineSymbolizer stroke="#aaa" stroke-width="4"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ &minscale_zoom18;
+ <Filter>[man_made]='pier'</Filter>
+ <LineSymbolizer stroke="#f2efe9" stroke-width="7"/>
+ </Rule>
+</Style>
+<Style name="locks">
+<Rule>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <Filter>[waterway]='lock_gate'</Filter>
+ <PointSymbolizer file="&symbols;/lock_gate.png"/>
+</Rule>
+</Style>
+<Layer name="dam" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>dam</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (select way,name from &prefix;_line where waterway='dam') as
dam</Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+<Layer name="marinas-area" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>marinas-area</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (select way from &prefix;_polygon where leisure ='marina') as marinas
+ </Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+<Layer name="piers-area" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>piers-area</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (select way,man_made from &prefix;_polygon where man_made in
('pier','breakwater','groyne')) as piers
+ </Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+<Layer name="piers" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>piers</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (select way,man_made from &prefix;_line where man_made in
('pier','breakwater','groyne')) as piers
+ </Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+<Layer name="locks" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>locks</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (select way,waterway from &prefix;_point where waterway='lock_gate') as
locks
+ </Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
+
+
diff --git a/stylesheet/black-and-white/inc/layers.xml.inc
b/stylesheet/black-and-white/inc/layers.xml.inc
index afec28b..2405e5b 100644
--- a/stylesheet/black-and-white/inc/layers.xml.inc
+++ b/stylesheet/black-and-white/inc/layers.xml.inc
@@ -3,13 +3,13 @@
<!ENTITY layer-water SYSTEM "layer-water.xml.inc">
<!ENTITY layer-water_features SYSTEM "layer-water_features.xml.inc">
<!ENTITY layer-citywall SYSTEM "layer-citywall.xml.inc">
-<!-- <!ENTITY layer-buildings SYSTEM "layer-buildings.xml.inc"> -->
+<!ENTITY layer-buildings SYSTEM "layer-buildings.xml.inc">
<!ENTITY layer-ferry-routes SYSTEM "layer-ferry-routes.xml.inc">
<!ENTITY layer-aerialways SYSTEM "layer-aerialways.xml.inc">
<!ENTITY layer-placenames SYSTEM "layer-placenames.xml.inc">
<!ENTITY layer-amenity-stations SYSTEM "layer-amenity-stations.xml.inc">
<!ENTITY layer-amenity-symbols SYSTEM "layer-amenity-symbols.xml.inc">
<!ENTITY layer-amenity-points SYSTEM "layer-amenity-points.xml.inc">
-<!-- <!ENTITY layer-power SYSTEM "layer-power.xml.inc"> -->
+<!ENTITY layer-power SYSTEM "layer-power.xml.inc">
<!ENTITY layer-addressing SYSTEM "layer-addressing.xml.inc">
<!ENTITY layer-admin SYSTEM "layer-admin.xml.inc">
diff --git a/stylesheet/black-and-white/osm.xml
b/stylesheet/black-and-white/osm.xml
index 8279da9..0dd195b 100644
--- a/stylesheet/black-and-white/osm.xml
+++ b/stylesheet/black-and-white/osm.xml
@@ -5,103 +5,127 @@
]>
<Map background-color="#b5d0d0" srs="&srs900913;" minimum-version="2.0.0">
&fontset-settings;
-<!-- <Style name="turning_circle-casing"> -->
-<!-- <Rule> -->
-<!-- &maxscale_zoom15; -->
-<!-- &minscale_zoom16; -->
-<!-- <Filter>[int_tc_type]='tertiary'</Filter> -->
-<!-- <PointSymbolizer file="&symbols;/turning_circle-tert-casing.18.png"
allow-overlap="true" ignore-placement="true"/> -->
-<!-- </Rule> -->
-<!-- <Rule> -->
-<!-- &maxscale_zoom16; -->
-<!-- &minscale_zoom16; -->
-<!-- <Filter>[int_tc_type]='residential' or
[int_tc_type]='unclassified'</Filter> -->
-<!-- <PointSymbolizer file="&symbols;/turning_circle-uncl-casing.18.png"
allow-overlap="true" ignore-placement="true"/> -->
-<!-- </Rule> -->
-<!-- <Rule> -->
-<!-- &maxscale_zoom16; -->
-<!-- &minscale_zoom16; -->
-<!-- <Filter>[int_tc_type]='service'</Filter> -->
-<!-- <PointSymbolizer file="&symbols;/turning_circle-uncl-casing.14.png"
allow-overlap="true" ignore-placement="true"/> -->
-<!-- </Rule> -->
-<!-- <Rule> -->
-<!-- &maxscale_zoom16; -->
-<!-- &minscale_zoom16; -->
-<!-- <Filter>[int_tc_type]='living_street'</Filter> -->
-<!-- <PointSymbolizer file="&symbols;/turning_circle-uncl-fill.18.png"
allow-overlap="true" ignore-placement="true"/> -->
-<!-- </Rule> -->
- <!-- <Rule> -->
- <!-- &maxscale_zoom17; -->
- <!-- <Filter>[int_tc_type]='tertiary'</Filter> -->
- <!-- <PointSymbolizer file="&symbols;/turning_circle-tert-casing.24.png"
allow-overlap="true" ignore-placement="true"/> -->
- <!-- </Rule> -->
- <!-- <Rule> -->
- <!-- &maxscale_zoom17; -->
- <!-- <Filter>[int_tc_type]='residential' or
[int_tc_type]='unclassified'</Filter> -->
- <!-- <PointSymbolizer file="&symbols;/turning_circle-uncl-casing.24.png"
allow-overlap="true" ignore-placement="true"/> -->
- <!-- </Rule> -->
- <!-- <Rule> -->
- <!-- &maxscale_zoom17; -->
- <!-- <Filter>[int_tc_type]='service'</Filter> -->
- <!-- <PointSymbolizer file="&symbols;/turning_circle-uncl-casing.16.png"
allow-overlap="true" ignore-placement="true"/> -->
- <!-- </Rule> -->
- <!-- <Rule> -->
- <!-- &maxscale_zoom17; -->
- <!-- <Filter>[int_tc_type]='living_street'</Filter> -->
- <!-- <PointSymbolizer file="&symbols;/turning_circle-uncl-fill.24.png"
allow-overlap="true" ignore-placement="true"/> -->
- <!-- </Rule> -->
-<!-- </Style> -->
-<!-- <Style name="turning_circle-fill"> -->
-<!-- <Rule> -->
-<!-- &maxscale_zoom15; -->
-<!-- &minscale_zoom16; -->
-<!-- <Filter>[int_tc_type]='tertiary'</Filter> -->
-<!-- <PointSymbolizer file="&symbols;/turning_circle-tert-fill.16.png"
allow-overlap="true" ignore-placement="true"/> -->
-<!-- </Rule> -->
-<!-- <Rule> -->
-<!-- &maxscale_zoom16; -->
-<!-- &minscale_zoom16; -->
-<!-- <Filter>[int_tc_type]='residential' or
[int_tc_type]='unclassified'</Filter> -->
-<!-- <PointSymbolizer file="&symbols;/turning_circle-uncl-fill.16.png"
allow-overlap="true" ignore-placement="true"/> -->
-<!-- </Rule> -->
-<!-- <Rule> -->
-<!-- &maxscale_zoom16; -->
-<!-- &minscale_zoom16; -->
-<!-- <Filter>[int_tc_type]='service'</Filter> -->
-<!-- <PointSymbolizer file="&symbols;/turning_circle-uncl-fill.12.png"
allow-overlap="true" ignore-placement="true"/> -->
-<!-- </Rule> -->
-<!-- <Rule> -->
-<!-- &maxscale_zoom16; -->
-<!-- &minscale_zoom16; -->
-<!-- <Filter>[int_tc_type]='living_street'</Filter> -->
-<!-- <PointSymbolizer file="&symbols;/turning_circle-livs-fill.16.png"
allow-overlap="true" ignore-placement="true"/> -->
-<!-- </Rule> -->
- <!-- <Rule> -->
- <!-- &maxscale_zoom17; -->
- <!-- <Filter>[int_tc_type]='tertiary'</Filter> -->
- <!-- <PointSymbolizer file="&symbols;/turning_circle-tert-fill.22.png"
allow-overlap="true" ignore-placement="true"/> -->
- <!-- </Rule> -->
- <!-- <Rule> -->
- <!-- &maxscale_zoom17; -->
- <!-- <Filter>[int_tc_type]='residential' or
[int_tc_type]='unclassified'</Filter> -->
- <!-- <PointSymbolizer file="&symbols;/turning_circle-uncl-fill.22.png"
allow-overlap="true" ignore-placement="true"/> -->
- <!-- </Rule> -->
- <!-- <Rule> -->
- <!-- &maxscale_zoom17; -->
- <!-- <Filter>[int_tc_type]='service'</Filter> -->
- <!-- <PointSymbolizer file="&symbols;/turning_circle-uncl-fill.14.png"
allow-overlap="true" ignore-placement="true"/> -->
- <!-- </Rule> -->
- <!-- <Rule> -->
- <!-- &maxscale_zoom17; -->
- <!-- <Filter>[int_tc_type]='living_street'</Filter> -->
- <!-- <PointSymbolizer file="&symbols;/turning_circle-livs-fill.22.png"
allow-overlap="true" ignore-placement="true"/> -->
- <!-- </Rule> -->
-<!-- </Style> -->
+<Style name="turning_circle-casing">
+ <Rule>
+ &maxscale_zoom15;
+ &minscale_zoom16;
+ <Filter>[int_tc_type]='tertiary'</Filter>
+ <PointSymbolizer file="&symbols;/turning_circle-tert-casing.18.png"
allow-overlap="true" ignore-placement="true"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom15;
+ &minscale_zoom15;
+ <Filter>[int_tc_type]='residential' or
[int_tc_type]='unclassified'</Filter>
+ <PointSymbolizer file="&symbols;/turning_circle-uncl-casing.14.png"
allow-overlap="true" ignore-placement="true"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom15;
+ &minscale_zoom15;
+ <Filter>[int_tc_type]='living_street'</Filter>
+ <PointSymbolizer file="&symbols;/turning_circle-uncl-fill.14.png"
allow-overlap="true" ignore-placement="true"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ &minscale_zoom16;
+ <Filter>[int_tc_type]='residential' or
[int_tc_type]='unclassified'</Filter>
+ <PointSymbolizer file="&symbols;/turning_circle-uncl-casing.18.png"
allow-overlap="true" ignore-placement="true"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ &minscale_zoom16;
+ <Filter>[int_tc_type]='service'</Filter>
+ <PointSymbolizer file="&symbols;/turning_circle-uncl-casing.14.png"
allow-overlap="true" ignore-placement="true"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ &minscale_zoom16;
+ <Filter>[int_tc_type]='living_street'</Filter>
+ <PointSymbolizer file="&symbols;/turning_circle-uncl-fill.18.png"
allow-overlap="true" ignore-placement="true"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[int_tc_type]='tertiary'</Filter>
+ <PointSymbolizer file="&symbols;/turning_circle-tert-casing.24.png"
allow-overlap="true" ignore-placement="true"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[int_tc_type]='residential' or
[int_tc_type]='unclassified'</Filter>
+ <PointSymbolizer file="&symbols;/turning_circle-uncl-casing.24.png"
allow-overlap="true" ignore-placement="true"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[int_tc_type]='service'</Filter>
+ <PointSymbolizer file="&symbols;/turning_circle-uncl-casing.16.png"
allow-overlap="true" ignore-placement="true"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[int_tc_type]='living_street'</Filter>
+ <PointSymbolizer file="&symbols;/turning_circle-uncl-fill.24.png"
allow-overlap="true" ignore-placement="true"/>
+ </Rule>
+</Style>
+<Style name="turning_circle-fill">
+ <Rule>
+ &maxscale_zoom15;
+ &minscale_zoom16;
+ <Filter>[int_tc_type]='tertiary'</Filter>
+ <PointSymbolizer file="&symbols;/turning_circle-tert-fill.16.png"
allow-overlap="true" ignore-placement="true"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom15;
+ &minscale_zoom15;
+ <Filter>[int_tc_type]='residential' or
[int_tc_type]='unclassified'</Filter>
+ <PointSymbolizer file="&symbols;/turning_circle-uncl-fill.12.png"
allow-overlap="true" ignore-placement="true"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom15;
+ &minscale_zoom15;
+ <Filter>[int_tc_type]='living_street'</Filter>
+ <PointSymbolizer file="&symbols;/turning_circle-livs-fill.12.png"
allow-overlap="true" ignore-placement="true"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ &minscale_zoom16;
+ <Filter>[int_tc_type]='residential' or
[int_tc_type]='unclassified'</Filter>
+ <PointSymbolizer file="&symbols;/turning_circle-uncl-fill.16.png"
allow-overlap="true" ignore-placement="true"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ &minscale_zoom16;
+ <Filter>[int_tc_type]='service'</Filter>
+ <PointSymbolizer file="&symbols;/turning_circle-uncl-fill.12.png"
allow-overlap="true" ignore-placement="true"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom16;
+ &minscale_zoom16;
+ <Filter>[int_tc_type]='living_street'</Filter>
+ <PointSymbolizer file="&symbols;/turning_circle-livs-fill.16.png"
allow-overlap="true" ignore-placement="true"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[int_tc_type]='tertiary'</Filter>
+ <PointSymbolizer file="&symbols;/turning_circle-tert-fill.22.png"
allow-overlap="true" ignore-placement="true"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[int_tc_type]='residential' or
[int_tc_type]='unclassified'</Filter>
+ <PointSymbolizer file="&symbols;/turning_circle-uncl-fill.22.png"
allow-overlap="true" ignore-placement="true"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[int_tc_type]='service'</Filter>
+ <PointSymbolizer file="&symbols;/turning_circle-uncl-fill.14.png"
allow-overlap="true" ignore-placement="true"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom17;
+ <Filter>[int_tc_type]='living_street'</Filter>
+ <PointSymbolizer file="&symbols;/turning_circle-livs-fill.22.png"
allow-overlap="true" ignore-placement="true"/>
+ </Rule>
+</Style>
<Style name="highway-area-casing">
<Rule>
<Filter>[highway] = 'residential' or [highway]='unclassified'</Filter>
&maxscale_zoom14;
- <LineSymbolizer stroke="black" stroke-width="1.6"/>
+ <LineSymbolizer stroke="#999" stroke-width="1"/>
</Rule>
<Rule>
<Filter>[highway] = 'pedestrian' or [highway]='service' or
[highway]='footway' or [highway]='path'</Filter>
@@ -171,6 +195,13 @@
</Rule>
<Rule>
<Filter>[leisure] = 'nature_reserve'</Filter>
+ &maxscale_zoom10;
+ &minscale_zoom13;
+ <PolygonPatternSymbolizer file="&symbols;/nature_reserve5.png" />
+ <LineSymbolizer stroke="#6c3" stroke-width="0.5"/>
+ </Rule>
+ <Rule>
+ <Filter>[leisure] = 'nature_reserve'</Filter>
&maxscale_zoom14;
<PolygonPatternSymbolizer file="&symbols;/nature_reserve6.png" />
<LineSymbolizer stroke="#6c3" stroke-width="1"/>
@@ -192,14 +223,25 @@
&maxscale_zoom16;
<TextSymbolizer size="10" fill="#000033" fontset-name="book-fonts"
halo-radius="1" wrap-width="20" placement="interior">[name]</TextSymbolizer>
</Rule>
- <!-- <Rule> -->
- <!-- <Filter>[way_area] < 20000</Filter> -->
- <!-- &maxscale_zoom17; -->
- <!-- <TextSymbolizer size="10" fill="#000033" fontset-name="book-fonts"
halo-radius="1" wrap-width="20" placement="interior">[name]</TextSymbolizer> -->
- <!-- </Rule> -->
+ <Rule>
+ <Filter>[way_area] < 20000</Filter>
+ &maxscale_zoom17;
+ <TextSymbolizer size="10" fill="#000033" fontset-name="book-fonts"
halo-radius="1" wrap-width="20" placement="interior">[name]</TextSymbolizer>
+ </Rule>
</Style>
<Style name="highway-junctions">
<Rule>
+ &maxscale_zoom11;
+ &minscale_zoom11;
+ <TextSymbolizer size="9" fill="#6666ff" minimum-distance="2"
fontset-name="oblique-fonts" halo-radius="1"
wrap-width="12">[ref]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ &maxscale_zoom12;
+ &minscale_zoom14;
+ <TextSymbolizer size="9" fill="#6666ff" minimum-distance="2"
fontset-name="oblique-fonts" halo-radius="1"
wrap-width="12">[ref]</TextSymbolizer>
+ <TextSymbolizer size="8" fill="#6666ff" dy="-8" minimum-distance="2"
fontset-name="oblique-fonts" halo-radius="1" wrap-width="2"
wrap-character=";">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
&maxscale_zoom15;
<TextSymbolizer size="12" fill="#6666ff" minimum-distance="2"
fontset-name="oblique-fonts" halo-radius="1"
wrap-width="12">[ref]</TextSymbolizer>
<TextSymbolizer size="11" fill="#6666ff" dy="-10" minimum-distance="2"
fontset-name="oblique-fonts" halo-radius="1" wrap-width="2"
wrap-character=";">[name]</TextSymbolizer>
@@ -212,51 +254,51 @@
&minscale_zoom18;
<TextSymbolizer size="9" fill="#000" dy="0" fontset-name="oblique-fonts"
halo-radius="1" wrap-width="0" placement="interior">[name]</TextSymbolizer>
</Rule>
- <!-- <Rule> -->
- <!-- <Filter>[amenity]='pub' or [amenity]='restaurant' or
[amenity]='cafe' or [amenity]='fast_food' or [amenity]='biergarten'</Filter> -->
- <!-- &maxscale_zoom17; -->
- <!-- <TextSymbolizer size="10" fill="#734a08" dy="9"
fontset-name="bold-fonts" halo-radius="1" wrap-width="34"
placement="interior">[name]</TextSymbolizer> -->
- <!-- </Rule> -->
- <!-- <Rule> -->
- <!-- <Filter>[amenity]='bar'</Filter> -->
- <!-- &maxscale_zoom17; -->
- <!-- <TextSymbolizer size="10" fill="#734a08" dy="11"
fontset-name="bold-fonts" halo-radius="1" wrap-width="0"
placement="interior">[name]</TextSymbolizer> -->
- <!-- </Rule> -->
- <!-- <Rule> -->
- <!-- <Filter>[amenity]='library' or [amenity]='theatre' or
[amenity]='courthouse'</Filter> -->
- <!-- &maxscale_zoom17; -->
- <!-- <TextSymbolizer size="10" fill="#734a08" dy="12"
fontset-name="bold-fonts" halo-radius="1" wrap-width="0"
placement="interior">[name]</TextSymbolizer> -->
- <!-- </Rule> -->
- <!-- <Rule> -->
- <!-- <Filter>[amenity]='cinema'</Filter> -->
- <!-- &maxscale_zoom17; -->
- <!-- <TextSymbolizer size="10" fill="#734a08" dy="14"
fontset-name="bold-fonts" halo-radius="1" wrap-width="0"
placement="interior">[name]</TextSymbolizer> -->
- <!-- </Rule> -->
- <!-- <Rule> -->
- <!-- <Filter>[amenity]='parking' and ([access] = 'public' or not
[access] != '')</Filter> -->
- <!-- &maxscale_zoom17; -->
- <!-- <TextSymbolizer size="9" fill="#0066ff" dy="9"
fontset-name="book-fonts" halo-radius="1" wrap-width="34"
placement="interior">[name]</TextSymbolizer> -->
- <!-- </Rule> -->
- <!-- <Rule> -->
- <!-- <Filter>[amenity]='parking' and ([access] != '' and not [access] =
'public')</Filter> -->
- <!-- &maxscale_zoom17; -->
- <!-- <TextSymbolizer size="9" fill="#66ccaf" dy="9"
fontset-name="book-fonts" halo-radius="1" wrap-width="34"
placement="interior">[name]</TextSymbolizer> -->
- <!-- </Rule> -->
- <!-- <Rule> -->
- <!-- <Filter>[amenity] = 'police'</Filter> -->
- <!-- &maxscale_zoom17; -->
- <!-- <TextSymbolizer size="10" fill="#734a08" dy="10"
fontset-name="book-fonts" halo-radius="1" wrap-width="30"
placement="interior">[name]</TextSymbolizer> -->
- <!-- </Rule> -->
- <!-- <Rule> -->
- <!-- <Filter>[amenity] = 'fire_station'</Filter> -->
- <!-- &maxscale_zoom17; -->
- <!-- <TextSymbolizer size="10" fill="#734a08" dy="9"
fontset-name="book-fonts" halo-radius="1" wrap-width="30"
placement="interior">[name]</TextSymbolizer> -->
- <!-- </Rule> -->
- <!-- <Rule> -->
- <!-- <Filter>[amenity] = 'place_of_worship'</Filter> -->
- <!-- &maxscale_zoom17; -->
- <!-- <TextSymbolizer size="10" fill="#000033" dy="11"
fontset-name="book-fonts" halo-radius="1" wrap-width="30"
placement="interior">[name]</TextSymbolizer> -->
- <!-- </Rule> -->
+ <Rule>
+ <Filter>[amenity]='pub' or [amenity]='restaurant' or [amenity]='cafe' or
[amenity]='fast_food' or [amenity]='biergarten'</Filter>
+ &maxscale_zoom17;
+ <TextSymbolizer size="10" fill="#734a08" dy="9"
fontset-name="bold-fonts" halo-radius="1" wrap-width="34"
placement="interior">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[amenity]='bar'</Filter>
+ &maxscale_zoom17;
+ <TextSymbolizer size="10" fill="#734a08" dy="11"
fontset-name="bold-fonts" halo-radius="1" wrap-width="0"
placement="interior">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[amenity]='library' or [amenity]='theatre' or
[amenity]='courthouse'</Filter>
+ &maxscale_zoom17;
+ <TextSymbolizer size="10" fill="#734a08" dy="12"
fontset-name="bold-fonts" halo-radius="1" wrap-width="0"
placement="interior">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[amenity]='cinema'</Filter>
+ &maxscale_zoom17;
+ <TextSymbolizer size="10" fill="#734a08" dy="14"
fontset-name="bold-fonts" halo-radius="1" wrap-width="0"
placement="interior">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[amenity]='parking' and ([access] = 'public' or not [access] !=
'')</Filter>
+ &maxscale_zoom17;
+ <TextSymbolizer size="9" fill="#0066ff" dy="9" fontset-name="book-fonts"
halo-radius="1" wrap-width="34" placement="interior">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[amenity]='parking' and ([access] != '' and not [access] =
'public')</Filter>
+ &maxscale_zoom17;
+ <TextSymbolizer size="9" fill="#66ccaf" dy="9" fontset-name="book-fonts"
halo-radius="1" wrap-width="34" placement="interior">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[amenity] = 'police'</Filter>
+ &maxscale_zoom17;
+ <TextSymbolizer size="10" fill="#734a08" dy="10"
fontset-name="book-fonts" halo-radius="1" wrap-width="30"
placement="interior">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[amenity] = 'fire_station'</Filter>
+ &maxscale_zoom17;
+ <TextSymbolizer size="10" fill="#734a08" dy="9"
fontset-name="book-fonts" halo-radius="1" wrap-width="30"
placement="interior">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[amenity] = 'place_of_worship'</Filter>
+ &maxscale_zoom17;
+ <TextSymbolizer size="10" fill="#000033" dy="11"
fontset-name="book-fonts" halo-radius="1" wrap-width="30"
placement="interior">[name]</TextSymbolizer>
+ </Rule>
<Rule>
<Filter>[natural] = 'wood'</Filter>
&maxscale_zoom15;
@@ -297,11 +339,11 @@
&maxscale_zoom15;
<TextSymbolizer size="10" fill="brown" dy="9" fontset-name="book-fonts"
halo-radius="1" wrap-width="20" placement="interior">[name]</TextSymbolizer>
</Rule>
- <!-- <Rule> -->
- <!-- <Filter>[historic] = 'memorial' or
[historic]='archaeological_site'</Filter> -->
- <!-- &maxscale_zoom17; -->
- <!-- <TextSymbolizer size="9" fill="brown" dy="12"
fontset-name="book-fonts" halo-radius="1" wrap-width="20"
placement="interior">[name]</TextSymbolizer> -->
- <!-- </Rule> -->
+ <Rule>
+ <Filter>[historic] = 'memorial' or
[historic]='archaeological_site'</Filter>
+ &maxscale_zoom17;
+ <TextSymbolizer size="9" fill="brown" dy="12" fontset-name="book-fonts"
halo-radius="1" wrap-width="20" placement="interior">[name]</TextSymbolizer>
+ </Rule>
<Rule>
<Filter>[natural] = 'water' or [natural] = 'lake' or [landuse] =
'reservoir' or [landuse] = 'basin'</Filter>
&maxscale_zoom15;
@@ -332,52 +374,52 @@
&maxscale_zoom16;
<TextSymbolizer size="8" fill="#6699cc" dy="22"
fontset-name="oblique-fonts" halo-radius="1"
placement="interior">[ele]</TextSymbolizer>
</Rule>
- <!-- <Rule> -->
- <!-- <Filter>[amenity]='shelter'</Filter> -->
- <!-- &maxscale_zoom17; -->
- <!-- <TextSymbolizer size="9" fill="#6699cc" dy="10"
fontset-name="book-fonts" halo-radius="1"
placement="interior">[name]</TextSymbolizer> -->
- <!-- <TextSymbolizer size="8" fill="#6699cc" dy="22"
fontset-name="oblique-fonts" halo-radius="1"
placement="interior">[ele]</TextSymbolizer> -->
- <!-- </Rule> -->
- <!-- <Rule> -->
- <!-- <Filter>[amenity] = 'bank'</Filter> -->
- <!-- &maxscale_zoom17; -->
- <!-- <TextSymbolizer size="9" fill="black" dy="9"
fontset-name="book-fonts" halo-radius="1" wrap-width="0"
placement="interior">[name]</TextSymbolizer> -->
- <!-- </Rule> -->
- <!-- <Rule> -->
- <!-- <Filter>[tourism] = 'hotel' or [tourism]='hostel' or
[tourism]='chalet'</Filter> -->
- <!-- &maxscale_zoom17; -->
- <!-- <TextSymbolizer size="10" fill="#0066ff" dy="11"
fontset-name="book-fonts" halo-radius="1" wrap-width="0"
placement="interior">[name]</TextSymbolizer> -->
- <!-- </Rule> -->
- <!-- <Rule> -->
- <!-- <Filter>[amenity] = 'embassy'</Filter> -->
- <!-- &maxscale_zoom17; -->
- <!-- <TextSymbolizer size="9" fill="#0066ff" dy="8"
fontset-name="book-fonts" halo-radius="1" wrap-width="0"
placement="interior">[name]</TextSymbolizer> -->
- <!-- </Rule> -->
- <!-- <Rule> -->
- <!-- <Filter>[tourism]='guest_house'</Filter> -->
- <!-- &maxscale_zoom17; -->
- <!-- <TextSymbolizer size="8" fill="#0066ff" dy="9"
fontset-name="book-fonts" halo-radius="1" wrap-width="0"
placement="interior">[name]</TextSymbolizer> -->
- <!-- </Rule> -->
- <!-- <Rule> -->
- <!-- <Filter>[tourism]='bed_and_breakfast'</Filter> -->
- <!-- &maxscale_zoom17; -->
- <!-- <TextSymbolizer size="8" fill="#0066ff" dy="7"
fontset-name="book-fonts" halo-radius="1" wrap-width="0"
placement="interior">[name]</TextSymbolizer> -->
- <!-- </Rule> -->
- <!-- <Rule> -->
- <!-- <Filter>[amenity] = 'fuel' or [amenity]='bus_station'</Filter> -->
- <!-- &maxscale_zoom17; -->
- <!-- <TextSymbolizer size="9" fill="#0066ff" dy="9"
fontset-name="book-fonts" halo-radius="1" wrap-width="0"
placement="interior">[name]</TextSymbolizer> -->
- <!-- </Rule> -->
- <!-- <Rule> -->
- <!-- <Filter>[tourism] = 'camp_site'</Filter> -->
- <!-- &maxscale_zoom17; -->
- <!-- <TextSymbolizer size="10" fill="#0066ff" dy="15"
fontset-name="book-fonts" halo-radius="1" wrap-width="70"
placement="interior">[name]</TextSymbolizer> -->
- <!-- </Rule> -->
- <!-- <Rule> -->
- <!-- <Filter>[tourism] = 'caravan_site'</Filter> -->
- <!-- &maxscale_zoom17; -->
- <!-- <TextSymbolizer size="10" fill="#0066ff" dy="19"
fontset-name="book-fonts" halo-radius="1" wrap-width="70"
placement="interior">[name]</TextSymbolizer> -->
- <!-- </Rule> -->
+ <Rule>
+ <Filter>[amenity]='shelter'</Filter>
+ &maxscale_zoom17;
+ <TextSymbolizer size="9" fill="#6699cc" dy="10"
fontset-name="book-fonts" halo-radius="1"
placement="interior">[name]</TextSymbolizer>
+ <TextSymbolizer size="8" fill="#6699cc" dy="22"
fontset-name="oblique-fonts" halo-radius="1"
placement="interior">[ele]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[amenity] = 'bank'</Filter>
+ &maxscale_zoom17;
+ <TextSymbolizer size="9" fill="black" dy="9" fontset-name="book-fonts"
halo-radius="1" wrap-width="0" placement="interior">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[tourism] = 'hotel' or [tourism]='hostel' or
[tourism]='chalet'</Filter>
+ &maxscale_zoom17;
+ <TextSymbolizer size="10" fill="#0066ff" dy="11"
fontset-name="book-fonts" halo-radius="1" wrap-width="0"
placement="interior">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[amenity] = 'embassy'</Filter>
+ &maxscale_zoom17;
+ <TextSymbolizer size="9" fill="#0066ff" dy="8" fontset-name="book-fonts"
halo-radius="1" wrap-width="0" placement="interior">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[tourism]='guest_house'</Filter>
+ &maxscale_zoom17;
+ <TextSymbolizer size="8" fill="#0066ff" dy="9" fontset-name="book-fonts"
halo-radius="1" wrap-width="0" placement="interior">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[tourism]='bed_and_breakfast'</Filter>
+ &maxscale_zoom17;
+ <TextSymbolizer size="8" fill="#0066ff" dy="7" fontset-name="book-fonts"
halo-radius="1" wrap-width="0" placement="interior">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[amenity] = 'fuel' or [amenity]='bus_station'</Filter>
+ &maxscale_zoom17;
+ <TextSymbolizer size="9" fill="#0066ff" dy="9" fontset-name="book-fonts"
halo-radius="1" wrap-width="0" placement="interior">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[tourism] = 'camp_site'</Filter>
+ &maxscale_zoom17;
+ <TextSymbolizer size="10" fill="#0066ff" dy="15"
fontset-name="book-fonts" halo-radius="1" wrap-width="70"
placement="interior">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[tourism] = 'caravan_site'</Filter>
+ &maxscale_zoom17;
+ <TextSymbolizer size="10" fill="#0066ff" dy="19"
fontset-name="book-fonts" halo-radius="1" wrap-width="70"
placement="interior">[name]</TextSymbolizer>
+ </Rule>
<Rule>
<Filter>[waterway] = 'lock'</Filter>
&maxscale_zoom15;
@@ -389,26 +431,32 @@
&minscale_zoom16;
<TextSymbolizer size="8" fill="blue" fontset-name="book-fonts"
halo-radius="1" wrap-width="30" placement="interior">[name]</TextSymbolizer>
</Rule>
- <!-- <Rule> -->
- <!-- <Filter>[leisure] = 'marina'</Filter> -->
- <!-- &maxscale_zoom17; -->
- <!-- <TextSymbolizer size="10" fill="blue" fontset-name="book-fonts"
halo-radius="1" wrap-width="30" placement="interior">[name]</TextSymbolizer> -->
- <!-- </Rule> -->
+ <Rule>
+ <Filter>[leisure] = 'marina'</Filter>
+ &maxscale_zoom17;
+ <TextSymbolizer size="10" fill="blue" fontset-name="book-fonts"
halo-radius="1" wrap-width="30" placement="interior">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[tourism] = 'theme_park'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom15;
+ <TextSymbolizer size="8" fill="#734a08" fontset-name="book-fonts"
halo-radius="1" wrap-width="30" placement="interior">[name]</TextSymbolizer>
+ </Rule>
<Rule>
<Filter>[tourism] = 'theme_park'</Filter>
&maxscale_zoom16;
<TextSymbolizer size="10" fill="#734a08" fontset-name="book-fonts"
halo-radius="1" wrap-width="30" placement="interior">[name]</TextSymbolizer>
</Rule>
- <!-- <Rule> -->
- <!-- <Filter>[tourism]='museum'</Filter> -->
- <!-- &maxscale_zoom17; -->
- <!-- <TextSymbolizer size="10" fill="#734a08" dy="10"
fontset-name="book-fonts" halo-radius="1" wrap-width="0"
placement="interior">[name]</TextSymbolizer> -->
- <!-- </Rule> -->
- <!-- <Rule> -->
- <!-- <Filter>[amenity]='prison'</Filter> -->
- <!-- &maxscale_zoom17; -->
- <!-- <TextSymbolizer size="10" fill="#734a08" dy="16"
fontset-name="book-fonts" halo-radius="1" wrap-width="0"
placement="interior">[name]</TextSymbolizer> -->
- <!-- </Rule> -->
+ <Rule>
+ <Filter>[tourism]='museum'</Filter>
+ &maxscale_zoom17;
+ <TextSymbolizer size="10" fill="#734a08" dy="10"
fontset-name="book-fonts" halo-radius="1" wrap-width="0"
placement="interior">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[amenity]='prison'</Filter>
+ &maxscale_zoom17;
+ <TextSymbolizer size="10" fill="#734a08" dy="16"
fontset-name="book-fonts" halo-radius="1" wrap-width="0"
placement="interior">[name]</TextSymbolizer>
+ </Rule>
<Rule>
<Filter>[tourism] = 'attraction'</Filter>
&maxscale_zoom16;
@@ -420,7 +468,7 @@
<TextSymbolizer size="9" fill="#000033" fontset-name="bold-fonts"
halo-radius="1" wrap-width="16" placement="interior">[name]</TextSymbolizer>
</Rule>
<Rule>
- <Filter>[amenity] = 'school' or [amenity] = 'college' or
[amenity]='townhall'</Filter>
+ <Filter>[amenity] = 'school' or [amenity] = 'college'</Filter>
&maxscale_zoom15;
<TextSymbolizer size="9" fill="#000033" fontset-name="book-fonts"
halo-radius="1" wrap-width="14" placement="interior">[name]</TextSymbolizer>
</Rule>
@@ -434,26 +482,26 @@
&maxscale_zoom15;
<TextSymbolizer size="9" fill="#000033" dy="16"
fontset-name="book-fonts" halo-radius="2" wrap-width="12"
placement="interior">[name]</TextSymbolizer>
</Rule>
- <!-- <Rule> -->
- <!-- <Filter>[man_made] = 'windmill'</Filter> -->
- <!-- &maxscale_zoom17; -->
- <!-- <TextSymbolizer size="9" fill="#734a08" dy="12"
fontset-name="book-fonts" halo-radius="1" wrap-width="20"
placement="interior">[name]</TextSymbolizer> -->
- <!-- </Rule> -->
+ <Rule>
+ <Filter>[man_made] = 'windmill'</Filter>
+ &maxscale_zoom17;
+ <TextSymbolizer size="9" fill="#734a08" dy="12"
fontset-name="book-fonts" halo-radius="1" wrap-width="20"
placement="interior">[name]</TextSymbolizer>
+ </Rule>
<Rule>
<Filter>[amenity] = 'hospital'</Filter>
&maxscale_zoom16;
<TextSymbolizer size="8" fill="#da0092" dy="10"
fontset-name="book-fonts" halo-radius="2" wrap-width="24"
placement="interior">[name]</TextSymbolizer>
</Rule>
- <!-- <Rule> -->
- <!-- <Filter>[amenity] = 'pharmacy'</Filter> -->
- <!-- &maxscale_zoom17; -->
- <!-- <TextSymbolizer size="8" fill="#da0092" dy="9"
fontset-name="book-fonts" halo-radius="1" wrap-width="12"
placement="interior">[name]</TextSymbolizer> -->
- <!-- </Rule> -->
- <!-- <Rule> -->
- <!-- <Filter>[shop]='bakery' or [shop]='clothes' or [shop]='fashion' or
[shop]='convenience' or [shop]='doityourself' or [shop]='hairdresser' or
[shop]='butcher' or [shop]='car' or [shop]='car_repair' or [shop]='bicycle' or
[shop]='florist'</Filter> -->
- <!-- &maxscale_zoom17; -->
- <!-- <TextSymbolizer size="8" fill="#939" dy="9"
fontset-name="book-fonts" halo-radius="1" wrap-width="12"
placement="interior">[name]</TextSymbolizer> -->
- <!-- </Rule> -->
+ <Rule>
+ <Filter>[amenity] = 'pharmacy'</Filter>
+ &maxscale_zoom17;
+ <TextSymbolizer size="8" fill="#da0092" dy="9" fontset-name="book-fonts"
halo-radius="1" wrap-width="12" placement="interior">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[shop]='bakery' or [shop]='clothes' or [shop]='fashion' or
[shop]='convenience' or [shop]='doityourself' or [shop]='hairdresser' or
[shop]='butcher' or [shop]='car' or [shop]='car_repair' or [shop]='bicycle' or
[shop]='florist'</Filter>
+ &maxscale_zoom17;
+ <TextSymbolizer size="8" fill="#939" dy="9" fontset-name="book-fonts"
halo-radius="1" wrap-width="12" placement="interior">[name]</TextSymbolizer>
+ </Rule>
<Rule>
<Filter>[shop]='supermarket' or [shop]='department_store'</Filter>
&maxscale_zoom16;
@@ -464,25 +512,73 @@
&maxscale_zoom12;
<TextSymbolizer size="9" fill="pink" fontset-name="bold-fonts"
halo-radius="1" wrap-width="10" placement="interior">[name]</TextSymbolizer>
</Rule>
- <!-- <Rule> -->
- <!-- <Filter>[aeroway] = 'gate'</Filter> -->
- <!-- &maxscale_zoom17; -->
- <!-- <TextSymbolizer size="10" fill="#aa66cc" fontset-name="book-fonts"
halo-radius="1" wrap-width="10" placement="interior">[ref]</TextSymbolizer> -->
- <!-- </Rule> -->
+ <Rule>
+ <Filter>[aeroway] = 'gate'</Filter>
+ &maxscale_zoom17;
+ <TextSymbolizer size="10" fill="#aa66cc" fontset-name="book-fonts"
halo-radius="1" wrap-width="10" placement="interior">[ref]</TextSymbolizer>
+ </Rule>
</Style>
<Style name="tunnels-casing">
<Rule>
<Filter>[highway] = 'motorway' or [highway]='motorway_link'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <LineSymbolizer stroke="#506077" stroke-width="3"
stroke-dasharray="4,2"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'motorway' or [highway]='motorway_link'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke="#506077" stroke-width="6.5"
stroke-dasharray="4,2"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'motorway' or [highway]='motorway_link'</Filter>
&maxscale_zoom15;
&minscale_zoom16;
<LineSymbolizer stroke="#506077" stroke-width="10"
stroke-dasharray="4,2"/>
</Rule>
<Rule>
+ <Filter>[highway] = 'motorway' or [highway]='motorway_link'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke="#506077" stroke-width="13"
stroke-dasharray="4,2"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'trunk' or [highway] = 'trunk_link'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <LineSymbolizer stroke="#477147" stroke-width="4"
stroke-dasharray="4,2"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'trunk' or [highway] = 'trunk_link'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke="#477147" stroke-width="8"
stroke-dasharray="4,2"/>
+ </Rule>
+ <Rule>
<Filter>[highway] = 'trunk' or [highway] = 'trunk_link'</Filter>
&maxscale_zoom15;
&minscale_zoom16;
<LineSymbolizer stroke="#477147" stroke-width="11"
stroke-dasharray="4,2"/>
</Rule>
+ <Rule>
+ <Filter>[highway] = 'trunk' or [highway] = 'trunk_link'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke="#477147" stroke-width="14"
stroke-dasharray="4,2"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'primary' or [highway] = 'primary_link'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <LineSymbolizer stroke="#8d4346" stroke-width="4"
stroke-dasharray="4,2"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'primary' or [highway] = 'primary_link'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke="#8d4346" stroke-width="8"
stroke-dasharray="4,2"/>
+ </Rule>
<Rule>
<Filter>[highway] = 'primary' or [highway] = 'primary_link'</Filter>
&maxscale_zoom15;
@@ -490,12 +586,66 @@
<LineSymbolizer stroke="#8d4346" stroke-width="11"
stroke-dasharray="4,2"/>
</Rule>
<Rule>
+ <Filter>[highway] = 'primary' or [highway] = 'primary_link'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke="#8d4346" stroke-width="14"
stroke-dasharray="4,2"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'secondary' or [highway] = 'secondary_link'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <LineSymbolizer stroke="#a37b48" stroke-width="4"
stroke-dasharray="4,2"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'secondary' or [highway] = 'secondary_link'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke="#a37b48" stroke-width="10"
stroke-dasharray="4,2"/>
+ </Rule>
+ <Rule>
<Filter>[highway] = 'secondary' or [highway] = 'secondary_link'</Filter>
&maxscale_zoom15;
&minscale_zoom16;
<LineSymbolizer stroke="#a37b48" stroke-width="12"
stroke-dasharray="4,2"/>
</Rule>
<Rule>
+ <Filter>[highway] = 'secondary' or [highway] = 'secondary_link'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke="#a37b48" stroke-width="17"
stroke-dasharray="4,2"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'tertiary' or [highway]='tertiary_link'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom13;
+ <LineSymbolizer stroke="#999" stroke-width="6" stroke-dasharray="4,2"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'tertiary' or [highway]='tertiary_link'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom14;
+ <LineSymbolizer stroke="#999" stroke-width="7.5" stroke-dasharray="4,2"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'residential' or [highway] = 'unclassified' or
[highway] = 'road'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom13;
+ <LineSymbolizer stroke="#999" stroke-width="3" stroke-dasharray="4,2"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'residential' or [highway] = 'unclassified' or
[highway] = 'road'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom14;
+ <LineSymbolizer stroke="#999" stroke-width="4.5" stroke-dasharray="4,2"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'residential' or [highway] = 'unclassified' or
[highway] = 'road'</Filter>
+ &maxscale_zoom15;
+ &minscale_zoom15;
+ <LineSymbolizer stroke="#999" stroke-width="8" stroke-dasharray="4,2"/>
+ </Rule>
+ <Rule>
<Filter>[highway] = 'residential' or [highway] = 'unclassified' or
[highway] = 'road'</Filter>
&maxscale_zoom16;
&minscale_zoom16;
@@ -507,46 +657,178 @@
&minscale_zoom16;
<LineSymbolizer stroke="#999" stroke-width="11" stroke-dasharray="4,2"/>
</Rule>
+ <Rule>
+ <Filter>[highway] = 'tertiary' or [highway]='tertiary_link' or [highway]
= 'residential' or [highway] = 'unclassified' or [highway] = 'road'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke="#999" stroke-width="16" stroke-dasharray="4,2"/>
+ </Rule>
</Style>
<Style name="tunnels-fill">
<Rule>
+ <Filter>[highway] = 'motorway' or [highway]='motorway_link'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <LineSymbolizer stroke-linejoin="round" stroke="#d6dfea"
stroke-width="2" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'motorway' or [highway] = 'motorway_link'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#d6dfea"
stroke-width="5" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
<Filter>[highway] = 'motorway' or [highway] = 'motorway_link'</Filter>
&maxscale_zoom15;
&minscale_zoom16;
<LineSymbolizer stroke-linejoin="round" stroke="#d6dfea"
stroke-width="8.5" stroke-linecap="round"/>
</Rule>
<Rule>
+ <Filter>[highway] = 'motorway' or [highway] = 'motorway_link'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#d6dfea"
stroke-width="11" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'trunk' or [highway] = 'trunk_link'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <LineSymbolizer stroke-linejoin="round" stroke="#cdeacd"
stroke-width="2.5" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'trunk' or [highway] = 'trunk_link'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#cdeacd"
stroke-width="6.5" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
<Filter>[highway] = 'trunk' or [highway] = 'trunk_link'</Filter>
&maxscale_zoom15;
&minscale_zoom16;
<LineSymbolizer stroke-linejoin="round" stroke="#cdeacd"
stroke-width="9" stroke-linecap="round"/>
</Rule>
<Rule>
+ <Filter>[highway] = 'trunk' or [highway] = 'trunk_link'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#cdeacd"
stroke-width="12" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'primary' or [highway] = 'primary_link'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <LineSymbolizer stroke-linejoin="round" stroke="#f4c3c4"
stroke-width="2.5" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'primary' or [highway] = 'primary_link'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#f4c3c4"
stroke-width="6.5" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
<Filter>[highway] = 'primary' or [highway] = 'primary_link'</Filter>
&maxscale_zoom15;
&minscale_zoom16;
<LineSymbolizer stroke-linejoin="round" stroke="#f4c3c4"
stroke-width="9" stroke-linecap="round"/>
</Rule>
<Rule>
+ <Filter>[highway] = 'primary' or [highway] = 'primary_link'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#f4c3c4"
stroke-width="12" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
<Filter>[highway] = 'secondary' or [highway] = 'secondary_link'</Filter>
- &maxscale_zoom15;
- &minscale_zoom16;
- <LineSymbolizer stroke-linejoin="round" stroke="#fff" stroke-width="10"
stroke-linecap="round"/>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <LineSymbolizer stroke-linejoin="round" stroke="#fee0b8"
stroke-width="2" stroke-linecap="round"/>
</Rule>
<Rule>
- <Filter>[highway] = 'tertiary' or [highway]='tertiary_link'</Filter>
- &maxscale_zoom15;
- &minscale_zoom16;
- <LineSymbolizer stroke-linejoin="round" stroke="#fff" stroke-width="9.4"
stroke-linecap="round"/>
+ <Filter>[highway] = 'secondary' or [highway] = 'secondary_link'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#fee0b8"
stroke-width="8" stroke-linecap="round"/>
</Rule>
<Rule>
- <Filter>[highway] = 'residential' or [highway] = 'unclassified' or
[highway] = 'road'</Filter>
- &maxscale_zoom16;
+ <Filter>[highway] = 'secondary' or [highway] = 'secondary_link'</Filter>
+ &maxscale_zoom15;
&minscale_zoom16;
- <LineSymbolizer stroke-linejoin="round" stroke="#fff" stroke-width="9.4"
stroke-linecap="round"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="#fee0b8"
stroke-width="10" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'secondary' or [highway] = 'secondary_link'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#fee0b8"
stroke-width="14" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'tertiary' or [highway]='tertiary_link'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom13;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ffc" stroke-width="5"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'tertiary' or [highway]='tertiary_link'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ffc" stroke-width="6.5"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'residential' or [highway] = 'unclassified' or
[highway] = 'road'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom13;
+ <LineSymbolizer stroke-linejoin="round" stroke="#fff" stroke-width="2"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'residential' or [highway] = 'unclassified' or
[highway] = 'road'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#fff" stroke-width="3"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'tertiary' or [highway]='tertiary_link'</Filter>
+ &maxscale_zoom15;
+ &minscale_zoom16;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ffc" stroke-width="9.4"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'tertiary' or [highway]='tertiary_link'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ffc" stroke-width="13"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'residential' or [highway] = 'unclassified' or
[highway] = 'road'</Filter>
+ &maxscale_zoom15;
+ &minscale_zoom15;
+ <LineSymbolizer stroke-linejoin="round" stroke="#fff" stroke-width="6.5"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'residential' or [highway] = 'unclassified' or
[highway] = 'road'</Filter>
+ &maxscale_zoom16;
+ &minscale_zoom16;
+ <LineSymbolizer stroke-linejoin="round" stroke="#fff" stroke-width="9.4"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'residential' or [highway] = 'unclassified' or
[highway] = 'road'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#fff" stroke-width="13"
stroke-linecap="round"/>
+ </Rule>
+</Style>
+<Style name="minor-roads-casing-links">
+ <Rule>
+ <Filter>[highway]='raceway'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <LineSymbolizer stroke-linejoin="round" stroke="pink"
stroke-width="1.2"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway]='raceway'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="pink" stroke-width="4"/>
</Rule>
-</Style>
-<Style name="minor-roads-casing-links">
<Rule>
<Filter>[highway]='raceway'</Filter>
&maxscale_zoom15;
@@ -555,77 +837,287 @@
</Rule>
<Rule>
<Filter>[highway]='motorway_link' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <LineSymbolizer stroke-linejoin="round" stroke="#506077"
stroke-width="1.5"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway]='motorway_link' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#506077"
stroke-width="4.5"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway]='motorway_link' and not [tunnel] = 'yes'</Filter>
&maxscale_zoom15;
&minscale_zoom16;
- <LineSymbolizer stroke-linejoin="round" stroke="black" stroke-width="8"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="#506077"
stroke-width="8"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway]='motorway_link' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#506077"
stroke-width="11"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'trunk_link' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <LineSymbolizer stroke-linejoin="round" stroke="#477147"
stroke-width="3"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'trunk_link' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#477147"
stroke-width="7.5"/>
</Rule>
<Rule>
<Filter>[highway] = 'trunk_link' and not [tunnel] = 'yes'</Filter>
&maxscale_zoom15;
&minscale_zoom16;
- <LineSymbolizer stroke-linejoin="round" stroke="black"
stroke-width="11.5"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="#477147"
stroke-width="11.5"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'trunk_link' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#477147"
stroke-width="16"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'primary_link' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <LineSymbolizer stroke-linejoin="round" stroke="#8d4346"
stroke-width="3"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'primary_link' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#8d4346"
stroke-width="7.5"/>
</Rule>
<Rule>
<Filter>[highway] = 'primary_link' and not [tunnel] = 'yes'</Filter>
&maxscale_zoom15;
&minscale_zoom16;
- <LineSymbolizer stroke-linejoin="round" stroke="black"
stroke-width="11.5"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="#8d4346"
stroke-width="11.5"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'primary_link' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#8d4346"
stroke-width="16"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'secondary_link' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <LineSymbolizer stroke-linejoin="round" stroke="#a37b48"
stroke-width="2.5" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'secondary_link' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#a37b48"
stroke-width="8.5" stroke-linecap="round"/>
</Rule>
<Rule>
<Filter>[highway] = 'secondary_link' and not [tunnel] = 'yes'</Filter>
&maxscale_zoom15;
&minscale_zoom16;
- <LineSymbolizer stroke-linejoin="round" stroke="black"
stroke-width="11.5" stroke-linecap="round"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="#a37b48"
stroke-width="11.5" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'secondary_link' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#a37b48"
stroke-width="16" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'tertiary_link' and not [tunnel]='yes'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom13;
+ <LineSymbolizer stroke-linejoin="round" stroke="#bbb" stroke-width="6"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'tertiary_link' and not [tunnel]='yes'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#bbb" stroke-width="7.5"
stroke-linecap="round"/>
</Rule>
<Rule>
<Filter>[highway] = 'tertiary_link' and not [tunnel]='yes'</Filter>
&maxscale_zoom15;
&minscale_zoom16;
- <LineSymbolizer stroke-linejoin="round" stroke="black" stroke-width="11"
stroke-linecap="round"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="#bbb" stroke-width="11"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'tertiary_link' and not [tunnel]='yes'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#bbb" stroke-width="16"
stroke-linecap="round"/>
</Rule>
</Style>
<Style name="minor-roads-casing">
<Rule>
<Filter>[highway] = 'motorway' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <LineSymbolizer stroke-linejoin="round" stroke="#506077"
stroke-width="3"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'trunk' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <LineSymbolizer stroke-linejoin="round" stroke="#477147"
stroke-width="3"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'primary' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <LineSymbolizer stroke-linejoin="round" stroke="#8d4346"
stroke-width="3"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'secondary' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <LineSymbolizer stroke-linejoin="round" stroke="#a37b48"
stroke-width="2.5" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'motorway' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#506077"
stroke-width="6.5"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'trunk' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#477147"
stroke-width="7.5"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'primary' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#8d4346"
stroke-width="7.5"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'secondary' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#a37b48"
stroke-width="8.5" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'motorway' and not [tunnel] = 'yes'</Filter>
&maxscale_zoom15;
&minscale_zoom16;
- <LineSymbolizer stroke-linejoin="round" stroke="black"
stroke-width="14"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="#506077"
stroke-width="10"/>
</Rule>
<Rule>
<Filter>[highway] = 'trunk' and not [tunnel] = 'yes'</Filter>
&maxscale_zoom15;
&minscale_zoom16;
- <LineSymbolizer stroke-linejoin="round" stroke="black"
stroke-width="13.5"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="#477147"
stroke-width="11.5"/>
</Rule>
<Rule>
<Filter>[highway] = 'primary' and not [tunnel] = 'yes'</Filter>
&maxscale_zoom15;
&minscale_zoom16;
- <LineSymbolizer stroke-linejoin="round" stroke="black"
stroke-width="13.5"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="#8d4346"
stroke-width="11.5"/>
</Rule>
<Rule>
<Filter>[highway] = 'secondary' and not [tunnel] = 'yes'</Filter>
&maxscale_zoom15;
&minscale_zoom16;
- <LineSymbolizer stroke-linejoin="round" stroke="black"
stroke-width="13.5" stroke-linecap="round"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="#a37b48"
stroke-width="11.5" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'motorway' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#506077"
stroke-width="13"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'trunk' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#477147"
stroke-width="16"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'primary' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#8d4346"
stroke-width="16"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'secondary' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#a37b48"
stroke-width="16" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'tertiary' and not [tunnel]='yes'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom13;
+ <LineSymbolizer stroke-linejoin="round" stroke="#bbb" stroke-width="6"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>([highway] = 'residential' or [highway] = 'unclassified' or
[highway] = 'road') and not [tunnel]='yes'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom13;
+ <LineSymbolizer stroke-linejoin="round" stroke="#999" stroke-width="3"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'tertiary' and not [tunnel]='yes'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#bbb" stroke-width="7.5"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>([highway] = 'residential' or [highway] = 'unclassified' or
[highway] = 'road') and not [tunnel]='yes'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#999" stroke-width="4.5"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>([highway] = 'residential' or [highway] = 'unclassified' or
[highway] = 'road') and not [tunnel]='yes'</Filter>
+ &maxscale_zoom15;
+ &minscale_zoom15;
+ <LineSymbolizer stroke-linejoin="round" stroke="#bbb" stroke-width="8"
stroke-linecap="round"/>
</Rule>
<Rule>
<Filter>([highway] = 'residential' or [highway] = 'unclassified' or
[highway] = 'road') and not [tunnel]='yes'</Filter>
&maxscale_zoom16;
&minscale_zoom16;
- <LineSymbolizer stroke-linejoin="round" stroke="black" stroke-width="11"
stroke-linecap="round"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="#bbb" stroke-width="11"
stroke-linecap="round"/>
</Rule>
<Rule>
<Filter>[highway] = 'tertiary' and not [tunnel]='yes'</Filter>
&maxscale_zoom15;
&minscale_zoom16;
- <LineSymbolizer stroke-linejoin="round" stroke="black" stroke-width="11"
stroke-linecap="round"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="#bbb" stroke-width="11"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>([highway] = 'tertiary' or [highway] = 'residential' or
[highway] = 'unclassified' or [highway] = 'road') and not
[tunnel]='yes'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#bbb" stroke-width="16"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'service' and not ([service]='INT-minor' or
[tunnel]='yes')</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom15;
+ <LineSymbolizer stroke-linejoin="round" stroke="#999" stroke-width="2.5"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'service' and [tunnel]='yes'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom15;
+ <LineSymbolizer stroke="#999" stroke-width="2.5" stroke-dasharray="4,2"/>
</Rule>
<Rule>
<Filter>[highway] = 'service' and not ([service]='INT-minor' or
[tunnel]='yes')</Filter>
&maxscale_zoom16;
&minscale_zoom18;
- <LineSymbolizer stroke-linejoin="round" stroke="black" stroke-width="7"
stroke-linecap="round"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="#999" stroke-width="7"
stroke-linecap="round"/>
</Rule>
<Rule>
<Filter>[highway] = 'service' and [tunnel]='yes'</Filter>
@@ -641,6 +1133,42 @@
</Rule>
<Rule>
<Filter>[highway] = 'pedestrian' and not [tunnel]='yes'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom13;
+ <LineSymbolizer stroke-linejoin="round" stroke="grey" stroke-width="2"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'pedestrian' and [tunnel]='yes'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom13;
+ <LineSymbolizer stroke="grey" stroke-width="2" stroke-dasharray="4,2"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'pedestrian' and not [tunnel]='yes'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="grey" stroke-width="3.6"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'pedestrian' and [tunnel]='yes'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom14;
+ <LineSymbolizer stroke="grey" stroke-width="3.6" stroke-dasharray="4,2"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'pedestrian' and not [tunnel]='yes'</Filter>
+ &maxscale_zoom15;
+ &minscale_zoom15;
+ <LineSymbolizer stroke-linejoin="round" stroke="grey" stroke-width="6.5"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'pedestrian' and [tunnel]='yes'</Filter>
+ &maxscale_zoom15;
+ &minscale_zoom15;
+ <LineSymbolizer stroke="grey" stroke-width="6.5" stroke-dasharray="4,2"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'pedestrian' and not [tunnel]='yes'</Filter>
&maxscale_zoom16;
<LineSymbolizer stroke-linejoin="round" stroke="grey" stroke-width="9"
stroke-linecap="round"/>
</Rule>
@@ -649,47 +1177,252 @@
&maxscale_zoom16;
<LineSymbolizer stroke="grey" stroke-width="9" stroke-dasharray="4,2"/>
</Rule>
+ <Rule>
+ <Filter>[highway] = 'living_street'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom13;
+ <LineSymbolizer stroke-linejoin="round" stroke="white"
stroke-width="2.5" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'living_street'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="white" stroke-width="4"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'living_street'</Filter>
+ &maxscale_zoom15;
+ &minscale_zoom15;
+ <LineSymbolizer stroke-linejoin="round" stroke="white" stroke-width="6"
stroke-linecap="round"/>
+ </Rule>
<Rule>
<Filter>[highway] = 'living_street'</Filter>
&maxscale_zoom16;
&minscale_zoom16;
<LineSymbolizer stroke-linejoin="round" stroke="white" stroke-width="9"
stroke-linecap="round"/>
</Rule>
+ <Rule>
+ <Filter>[highway] = 'living_street'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="white"
stroke-width="14.5" stroke-linecap="round"/>
+ </Rule>
</Style>
<Style name="minor-roads-fill-links">
<Rule>
+ <Filter>[highway]='motorway_link' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <LineSymbolizer stroke="#809bc0" stroke-width="0.5"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'motorway_link' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#809bc0"
stroke-width="3" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
<Filter>[highway] = 'motorway_link' and not [tunnel] = 'yes'</Filter>
&maxscale_zoom15;
&minscale_zoom16;
- <LineSymbolizer stroke-linejoin="round" stroke="white"
stroke-width="6.5" stroke-linecap="round"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="#809bc0"
stroke-width="6.5" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'motorway_link' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#809bc0"
stroke-width="9" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'trunk_link' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <LineSymbolizer stroke-linejoin="round" stroke="#a9dba9"
stroke-width="2.5" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'trunk_link' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#a9dba9"
stroke-width="7" stroke-linecap="round"/>
</Rule>
<Rule>
<Filter>[highway] = 'trunk_link' and not [tunnel] = 'yes'</Filter>
&maxscale_zoom15;
&minscale_zoom16;
- <LineSymbolizer stroke-linejoin="round" stroke="white" stroke-width="11"
stroke-linecap="round"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="#a9dba9"
stroke-width="11" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'trunk_link' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#a9dba9"
stroke-width="15.5" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'primary_link' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ec989a"
stroke-width="2.5" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'primary_link' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ec989a"
stroke-width="7" stroke-linecap="round"/>
</Rule>
<Rule>
<Filter>[highway] = 'primary_link' and not [tunnel] = 'yes'</Filter>
&maxscale_zoom15;
&minscale_zoom16;
- <LineSymbolizer stroke-linejoin="round" stroke="white" stroke-width="11"
stroke-linecap="round"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="#ec989a"
stroke-width="11" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'primary_link' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ec989a"
stroke-width="15.5" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'secondary_link' and not [tunnel]='yes'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <LineSymbolizer stroke-linejoin="round" stroke="#fed7a5"
stroke-width="2" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'secondary_link' and not [tunnel]='yes'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#fed7a5"
stroke-width="8" stroke-linecap="round"/>
</Rule>
<Rule>
<Filter>[highway] = 'secondary_link' and not [tunnel]='yes'</Filter>
&maxscale_zoom15;
&minscale_zoom16;
- <LineSymbolizer stroke-linejoin="round" stroke="white" stroke-width="11"
stroke-linecap="round"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="#fed7a5"
stroke-width="11" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'secondary_link' and not [tunnel]='yes'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#fed7a5"
stroke-width="15.5" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'tertiary_link' and not [tunnel]='yes'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom13;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ffffb3"
stroke-width="4.5" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'tertiary_link' and not [tunnel]='yes'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ffffb3"
stroke-width="6" stroke-linecap="round"/>
</Rule>
<Rule>
<Filter>[highway] = 'tertiary_link' and not [tunnel]='yes'</Filter>
&maxscale_zoom15;
&minscale_zoom16;
- <LineSymbolizer stroke-linejoin="round" stroke="white"
stroke-width="9.4" stroke-linecap="round"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="#ffffb3"
stroke-width="9.4" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'tertiary_link' and not [tunnel]='yes'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ffffb3"
stroke-width="13" stroke-linecap="round"/>
</Rule>
</Style>
<Style name="minor-roads-fill">
<Rule>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <Filter>([highway] = 'proposed' or [highway]='construction') and not
[construction] != ''</Filter>
+ <LineSymbolizer stroke="#9cc" stroke-width="2"/>
+ <LineSymbolizer stroke="white" stroke-width="2" stroke-dasharray="4,2"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <Filter>([highway] = 'proposed' or [highway]='construction') and
([construction]='motorway' or [construction]='motorway_link')</Filter>
+ <LineSymbolizer stroke="#809bc0" stroke-width="2"/>
+ <LineSymbolizer stroke="white" stroke-width="2" stroke-dasharray="4,2"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <Filter>([highway] = 'proposed' or [highway]='construction') and
([construction]='trunk' or [construction]='trunk_link')</Filter>
+ <LineSymbolizer stroke="#a9dba9" stroke-width="2"/>
+ <LineSymbolizer stroke="white" stroke-width="2" stroke-dasharray="4,2"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <Filter>([highway] = 'proposed' or [highway]='construction') and
([construction]='primary' or [construction]='primary_link')</Filter>
+ <LineSymbolizer stroke="#ec989a" stroke-width="2"/>
+ <LineSymbolizer stroke="white" stroke-width="2" stroke-dasharray="4,2"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <Filter>([highway] = 'proposed' or [highway]='construction') and
([construction]='secondary' or [construction]='secondary_link')</Filter>
+ <LineSymbolizer stroke="#fed7a5" stroke-width="2"/>
+ <LineSymbolizer stroke="white" stroke-width="2" stroke-dasharray="4,2"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom13;
+ &minscale_zoom15;
+ <Filter>([highway] = 'proposed' or [highway]='construction') and not
[construction] != ''</Filter>
+ <LineSymbolizer stroke="#9cc" stroke-width="4"/>
+ <LineSymbolizer stroke="white" stroke-width="3.5"
stroke-dasharray="6,4"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom13;
+ &minscale_zoom15;
+ <Filter>([highway] = 'proposed' or [highway]='construction') and
([construction]='motorway' or [construction]='motorway_link')</Filter>
+ <LineSymbolizer stroke="#809bc0" stroke-width="4"/>
+ <LineSymbolizer stroke="white" stroke-width="3.5"
stroke-dasharray="6,4"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom13;
+ &minscale_zoom15;
+ <Filter>([highway] = 'proposed' or [highway]='construction') and
([construction]='trunk' or [construction]='trunk_link')</Filter>
+ <LineSymbolizer stroke="#a9dba9" stroke-width="4"/>
+ <LineSymbolizer stroke="white" stroke-width="3.5"
stroke-dasharray="6,4"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom13;
+ &minscale_zoom15;
+ <Filter>([highway] = 'proposed' or [highway]='construction') and
([construction]='primary' or [construction]='primary_link')</Filter>
+ <LineSymbolizer stroke="#ec989a" stroke-width="4"/>
+ <LineSymbolizer stroke="white" stroke-width="3.5"
stroke-dasharray="6,4"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom13;
+ &minscale_zoom15;
+ <Filter>([highway] = 'proposed' or [highway]='construction') and
([construction]='secondary' or [construction]='secondary_link')</Filter>
+ <LineSymbolizer stroke="#fed7a5" stroke-width="4"/>
+ <LineSymbolizer stroke="white" stroke-width="3.5"
stroke-dasharray="6,4"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom13;
+ &minscale_zoom15;
+ <Filter>([highway] = 'proposed' or [highway]='construction') and
([construction]='tertiary' or [construction]='tertiary_link')</Filter>
+ <LineSymbolizer stroke="#ffffb3" stroke-width="4"/>
+ <LineSymbolizer stroke="white" stroke-width="3.5"
stroke-dasharray="6,4"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom13;
+ &minscale_zoom15;
+ <Filter>([highway] = 'proposed' or [highway]='construction') and
([construction]='residential' or [construction]='unclassified' or
[construction]='living_street')</Filter>
+ <LineSymbolizer stroke-linejoin="round" stroke="#aaa" stroke-width="4"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="white"
stroke-width="3.5" stroke-dasharray="6,4"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom14;
+ &minscale_zoom15;
+ <Filter>([highway] = 'proposed' or [highway]='construction') and
[construction]='service'</Filter>
+ <LineSymbolizer stroke-linejoin="round" stroke="#aaa"
stroke-width="2.5"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="white" stroke-width="2"
stroke-dasharray="6,4"/>
+ </Rule>
+ <Rule>
&maxscale_zoom16;
&minscale_zoom18;
<Filter>([highway] = 'proposed' or [highway]='construction') and not
[construction] != ''</Filter>
@@ -754,27 +1487,99 @@
</Rule>
<Rule>
<Filter>[highway] = 'motorway' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <LineSymbolizer stroke="#809bc0" stroke-width="2"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'motorway' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#809bc0"
stroke-width="5" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'motorway' and not [tunnel] = 'yes'</Filter>
&maxscale_zoom15;
&minscale_zoom16;
- <LineSymbolizer stroke-linejoin="round" stroke="white"
stroke-width="10.5" stroke-linecap="round"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="#809bc0"
stroke-width="8.5" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'motorway' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#809bc0"
stroke-width="11" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'trunk' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <LineSymbolizer stroke-linejoin="round" stroke="#a9dba9"
stroke-width="2.5" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'trunk' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#a9dba9"
stroke-width="7" stroke-linecap="round"/>
</Rule>
<Rule>
<Filter>[highway] = 'trunk' and not [tunnel] = 'yes'</Filter>
&maxscale_zoom15;
&minscale_zoom16;
- <LineSymbolizer stroke-linejoin="round" stroke="white" stroke-width="11"
stroke-linecap="round"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="#a9dba9"
stroke-width="11" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'trunk' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#a9dba9"
stroke-width="15.5" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'primary' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom11;
+ &minscale_zoom12;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ec989a"
stroke-width="2.5" stroke-linecap="round"/>
</Rule>
<Rule>
<Filter>[highway] = 'primary' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ec989a"
stroke-width="7" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'primary' and not [tunnel] = 'yes'</Filter>
&maxscale_zoom15;
&minscale_zoom16;
- <LineSymbolizer stroke-linejoin="round" stroke="white" stroke-width="11"
stroke-linecap="round"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="#ec989a"
stroke-width="11" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'primary' and not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ec989a"
stroke-width="15.5" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'secondary' and not [tunnel]='yes'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <LineSymbolizer stroke-linejoin="round" stroke="#fed7a5"
stroke-width="2" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'secondary' and not [tunnel]='yes'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#fed7a5"
stroke-width="8" stroke-linecap="round"/>
</Rule>
<Rule>
<Filter>[highway] = 'secondary' and not [tunnel]='yes'</Filter>
&maxscale_zoom15;
&minscale_zoom16;
- <LineSymbolizer stroke-linejoin="round" stroke="white" stroke-width="11"
stroke-linecap="round"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="#fed7a5"
stroke-width="11" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'secondary' and not [tunnel]='yes'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#fed7a5"
stroke-width="15.5" stroke-linecap="round"/>
</Rule>
<Rule>
&maxscale_zoom13;
@@ -795,6 +1600,13 @@
<LineSymbolizer stroke-linejoin="round" stroke="grey" stroke-width="2"
stroke-dasharray="2,4"/>
</Rule>
<Rule>
+ &maxscale_zoom13;
+ &minscale_zoom13;
+ <Filter>[railway] = 'rail' and not [tunnel] = 'yes'</Filter>
+ <LineSymbolizer stroke-linejoin="round" stroke="#999999"
stroke-width="3"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="white" stroke-width="1"
stroke-dasharray="8,12"/>
+ </Rule>
+ <Rule>
&maxscale_zoom14;
&minscale_zoom18;
<Filter>[railway] = 'rail' and not [tunnel]='yes'</Filter>
@@ -802,6 +1614,12 @@
<LineSymbolizer stroke-linejoin="round" stroke="white" stroke-width="1"
stroke-dasharray="0,11,8,1"/>
</Rule>
<Rule>
+ &maxscale_zoom11;
+ &minscale_zoom12;
+ <Filter>[railway] = 'spur-siding-yard'</Filter>
+ <LineSymbolizer stroke-linejoin="round" stroke="#aaa" stroke-width="1"/>
+ </Rule>
+ <Rule>
&maxscale_zoom13;
&minscale_zoom18;
<Filter>[railway] = 'spur-siding-yard' and [tunnel] = 'yes'</Filter>
@@ -842,6 +1660,12 @@
<LineSymbolizer stroke="#999" stroke-width="3" stroke-dasharray="1,10"/>
</Rule>
<Rule>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <Filter>[railway]='tram' and [tunnel]='yes'</Filter>
+ <LineSymbolizer stroke="#444" stroke-width="1" stroke-dasharray="5,3"/>
+ </Rule>
+ <Rule>
&maxscale_zoom15;
&minscale_zoom18;
<Filter>[railway]='tram' and [tunnel]='yes'</Filter>
@@ -872,29 +1696,137 @@
<LineSymbolizer stroke="#999" stroke-width="2"/>
</Rule>
<Rule>
+ <Filter>[highway] = 'tertiary' or [highway] = 'residential' or [highway]
= 'unclassified' or [highway] = 'road'</Filter>
+ &maxscale_zoom10;
+ &minscale_zoom12;
+ <LineSymbolizer stroke="#bbb" stroke-width="1"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'road'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom13;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ddd" stroke-width="2"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'road'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ddd" stroke-width="3"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'road'</Filter>
+ &maxscale_zoom15;
+ &minscale_zoom15;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ddd" stroke-width="6.5"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
<Filter>[highway] = 'road'</Filter>
&maxscale_zoom16;
&minscale_zoom16;
<LineSymbolizer stroke-linejoin="round" stroke="#ddd" stroke-width="9.4"
stroke-linecap="round"/>
</Rule>
<Rule>
- <Filter>([highway] = 'residential' or [highway] = 'unclassified') and
not [tunnel] = 'yes'</Filter>
- &maxscale_zoom16;
- &minscale_zoom16;
- <LineSymbolizer stroke-linejoin="round" stroke="#fff" stroke-width="9.4"
stroke-linecap="round"/>
+ <Filter>[highway] = 'road'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ddd" stroke-width="13"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>([highway] = 'residential' or [highway] = 'unclassified') and
not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom13;
+ <LineSymbolizer stroke-linejoin="round" stroke="#fff" stroke-width="2"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>([highway] = 'residential' or [highway] = 'unclassified') and
not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#fff" stroke-width="3"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>([highway] = 'residential' or [highway] = 'unclassified') and
not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom15;
+ &minscale_zoom15;
+ <LineSymbolizer stroke-linejoin="round" stroke="#fff" stroke-width="6.5"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>([highway] = 'residential' or [highway] = 'unclassified') and
not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom16;
+ &minscale_zoom16;
+ <LineSymbolizer stroke-linejoin="round" stroke="#fff" stroke-width="9.4"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>([highway] = 'residential' or [highway] = 'unclassified') and
not [tunnel] = 'yes'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#fff" stroke-width="13"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'living_street'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom13;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ccc" stroke-width="1.5"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'living_street'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ccc" stroke-width="3"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'living_street'</Filter>
+ &maxscale_zoom15;
+ &minscale_zoom15;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ccc" stroke-width="4.7"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'living_street'</Filter>
+ &maxscale_zoom16;
+ &minscale_zoom16;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ccc" stroke-width="7.4"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'living_street'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ccc" stroke-width="13"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'tertiary' and not [tunnel]='yes'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom13;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ffffb3"
stroke-width="4.5" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'tertiary' and not [tunnel]='yes'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ffffb3"
stroke-width="6" stroke-linecap="round"/>
</Rule>
<Rule>
- <Filter>[highway] = 'living_street'</Filter>
- &maxscale_zoom16;
+ <Filter>[highway] = 'tertiary' and not [tunnel]='yes'</Filter>
+ &maxscale_zoom15;
&minscale_zoom16;
- <LineSymbolizer stroke-linejoin="round" stroke="#ccc" stroke-width="7.4"
stroke-linecap="round"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="#ffffb3"
stroke-width="9.4" stroke-linecap="round"/>
</Rule>
<Rule>
<Filter>[highway] = 'tertiary' and not [tunnel]='yes'</Filter>
- &maxscale_zoom15;
- &minscale_zoom16;
- <LineSymbolizer stroke-linejoin="round" stroke="#fff" stroke-width="9.4"
stroke-linecap="round"/>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ffffb3"
stroke-width="13" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'service' and not [service]='INT-minor'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom13;
+ <LineSymbolizer stroke="#bbbbbb" stroke-width="1"/>
</Rule>
+ <Rule>
+ <Filter>[highway] = 'service' and not [service]='INT-minor'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom15;
+ <LineSymbolizer stroke-linejoin="round" stroke="white" stroke-width="2"
stroke-linecap="round"/>
+ </Rule>
<Rule>
<Filter>[highway] = 'service' and not [service]='INT-minor'</Filter>
&maxscale_zoom16;
@@ -907,6 +1839,24 @@
&minscale_zoom18;
<LineSymbolizer stroke-linejoin="round" stroke="#fff" stroke-width="3"
stroke-linecap="round"/>
</Rule>
+ <Rule>
+ <Filter>[highway] = 'pedestrian'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom13;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ededed"
stroke-width="1.5" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'pedestrian'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ededed"
stroke-width="3" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'pedestrian'</Filter>
+ &maxscale_zoom15;
+ &minscale_zoom15;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ededed"
stroke-width="5.5" stroke-linecap="round"/>
+ </Rule>
<Rule>
<Filter>[highway] = 'pedestrian'</Filter>
&maxscale_zoom16;
@@ -951,6 +1901,13 @@
<LineSymbolizer stroke-linejoin="round" stroke="#bbbbbb"
stroke-width="4" stroke-linecap="round"/>
</Rule>
<Rule>
+ <Filter>[highway] = 'steps'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke="#fff" stroke-width="6" stroke-opacity="0.4"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="salmon"
stroke-width="2.0" stroke-dasharray="1,3" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
<Filter>([highway] = 'cycleway' or ([highway] = 'path' and [bicycle] =
'designated')) and not [tunnel] = 'yes'</Filter>
&maxscale_zoom13;
<LineSymbolizer stroke-linejoin="round" stroke="white" stroke-width="3"
stroke-linecap="round" stroke-opacity="0.4"/>
@@ -963,17 +1920,61 @@
<LineSymbolizer stroke-linejoin="round" stroke="#ffcc00"
stroke-width="1.5" stroke-dasharray="3,4" stroke-linecap="round"/>
</Rule>
<Rule>
+ <Filter>[highway] = 'track'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom13;
+ <LineSymbolizer stroke-linejoin="round" stroke="white"
stroke-width="2.5" stroke-linecap="round" stroke-opacity="0.4"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="#996600"
stroke-width="1.2" stroke-dasharray="3,4" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'unsurfaced'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom13;
+ <LineSymbolizer stroke-linejoin="round" stroke="#fff" stroke-width="3.5"
stroke-linecap="round" stroke-opacity="0.4"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="#debd9c"
stroke-width="2.5" stroke-dasharray="2,4" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
<Filter>[highway] = 'unsurfaced'</Filter>
&maxscale_zoom14;
<LineSymbolizer stroke-linejoin="round" stroke="#fff" stroke-width="5"
stroke-linecap="round" stroke-opacity="0.4"/>
<LineSymbolizer stroke-linejoin="round" stroke="#debd9c"
stroke-width="4" stroke-dasharray="4,6" stroke-linecap="round"/>
</Rule>
<Rule>
+ <Filter>[aeroway] = 'runway'</Filter>
+ &maxscale_zoom11;
+ &minscale_zoom11;
+ <LineSymbolizer stroke="#bbc" stroke-width="2"/>
+ </Rule>
+ <Rule>
+ <Filter>[aeroway] = 'runway'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <LineSymbolizer stroke="#bbc" stroke-width="4"/>
+ </Rule>
+ <Rule>
+ <Filter>[aeroway] = 'runway'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom13;
+ <LineSymbolizer stroke="#bbc" stroke-width="7"/>
+ </Rule>
+ <Rule>
<Filter>[aeroway] = 'runway' and not [bridge]='yes'</Filter>
&maxscale_zoom14;
<LineSymbolizer stroke="#bbc" stroke-width="18"/>
</Rule>
<Rule>
+ <Filter>[aeroway] = 'taxiway'</Filter>
+ &maxscale_zoom11;
+ &minscale_zoom13;
+ <LineSymbolizer stroke="#bbc" stroke-width="1"/>
+ </Rule>
+ <Rule>
+ <Filter>[aeroway] = 'taxiway' and not [bridge]='yes'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom14;
+ <LineSymbolizer stroke="#bbc" stroke-width="4"/>
+ </Rule>
+ <Rule>
<Filter>[aeroway] = 'taxiway' and not [bridge]='yes'</Filter>
&maxscale_zoom15;
<LineSymbolizer stroke="#bbc" stroke-width="6"/>
@@ -981,16 +1982,52 @@
</Style>
<Style name="access">
<Rule>
+ <Filter>[access] = 'permissive' and ([highway]='unclassified' or
[highway]='residential' or [highway]='footway')</Filter>
+ &maxscale_zoom15;
+ &minscale_zoom15;
+ <LineSymbolizer stroke-linejoin="round" stroke-opacity="0.5"
stroke="#cf9" stroke-linecap="round" stroke-dasharray="6,8" stroke-width="6"/>
+ </Rule>
+ <Rule>
+ <Filter>[access] = 'permissive' and ([highway] = 'service' and not
[service] = 'INT-minor')</Filter>
+ &maxscale_zoom15;
+ &minscale_zoom15;
+ <LineSymbolizer stroke-linejoin="round" stroke-opacity="0.5"
stroke="#cf9" stroke-linecap="round" stroke-dasharray="6,8" stroke-width="3"/>
+ </Rule>
+ <Rule>
<Filter>[access] = 'permissive' and ([highway]='unclassified' or
[highway]='residential' or [highway]='footway' or [highway]='service')</Filter>
&maxscale_zoom16;
<LineSymbolizer stroke-linejoin="round" stroke-opacity="0.5"
stroke="#cf9" stroke-linecap="round" stroke-dasharray="6,8" stroke-width="6"/>
</Rule>
<Rule>
+ <Filter>[access]='destination' and ([highway]='unclassified' or
[highway]='residential')</Filter>
+ &maxscale_zoom15;
+ &minscale_zoom15;
+ <LineSymbolizer stroke-linejoin="round" stroke-opacity="0.5"
stroke="#c2e0ff" stroke-linecap="round" stroke-dasharray="6,8"
stroke-width="6"/>
+ </Rule>
+ <Rule>
+ <Filter>[access]='destination' and ([highway] = 'service' and not
[service] = 'INT-minor')</Filter>
+ &maxscale_zoom15;
+ &minscale_zoom15;
+ <LineSymbolizer stroke-linejoin="round" stroke-opacity="0.5"
stroke="#c2e0ff" stroke-linecap="round" stroke-dasharray="6,8"
stroke-width="3"/>
+ </Rule>
+ <Rule>
<Filter>[access]='destination' and ([highway]='unclassified' or
[highway]='residential' or [highway]='service')</Filter>
&maxscale_zoom16;
<LineSymbolizer stroke-linejoin="round" stroke-opacity="0.5"
stroke="#c2e0ff" stroke-linecap="round" stroke-dasharray="6,8"
stroke-width="6"/>
</Rule>
<Rule>
+ <Filter>([access] = 'private' or [access] = 'no') and not [highway] =
'service'</Filter>
+ &maxscale_zoom15;
+ &minscale_zoom15;
+ <LineSymbolizer stroke-linejoin="round" stroke-opacity="0.5"
stroke="#efa9a9" stroke-linecap="round" stroke-dasharray="6,8"
stroke-width="6"/>
+ </Rule>
+ <Rule>
+ <Filter>([access] = 'private' or [access] = 'no') and ([highway] =
'service' and not [service] = 'INT-minor')</Filter>
+ &maxscale_zoom15;
+ &minscale_zoom15;
+ <LineSymbolizer stroke-linejoin="round" stroke-opacity="0.5"
stroke="#efa9a9" stroke-linecap="round" stroke-dasharray="6,8"
stroke-width="3"/>
+ </Rule>
+ <Rule>
<Filter>[access] = 'private' or [access] = 'no'</Filter>
&maxscale_zoom16;
<LineSymbolizer stroke-linejoin="round" stroke-opacity="0.5"
stroke="#efa9a9" stroke-linecap="round" stroke-dasharray="6,8"
stroke-width="6"/>
@@ -1116,43 +2153,152 @@
<LineSymbolizer stroke-linejoin="round" stroke="#b5d0d0"
stroke-width="6" stroke-linecap="round"/>
<TextSymbolizer size="9" fill="#6699cc" placement="line"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
</Rule>
+ <Rule>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#000" stroke-width="11"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="#b5d0d0"
stroke-width="10" stroke-linecap="round"/>
+ <TextSymbolizer size="9" fill="#6699cc" placement="line"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
+ </Rule>
</Style>
<Style name="bridges_casing">
+ <Rule>
+ <Filter>[highway] = 'motorway' or [highway]='motorway_link'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <LineSymbolizer stroke="#506077" stroke-width="3"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'motorway' or [highway]='motorway_link'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke="black" stroke-width="6.5"/>
+ </Rule>
<Rule>
<Filter>[highway] = 'motorway' or [highway]='motorway_link'</Filter>
&maxscale_zoom15;
&minscale_zoom16;
- <LineSymbolizer stroke="black" stroke-width="11"/>
+ <LineSymbolizer stroke="black" stroke-width="9"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'motorway' or [highway]='motorway_link'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke="black" stroke-width="12"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'trunk' or [highway]='trunk_link'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <LineSymbolizer stroke="#477147" stroke-width="4"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'trunk' or [highway]='trunk_link'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke="black" stroke-width="8"/>
</Rule>
<Rule>
<Filter>[highway] = 'trunk' or [highway]='trunk_link'</Filter>
&maxscale_zoom15;
&minscale_zoom16;
- <LineSymbolizer stroke="black" stroke-width="13"/>
+ <LineSymbolizer stroke="black" stroke-width="11"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'trunk' or [highway]='trunk_link'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke="black" stroke-width="16"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'primary' or [highway]='primary_link'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <LineSymbolizer stroke="#8d4346" stroke-width="4"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'primary' or [highway]='primary_link'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke="black" stroke-width="8"/>
</Rule>
<Rule>
<Filter>[highway] = 'primary' or [highway]='primary_link'</Filter>
&maxscale_zoom15;
&minscale_zoom16;
- <LineSymbolizer stroke="black" stroke-width="13"/>
+ <LineSymbolizer stroke="black" stroke-width="11"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'primary' or [highway]='primary_link'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke="black" stroke-width="16"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'secondary' or [highway]='secondary_link'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke="black" stroke-width="10"/>
</Rule>
<Rule>
<Filter>[highway] = 'secondary' or [highway]='secondary_link'</Filter>
&maxscale_zoom15;
&minscale_zoom16;
- <LineSymbolizer stroke="black" stroke-width="14"/>
+ <LineSymbolizer stroke="black" stroke-width="12"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'secondary' or [highway]='secondary_link'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke="black" stroke-width="16"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'tertiary' or [highway]='tertiary_link'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom14;
+ <LineSymbolizer stroke="black" stroke-width="7.5"/>
</Rule>
<Rule>
<Filter>[highway] = 'tertiary' or [highway]='tertiary_link'</Filter>
&maxscale_zoom15;
&minscale_zoom16;
- <LineSymbolizer stroke="black" stroke-width="13"/>
+ <LineSymbolizer stroke="black" stroke-width="11"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'tertiary' or [highway]='tertiary_link'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke="black" stroke-width="16"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'residential' or [highway] = 'unclassified' or
[highway] = 'road'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom14;
+ <LineSymbolizer stroke="black" stroke-width="4.5"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'residential' or [highway] = 'unclassified' or
[highway] = 'road'</Filter>
+ &maxscale_zoom15;
+ &minscale_zoom15;
+ <LineSymbolizer stroke="black" stroke-width="9"/>
</Rule>
<Rule>
<Filter>[highway] = 'residential' or [highway] = 'unclassified' or
[highway] = 'road'</Filter>
&maxscale_zoom16;
&minscale_zoom16;
- <LineSymbolizer stroke="black" stroke-width="13"/>
+ <LineSymbolizer stroke="black" stroke-width="11"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'residential' or [highway] = 'unclassified' or
[highway] = 'road'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke="black" stroke-width="16"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'service'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom15;
+ <LineSymbolizer stroke="black" stroke-width="3"/>
</Rule>
<Rule>
<Filter>[highway] = 'service'</Filter>
@@ -1162,6 +2308,24 @@
</Rule>
<Rule>
<Filter>[highway] = 'pedestrian'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom13;
+ <LineSymbolizer stroke="black" stroke-width="2.2"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'pedestrian'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom14;
+ <LineSymbolizer stroke="black" stroke-width="3.8"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'pedestrian'</Filter>
+ &maxscale_zoom15;
+ &minscale_zoom15;
+ <LineSymbolizer stroke="black" stroke-width="7"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'pedestrian'</Filter>
&maxscale_zoom16;
<LineSymbolizer stroke="black" stroke-width="9.5"/>
</Rule>
@@ -1172,6 +2336,12 @@
</Rule>
<Rule>
<Filter>[aeroway] = 'taxiway'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom14;
+ <LineSymbolizer stroke="black" stroke-width="5"/>
+ </Rule>
+ <Rule>
+ <Filter>[aeroway] = 'taxiway'</Filter>
&maxscale_zoom15;
<LineSymbolizer stroke="black" stroke-width="7"/>
</Rule>
@@ -1189,6 +2359,12 @@
</Rule>
<Rule>
<Filter>[highway] = 'unsurfaced'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom13;
+ <LineSymbolizer stroke="black" stroke-width="5"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'unsurfaced'</Filter>
&maxscale_zoom14;
<LineSymbolizer stroke="black" stroke-width="6.5"/>
</Rule>
@@ -1281,6 +2457,12 @@
</Rule>
<Rule>
<Filter>[highway] = 'unsurfaced'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom13;
+ <LineSymbolizer stroke-linejoin="round" stroke="white" stroke-width="4"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'unsurfaced'</Filter>
&maxscale_zoom14;
<LineSymbolizer stroke-linejoin="round" stroke="white" stroke-width="5"
stroke-linecap="round"/>
</Rule>
@@ -1359,41 +2541,143 @@
</Rule>
</Style>
<Style name="bridges_fill">
+ <Rule>
+ <Filter>[highway] = 'motorway' or [highway]='motorway_link'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <LineSymbolizer stroke-linejoin="round" stroke="#809bc0"
stroke-width="2" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'motorway' or [highway]='motorway_link'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#809bc0"
stroke-width="5.5" stroke-linecap="round"/>
+ </Rule>
<Rule>
<Filter>[highway] = 'motorway' or [highway]='motorway_link'</Filter>
&maxscale_zoom15;
&minscale_zoom16;
- <LineSymbolizer stroke-linejoin="round" stroke="white"
stroke-width="7.5" stroke-linecap="round"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="#809bc0"
stroke-width="7.5" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'motorway' or [highway]='motorway_link'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#809bc0"
stroke-width="10" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'trunk' or [highway]='trunk_link'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <LineSymbolizer stroke-linejoin="round" stroke="#a9dba9"
stroke-width="3" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'trunk' or [highway]='trunk_link'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#a9dba9"
stroke-width="7" stroke-linecap="round"/>
</Rule>
<Rule>
<Filter>[highway] = 'trunk' or [highway]='trunk_link'</Filter>
&maxscale_zoom15;
&minscale_zoom16;
- <LineSymbolizer stroke-linejoin="round" stroke="white"
stroke-width="9.5" stroke-linecap="round"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="#a9dba9"
stroke-width="9.5" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'trunk' or [highway]='trunk_link'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#a9dba9"
stroke-width="14.5" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'primary' or [highway]='primary_link'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ec989a"
stroke-width="3" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'primary' or [highway]='primary_link'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ec989a"
stroke-width="7" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'primary' or [highway]='primary_link'</Filter>
+ &maxscale_zoom15;
+ &minscale_zoom16;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ec989a"
stroke-width="9.5" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'primary' or [highway]='primary_link'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ec989a"
stroke-width="14.5" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'secondary' or [highway] = 'secondary_link'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#fed7a5"
stroke-width="9" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'secondary' or [highway] = 'secondary_link'</Filter>
+ &maxscale_zoom15;
+ &minscale_zoom16;
+ <LineSymbolizer stroke-linejoin="round" stroke="#fed7a5"
stroke-width="10.5" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'secondary' or [highway] = 'secondary_link'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#fed7a5"
stroke-width="14.5" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'tertiary' or [highway]='tertiary_link'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ffffb3"
stroke-width="6" stroke-linecap="round"/>
</Rule>
<Rule>
- <Filter>[highway] = 'primary' or [highway]='primary_link'</Filter>
+ <Filter>[highway] = 'tertiary' or [highway]='tertiary_link'</Filter>
&maxscale_zoom15;
&minscale_zoom16;
- <LineSymbolizer stroke-linejoin="round" stroke="white"
stroke-width="9.5" stroke-linecap="round"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="#ffffb3"
stroke-width="9.5" stroke-linecap="round"/>
</Rule>
<Rule>
- <Filter>[highway] = 'secondary' or [highway] = 'secondary_link'</Filter>
- &maxscale_zoom15;
- &minscale_zoom16;
- <LineSymbolizer stroke-linejoin="round" stroke="white"
stroke-width="10.5" stroke-linecap="round"/>
- </Rule>
- <Rule>
<Filter>[highway] = 'tertiary' or [highway]='tertiary_link'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ffffb3"
stroke-width="14" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'road'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ddd" stroke-width="3.5"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'road'</Filter>
&maxscale_zoom15;
&minscale_zoom16;
- <LineSymbolizer stroke-linejoin="round" stroke="white"
stroke-width="9.5" stroke-linecap="round"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="#ddd" stroke-width="9.5"
stroke-linecap="round"/>
</Rule>
<Rule>
<Filter>[highway] = 'road'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ddd" stroke-width="14"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'residential' or [highway] = 'unclassified'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="white"
stroke-width="3.5" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'residential' or [highway] = 'unclassified'</Filter>
&maxscale_zoom15;
- &minscale_zoom16;
- <LineSymbolizer stroke-linejoin="round" stroke="white"
stroke-width="9.5" stroke-linecap="round"/>
+ &minscale_zoom15;
+ <LineSymbolizer stroke-linejoin="round" stroke="white"
stroke-width="7.5" stroke-linecap="round"/>
</Rule>
<Rule>
<Filter>[highway] = 'residential' or [highway] = 'unclassified'</Filter>
@@ -1402,6 +2686,18 @@
<LineSymbolizer stroke-linejoin="round" stroke="white"
stroke-width="9.5" stroke-linecap="round"/>
</Rule>
<Rule>
+ <Filter>[highway] = 'residential' or [highway] = 'unclassified'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <LineSymbolizer stroke-linejoin="round" stroke="white" stroke-width="14"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'service'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom15;
+ <LineSymbolizer stroke-linejoin="round" stroke="white" stroke-width="2"
stroke-linecap="round"/>
+ </Rule>
+ <Rule>
<Filter>[highway] = 'service'</Filter>
&maxscale_zoom16;
&minscale_zoom18;
@@ -1409,6 +2705,24 @@
</Rule>
<Rule>
<Filter>[highway] = 'pedestrian'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom13;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ededed"
stroke-width="1.5" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'pedestrian'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom14;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ededed"
stroke-width="3" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'pedestrian'</Filter>
+ &maxscale_zoom15;
+ &minscale_zoom15;
+ <LineSymbolizer stroke-linejoin="round" stroke="#ededed"
stroke-width="5.5" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'pedestrian'</Filter>
&maxscale_zoom16;
<LineSymbolizer stroke-linejoin="round" stroke="#ededed"
stroke-width="8" stroke-linecap="round"/>
</Rule>
@@ -1419,6 +2733,12 @@
</Rule>
<Rule>
<Filter>[aeroway] = 'taxiway'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom14;
+ <LineSymbolizer stroke="#bbc" stroke-width="4"/>
+ </Rule>
+ <Rule>
+ <Filter>[aeroway] = 'taxiway'</Filter>
&maxscale_zoom15;
<LineSymbolizer stroke="#bbc" stroke-width="6"/>
</Rule>
@@ -1436,6 +2756,12 @@
</Rule>
<Rule>
<Filter>[highway] = 'unsurfaced'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom13;
+ <LineSymbolizer stroke-linejoin="round" stroke="#debd9c"
stroke-width="3" stroke-dasharray="2,4" stroke-linecap="round"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'unsurfaced'</Filter>
&maxscale_zoom14;
<LineSymbolizer stroke-linejoin="round" stroke="#debd9c"
stroke-width="4" stroke-dasharray="4,6" stroke-linecap="round"/>
</Rule>
@@ -1465,6 +2791,13 @@
<LineSymbolizer stroke-linejoin="round" stroke="#ffcc00"
stroke-width="1.5" stroke-dasharray="3,4" stroke-linecap="round"/>
</Rule>
<Rule>
+ &maxscale_zoom13;
+ &minscale_zoom13;
+ <Filter>[railway] = 'rail'</Filter>
+ <LineSymbolizer stroke-linejoin="round" stroke="#999999"
stroke-width="3"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="white" stroke-width="1"
stroke-dasharray="8,12"/>
+ </Rule>
+ <Rule>
&maxscale_zoom14;
&minscale_zoom18;
<Filter>[railway] = 'rail'</Filter>
@@ -1516,8 +2849,149 @@
</Rule>
</Style>
<Style name="roads">
+ <Rule>
+ <Filter>[highway] = 'motorway' or [highway] = 'motorway_link'</Filter>
+ &maxscale_zoom5;
+ &minscale_zoom6;
+ <LineSymbolizer stroke="#809bc0" stroke-width="0.5"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'motorway' or [highway] = 'motorway_link'</Filter>
+ &maxscale_zoom7;
+ &minscale_zoom8;
+ <LineSymbolizer stroke="#809bc0" stroke-width="1"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'motorway' or [highway] = 'motorway_link'</Filter>
+ &maxscale_zoom9;
+ &minscale_zoom9;
+ <LineSymbolizer stroke="#809bc0" stroke-width="1.4"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'motorway' or [highway] = 'motorway_link'</Filter>
+ &maxscale_zoom10;
+ &minscale_zoom10;
+ <LineSymbolizer stroke="#809bc0" stroke-width="2"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'motorway' or [highway] = 'motorway_link'</Filter>
+ &maxscale_zoom11;
+ &minscale_zoom11;
+ <LineSymbolizer stroke="#809bc0" stroke-width="2.5"/>
+ </Rule>
+ <!-- TRUNK -->
+ <Rule>
+ <Filter>[highway] = 'trunk' or [highway] = 'trunk_link'</Filter>
+ &maxscale_zoom5;
+ &minscale_zoom6;
+ <LineSymbolizer stroke="#a9dba9" stroke-width="0.4"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'trunk' or [highway] = 'trunk_link'</Filter>
+ &maxscale_zoom7;
+ &minscale_zoom8;
+ <LineSymbolizer stroke="#97d397" stroke-width="1"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'trunk' or [highway] = 'trunk_link'</Filter>
+ &maxscale_zoom9;
+ &minscale_zoom10;
+ <LineSymbolizer stroke="#97d397" stroke-width="2"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'trunk' or [highway] = 'trunk_link'</Filter>
+ &maxscale_zoom11;
+ &minscale_zoom11;
+ <LineSymbolizer stroke="#97d397" stroke-width="2.5"/>
+ </Rule>
+ <!-- PRIMARY-->
+ <Rule>
+ <Filter>[highway] = 'primary' or [highway] = 'primary_link'</Filter>
+ &maxscale_zoom7;
+ &minscale_zoom8;
+ <LineSymbolizer stroke="#ec989a" stroke-width="0.5"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'primary' or [highway] = 'primary_link'</Filter>
+ &maxscale_zoom9;
+ &minscale_zoom9;
+ <LineSymbolizer stroke="#ec989a" stroke-width="1.2"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'primary' or [highway] = 'primary_link'</Filter>
+ &maxscale_zoom10;
+ &minscale_zoom10;
+ <LineSymbolizer stroke="#ec989a" stroke-width="2"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'primary' or [highway] = 'primary_link'</Filter>
+ &maxscale_zoom11;
+ &minscale_zoom11;
+ <LineSymbolizer stroke="#ec989a" stroke-width="2.5"/>
+ </Rule>
+ <!-- SECONDARY -->
+ <Rule>
+ <Filter>[highway] = 'secondary' or [highway] = 'secondary_link'</Filter>
+ &maxscale_zoom9;
+ &minscale_zoom10;
+ <LineSymbolizer stroke="#fecc8b" stroke-width="1"/>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'secondary' or [highway] = 'secondary_link'</Filter>
+ &maxscale_zoom11;
+ &minscale_zoom11;
+ <LineSymbolizer stroke="#fecc8b" stroke-width="2"/>
+ </Rule>
<!-- RAIL -->
<Rule>
+ &maxscale_zoom6;
+ &minscale_zoom8;
+ <Filter>[railway] = 'rail'</Filter>
+ <LineSymbolizer stroke="#aaa" stroke-width="0.6"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom9;
+ &minscale_zoom9;
+ <Filter>[railway] = 'rail' and not [tunnel]='yes'</Filter>
+ <LineSymbolizer stroke="#aaa" stroke-width="1"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom9;
+ &minscale_zoom9;
+ <Filter>[railway] = 'rail' and [tunnel]='yes'</Filter>
+ <LineSymbolizer stroke="#aaa" stroke-width="1" stroke-dasharray="5,2"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom8;
+ &minscale_zoom9;
+ <Filter>[railway] = 'tram' or [railway] = 'light_rail' or [railway] =
'narrow_gauge' or [railway]='funicular'</Filter>
+ <LineSymbolizer stroke="#ccc" stroke-width="1"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom10;
+ &minscale_zoom12;
+ <Filter>[railway] = 'rail' and not [tunnel]='yes'</Filter>
+ <LineSymbolizer stroke="#aaa" stroke-width="2"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom10;
+ &minscale_zoom12;
+ <Filter>[railway] = 'rail' and [tunnel]='yes'</Filter>
+ <LineSymbolizer stroke="#aaa" stroke-width="2" stroke-dasharray="5,2"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom10;
+ &minscale_zoom12;
+ <Filter>[railway] = 'tram' or [railway] = 'light_rail' or [railway] =
'narrow_gauge' or [railway]='funicular'</Filter>
+ <LineSymbolizer stroke="#aaa" stroke-width="1"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <Filter>[railway] = 'preserved'</Filter>
+ <LineSymbolizer stroke-linejoin="round" stroke="#aaa"
stroke-width="1.5"/>
+ </Rule>
+ <Rule>
&maxscale_zoom13;
&minscale_zoom18;
<Filter>[railway] = 'preserved'</Filter>
@@ -1525,6 +2999,12 @@
<LineSymbolizer stroke-linejoin="round" stroke="white" stroke-width="1"
stroke-dasharray="0,1,8,1"/>
</Rule>
<Rule>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <Filter>[railway] = 'INT-preserved-ssy'</Filter>
+ <LineSymbolizer stroke-linejoin="round" stroke="#aaa" stroke-width="1"/>
+ </Rule>
+ <Rule>
&maxscale_zoom13;
&minscale_zoom18;
<Filter>[railway] = 'INT-preserved-ssy'</Filter>
@@ -1541,6 +3021,12 @@
</Style>
<Style name="trams">
<Rule>
+ <Filter>[railway] = 'tram'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <LineSymbolizer stroke="#444" stroke-width="1"/>
+ </Rule>
+ <Rule>
<Filter>[railway] = 'tram' and not [bridge]='yes'</Filter>
&maxscale_zoom15;
&minscale_zoom18;
@@ -1556,6 +3042,12 @@
</Rule>
</Style>
<Style name="guideways">
+<Rule>
+ &maxscale_zoom13;
+ &minscale_zoom13;
+ <LineSymbolizer stroke-linejoin="round" stroke="#6666ff"
stroke-width="3"/>
+ <LineSymbolizer stroke-linejoin="round" stroke="white" stroke-width="1"
stroke-dasharray="8,12"/>
+ </Rule>
<Rule>
&maxscale_zoom14;
&minscale_zoom18;
@@ -1563,8 +3055,44 @@
<LineSymbolizer stroke-linejoin="round" stroke="white" stroke-width="1"
stroke-dasharray="0,11,8,1"/>
</Rule>
</Style>
-<!-- <Style name="roads-text-ref-low-zoom"> -->
-<!-- </Style> -->
+<Style name="roads-text-ref-low-zoom">
+ <Rule>
+ <Filter>[highway] = 'motorway' and [length] le 6</Filter>
+ &maxscale_zoom10;
+ &minscale_zoom12;
+ <ShieldSymbolizer size="10" fill="#fff" placement="line"
file="&symbols;/mot_shield[length].png" spacing="750" minimum-distance="30"
fontset-name="bold-fonts">[ref]</ShieldSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'motorway' and [length] = 7</Filter>
+ &maxscale_zoom10;
+ &minscale_zoom12;
+ <ShieldSymbolizer size="10" fill="#fff" placement="line"
file="&symbols;/mot_shield6.png" spacing="750" minimum-distance="30"
fontset-name="bold-fonts">[ref]</ShieldSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'motorway' and [length] = 8</Filter>
+ &maxscale_zoom10;
+ &minscale_zoom12;
+ <ShieldSymbolizer size="10" fill="#fff" placement="line"
file="&symbols;/mot_shield7.png" spacing="750" minimum-distance="30"
fontset-name="bold-fonts">[ref]</ShieldSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'trunk'</Filter>
+ &maxscale_zoom11;
+ &minscale_zoom12;
+ <ShieldSymbolizer size="10" fill="#fff" placement="line"
file="&symbols;/tru_shield[length].png" spacing="750" minimum-distance="30"
fontset-name="bold-fonts">[ref]</ShieldSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'primary'</Filter>
+ &maxscale_zoom11;
+ &minscale_zoom12;
+ <ShieldSymbolizer size="10" fill="#fff" placement="line"
file="&symbols;/pri_shield[length].png" spacing="750" minimum-distance="30"
fontset-name="bold-fonts">[ref]</ShieldSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'secondary'</Filter>
+ &maxscale_zoom12;
+ &minscale_zoom12;
+ <ShieldSymbolizer size="10" fill="#fff" placement="line"
file="&symbols;/sec_shield[length].png" spacing="750" minimum-distance="40"
fontset-name="bold-fonts">[ref]</ShieldSymbolizer>
+ </Rule>
+</Style>
<Style name="roads-text-ref">
<Rule>
<Filter>[highway] = 'motorway' and [length] le 6</Filter>
@@ -1611,7 +3139,7 @@
<Rule>
<Filter>([highway] = 'unclassified' or [highway]='residential') and not
[bridge]='yes'</Filter>
&maxscale_zoom15;
- <TextSymbolizer size="10" fill="#000" spacing="750"
minimum-distance="18" fontset-name="bold-fonts" halo-radius="1"
placement-type="simple" max-char-angle-delta="40" placements="X,10,9,8,7,6,5,4"
avoid-edges="false">[ref]</TextSymbolizer>
+ <TextSymbolizer size="10" fill="#000" spacing="750"
minimum-distance="18" fontset-name="bold-fonts"
halo-radius="1">[ref]</TextSymbolizer>
</Rule>
<Rule>
<Filter>([aeroway] = 'runway' or [aeroway]='taxiway') and not
[bridge]='yes'</Filter>
@@ -1622,15 +3150,38 @@
<Style name="roads-text-name">
<Rule>
<Filter>[highway] = 'trunk' or [highway] = 'primary'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom13;
+ <TextSymbolizer size="8" fill="black" placement="line"
fontset-name="book-fonts" halo-radius="0">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'secondary'</Filter>
+ &maxscale_zoom13;
+ &minscale_zoom13;
+ <TextSymbolizer size="8" fill="black" placement="line"
fontset-name="book-fonts" halo-radius="1"
halo-fill="#fed7a5">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'trunk' or [highway] = 'primary'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom14;
+ <TextSymbolizer size="9" fill="black" placement="line"
fontset-name="book-fonts" halo-radius="0">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'trunk' or [highway] = 'primary'</Filter>
&maxscale_zoom15;
&minscale_zoom18;
<TextSymbolizer size="10" fill="black" placement="line"
fontset-name="book-fonts" halo-radius="0">[name]</TextSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'secondary'</Filter>
+ &maxscale_zoom14;
+ &minscale_zoom14;
+ <TextSymbolizer size="9" fill="black" placement="line"
fontset-name="book-fonts" halo-radius="1"
halo-fill="#fed7a5">[name]</TextSymbolizer>
+ </Rule><Rule>
+ <Filter>[highway] = 'secondary'</Filter>
&maxscale_zoom15;
&minscale_zoom18;
- <TextSymbolizer size="10" fill="black" placement="line"
fontset-name="book-fonts" halo-radius="1"
halo-fill="white">[name]</TextSymbolizer>
+ <TextSymbolizer size="10" fill="black" placement="line"
fontset-name="book-fonts" halo-radius="1"
halo-fill="#fed7a5">[name]</TextSymbolizer>
</Rule>
<Rule>
<Filter>[highway] = 'tertiary'</Filter>
@@ -1639,6 +3190,18 @@
<TextSymbolizer size="9" fill="#000" placement="line"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
</Rule>
<Rule>
+ <Filter>[highway] = 'tertiary'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <TextSymbolizer size="11" fill="#000" placement="line"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ &maxscale_zoom13;
+ &minscale_zoom15;
+ <Filter>[highway] = 'proposed' or [highway]='construction'</Filter>
+ <TextSymbolizer size="9" fill="#000" placement="line"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
&maxscale_zoom16;
&minscale_zoom18;
<Filter>[highway] = 'proposed' or [highway]='construction'</Filter>
@@ -1646,9 +3209,21 @@
</Rule>
<Rule>
<Filter>[highway] = 'unclassified' or [highway] = 'residential'</Filter>
+ &maxscale_zoom15;
+ &minscale_zoom15;
+ <TextSymbolizer size="8" fill="#000" spacing="300" placement="line"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'unclassified' or [highway] = 'residential'</Filter>
&maxscale_zoom16;
&minscale_zoom16;
- <TextSymbolizer size="9" fill="#000" spacing="300" placement="line"
fontset-name="book-fonts" halo-radius="1" placement-type="simple"
max-char-angle-delta="40" placements="X,9,8,7,6,5,4"
avoid-edges="false">[name]</TextSymbolizer>
+ <TextSymbolizer size="9" fill="#000" spacing="300" placement="line"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ <Filter>[highway] = 'unclassified' or [highway] = 'residential'</Filter>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <TextSymbolizer size="11" fill="#000" spacing="400" placement="line"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
</Rule>
<Rule>
<ElseFilter/>
@@ -1656,8 +3231,20 @@
&minscale_zoom16;
<TextSymbolizer size="9" fill="#000" placement="line"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
</Rule>
+ <Rule>
+ <ElseFilter/>
+ &maxscale_zoom17;
+ &minscale_zoom18;
+ <TextSymbolizer size="11" fill="#000" placement="line"
fontset-name="book-fonts" halo-radius="1">[name]</TextSymbolizer>
+ </Rule>
</Style>
<Style name="cliffs">
+ <Rule>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <Filter>[natural] = 'cliff'</Filter>
+ <LinePatternSymbolizer file="&symbols;/cliff.png"/>
+ </Rule>
<Rule>
&maxscale_zoom15;
<Filter>[natural] = 'cliff'</Filter>
@@ -1718,12 +3305,41 @@
</Style>
<Style name="boundary">
<Rule>
+ &maxscale_zoom7;
+ &minscale_zoom9;
+ <PolygonSymbolizer fill-opacity="0.05" fill="green"/>
+ <LineSymbolizer stroke="green" stroke-width="1.5" stroke-dasharray="4,2"
stroke-opacity="0.15"/>
+ </Rule>
+ <Rule>
+ &maxscale_zoom10;
+ &minscale_zoom12;
+ <PolygonSymbolizer fill-opacity="0.05" fill="green"/>
+ <LineSymbolizer stroke="green" stroke-width="3" stroke-dasharray="6,2"
stroke-opacity="0.15"/>
+ </Rule>
+ <Rule>
&maxscale_zoom13;
&minscale_zoom18;
<LineSymbolizer stroke="green" stroke-width="3" stroke-dasharray="6,2"
stroke-opacity="0.15"/>
</Rule>
+ <Rule>
+ <Filter>[way_area] >= 200000000</Filter>
+ &maxscale_zoom8;
+ &minscale_zoom9;
+ <TextSymbolizer size="8" fill="#9c9" fontset-name="bold-fonts"
halo-radius="1" wrap-width="14">[name]</TextSymbolizer>
+ </Rule>
+ <Rule>
+ &maxscale_zoom10;
+ &minscale_zoom11;
+ <TextSymbolizer size="11" fill="#9c9" fontset-name="bold-fonts"
halo-radius="1" wrap-width="14">[name]</TextSymbolizer>
+ </Rule>
</Style>
<Style name="theme_park">
+<Rule>
+ &maxscale_zoom13;
+ &minscale_zoom14;
+ <Filter>[tourism]='theme_park'</Filter>
+ <LineSymbolizer stroke="#734a08" stroke-width="1.5"
stroke-dasharray="9,3" stroke-opacity="0.6"/>
+ </Rule>
<Rule>
&maxscale_zoom15;
&minscale_zoom18;
@@ -1759,29 +3375,29 @@
&datasource-settings;
</Datasource>
</Layer>
-<!-- <Layer name="turning_circle-casing" status="on"
srs="&osm2pgsql_projection;"> -->
-<!-- <StyleName>turning_circle-casing</StyleName> -->
-<!-- <Datasource> -->
-<!-- <Parameter name="table"> -->
-<!-- (select distinct on (p.way) p.way as way,l.highway as int_tc_type
-->
-<!-- from &prefix;_point p -->
-<!-- join &prefix;_line l -->
-<!-- on ST_DWithin(p.way,l.way,&dwithin_node_way;) -->
-<!-- join (values -->
-<!-- ('tertiary',1), -->
-<!-- ('unclassified',2), -->
-<!-- ('residential',3), -->
-<!-- ('living_street',4), -->
-<!-- ('service',5) -->
-<!-- ) as v (highway,prio) -->
-<!-- on v.highway=l.highway -->
-<!-- where p.highway='turning_circle' -->
-<!-- order by p.way,v.prio -->
-<!-- ) as turning_circle -->
-<!-- </Parameter> -->
-<!-- &datasource-settings; -->
-<!-- </Datasource> -->
-<!-- </Layer> -->
+<Layer name="turning_circle-casing" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>turning_circle-casing</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (select distinct on (p.way) p.way as way,l.highway as int_tc_type
+ from &prefix;_point p
+ join &prefix;_line l
+ on ST_DWithin(p.way,l.way,&dwithin_node_way;)
+ join (values
+ ('tertiary',1),
+ ('unclassified',2),
+ ('residential',3),
+ ('living_street',4),
+ ('service',5)
+ ) as v (highway,prio)
+ on v.highway=l.highway
+ where p.highway='turning_circle'
+ order by p.way,v.prio
+ ) as turning_circle
+ </Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
<Layer name="footbikecycle-tunnels" status="on" srs="&osm2pgsql_projection;">
<StyleName>footbikecycle-tunnels</StyleName>
<Datasource>
@@ -1890,29 +3506,29 @@
&datasource-settings;
</Datasource>
</Layer>
-<!-- <Layer name="turning_circle-fill" status="on"
srs="&osm2pgsql_projection;"> -->
-<!-- <StyleName>turning_circle-fill</StyleName> -->
-<!-- <Datasource> -->
-<!-- <Parameter name="table"> -->
-<!-- (select distinct on (p.way) p.way as way,l.highway as int_tc_type
-->
-<!-- from &prefix;_point p -->
-<!-- join &prefix;_line l -->
-<!-- on ST_DWithin(p.way,l.way,&dwithin_node_way;) -->
-<!-- join (values -->
-<!-- ('tertiary',1), -->
-<!-- ('unclassified',2), -->
-<!-- ('residential',3), -->
-<!-- ('living_street',4), -->
-<!-- ('service',5) -->
-<!-- ) as v (highway,prio) -->
-<!-- on v.highway=l.highway -->
-<!-- where p.highway='turning_circle' -->
-<!-- order by p.way,v.prio -->
-<!-- ) as turning_circle -->
-<!-- </Parameter> -->
-<!-- &datasource-settings; -->
-<!-- </Datasource> -->
-<!-- </Layer> -->
+<Layer name="turning_circle-fill" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>turning_circle-fill</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (select distinct on (p.way) p.way as way,l.highway as int_tc_type
+ from &prefix;_point p
+ join &prefix;_line l
+ on ST_DWithin(p.way,l.way,&dwithin_node_way;)
+ join (values
+ ('tertiary',1),
+ ('unclassified',2),
+ ('residential',3),
+ ('living_street',4),
+ ('service',5)
+ ) as v (highway,prio)
+ on v.highway=l.highway
+ where p.highway='turning_circle'
+ order by p.way,v.prio
+ ) as turning_circle
+ </Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
&layer-ferry-routes;
&layer-aerialways;
<Layer name="roads" status="on" srs="&osm2pgsql_projection;">
@@ -2310,20 +3926,20 @@
&layer-amenity-symbols;
&layer-amenity-points;
&layer-power;
-<!-- <Layer name="roads-text-ref-low-zoom" status="on"
srs="&osm2pgsql_projection;"> -->
-<!-- <StyleName>roads-text-ref-low-zoom</StyleName> -->
-<!-- <Datasource> -->
-<!-- <Parameter name="table"> -->
-<!-- (select way,highway,ref,char_length(ref) as length -->
-<!-- from &prefix;_roads -->
-<!-- where highway in ('motorway','trunk','primary','secondary') -->
-<!-- and ref is not null -->
-<!-- and char_length(ref) between 1 and 8 -->
-<!-- ) as roads -->
-<!-- </Parameter> -->
-<!-- &datasource-settings; -->
-<!-- </Datasource> -->
-<!-- </Layer> -->
+<Layer name="roads-text-ref-low-zoom" status="on" srs="&osm2pgsql_projection;">
+ <StyleName>roads-text-ref-low-zoom</StyleName>
+ <Datasource>
+ <Parameter name="table">
+ (select way,highway,ref,char_length(ref) as length
+ from &prefix;_roads
+ where highway in ('motorway','trunk','primary','secondary')
+ and ref is not null
+ and char_length(ref) between 1 and 8
+ ) as roads
+ </Parameter>
+ &datasource-settings;
+ </Datasource>
+</Layer>
<Layer name="highway-junctions" status="on" srs="&osm2pgsql_projection;">
<StyleName>highway-junctions</StyleName>
<Datasource>
--
1.7.5.4
- [Maposmatic-dev] [PATCH 1/9] B&W stylesheet: restore original mapnik-osm stylesheet,
David MENTRE <=
- [Maposmatic-dev] [PATCH 3/9] b&w stylesheet: display townhall, public_building, etc. amenities, David MENTRE, 2012/03/30
- [Maposmatic-dev] [PATCH 5/9] b&w stylesheet: remove landuse=residential coloring, David MENTRE, 2012/03/30
- [Maposmatic-dev] [PATCH 2/9] b&w stylesheet: remove building and power layers, David MENTRE, 2012/03/30
- [Maposmatic-dev] [PATCH 8/9] b&w stylesheet: put parking and residential area casing in black, David MENTRE, 2012/03/30
- [Maposmatic-dev] [PATCH 7/9] b&w stylesheet: increase casing of motorway, trunk, primary and secondary roads at zoom levels 15 to 18, David MENTRE, 2012/03/30
- [Maposmatic-dev] [PATCH 6/9] b&w stylesheet: put public buildings in black with light grey background, David MENTRE, 2012/03/30
- [Maposmatic-dev] [PATCH 9/9] b&w stylesheet: Allow smaller fonts for street names, David MENTRE, 2012/03/30
- [Maposmatic-dev] [PATCH 4/9] b&w stylesheet: put all roads in black and white, David MENTRE, 2012/03/30
- Re: [Maposmatic-dev] [PATCH 1/9] B&W stylesheet: restore original mapnik-osm stylesheet, Thomas Petazzoni, 2012/03/30