From 4abe3bd03f0c1781c9d313b6e20248e16fea6b74 Mon Sep 17 00:00:00 2001 From: Mark Tully Date: Fri, 26 May 2017 00:50:04 +0100 Subject: [PATCH 1/6] Activating name & house number rendering on base map --- app/src/main/assets/cinnabar-style-7.0.0.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/assets/cinnabar-style-7.0.0.yaml b/app/src/main/assets/cinnabar-style-7.0.0.yaml index f479af9977..92f0a4df25 100644 --- a/app/src/main/assets/cinnabar-style-7.0.0.yaml +++ b/app/src/main/assets/cinnabar-style-7.0.0.yaml @@ -219,8 +219,8 @@ global: icon_visible_populated_places: true text_visible_neighbourhoods: true text_visible_neighbourhoods_e: true - text_visible_building: false # false for default - text_visible_address: false # false for default + text_visible_building: true # false for default + text_visible_address: true # false for default text_visible_water_labels: true text_visible_island: true label_visible_landuse_green: true From b6db21549a6328536cb76dafb92da5e8152c774f Mon Sep 17 00:00:00 2001 From: Mark Tully Date: Fri, 26 May 2017 01:16:45 +0100 Subject: [PATCH 2/6] Show building numbers in black from z18 on base map --- app/src/main/assets/cinnabar-style-7.0.0.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/assets/cinnabar-style-7.0.0.yaml b/app/src/main/assets/cinnabar-style-7.0.0.yaml index 92f0a4df25..88aad411b3 100644 --- a/app/src/main/assets/cinnabar-style-7.0.0.yaml +++ b/app/src/main/assets/cinnabar-style-7.0.0.yaml @@ -3607,7 +3607,7 @@ layers: filter: all: - function() { return global.text_visible_address; } - - $zoom: { min: 20 } + - $zoom: { min: 18 } any: - kind: address - { label_position: true, addr_housenumber: true, name: false } @@ -3617,7 +3617,7 @@ layers: order: 7 text_source: addr_housenumber font: - fill: global.text_fill_address + fill: global.text_fill family: global.text_font_family style: italic size: 10px From f8e248cd791c29ed1282f23da8b1a858574f74bd Mon Sep 17 00:00:00 2001 From: Mark Tully Date: Fri, 26 May 2017 01:46:34 +0100 Subject: [PATCH 3/6] Show building names from z18 on base map --- app/src/main/assets/cinnabar-style-7.0.0.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/assets/cinnabar-style-7.0.0.yaml b/app/src/main/assets/cinnabar-style-7.0.0.yaml index 88aad411b3..62f34cae6c 100644 --- a/app/src/main/assets/cinnabar-style-7.0.0.yaml +++ b/app/src/main/assets/cinnabar-style-7.0.0.yaml @@ -3563,9 +3563,9 @@ layers: - { $zoom: [17], area: { min: 2000 }, kind_detail: [university, college, school, kindergarten] } - { $zoom: [18], area: { min: 1000 } } - { $zoom: [18], kind_detail: [university, college, school, kindergarten] } - - { $zoom: [19], area: { min: 200 } } - - { $zoom: { min: 19 }, kind_detail: [university, college, school, kindergarten] } - - { $zoom: { min: 20 }, area: true } + - { $zoom: [18], area: { min: 200 } } + - { $zoom: { min: 18 }, kind_detail: [university, college, school, kindergarten] } + - { $zoom: { min: 18 }, area: true } draw: text-blend-order: #interactive: global.sdk_interactive @@ -3584,7 +3584,7 @@ layers: draw: { text-blend-order: { font: { size: 12px, stroke: { width: 2 } } } } building_labels-z18: filter: { $zoom: [18,19] } - draw: { text-blend-order: { font: { size: 12px, weight: 600, stroke: { width: 3 } } } } + draw: { text-blend-order: { font: { size: 10px, weight: 600, stroke: { width: 3 } } } } building_labels-z20-up: filter: { $zoom: { min: 20 } } draw: { text-blend-order: { font: { size: 14px, weight: 600, stroke: { width: 3 } } } } @@ -3598,8 +3598,8 @@ layers: draw: text-blend-order: visible: false - building-labels-z20+: - filter: { $zoom: { min: 20 } } + building-labels-z18+: + filter: { $zoom: { min: 18 } } draw: text-blend-order: text_source: global.ux_language_text_source_building_and_address From 5b2ac417d6b2b31acfc46968895611231db664bc Mon Sep 17 00:00:00 2001 From: Mark Tully Date: Fri, 26 May 2017 01:59:20 +0100 Subject: [PATCH 4/6] Show bus stops from z18 on base map --- app/src/main/assets/cinnabar-style-7.0.0.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/assets/cinnabar-style-7.0.0.yaml b/app/src/main/assets/cinnabar-style-7.0.0.yaml index 62f34cae6c..f8e534de40 100644 --- a/app/src/main/assets/cinnabar-style-7.0.0.yaml +++ b/app/src/main/assets/cinnabar-style-7.0.0.yaml @@ -5092,17 +5092,18 @@ layers: kind: [bus_stop] draw: icons: - size: 14px + visible: true + size: 20px text: font: size: 11px weight: normal later: - filter: { $zoom: { max: 19 } } + filter: { $zoom: { min: 19 } } draw: icons: text: - visible: false + visible: true airport-gate: filter: { kind: aeroway_gate } From 4da5fe63c9c9d87df99425ae917d3676dd00ba86 Mon Sep 17 00:00:00 2001 From: Mark Tully Date: Sat, 27 May 2017 00:34:35 +0100 Subject: [PATCH 5/6] Show building name only when building name and house number exist since a bug in tangram-es prevents '\n' from being displayed correctly --- app/src/main/assets/cinnabar-style-7.0.0.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/src/main/assets/cinnabar-style-7.0.0.yaml b/app/src/main/assets/cinnabar-style-7.0.0.yaml index f8e534de40..3962b7bd04 100644 --- a/app/src/main/assets/cinnabar-style-7.0.0.yaml +++ b/app/src/main/assets/cinnabar-style-7.0.0.yaml @@ -130,11 +130,7 @@ global: ux_language_text_source_building_and_address: | function() { var name = (global.ux_language && feature['name:'+global.ux_language]) || (global.ux_language_fallback && feature['name:'+global.ux_language_fallback]) || feature['name']; - if (name && feature.addr_housenumber) { - return name + '\n' + feature.addr_housenumber; - } else { - return name; - } + return name; } # To facilitate data visualizations several recommended sort orders are provided From a7ba1b08cc16c5254515ee97232e86444bd26de9 Mon Sep 17 00:00:00 2001 From: Mark Tully Date: Sat, 27 May 2017 00:45:38 +0100 Subject: [PATCH 6/6] Show building name in the same style as house number --- app/src/main/assets/cinnabar-style-7.0.0.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/assets/cinnabar-style-7.0.0.yaml b/app/src/main/assets/cinnabar-style-7.0.0.yaml index 3962b7bd04..d112fef236 100644 --- a/app/src/main/assets/cinnabar-style-7.0.0.yaml +++ b/app/src/main/assets/cinnabar-style-7.0.0.yaml @@ -3573,17 +3573,17 @@ layers: fill: global.text_fill family: global.text_font_family style: italic - size: 11px - stroke: { color: global.text_stroke_address, width: 1 } + size: 10px + stroke: { color: global.building1, width: 4 } building_labels-z15-z16-z17: filter: { $zoom: [15,16,17] } draw: { text-blend-order: { font: { size: 12px, stroke: { width: 2 } } } } building_labels-z18: filter: { $zoom: [18,19] } - draw: { text-blend-order: { font: { size: 10px, weight: 600, stroke: { width: 3 } } } } + draw: { text-blend-order: { font: { size: 10px, weight: 500, stroke: { width: 1 } } } } building_labels-z20-up: filter: { $zoom: { min: 20 } } - draw: { text-blend-order: { font: { size: 14px, weight: 600, stroke: { width: 3 } } } } + draw: { text-blend-order: { font: { size: 14px, weight: 500, stroke: { width: 1 } } } } building-labels-z16: filter: function() { if( $zoom == 16 && feature.name.length > 20 ) { return true; } else { return false; } } draw: