Merge branch 'master' of git.rrze.uni-erlangen.de:osmrrze

diff --git a/styles/mapnik-osm-data/buildingnumbers.geojson b/styles/mapnik-osm-data/buildingnumbers.geojson
new file mode 100644 (file)
index 0000000..1897ab8
--- /dev/null
+++ b/styles/mapnik-osm-data/buildingnumbers.geojson
@@ -0,0 +1,116 @@
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "geometry": {
+        "coordinates": [ 11.02702, 49.57394 ],
+        "type": "Point"
+      },
+      "properties": {
+        "name": "113"
+      },
+      "type": "Feature"
+    },
+    {
+      "geometry": {
+        "coordinates": [ 11.02751, 49.57356 ],
+        "type": "Point"
+      },
+      "properties": {
+        "name": "113"
+      },
+      "type": "Feature"
+    },
+    {
+      "geometry": {
+        "coordinates": [ 11.02981, 49.57364 ],
+        "type": "Point"
+      },
+      "properties": {
+        "name": "128\n(NMI)"
+      },
+      "type": "Feature"
+    },
+    {
+      "geometry": {
+        "coordinates": [ 11.03062, 49.57425 ],
+        "type": "Point"
+      },
+      "properties": {
+        "name": "128"
+      },
+      "type": "Feature"
+    },
+    {
+      "geometry": {
+        "coordinates": [ 11.02873, 49.57307 ],
+        "type": "Point"
+      },
+      "properties": {
+        "name": "115"
+      },
+      "type": "Feature"
+    },
+    {
+      "geometry": {
+        "coordinates": [ 11.02596, 49.57337 ],
+        "type": "Point"
+      },
+      "properties": {
+        "name": "142\n(Casa Huber)"
+      },
+      "type": "Feature"
+    },
+    {
+      "geometry": {
+        "coordinates": [ 11.02659, 49.57280 ],
+        "type": "Point"
+      },
+      "properties": {
+        "name": "114"
+      },
+      "type": "Feature"
+    },
+    {
+      "geometry": {
+        "coordinates": [ 11.02813, 49.57432 ],
+        "type": "Point"
+      },
+      "properties": {
+        "name": "112"
+      },
+      "type": "Feature"
+    },
+    {
+      "geometry": {
+        "coordinates": [ 11.02811, 49.57488 ],
+        "type": "Point"
+      },
+      "properties": {
+        "name": "112"
+      },
+      "type": "Feature"
+    },
+    {
+      "geometry": {
+        "coordinates": [ 11.02880, 49.57536 ],
+        "type": "Point"
+      },
+      "properties": {
+        "name": "112"
+      },
+      "type": "Feature"
+    },
+    {
+      "geometry": {
+        "coordinates": [ 11.02963, 49.57442 ],
+        "type": "Point"
+      },
+      "properties": {
+        "name": "119"
+      },
+      "type": "Feature"
+    }
+  ]
+}
+

diff --git a/styles/mapnik-osm-data/rrze-overlay.xml b/styles/mapnik-osm-data/rrze-overlay.xml
index b940b73b9efcd4d3d25721d267426ab6d812f0d5..19ada77917c24e2fdb8412e73ce3ec1d658329c5 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,13 @@
     </Rule>
 </Style>
 
-<Style name="points">
+<Style name="gebaeudenummernfamos">
     <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"/>
+      &maxscale_zoom17;
+      <TextSymbolizer size="9" fill="#009090" fontset-name="book-fonts" halo-radius="1" wrap-width="99" placement="interior">[name]</TextSymbolizer>
     </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 +145,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>
@@ -211,4 +154,12 @@
     </Datasource>
 </Layer>
 
+<Layer name="gebaeudenummernfamos" status="on" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+    <StyleName>gebaeudenummernfamos</StyleName>
+    <Datasource>
+        <Parameter name="type">geojson</Parameter>
+        <Parameter name="file">buildingnumbers.geojson</Parameter>
+    </Datasource>
+</Layer>
+
 </Map>