[openstreetmap-carto] 01/04: Imported Upstream version 2.39.0
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sat Mar 5 00:21:13 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository openstreetmap-carto.
commit dcddd0371915cbbc945eb72e1c269fc77b916fce
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Mar 5 00:39:44 2016 +0100
Imported Upstream version 2.39.0
---
amenity-points.mss | 20 +++++++++++-------
project.mml | 8 ++++----
project.yaml | 8 +++-----
roads.mss | 6 ++++++
symbols/cave.14.svg | 31 ++++++++++++++++++++++++++++
symbols/information.12.svg | 48 +++++++++++++++++++++++++++++++++++++++++++
symbols/information.p.16.png | Bin 294 -> 0 bytes
symbols/poi_cave.p.16.png | Bin 270 -> 0 bytes
symbols/shelter-14.svg | 31 ++++++++++++++++++++++++++++
symbols/shelter2.p.16.png | Bin 571 -> 0 bytes
10 files changed, 136 insertions(+), 16 deletions(-)
diff --git a/amenity-points.mss b/amenity-points.mss
index a5533d8..765d836 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -28,8 +28,10 @@
}
[feature = 'amenity_shelter'][zoom >= 16] {
- point-file: url('symbols/shelter2.p.16.png');
- point-placement: interior;
+ marker-file: url('symbols/shelter-14.svg');
+ marker-fill: @transportation-icon;
+ marker-placement: interior;
+ marker-clip: false;
}
[feature = 'amenity_atm'][zoom >= 17] {
@@ -245,8 +247,10 @@
}
[feature = 'tourism_information'][zoom >= 17] {
- point-file: url('symbols/information.p.16.png');
- point-placement: interior;
+ marker-file: url('symbols/information.12.svg');
+ marker-placement: interior;
+ marker-fill: @amenity-brown;
+ marker-clip: false;
}
[feature = 'amenity_embassy'][zoom >= 17] {
@@ -987,8 +991,9 @@
}
[feature = 'natural_cave_entrance'][zoom >= 15] {
- point-file: url('symbols/poi_cave.p.16.png');
- point-placement: interior;
+ marker-file: url('symbols/cave.14.svg');
+ marker-placement: interior;
+ marker-clip: false;
}
[feature = 'natural_spring'][zoom >= 14] {
@@ -1073,7 +1078,8 @@
}
}
- [barrier = 'lift_gate'][zoom >= 16]::barrier {
+ [barrier = 'lift_gate'][zoom >= 16]::barrier,
+ [barrier = 'swing_gate'][zoom >= 16]::barrier {
marker-file: url('symbols/liftgate.svg');
marker-fill: #3f3f3f;
marker-placement: interior;
diff --git a/project.mml b/project.mml
index 2912f08..aac77f8 100644
--- a/project.mml
+++ b/project.mml
@@ -1345,7 +1345,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 name,\n railway,\n aerialway,\n disused,\n CASE railway \n WHEN 'station' THEN 1 \n WHEN 'subway_entrance' THEN 3\n ELSE 2\n END\n AS prio\n FROM planet_osm_point\n WHERE railway IN ('station', 'halt', 'tram_stop', 'subway_entrance')\n OR aerialway = 'station'\n ORDER BY prio\n) AS stations",
+ "table": "(SELECT\n way,\n name,\n railway,\n aerialway,\n CASE railway \n WHEN 'station' THEN 1 \n WHEN 'subway_entrance' THEN 3\n ELSE 2\n END\n AS prio\n FROM planet_osm_point\n WHERE railway IN ('station', 'halt', 'tram_stop', 'subway_entrance')\n OR aerialway = 'station'\n ORDER BY prio\n) AS stations",
"geometry_field": "way",
"type": "postgis",
"key_field": "",
@@ -1371,7 +1371,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 name,\n railway,\n aerialway,\n disused\nFROM planet_osm_polygon\nWHERE railway IN ('station', 'halt', 'tram_stop')\n OR aerialway = 'station'\n) AS stations_poly",
+ "table": "(SELECT\n way,\n name,\n railway,\n aerialway\nFROM planet_osm_polygon\nWHERE railway IN ('station', 'halt', 'tram_stop')\n OR aerialway = 'station'\n) AS stations_poly",
"geometry_field": "way",
"type": "postgis",
"key_field": "",
@@ -1997,7 +1997,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 man_made,\n historic,\n access,\n name,\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', 'motorcycle_parking', 'bench', 'waste_basket')\n OR historic = [...]
+ "table": "(SELECT\n way,\n amenity,\n railway,\n highway,\n barrier,\n man_made,\n historic,\n access,\n name,\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', 'swing_gate', 'block')\n OR highway IN ('mini_roundabout')\n OR railway = 'level_crossing'\n OR amenity IN ('parking', 'bicycle_parking', 'motorcycle_parking', 'bench', 'waste_basket')\n [...]
"geometry_field": "way",
"type": "postgis",
"key_field": "",
@@ -2023,7 +2023,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 man_made,\n historic,\n access,\n name\n FROM planet_osm_polygon\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', 'motorcycle_parking')\n ) AS amenity_low_priority_poly",
+ "table": "(SELECT\n way,\n amenity,\n railway,\n highway,\n barrier,\n man_made,\n historic,\n access,\n name\n FROM planet_osm_polygon\n WHERE barrier IN ('bollard', 'gate', 'lift_gate', 'swing_gate', 'block')\n OR highway IN ('mini_roundabout')\n OR railway = 'level_crossing'\n OR amenity IN ('parking', 'bicycle_parking', 'motorcycle_parking')\n ) AS amenity_low_priority_poly",
"geometry_field": "way",
"type": "postgis",
"key_field": "",
diff --git a/project.yaml b/project.yaml
index a2ecd19..d4f8984 100644
--- a/project.yaml
+++ b/project.yaml
@@ -1577,7 +1577,6 @@ Layer:
name,
railway,
aerialway,
- disused,
CASE railway
WHEN 'station' THEN 1
WHEN 'subway_entrance' THEN 3
@@ -1604,8 +1603,7 @@ Layer:
way,
name,
railway,
- aerialway,
- disused
+ aerialway
FROM planet_osm_polygon
WHERE railway IN ('station', 'halt', 'tram_stop')
OR aerialway = 'station'
@@ -2448,7 +2446,7 @@ Layer:
name,
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')
+ WHERE barrier IN ('bollard', 'gate', 'lift_gate', 'swing_gate', 'block')
OR highway IN ('mini_roundabout')
OR railway = 'level_crossing'
OR amenity IN ('parking', 'bicycle_parking', 'motorcycle_parking', 'bench', 'waste_basket')
@@ -2478,7 +2476,7 @@ Layer:
access,
name
FROM planet_osm_polygon
- WHERE barrier IN ('bollard', 'gate', 'lift_gate', 'block')
+ WHERE barrier IN ('bollard', 'gate', 'lift_gate', 'swing_gate', 'block')
OR highway IN ('mini_roundabout')
OR railway = 'level_crossing'
OR amenity IN ('parking', 'bicycle_parking', 'motorcycle_parking')
diff --git a/roads.mss b/roads.mss
index 4f1911f..87a40f1 100644
--- a/roads.mss
+++ b/roads.mss
@@ -3047,6 +3047,12 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
[feature = 'highway_footway'],
[feature = 'highway_path'] {
marker-fill: @footway-oneway-arrow-color;
+ [horse = 'designated'] {
+ marker-fill: @bridleway-oneway-arrow-color;
+ }
+ [bicycle = 'designated'] {
+ marker-fill: @cycleway-oneway-arrow-color;
+ }
}
[feature = 'highway_steps'] {
marker-fill: @steps-oneway-arrow-color;
diff --git a/symbols/cave.14.svg b/symbols/cave.14.svg
new file mode 100644
index 0000000..d4eabc1
--- /dev/null
+++ b/symbols/cave.14.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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="14"
+ height="14"
+ id="svg2"
+ enable-background="new">
+ <metadata
+ id="metadata9">
+ <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="defs7" />
+ <path
+ d="M 3,10 C 3,9 5,6 6.9763711,6.0000697 9,6 11,9 11,10 L 7,10 Z M 7,3 C 4,3 0,7 0,10 l 1,0 C 1,7 5,4 7,4 c 2,0 6,3 6,6 l 1,0 C 14,7 10,3 7,3 Z"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-opacity:1"
+ id="path4185" />
+</svg>
diff --git a/symbols/information.12.svg b/symbols/information.12.svg
new file mode 100644
index 0000000..f07bc40
--- /dev/null
+++ b/symbols/information.12.svg
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+ id="svg2"
+ height="12"
+ width="12"
+ version="1.1">
+ <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:license
+ rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs6" />
+ <rect
+ style="visibility:hidden;fill:none;stroke:none"
+ id="canvas"
+ y="-2"
+ x="0"
+ height="14"
+ width="14" />
+ <path
+ id="information"
+ d="M 6 0 A 1 1 0 0 0 5 1 A 1 1 0 0 0 6 2 A 1 1 0 0 0 7 1 A 1 1 0 0 0 6 0 z M 7 4 L 4 5 L 4 6 L 4.921875 6 L 5 11 L 4 11 L 4 12 L 8 12 L 8 11 L 7 11 L 7 4 z "
+ style="fill:#000000;fill-opacity:1;stroke:none" />
+</svg>
diff --git a/symbols/information.p.16.png b/symbols/information.p.16.png
deleted file mode 100644
index 65d03db..0000000
Binary files a/symbols/information.p.16.png and /dev/null differ
diff --git a/symbols/poi_cave.p.16.png b/symbols/poi_cave.p.16.png
deleted file mode 100644
index aafddbb..0000000
Binary files a/symbols/poi_cave.p.16.png and /dev/null differ
diff --git a/symbols/shelter-14.svg b/symbols/shelter-14.svg
new file mode 100644
index 0000000..7abe838
--- /dev/null
+++ b/symbols/shelter-14.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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 14 14"
+ id="svg2">
+ <defs
+ id="defs3053" />
+ <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>
+ <path
+ id="rect4777"
+ d="M 4.0078125 0 L 3.0078125 2 L 3.4765625 2 L 4.5234375 0 L 4.0078125 0 z M 8.0078125 0 L 7.0078125 2 L 7.4765625 2 L 8.5234375 0 L 8.0078125 0 z M 12.007812 0 L 11.007812 2 L 11.476562 2 L 12.523438 0 L 12.007812 0 z M 1 2 L 0 4 L 0.46875 4 L 1.5175781 2 L 1 2 z M 5.0078125 2 L 4.0078125 4 L 4.4765625 4 L 5.5234375 2 L 5.0078125 2 z M 9.0078125 2 L 8.0078125 4 L 8.4765625 4 L 9.5234375 2 L 9.0078125 2 z M 13.007812 2 L 12.007812 4 L 12.476562 4 L 13.523438 2 L 13.007812 2 z M 2.5 [...]
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-opacity:1" />
+</svg>
diff --git a/symbols/shelter2.p.16.png b/symbols/shelter2.p.16.png
deleted file mode 100644
index 09ea530..0000000
Binary files a/symbols/shelter2.p.16.png and /dev/null differ
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/openstreetmap-carto.git
More information about the Pkg-grass-devel
mailing list