Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reduce number of overlapping admin borders #1107

Merged
merged 2 commits into from
Nov 14, 2014
Merged

Reduce number of overlapping admin borders #1107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7dfed68
Reduce number of overlapping admin borders
matthijsmelissen Nov 1, 2014
7476361
Prevent overlapping admin borders of different layers
matthijsmelissen Nov 1, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 31 additions & 3 deletions admin.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,32 @@
@admin-boundaries: #ac46ac;

#admin-01234 {
/* For performance reasons, the admin border layers are split into three groups
for low, middle and high zoom levels.
For each zoomlevel, all borders come from a single attachment, to handle
overlapping borders correctly. */

#admin-low-zoom[zoom < 11],
#admin-mid-zoom[zoom >= 11][zoom < 13],
#admin-high-zoom[zoom >= 13] {
[admin_level = '2'],
[admin_level = '3'] {
[zoom >= 4] {
background/line-color: white;
background/line-width: 0.6;
line-color: @admin-boundaries;
line-width: 0.6;
}
[zoom >= 7] {
background/line-width: 2;
line-width: 2;
}
[zoom >= 10] {
[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;
Expand All @@ -23,29 +35,39 @@
}
[admin_level = '4'] {
[zoom >= 4] {
background/line-color: white;
background/line-width: 0.6;
line-color: @admin-boundaries;
line-width: 0.6;
line-dasharray: 4,3;
line-clip: false;
}
[zoom >= 7] {
background/line-width: 1;
line-width: 1;
}
[zoom >= 11] {
background/line-width: 3;
line-width: 3;
}
}
opacity: 0.4;
comp-op: darken;
}

#admin-5678 {
#admin-mid-zoom[zoom >= 11][zoom < 13],
#admin-high-zoom[zoom >= 13] {
[admin_level = '5'][zoom >= 11] {
background/line-color: white;
background/line-width: 2;
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-color: white;
background/line-width: 2;
line-color: @admin-boundaries;
line-width: 2;
line-dasharray: 6,3,2,3;
Expand All @@ -54,26 +76,32 @@
[admin_level = '7'],
[admin_level = '8'] {
[zoom >= 12] {
background/line-color: white;
background/line-width: 1.5;
line-color: @admin-boundaries;
line-width: 1.5;
line-dasharray: 5,2;
line-clip: false;
}
}
opacity: 0.5;
comp-op: darken;
}

#admin-other {
#admin-high-zoom[zoom >= 13] {
[admin_level = '9'],
[admin_level = '10'] {
[zoom >= 13] {
background/line-color: white;
background/line-width: 2;
line-color: @admin-boundaries;
line-width: 2;
line-dasharray: 2,3;
line-clip: false;
}
}
opacity: 0.5;
comp-op: darken;
}

#admin-text[zoom >= 16] {
Expand Down
18 changes: 9 additions & 9 deletions project.mml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -888,14 +888,14 @@
"advanced": {}
},
{
"name": "admin-01234",
"name": "admin-low-zoom",
"srs-name": "900913",
"geometry": "linestring",
"id": "admin-01234",
"id": "admin-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 way, admin_level\n FROM planet_osm_roads\n WHERE \"boundary\" = 'administrative'\n AND admin_level IN ('0', '1', '2', '3', '4')\n ) AS admin_01234",
"table": "(SELECT way, 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": "",
Expand All @@ -911,14 +911,14 @@
"advanced": {}
},
{
"name": "admin-5678",
"name": "admin-mid-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 way, admin_level\n FROM planet_osm_roads\n WHERE \"boundary\" = 'administrative'\n AND admin_level IN ('5', '6', '7', '8')\n ) AS admin_5678",
"table": "(SELECT way, 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": "",
Expand All @@ -930,18 +930,18 @@
180,
85.05112877980659
],
"id": "admin-5678",
"id": "admin-mid-zoom",
"advanced": {}
},
{
"name": "admin-other",
"name": "admin-high-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 way, admin_level\n FROM planet_osm_roads\n WHERE \"boundary\" = 'administrative'\n AND admin_level IN ('9', '10')\n ) AS admin_other",
"table": "(SELECT way, 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 DESC\n ) AS admin_high_zoom",
"geometry_field": "way",
"type": "postgis",
"key_field": "",
Expand All @@ -953,7 +953,7 @@
180,
85.05112877980659
],
"id": "admin-other",
"id": "admin-high-zoom",
"advanced": {}
},
{
Expand Down
25 changes: 14 additions & 11 deletions project.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -997,8 +997,8 @@ Layer:
table: |2-
(SELECT way FROM planet_osm_line WHERE highway = 'bus_guideway' AND (tunnel IS NULL OR tunnel != 'yes')) AS guideways
advanced: {}
- name: "admin-01234"
id: "admin-01234"
- name: "admin-low-zoom"
id: "admin-low-zoom"
class: ""
geometry: "linestring"
<<: *extents
Expand All @@ -1009,10 +1009,11 @@ Layer:
FROM planet_osm_roads
WHERE "boundary" = 'administrative'
AND admin_level IN ('0', '1', '2', '3', '4')
) AS admin_01234
ORDER BY admin_level DESC
) AS admin_low_zoom
advanced: {}
- id: "admin-5678"
name: "admin-5678"
- id: "admin-mid-zoom"
name: "admin-mid-zoom"
class: ""
geometry: "linestring"
<<: *extents
Expand All @@ -1022,11 +1023,12 @@ Layer:
(SELECT way, admin_level
FROM planet_osm_roads
WHERE "boundary" = 'administrative'
AND admin_level IN ('5', '6', '7', '8')
) AS admin_5678
AND admin_level IN ('0', '1', '2', '3', '4', '5', '6', '7', '8')
ORDER BY admin_level DESC
) AS admin_mid_zoom
advanced: {}
- id: "admin-other"
name: "admin-other"
- id: "admin-high-zoom"
name: "admin-high-zoom"
class: ""
geometry: "linestring"
<<: *extents
Expand All @@ -1036,8 +1038,9 @@ Layer:
(SELECT way, admin_level
FROM planet_osm_roads
WHERE "boundary" = 'administrative'
AND admin_level IN ('9', '10')
) AS admin_other
AND admin_level IN ('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10')
ORDER BY admin_level DESC
) AS admin_high_zoom
advanced: {}
- id: "power-minorline"
name: "power-minorline"
Expand Down