From 3bdf14762a18002f6bdc259f26747f891d694a93 Mon Sep 17 00:00:00 2001 From: Nathaniel Kelso Date: Wed, 21 Dec 2016 12:15:00 -0800 Subject: [PATCH] switch to 0px icon size for localities (requires Tangram JS 0.11.5) --- bubble-wrap.yaml | 150 +++++++---------------------------------------- 1 file changed, 22 insertions(+), 128 deletions(-) diff --git a/bubble-wrap.yaml b/bubble-wrap.yaml index 2765e0a..f80ecc3 100644 --- a/bubble-wrap.yaml +++ b/bubble-wrap.yaml @@ -3874,7 +3874,8 @@ layers: font: family: Varela fill: global.text_fill - # NOTE: This is a hack for localities because of an icon & text bug, see note below + + # for text only labels like country text-blend-order: text_source: global.ux_language_text_source visible: false # labels are enabled by each layer below @@ -3882,20 +3883,21 @@ layers: font: family: Varela fill: global.text_fill - # END NOTE country: filter: kind: country $zoom: { min: 2, max: 9 } draw: - text-blend-order: - priority: 3 - visible: global.text_visible_admin - text_source: global.ux_language_text_source - font: - fill: [[2,[0.357,0.243,0.184]],[6,[0.604,0.437,0.427]]] - transform: uppercase + icons: + size: 0px + text: + priority: 3 + visible: global.text_visible_admin + text_source: global.ux_language_text_source + font: + fill: [[2,[0.357,0.243,0.184]],[6,[0.604,0.437,0.427]]] + transform: uppercase country-z2-z3: filter: $zoom: [2,3] @@ -4087,38 +4089,15 @@ layers: font: size: [[5,9px],[8,10px],[12,11px]] text-blend-order: - visible: global.text_visible_populated_places - buffer: 8px - interactive: global.interactive - font: - size: [[5,9px],[8,10px],[12,11px]] + visible: false - # - # NOTE: you'd think no-townspot would be the way to go, but icons with size 0px seems to have a bug to also hide the text :( - # - # no-townspot: - # filter: { $zoom: { min: 11 } } - # draw: - # icons: - # size: 0px - # text: - # anchor: center - # - # NOTE: So instead we play a shell game with symbolizers per zoom - # - _icons_later: + no-townspot-z11: filter: { $zoom: { min: 11 } } draw: icons: - visible: false - text-blend-order: - visible: global.text_visible_populated_places - _text_early: - filter: { $zoom: { max: 11 } } - draw: - text-blend-order: - visible: false - # END HACK + size: 0px + text: + anchor: center z8-50k-below: filter: { $zoom: [8,9], population: { min: 10000, max: 50000 } } @@ -4156,26 +4135,26 @@ layers: funky-village: filter: { $zoom: [11], population: { max: 1000 }, kind_detail: [village] } draw: - text-blend-order: + icons: visible: false funky-isolated_dwelling: filter: { $zoom: [13], kind_detail: [isolated_dwelling] } draw: - text-blend-order: + icons: visible: false hamlet: filter: { $zoom: [13], kind_detail: hamlet } draw: - text-blend-order: + icons: visible: false # END HACK # someone in London and Salt Lake City thought neighbourhoods should be tagged place: locality # They were wrong funky-fake-neighbourhoods: - filter: { $zoom: { min: 13 }, kind_detail: [locality] } + filter: { kind_detail: [locality] } draw: - text-blend-order: + icons: visible: false population-10m-up: @@ -4189,10 +4168,6 @@ layers: text: font: size: [[2,11px],[6,15px],[8,16px],[10,18px],[12,18px],[13,0px]] - text-blend-order: - priority: 6 - font: - size: [[2,11px],[6,15px],[8,16px],[10,18px],[12,18px],[13,0px]] capital: # we only want townspots to show as capital dots starting at zoom 5 filter: { country_capital: true, $zoom: { min: 5 } } @@ -4201,8 +4176,6 @@ layers: size: [[10,8px],[11,0px]] sprite: capital-l priority: 5 - text-blend-order: - priority: 5 population-5m-10m: filter: population: { min: 5000000, max: 10000000 } @@ -4214,10 +4187,6 @@ layers: text: font: size: [[4,10px],[6,13px],[8,16px],[10,18px],[12,18px],[13,0px]] - text-blend-order: - priority: 7 - font: - size: [[4,10px],[6,13px],[8,16px],[10,18px],[12,18px],[13,0px]] capital: # we only want townspots to show as capital dots starting at zoom 5 filter: { country_capital: true, $zoom: { min: 5 } } @@ -4226,8 +4195,6 @@ layers: size: [[10,8px],[11,0px]] sprite: capital-l priority: 6 - text-blend-order: - priority: 6 population-1m-5m: filter: population: { min: 1000000, max: 5000000 } @@ -4239,10 +4206,6 @@ layers: text: font: size: [[4,10px],[6,13px],[8,16px],[10,18px],[12,18px],[13,0px]] - text-blend-order: - priority: 9 - font: - size: [[4,10px],[6,13px],[8,16px],[10,18px],[12,18px],[13,0px]] capital: # we only want townspots to show as capital dots starting at zoom 5 filter: { country_capital: true, $zoom: { min: 5 } } @@ -4251,8 +4214,6 @@ layers: size: [[10,8px],[11,0px]] sprite: capital-l priority: 8 - text-blend-order: - priority: 8 population-500k-1m: filter: population: { min: 500000, max: 1000000 } @@ -4264,10 +4225,6 @@ layers: text: font: size: [[5,10px],[8,14px],[10,14px],[12,16px],[13,0px]] - text-blend-order: - priority: 11 - font: - size: [[5,10px],[8,14px],[10,14px],[12,16px],[13,0px]] capital: filter: { country_capital: true, $zoom: { min: 5 } } draw: @@ -4275,8 +4232,6 @@ layers: size: [[10,6px],[11,0px]] sprite: capital-m priority: 10 - text-blend-order: - priority: 10 population-200k-500k: filter: population: { min: 200000, max: 500000 } @@ -4288,10 +4243,6 @@ layers: text: font: size: [[6,10px],[8,12px],[10,14px],[12,16px],[13,0px]] - text-blend-order: - priority: 13 - font: - size: [[6,10px],[8,12px],[10,14px],[12,16px],[13,0px]] capital: filter: { country_capital: true, $zoom: { min: 5 } } draw: @@ -4299,8 +4250,6 @@ layers: size: [[10,6px],[11,0px]] sprite: capital-m priority: 12 - text-blend-order: - priority: 12 population-100k-200k: filter: population: { min: 100000, max: 200000 } @@ -4312,10 +4261,6 @@ layers: text: font: size: [[6,10px],[8,12px],[10,12px],[12,14px],[14,14px],[15,0px]] - text-blend-order: - priority: 15 - font: - size: [[6,10px],[8,12px],[10,12px],[12,14px],[14,14px],[15,0px]] capital: filter: { country_capital: true, $zoom: { min: 5 } } draw: @@ -4323,8 +4268,6 @@ layers: size: [[10,6px],[11,0px]] sprite: capital-m priority: 14 - text-blend-order: - priority: 14 population-50k-100k: filter: population: { min: 50000, max: 100000 } @@ -4337,11 +4280,6 @@ layers: font: fill: [0.30,0.30,0.30] size: [[6,10px],[8,11px],[10,12px],[12,14px],[14,14px],[15,0px]] - text-blend-order: - priority: 17 - font: - fill: [0.30,0.30,0.30] - size: [[6,10px],[8,11px],[10,12px],[12,14px],[14,14px],[15,0px]] capital: filter: { country_capital: true, $zoom: { min: 5 } } draw: @@ -4349,8 +4287,6 @@ layers: size: [[10,5px],[11,0px]] sprite: capital-m priority: 16 - text-blend-order: - priority: 16 population-20k-50k: filter: population: { min: 20000, max: 50000 } @@ -4363,11 +4299,6 @@ layers: font: fill: [0.30,0.30,0.30] size: [[9,11px],[12,12px],[14,12px],[15,0px]] - text-blend-order: - priority: 19 - font: - fill: [0.30,0.30,0.30] - size: [[9,11px],[12,12px],[14,12px],[15,0px]] capital: filter: { country_capital: true, $zoom: { min: 5 } } draw: @@ -4375,8 +4306,6 @@ layers: size: [[10,5px],[11,0px]] sprite: capital-s priority: 18 - text-blend-order: - priority: 18 population-10k-20k: filter: population: { min: 10000, max: 20000 } @@ -4389,11 +4318,6 @@ layers: font: fill: [0.35,0.35,0.35] size: [[9,11px],[12,12px],[14,12px],[15,0px]] - text-blend-order: - priority: 21 - font: - fill: [0.35,0.35,0.35] - size: [[9,11px],[12,12px],[14,12px],[15,0px]] capital: filter: { country_capital: true, $zoom: { min: 5 } } draw: @@ -4401,8 +4325,6 @@ layers: size: [[10,5px],[11,0px]] sprite: capital-s priority: 20 - text-blend-order: - priority: 20 population-5k-10k: filter: population: { min: 5000, max: 10000 } @@ -4415,11 +4337,6 @@ layers: font: fill: [0.35,0.35,0.35] size: [[9,10px],[12,12px],[13,12px],[14,12px],[15,0px]] - text-blend-order: - priority: 23 - font: - fill: [0.35,0.35,0.35] - size: [[9,10px],[12,12px],[13,12px],[14,12px],[15,0px]] capital: filter: { country_capital: true, $zoom: { min: 5 } } draw: @@ -4427,8 +4344,6 @@ layers: size: [[10,5px],[11,0px]] sprite: capital-s priority: 22 - text-blend-order: - priority: 22 population-2k-5k: filter: population: { min: 2000, max: 5000 } @@ -4441,11 +4356,6 @@ layers: font: fill: [0.35,0.35,0.35] size: [[9,10px],[12,10px],[13,12px],[14,12px],[15,0px]] - text-blend-order: - priority: 25 - font: - fill: [0.35,0.35,0.35] - size: [[9,10px],[12,10px],[13,12px],[14,12px],[15,0px]] capital: filter: { country_capital: true, $zoom: { min: 5 } } draw: @@ -4453,8 +4363,6 @@ layers: size: [[10,5px],[11,0px]] sprite: capital-s priority: 24 - text-blend-order: - priority: 24 population-1k-2k: filter: population: { min: 1000, max: 2000 } @@ -4467,11 +4375,6 @@ layers: font: fill: [0.35,0.35,0.35] size: [[9,10px],[12,10px],[14,11px],[15,0px]] - text-blend-order: - priority: 27 - font: - fill: [0.35,0.35,0.35] - size: [[9,10px],[12,10px],[14,11px],[15,0px]] capital: filter: { country_capital: true, $zoom: { min: 5 } } draw: @@ -4479,8 +4382,6 @@ layers: size: [[10,5px],[11,0px]] sprite: capital-s priority: 26 - text-blend-order: - priority: 26 population-200-1k: filter: population: { min: 200, max: 1000 } @@ -4493,11 +4394,6 @@ layers: font: fill: [0.35,0.35,0.35] size: [[9,10px],[12,10px],[14,11px],[15,0px]] - text-blend-order: - priority: 28 - font: - fill: [0.35,0.35,0.35] - size: [[9,10px],[12,10px],[14,11px],[15,0px]] capital: filter: { country_capital: true, $zoom: { min: 5 } } draw: @@ -4505,8 +4401,6 @@ layers: size: [[10,5px],[11,0px]] sprite: capital-s priority: 27 - text-blend-order: - priority: 27 # #neighborhoods (excluding microhoods, eg the Tendernob) @@ -5261,7 +5155,7 @@ layers: size: 12px lakes-labels: - filter: + filter: $zoom: { min: 4 } draw: text-blend-order: