remove busstop and bicycle parking from overlay, as both our base styles render that...

[osmrrze.git] / styles / mapnik-osm-data / rrze-overlay.xml

diff --git a/styles/mapnik-osm-data/rrze-overlay.xml b/styles/mapnik-osm-data/rrze-overlay.xml
index d8841c0d634123da29bbb7c62169bf7980b42f17..7ea041dd6b662ccfa428a21679df1fccdaff5ece 100644 (file)
--- a/styles/mapnik-osm-data/rrze-overlay.xml
+++ b/styles/mapnik-osm-data/rrze-overlay.xml
@@ -7,20 +7,87 @@
   &fontset-settings;
 <Style name="text">
     <Rule>
-      <Filter>[amenity]='bicycle_parking' and ([access] = 'public' or [access] = 'yes' or not [access] != '')</Filter>
+      <Filter>[campusbuilding]='lecture hall'</Filter>
       &maxscale_zoom17;
-      <TextSymbolizer size="9" fill="#0066ff" dy="9" fontset-name="book-fonts" halo-radius="1" wrap-width="34" placement="interior">[name]</TextSymbolizer>
+      <TextSymbolizer size="9" fill="#006600" fontset-name="book-fonts" halo-radius="1" wrap-width="34" placement="interior">[nameshort]</TextSymbolizer>
     </Rule>
-</Style>
-
-<Style name="points">
     <Rule>
-      &maxscale_zoom15;
-      <Filter>[amenity] = 'bicycle_parking' and ([access] = 'public' or [access] = 'yes' or not [access] != '')</Filter>
-      <PointSymbolizer file="rrze&symbols;/parking_bicycle.p.16.png" allow-overlap="false" placement="interior"/>
+      <Filter>[leisure]='hackerspace'</Filter>
+      &maxscale_zoom17;
+      <!-- wrap-width=10 damit wir kompatibel mit dem deutschen stil sind, so dass wir deren text nur mit identischem text ueberlagern -->
+      <TextSymbolizer size="9" fill="#006600" fontset-name="book-fonts" halo-radius="1" wrap-width="10" placement="interior">[name]</TextSymbolizer>
     </Rule>
 </Style>
 
