[Maposmatic-dev] [PATCH 3/9] b&w stylesheet: display townhall, public_building, etc. amenities

[David MENTRE]

Signed-off-by: David MENTRE <address@hidden>
---
 .../black-and-white/inc/layer-landcover.xml.inc    |    6 +++---
 stylesheet/black-and-white/osm.xml                 |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/stylesheet/black-and-white/inc/layer-landcover.xml.inc 
b/stylesheet/black-and-white/inc/layer-landcover.xml.inc
index 2abe83b..2020b68 100644
--- a/stylesheet/black-and-white/inc/layer-landcover.xml.inc
+++ b/stylesheet/black-and-white/inc/layer-landcover.xml.inc
@@ -260,12 +260,12 @@
       <PolygonPatternSymbolizer file="&symbols;/scrub.png" />
     </Rule>
     <Rule>
-      <Filter>[amenity] = 'university' or [amenity] = 'college' or [amenity] = 
'school' or [amenity]='hospital' or [amenity]='kindergarten'</Filter>
+      <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>
       &maxscale_zoom10;
       <PolygonSymbolizer fill="#f0f0d8"/>
     </Rule>
     <Rule>
-      <Filter>[amenity] = 'university' or [amenity] = 'college' or [amenity] = 
'school' or [amenity]='hospital' or [amenity]='kindergarten'</Filter>
+      <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>
       &maxscale_zoom12;
       <LineSymbolizer stroke="brown" stroke-width="0.3"/>
     </Rule>
@@ -342,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')
+          or amenity in 
('parking','university','college','school','hospital','kindergarten','grave_yard','place_of_worship','library','townhall','post_office','public_building','police')
           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/osm.xml 
b/stylesheet/black-and-white/osm.xml
index 6de6159..cbee801 100644
--- a/stylesheet/black-and-white/osm.xml
+++ b/stylesheet/black-and-white/osm.xml
@@ -468,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'</Filter>
+      <Filter>[amenity] = 'school' or [amenity] = 'college' or 
[amenity]='townhall'</Filter>
       &maxscale_zoom15;
       <TextSymbolizer size="9" fill="#000033" fontset-name="book-fonts" 
halo-radius="1" wrap-width="14" placement="interior">[name]</TextSymbolizer>
     </Rule>
-- 
1.7.5.4