Permalink
Browse files

Add icon for amenity=bench and amenity=waste_basket

* Add icon for amenity=bench from z18 (resolves #194)
* Add icon for amenity=waste_basket from z19 (resolves #418)
  • Loading branch information...
matthijsmelissen authored and matkoniecz committed Jan 25, 2015
1 parent 06ca2ae commit 1307289635663de2622d25232bdcd53f07eb9f86
Showing with 98 additions and 4 deletions.
  1. +12 −0 amenity-points.mss
  2. +1 −1 project.mml
  3. +5 −3 project.yaml
  4. +40 −0 symbols/bench.16.svg
  5. +40 −0 symbols/waste_basket.10.svg
View
@@ -762,6 +762,18 @@
}
}
}
[amenity = 'bench'][zoom >= 19]::amenity {
marker-file: url('symbols/bench.16.svg');
marker-fill: #744a08;
marker-placement: interior;
}
[amenity = 'waste_basket'][zoom >= 19]::amenity {
marker-file: url('symbols/waste_basket.10.svg');
marker-fill: #744a08;
marker-placement: interior;
}
}
/* Note that .text is also used in water.mss */
View
@@ -1999,7 +1999,7 @@
"srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
"Datasource": {
"extent": "-20037508,-20037508,20037508,20037508",
"table": "(SELECT\n way,\n amenity,\n railway,\n highway,\n barrier,\n access\n FROM planet_osm_point\n WHERE barrier IN ('bollard', 'gate', 'lift_gate', 'block')\n OR highway IN ('mini_roundabout')\n OR railway = 'level_crossing'\n OR amenity IN ('parking', 'bicycle_parking')\n ) AS amenity_low_priority",
"table": "(SELECT\n way,\n amenity,\n railway,\n highway,\n barrier,\n access,\n CASE WHEN amenity='waste_basket' THEN 2 ELSE 1 END AS prio\n FROM planet_osm_point p\n WHERE barrier IN ('bollard', 'gate', 'lift_gate', 'block')\n OR highway IN ('mini_roundabout')\n OR railway = 'level_crossing'\n OR amenity IN ('parking', 'bicycle_parking', 'bench', 'waste_basket')\n ORDER BY prio\n ) AS amenity_low_priority",
"geometry_field": "way",
"type": "postgis",
"key_field": "",
View
@@ -2108,12 +2108,14 @@ Layer:
railway,
highway,
barrier,
access
FROM planet_osm_point
access,
CASE WHEN amenity='waste_basket' THEN 2 ELSE 1 END AS prio
FROM planet_osm_point p
WHERE barrier IN ('bollard', 'gate', 'lift_gate', 'block')
OR highway IN ('mini_roundabout')
OR railway = 'level_crossing'
OR amenity IN ('parking', 'bicycle_parking')
OR amenity IN ('parking', 'bicycle_parking', 'bench', 'waste_basket')
ORDER BY prio
) AS amenity_low_priority
properties:
minzoom: 14
View
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
version="1.1"
width="100%"
height="100%"
viewBox="0 0 16 16"
id="svg2">
<metadata
id="metadata8">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs6" />
<rect
width="16"
height="16"
x="0"
y="0"
id="canvas"
style="fill:none;stroke:none;visibility:hidden" />
<path
d="M 2,6 C 1,6 1,7.5 2,7.5 l 12,0 C 15,7.5 15,6 14,6 L 2,6 z m 1,2 0,3 1.5,0 0,-3 L 3,8 z m 8.5,0 0,3 1.5,0 0,-3 -1.5,0 z"
id="bench"
style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
</svg>
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
version="1.1"
width="100%"
height="100%"
viewBox="0 0 10 10"
id="svg2">
<metadata
id="metadata8">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs6" />
<rect
width="10"
height="10"
x="0"
y="0"
id="canvas"
style="fill:none;stroke:none;visibility:hidden" />
<path
d="M 4,2 3,2 2,3 8,3 7,2 6,2 5,1 z M 2,4 3,9 7,9 8,4 z"
id="waste-basket"
style="fill:#000000;fill-opacity:1;stroke:none" />
</svg>

0 comments on commit 1307289

Please sign in to comment.