From 8af891eda038de114f1c12e656258aacb05bcf74 Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Tue, 10 Jan 2017 16:02:25 +0100 Subject: [PATCH] Migreate boundary --- style.json | 174 +++-------------------------------------------------- 1 file changed, 7 insertions(+), 167 deletions(-) diff --git a/style.json b/style.json index 1cd2172..dcdc888 100644 --- a/style.json +++ b/style.json @@ -2884,22 +2884,18 @@ ] }, { - "id": "admin_level_3", + "id": "boundary_3", "type": "line", "metadata": {}, "source": "openmaptiles", - "source-layer": "admin", + "source-layer": "boundary", "filter": [ "all", [ - "==", - "maritime", - 0 - ], - [ - ">=", + "in", "admin_level", - 3 + "3", + "4" ] ], "layout": { @@ -2931,27 +2927,17 @@ } }, { - "id": "admin_level_2", + "id": "boundary_2", "type": "line", "metadata": {}, "source": "openmaptiles", - "source-layer": "admin", + "source-layer": "boundary", "filter": [ "all", [ "==", "admin_level", 2 - ], - [ - "==", - "disputed", - 0 - ], - [ - "==", - "maritime", - 0 ] ], "layout": { @@ -2992,152 +2978,6 @@ } } }, - { - "id": "admin_level_2_disputed", - "type": "line", - "metadata": {}, - "source": "openmaptiles", - "source-layer": "admin", - "filter": [ - "all", - [ - "==", - "admin_level", - 2 - ], - [ - "==", - "disputed", - 1 - ], - [ - "==", - "maritime", - 0 - ] - ], - "layout": { - "line-cap": "round" - }, - "paint": { - "line-color": "#9e9cab", - "line-dasharray": [ - 2, - 2 - ], - "line-width": { - "base": 1, - "stops": [ - [ - 4, - 1.4 - ], - [ - 5, - 2 - ], - [ - 12, - 8 - ] - ] - } - } - }, - { - "id": "admin_level_3_maritime", - "type": "line", - "metadata": {}, - "source": "openmaptiles", - "source-layer": "admin", - "filter": [ - "all", - [ - "==", - "maritime", - 1 - ], - [ - ">=", - "admin_level", - 3 - ] - ], - "layout": { - "line-join": "round" - }, - "paint": { - "line-color": "#a0c8f0", - "line-dasharray": [ - 3, - 1, - 1, - 1 - ], - "line-opacity": 0.5, - "line-width": { - "base": 1, - "stops": [ - [ - 4, - 0.4 - ], - [ - 5, - 1 - ], - [ - 12, - 3 - ] - ] - } - } - }, - { - "id": "admin_level_2_maritime", - "type": "line", - "metadata": {}, - "source": "openmaptiles", - "source-layer": "admin", - "filter": [ - "all", - [ - "==", - "admin_level", - 2 - ], - [ - "==", - "maritime", - 1 - ] - ], - "layout": { - "line-cap": "round" - }, - "paint": { - "line-color": "#a0c8f0", - "line-opacity": 0.5, - "line-width": { - "base": 1, - "stops": [ - [ - 4, - 1.4 - ], - [ - 5, - 2 - ], - [ - 12, - 8 - ] - ] - } - } - }, { "id": "water_label", "type": "symbol",