+<Style name="subwaylines" filter-mode="first">
+  <Rule>
+    &maxscale_zoom10;
+    <Filter>([ref] = 'Waterloo &amp; City')</Filter>
+    <LineSymbolizer stroke="#88d0c4" stroke-width="3" />
+    <TextSymbolizer fill="#88d0c4" placement="line" fontset-name="book-fonts" size="9" dy="-6" vertical-alignment="middle" halo-radius="1" halo-fill="#ffffff" minimum-distance="200" ><![CDATA[[ref]]]></TextSymbolizer>
+  </Rule>
+  <Rule>
+    &maxscale_zoom10;
+    <Filter>([ref] = 'Victoria')</Filter>
+    <LineSymbolizer stroke="#0a9cda" stroke-width="3" />
+    <TextSymbolizer fill="#0a9cda" placement="line" fontset-name="book-fonts" size="9" dy="-6" vertical-alignment="middle" halo-radius="1" halo-fill="#ffffff" minimum-distance="200" ><![CDATA[[ref]]]></TextSymbolizer>
+  </Rule>
+  <Rule>
+    &maxscale_zoom10;
+    <Filter>([ref] = 'Piccadilly')</Filter>
+    <LineSymbolizer stroke="#094fa3" stroke-width="3" />
+    <TextSymbolizer fill="#094fa3" placement="line" fontset-name="book-fonts" size="9" dy="-6" vertical-alignment="middle" halo-radius="1" halo-fill="#ffffff" minimum-distance="200" ><![CDATA[[ref]]]></TextSymbolizer>
+  </Rule>
+  <Rule>
+    &maxscale_zoom10;
+    <Filter>([ref] = 'Northern')</Filter>
+    <LineSymbolizer stroke="#000000" stroke-width="3" />
+    <TextSymbolizer fill="#000000" placement="line" fontset-name="book-fonts" size="9" dy="-6" vertical-alignment="middle" halo-radius="1" halo-fill="#ffffff" minimum-distance="200" ><![CDATA[[ref]]]></TextSymbolizer>
+  </Rule>
+  <Rule>
+    &maxscale_zoom10;
+    <Filter>([ref] = 'Metropolitan')</Filter>
+    <LineSymbolizer stroke="#91005a" stroke-width="3" />
+    <TextSymbolizer fill="#91005a" placement="line" fontset-name="book-fonts" size="9" dy="-6" vertical-alignment="middle" halo-radius="1" halo-fill="#ffffff" minimum-distance="200" ><![CDATA[[ref]]]></TextSymbolizer>
+  </Rule>
+  <Rule>
+    &maxscale_zoom10;
+    <Filter>([ref] = 'Jubilee')</Filter>
+    <LineSymbolizer stroke="#949699" stroke-width="3" />
+    <TextSymbolizer fill="#949699" placement="line" fontset-name="book-fonts" size="9" dy="-6" vertical-alignment="middle" halo-radius="1" halo-fill="#ffffff" minimum-distance="200" ><![CDATA[[ref]]]></TextSymbolizer>
+  </Rule>
+  <Rule>
+    <MaxScaleDenominator>750000</MaxScaleDenominator>
+    <Filter>([ref] = 'Hammersmith &amp; City')</Filter>
+    <LineSymbolizer stroke="#f491a8" offset="2" stroke-dasharray="8, 5" stroke-width="3" />
+    <TextSymbolizer fill="#f491a8" placement="line" fontset-name="book-fonts" size="9" dy="-6" vertical-alignment="middle" halo-radius="1" halo-fill="#ffffff" minimum-distance="200" ><![CDATA[[ref]]]></TextSymbolizer>
+  </Rule>
+  <Rule>
+    &maxscale_zoom10;
+    <Filter>([ref] = 'District')</Filter>
+    <LineSymbolizer stroke="#00a166" stroke-width="3" />
+    <TextSymbolizer fill="#00a166" placement="line" fontset-name="book-fonts" size="9" dy="-6" vertical-alignment="middle" halo-radius="1" halo-fill="#ffffff" minimum-distance="200" ><![CDATA[[ref]]]></TextSymbolizer>
+  </Rule>
+  <Rule>
+    &maxscale_zoom10;
+    <Filter>([ref] = 'Circle')</Filter>
+    <LineSymbolizer stroke="#ffe02b" offset="2" stroke-dasharray="8, 5" stroke-width="3" />
+    <TextSymbolizer fill="#ffe02b" placement="line" fontset-name="book-fonts" size="9" dy="-6" vertical-alignment="middle" halo-radius="1" halo-fill="#ffffff" minimum-distance="200" ><![CDATA[[ref]]]></TextSymbolizer>
+  </Rule>
+  <Rule>
+    &maxscale_zoom10;
+    <Filter>([ref] = 'Central')</Filter>
+    <LineSymbolizer stroke="#f15b2e" stroke-width="3" />
+    <TextSymbolizer fill="#f15b2e" placement="line" fontset-name="book-fonts" size="9" dy="-6" vertical-alignment="middle" halo-radius="1" halo-fill="#ffffff" minimum-distance="200" ><![CDATA[[ref]]]></TextSymbolizer>
+  </Rule>
+  <Rule>
+    &maxscale_zoom10;
+    <Filter>([ref] = 'Bakerloo')</Filter>
+    <LineSymbolizer stroke="#ae6017" stroke-width="3" />
+    <TextSymbolizer fill="#ae6017" placement="line" fontset-name="book-fonts" size="9" dy="-6" vertical-alignment="middle" halo-radius="1" halo-fill="#ffffff" minimum-distance="200" ><![CDATA[[ref]]]></TextSymbolizer>
+  </Rule>
+</Style>
+
 <Layer name="amenity-points" status="on" srs="&osm2pgsql_projection;">
     <StyleName>points</StyleName>
     <Datasource>
@@ -49,9 +116,10 @@
     <StyleName>text</StyleName>
     <Datasource>
       <Parameter name="table">
-      (select way,amenity,access,name,ref,'yes'::text as point
+      (select way,amenity,access,name,leisure,tags->'campusbuilding' as campusbuilding,tags->'name:short' as nameshort,ref,'yes'::text as point
        from &prefix;_point
        where amenity is not null
+       or tags is not null
       ) as text
       </Parameter>
       &datasource-settings;
@@ -61,12 +129,22 @@
     <StyleName>text</StyleName>
     <Datasource>
       <Parameter name="table">
-      (select way,access,amenity,NULL as ele,name,ref,'no'::text as point
+      (select way,amenity,access,name,leisure,tags->'campusbuilding' as campusbuilding,tags->'name:short' as nameshort,ref,'no'::text as point
        from &prefix;_polygon
        where amenity is not null
+       or tags is not null
       ) as text
       </Parameter>
       &datasource-settings;
     </Datasource>
 </Layer>
+
+<Layer name="subwaylines" status="on" srs="&osm2pgsql_projection;">
+    <StyleName>subwaylines</StyleName>
+    <Datasource>
+       <Parameter name="table"><![CDATA[(SELECT way, ref, osm_id FROM planet_osm_line WHERE route='subway') AS subwayroutes]]></Parameter>
+      &datasource-settings;
+    </Datasource>
+</Layer>
+
 </Map>