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

diff --git a/styles/mapnik-osm-data/rrze-overlay.xml b/styles/mapnik-osm-data/rrze-overlay.xml
index b940b73b9efcd4d3d25721d267426ab6d812f0d5..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,53 +19,6 @@
     </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">
-  <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>
-  </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>
-  </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>
-  </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>
-  </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>
-  </Rule>
-  <Rule>
-    &maxscale_zoom15;
-    <MarkersSymbolizer file="rrzesymbols/bus_stop.svg" placement="interior" transform="scale(0.025)" />
-  </Rule>
-</Style>
-
 <Style name="subwaylines" filter-mode="first">
   <Rule>
     &maxscale_zoom10;
@@ -190,18 +138,6 @@
       &datasource-settings;
     </Datasource>
 </Layer>
-<Layer name="busstop" status="on" srs="&osm2pgsql_projection;">
-    <StyleName>busstop</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 (tags->'public_transport'='stop_position' and tags->'bus'='yes')
-      ) as busstop
-      </Parameter>
-      &datasource-settings;
-    </Datasource>
-</Layer>
 
 <Layer name="subwaylines" status="on" srs="&osm2pgsql_projection;">
     <StyleName>subwaylines</StyleName>