[openstreetmap-carto] 02/05: Imported Upstream version 2.37.1
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Fri Dec 4 16:40:17 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository openstreetmap-carto.
commit ea3de93f554f4527532915940288b42f03a55867
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Dec 4 17:06:25 2015 +0100
Imported Upstream version 2.37.1
---
admin.mss | 82 ++++++++++------------------------------------
placenames.mss | 41 ++++++-----------------
project.mml | 94 ++++-------------------------------------------------
project.yaml | 101 +--------------------------------------------------------
shapefiles.mss | 8 +----
5 files changed, 35 insertions(+), 291 deletions(-)
diff --git a/admin.mss b/admin.mss
index 853ac18..d586f74 100644
--- a/admin.mss
+++ b/admin.mss
@@ -6,88 +6,48 @@ For each zoomlevel, all borders come from a single attachment, to handle
overlapping borders correctly.
*/
-#admin-very-low-zoom[zoom >= 4][zoom < 5],
-#admin-low-zoom[zoom >= 5][zoom < 11],
+#admin-low-zoom[zoom < 11],
#admin-mid-zoom[zoom >= 11][zoom < 13],
#admin-high-zoom[zoom >= 13] {
- [admin_level = '2'] {
- [zoom >= 4] {
- background/line-join: bevel;
- background/line-color: white;
- background/line-width: 1.2;
- line-join: bevel;
- line-color: @admin-boundaries;
- line-width: 1.2;
- }
- [zoom >= 5] {
- background/line-width: 1.5;
- line-width: 1.5;
- }
- [zoom >= 6] {
- background/line-width: 1.8;
- line-width: 1.8;
- }
- [zoom >= 7] {
- background/line-width: 2;
- line-width: 2;
- }
- [zoom >= 10] {
- background/line-width: 6;
- line-width: 6;
- }
- }
+ [admin_level = '2'],
[admin_level = '3'] {
[zoom >= 4] {
- background/line-join: bevel;
background/line-color: white;
background/line-width: 0.6;
- line-join: bevel;
line-color: @admin-boundaries;
line-width: 0.6;
}
[zoom >= 7] {
- background/line-width: 1.2;
- line-width: 1.2;
+ background/line-width: 2;
+ line-width: 2;
}
[zoom >= 10] {
- background/line-width: 4;
- line-width: 4;
- line-dasharray: 4,2;
- line-clip: false;
+ [admin_level = '2'] {
+ background/line-width: 6;
+ line-width: 6;
+ }
+ [admin_level = '3'] {
+ background/line-width: 5;
+ line-width: 5;
+ line-dasharray: 4,2;
+ line-clip: false;
+ }
}
}
[admin_level = '4'] {
[zoom >= 4] {
- background/line-join: bevel;
background/line-color: white;
- background/line-width: 0.4;
- line-join: bevel;
+ background/line-width: 0.6;
line-color: @admin-boundaries;
- line-width: 0.4;
+ line-width: 0.6;
line-dasharray: 4,3;
line-clip: false;
}
- [zoom >= 5] {
- background/line-width: 0.6;
- line-width: 0.6;
- }
- [zoom >= 6] {
- background/line-width: 0.8;
- line-width: 0.8;
- }
[zoom >= 7] {
background/line-width: 1;
line-width: 1;
}
- [zoom >= 9] {
- background/line-width: 1.8;
- line-width: 1.8;
- }
- [zoom >= 10] {
- background/line-width: 2.5;
- line-width: 2.5;
- }
- [zoom >= 12] {
+ [zoom >= 11] {
background/line-width: 3;
line-width: 3;
}
@@ -110,20 +70,16 @@ overlapping borders correctly.
#admin-mid-zoom[zoom >= 11][zoom < 13],
#admin-high-zoom[zoom >= 13] {
[admin_level = '5'][zoom >= 11] {
- background/line-join: bevel;
background/line-color: white;
background/line-width: 2;
- line-join: bevel;
line-color: @admin-boundaries;
line-width: 2;
line-dasharray: 6,3,2,3,2,3;
line-clip: false;
}
[admin_level = '6'][zoom >= 11] {
- background/line-join: bevel;
background/line-color: white;
background/line-width: 2;
- line-join: bevel;
line-color: @admin-boundaries;
line-width: 2;
line-dasharray: 6,3,2,3;
@@ -132,10 +88,8 @@ overlapping borders correctly.
[admin_level = '7'],
[admin_level = '8'] {
[zoom >= 12] {
- background/line-join: bevel;
background/line-color: white;
background/line-width: 1.5;
- line-join: bevel;
line-color: @admin-boundaries;
line-width: 1.5;
line-dasharray: 5,2;
@@ -150,10 +104,8 @@ overlapping borders correctly.
[admin_level = '9'],
[admin_level = '10'] {
[zoom >= 13] {
- background/line-join: bevel;
background/line-color: white;
background/line-width: 2;
- line-join: bevel;
line-color: @admin-boundaries;
line-width: 2;
line-dasharray: 2,3;
diff --git a/placenames.mss b/placenames.mss
index cef29d3..6137660 100644
--- a/placenames.mss
+++ b/placenames.mss
@@ -1,38 +1,18 @@
@placenames: #222;
@placenames-light: #777777;
- at country-labels: darken(@admin-boundaries, 15%);
- at state-labels: desaturate(darken(@admin-boundaries, 5%), 20%);
.country {
- [admin_level = '2'][zoom >= 3][way_pixels > 1000][way_pixels < 360000] {
+ [admin_level = '2'][zoom >= 2][way_pixels > 3000][way_pixels < 196000] {
text-name: "[name]";
text-size: 9;
-
- [zoom >= 3] {
- text-size: 10;
- }
- [zoom >= 4] {
- text-size: 11;
- }
- [zoom >= 5] {
- text-size: 12;
- }
- [zoom >= 7] {
- text-size: 13;
- }
- [zoom >= 10] {
- text-size: 14;
- }
-
- text-fill: @country-labels;
+ text-fill: #9d6c9d;
text-face-name: @book-fonts;
- text-halo-fill: rgba(255,255,255,0.6);
text-halo-radius: 1.5;
- text-wrap-width: 35;
+ text-wrap-width: 50;
text-placement: interior;
- text-character-spacing: 0.5;
- text-min-distance: 3;
- text-line-spacing: 1;
+ [zoom >= 4] {
+ text-size: 10;
+ }
}
}
@@ -42,20 +22,18 @@
[zoom >= 5][way_pixels > 3000][way_pixels < 196000] {
text-name: "[ref]";
text-size: 9;
- text-fill: @state-labels;
+ text-fill: #9d6c9d;
text-face-name: @oblique-fonts;
- text-halo-fill: rgba(255,255,255,0.6);
text-halo-radius: 1.5;
text-wrap-width: 0;
text-placement: interior;
- text-min-distance: 3;
[zoom >= 5] {
text-name: "[name]";
- text-wrap-width: 30;
+ text-wrap-width: 50;
}
[zoom >= 7] {
text-size: 11;
- text-wrap-width: 50;
+ text-wrap-width: 70;
}
}
}
@@ -63,6 +41,7 @@
#placenames-medium::high-importance {
[category = 1][zoom < 14] {
+ [zoom >= 3][score >= 5000000],
[zoom >= 4][score >= 3000000],
[zoom >= 5][score >= 400000] {
text-name: "[name]";
diff --git a/project.mml b/project.mml
index 1d257b2..ebce0cd 100644
--- a/project.mml
+++ b/project.mml
@@ -1049,33 +1049,6 @@
"advanced": {}
},
{
- "name": "admin-very-low-zoom",
- "srs-name": "900913",
- "geometry": "linestring",
- "class": "",
- "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 admin_level\n FROM planet_osm_roads o\n WHERE boundary = 'administrative'\n AND (admin_level IN ('0', '1', '2')\n OR (admin_level IN ('3', '4')\n AND EXISTS\n (SELECT 1\n FROM planet_osm_polygon i\n WHERE boundary = 'administrative'\n AND admin_level = '2'\n AND way_area > 9e+12\n AND ST_Within(o.way, i.way)\n AND osm_id < 0\n )\n )\n [...]
- "geometry_field": "way",
- "type": "postgis",
- "key_field": "",
- "dbname": "gis"
- },
- "extent": [
- -180,
- -85.05112877980659,
- 180,
- 85.05112877980659
- ],
- "id": "admin-very-low-zoom",
- "properties": {
- "maxzoom": 4,
- "minzoom": 4
- },
- "advanced": {}
- },
- {
"name": "admin-low-zoom",
"srs-name": "900913",
"geometry": "linestring",
@@ -1083,7 +1056,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 admin_level\n FROM planet_osm_roads\n WHERE boundary = 'administrative'\n AND admin_level IN ('0', '1', '2', '3', '4')\n AND osm_id < 0\n ORDER BY admin_level DESC\n) AS admin_low_zoom",
+ "table": "(SELECT\n way,\n admin_level\n FROM planet_osm_roads\n WHERE boundary = 'administrative'\n AND admin_level IN ('0', '1', '2', '3', '4')\n ORDER BY admin_level DESC\n) AS admin_low_zoom",
"geometry_field": "way",
"type": "postgis",
"key_field": "",
@@ -1097,8 +1070,7 @@
],
"id": "admin-low-zoom",
"properties": {
- "maxzoom": 10,
- "minzoom": 5
+ "maxzoom": 10
},
"advanced": {}
},
@@ -1111,7 +1083,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 admin_level\n FROM planet_osm_roads\n WHERE boundary = 'administrative'\n AND admin_level IN ('0', '1', '2', '3', '4', '5', '6', '7', '8')\n AND osm_id < 0\n ORDER BY admin_level DESC\n) AS admin_mid_zoom",
+ "table": "(SELECT\n way,\n admin_level\n FROM planet_osm_roads\n WHERE boundary = 'administrative'\n AND admin_level IN ('0', '1', '2', '3', '4', '5', '6', '7', '8')\n ORDER BY admin_level DESC\n) AS admin_mid_zoom",
"geometry_field": "way",
"type": "postgis",
"key_field": "",
@@ -1138,7 +1110,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 admin_level\n FROM planet_osm_roads\n WHERE boundary = 'administrative'\n AND admin_level IN ('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10')\n AND osm_id < 0\n ORDER BY admin_level::integer DESC -- With 10 as a valid value, we need to do a numeric ordering, not a text ordering\n) AS admin_high_zoom",
+ "table": "(SELECT\n way,\n admin_level\n FROM planet_osm_roads\n WHERE boundary = 'administrative'\n AND admin_level IN ('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10')\n ORDER BY admin_level::integer DESC -- With 10 as a valid value, we need to do a numeric ordering, not a text ordering\n) AS admin_high_zoom",
"geometry_field": "way",
"type": "postgis",
"key_field": "",
@@ -1286,60 +1258,6 @@
"advanced": {}
},
{
- "name": "placenames-large-very-low-zoom",
- "srs-name": "900913",
- "geometry": "point",
- "class": "country state",
- "id": "placenames-large-very-low-zoom",
- "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 way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels,\n name,\n ref,\n admin_level\n FROM planet_osm_polygon\n WHERE boundary = 'administrative'\n AND admin_level = '2'\n AND name IS NOT NULL\n AND way_area > 100*!pixel_width!::real*!pixel_height!::real -- Conditions in the MSS filter this down even more\n ORDER BY admin_level ASC, way_area DESC\n) AS placenames_large_very_low_zoom",
- "geometry_field": "way",
- "type": "postgis",
- "key_field": "",
- "dbname": "gis"
- },
- "extent": [
- -180,
- -85.05112877980659,
- 180,
- 85.05112877980659
- ],
- "properties": {
- "maxzoom": 3,
- "minzoom": 2
- },
- "advanced": {}
- },
- {
- "name": "placenames-large-low-zoom",
- "srs-name": "900913",
- "geometry": "point",
- "class": "country state",
- "id": "placenames-large-low-zoom",
- "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 way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels,\n name,\n ref,\n admin_level\n FROM planet_osm_polygon o\n WHERE boundary = 'administrative'\n AND (admin_level = '2'\n OR (admin_level = '4'\n AND EXISTS\n (SELECT 1\n FROM planet_osm_polygon i\n WHERE boundary = 'administrative'\n AND admin_level = '2'\n AND way_area > 9e+12\n [...]
- "geometry_field": "way",
- "type": "postgis",
- "key_field": "",
- "dbname": "gis"
- },
- "extent": [
- -180,
- -85.05112877980659,
- 180,
- 85.05112877980659
- ],
- "properties": {
- "maxzoom": 4,
- "minzoom": 4
- },
- "advanced": {}
- },
- {
"name": "placenames-large",
"srs-name": "900913",
"geometry": "point",
@@ -1348,7 +1266,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 way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels,\n name,\n ref,\n admin_level\n FROM planet_osm_polygon\n WHERE boundary = 'administrative'\n AND admin_level IN ('2', '4')\n AND name IS NOT NULL\n AND way_area > 100*!pixel_width!::real*!pixel_height!::real -- Conditions in the MSS filter this down even more\n ORDER BY admin_level ASC, way_area DESC\n) AS placenames_large",
+ "table": "(SELECT\n way,\n way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels,\n name,\n ref,\n admin_level\n FROM planet_osm_polygon\n WHERE boundary = 'administrative'\n AND admin_level IN ('2', '4')\n AND name IS NOT NULL\n ORDER BY admin_level ASC, way_area DESC\n) AS placenames_large",
"geometry_field": "way",
"type": "postgis",
"key_field": "",
@@ -1361,7 +1279,7 @@
85.05112877980659
],
"properties": {
- "minzoom": 5
+ "minzoom": 2
},
"advanced": {}
},
diff --git a/project.yaml b/project.yaml
index 93f6397..28d7901 100644
--- a/project.yaml
+++ b/project.yaml
@@ -1311,39 +1311,6 @@ Layer:
properties:
minzoom: 13
advanced: {}
- - name: "admin-very-low-zoom"
- id: "admin-very-low-zoom"
- class: ""
- geometry: "linestring"
- <<: *extents
- Datasource:
- <<: *osm2pgsql
- table: |-
- (SELECT
- way,
- admin_level
- FROM planet_osm_roads o
- WHERE boundary = 'administrative'
- AND (admin_level IN ('0', '1', '2')
- OR (admin_level IN ('3', '4')
- AND EXISTS
- (SELECT 1
- FROM planet_osm_polygon i
- WHERE boundary = 'administrative'
- AND admin_level = '2'
- AND way_area > 9e+12
- AND ST_Within(o.way, i.way)
- AND osm_id < 0
- )
- )
- )
- AND osm_id < 0
- ORDER BY admin_level DESC
- ) AS admin_very_low_zoom
- properties:
- minzoom: 4
- maxzoom: 4
- advanced: {}
- name: "admin-low-zoom"
id: "admin-low-zoom"
class: ""
@@ -1358,11 +1325,9 @@ Layer:
FROM planet_osm_roads
WHERE boundary = 'administrative'
AND admin_level IN ('0', '1', '2', '3', '4')
- AND osm_id < 0
ORDER BY admin_level DESC
) AS admin_low_zoom
properties:
- minzoom: 5
maxzoom: 10
advanced: {}
- id: "admin-mid-zoom"
@@ -1379,7 +1344,6 @@ Layer:
FROM planet_osm_roads
WHERE boundary = 'administrative'
AND admin_level IN ('0', '1', '2', '3', '4', '5', '6', '7', '8')
- AND osm_id < 0
ORDER BY admin_level DESC
) AS admin_mid_zoom
properties:
@@ -1400,7 +1364,6 @@ Layer:
FROM planet_osm_roads
WHERE boundary = 'administrative'
AND admin_level IN ('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10')
- AND osm_id < 0
ORDER BY admin_level::integer DESC -- With 10 as a valid value, we need to do a numeric ordering, not a text ordering
) AS admin_high_zoom
properties:
@@ -1500,67 +1463,6 @@ Layer:
properties:
minzoom: 16
advanced: {}
- - id: "placenames-large-very-low-zoom"
- name: "placenames-large-very-low-zoom"
- class: "country state"
- geometry: "point"
- <<: *extents
- Datasource:
- <<: *osm2pgsql
- table: |-
- (SELECT
- way,
- way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels,
- name,
- ref,
- admin_level
- FROM planet_osm_polygon
- WHERE boundary = 'administrative'
- AND admin_level = '2'
- AND name IS NOT NULL
- AND way_area > 100*!pixel_width!::real*!pixel_height!::real -- Conditions in the MSS filter this down even more
- ORDER BY admin_level ASC, way_area DESC
- ) AS placenames_large_very_low_zoom
- properties:
- minzoom: 2
- maxzoom: 3
- advanced: {}
- - id: "placenames-large-low-zoom"
- name: "placenames-large-low-zoom"
- class: "country state"
- geometry: "point"
- <<: *extents
- Datasource:
- <<: *osm2pgsql
- table: |-
- (SELECT
- way,
- way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels,
- name,
- ref,
- admin_level
- FROM planet_osm_polygon o
- WHERE boundary = 'administrative'
- AND (admin_level = '2'
- OR (admin_level = '4'
- AND EXISTS
- (SELECT 1
- FROM planet_osm_polygon i
- WHERE boundary = 'administrative'
- AND admin_level = '2'
- AND way_area > 9e+12
- AND ST_Within(o.way, i.way)
- AND osm_id < 0
- )
- )
- )
- AND way_area > 100*!pixel_width!::real*!pixel_height!::real -- Conditions in the MSS filter this down even more
- ORDER BY admin_level ASC, way_area DESC
- ) AS placenames_large_low_zoom
- properties:
- minzoom: 4
- maxzoom: 4
- advanced: {}
- id: "placenames-large"
name: "placenames-large"
class: "country state"
@@ -1579,11 +1481,10 @@ Layer:
WHERE boundary = 'administrative'
AND admin_level IN ('2', '4')
AND name IS NOT NULL
- AND way_area > 100*!pixel_width!::real*!pixel_height!::real -- Conditions in the MSS filter this down even more
ORDER BY admin_level ASC, way_area DESC
) AS placenames_large
properties:
- minzoom: 5
+ minzoom: 2
advanced: {}
- id: "placenames-medium"
name: "placenames-medium"
diff --git a/shapefiles.mss b/shapefiles.mss
index 1274b57..5b3d1c0 100644
--- a/shapefiles.mss
+++ b/shapefiles.mss
@@ -1,12 +1,6 @@
#necountries {
[zoom >= 1][zoom < 4] {
- line-width: 0.2;
- [zoom >= 2] {
- line-width: 0.3;
- }
- [zoom >= 3] {
- line-width: 0.4;
- }
+ line-width: 0.5;
line-color: @admin-boundaries;
}
}
--
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