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 82425965d773f6fb4e236eb9afd5a910e0332450..7ea041dd6b662ccfa428a21679df1fccdaff5ece 100644 (file)
--- a/styles/mapnik-osm-data/rrze-overlay.xml
+++ b/styles/mapnik-osm-data/rrze-overlay.xml
@@ -6,11 +6,6 @@
 <Map background-color="transparent" srs="&srs900913;" minimum-version="2.0.0" buffer-size="512" maximum-extent="-20037508.342789244,-20037508.342780735,20037508.342789244,20037508.342780709">
   &fontset-settings;
 <Style name="text">
-    <Rule>
-      <Filter>[amenity]='bicycle_parking' and ([access] = 'public' or [access] = 'yes' 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>[campusbuilding]='lecture hall'</Filter>
       &maxscale_zoom17;
@@ -24,50 +19,72 @@
     </Rule>
 </Style>
 
-<Style name="points">
-    <Rule>
-      &maxscale_zoom15;
-      <Filter>[amenity] = 'bicycle_parking' and ([access] = 'public' or [access] = 'yes' or not [access] != '')</Filter>
-      <PointSymbolizer file="rrzesymbols/parking_bicycle.p.16.png" allow-overlap="false" placement="interior"/>
-    </Rule>
-</Style>
-
-<Style name="busstop" filter-mode="first">
+<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_zoom15;
-    <Filter>([name] != null) and ([llength] &gt; 3) and ([line] != null)</Filter>
-    <MarkersSymbolizer file="rrzesymbols/bus_stop.svg" placement="interior" transform="scale(0.025)" />
-    <ShieldSymbolizer placement="point" horizontal-alignment="middle" vertical-alignment="middle" fill="#ffffff" file="rrzesymbols/busshieldwide.svg" fontset-name="book-fonts" unlock-image="true" shield-dy="-19" dy="0" spacing="40" min_distance="1" >[line]</ShieldSymbolizer>
-    <TextSymbolizer size="9" fill="#0092da" fontset-name="book-fonts" halo-radius="1" dy="10" ><![CDATA[[name]]]></TextSymbolizer>
+    &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_zoom15;
-    <Filter>([name] != null) and ([line] != null)</Filter>
-    <MarkersSymbolizer file="rrzesymbols/bus_stop.svg" placement="interior" transform="scale(0.025)" />
-    <ShieldSymbolizer placement="point" horizontal-alignment="middle" vertical-alignment="middle" fill="#ffffff" file="rrzesymbols/busshield.svg" fontset-name="book-fonts" unlock-image="true" shield-dy="-19" dy="0" spacing="40" min_distance="1" >[line]</ShieldSymbolizer>
-    <TextSymbolizer size="9" fill="#0092da" fontset-name="book-fonts" halo-radius="1" dy="10" ><![CDATA[[name]]]></TextSymbolizer>
+    &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_zoom15;
-    <Filter>([name] != null)</Filter>
-    <MarkersSymbolizer file="rrzesymbols/bus_stop.svg" placement="interior" transform="scale(0.025)" />
-    <TextSymbolizer size="9" fill="#0092da" fontset-name="book-fonts" halo-radius="1" dy="10" ><![CDATA[[name]]]></TextSymbolizer>
+    &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_zoom15;
-    <Filter>([line] != null) and ([llength] &gt; 3)</Filter>
-    <MarkersSymbolizer file="rrzesymbols/bus_stop.svg" placement="interior" transform="scale(0.025)" />
-    <ShieldSymbolizer placement="point" horizontal-alignment="middle" vertical-alignment="middle" fill="#ffffff" file="rrzesymbols/busshieldwide.svg" fontset-name="book-fonts" unlock-image="true" shield-dy="-19" dy="0" spacing="40" min_distance="1" >[line]</ShieldSymbolizer>
+    &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>
-    &maxscale_zoom15;
-    <Filter>([line] != null)</Filter>
-    <MarkersSymbolizer file="rrzesymbols/bus_stop.svg" placement="interior" transform="scale(0.025)" />
-    <ShieldSymbolizer placement="point" horizontal-alignment="middle" vertical-alignment="middle" fill="#ffffff" file="rrzesymbols/busshield.svg" fontset-name="book-fonts" unlock-image="true" shield-dy="-19" dy="0" spacing="40" min_distance="1" >[line]</ShieldSymbolizer>
+    <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_zoom15;
-    <MarkersSymbolizer file="rrzesymbols/bus_stop.svg" placement="interior" transform="scale(0.025)" />
+    &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>
 
@@ -121,16 +138,13 @@
       &datasource-settings;
     </Datasource>
 </Layer>
-<Layer name="busstop" status="on" srs="&osm2pgsql_projection;">
-    <StyleName>busstop</StyleName>
+
+<Layer name="subwaylines" status="on" srs="&osm2pgsql_projection;">
+    <StyleName>subwaylines</StyleName>
     <Datasource>
-      <Parameter name="table">
-      (select way,name,replace(tags->'line',',',';') as line,length(tags->'line') as llength
-       from &prefix;_point
-       where highway='bus_stop' or (public_transport='stop_position' and tags->'bus'='yes')
-      ) as busstop
-      </Parameter>
+       <Parameter name="table"><![CDATA[(SELECT way, ref, osm_id FROM planet_osm_line WHERE route='subway') AS subwayroutes]]></Parameter>
       &datasource-settings;
     </Datasource>
 </Layer>
+
 </Map>