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

Display housenumbers and bus stops on basemap #271

Closed
wants to merge 6 commits into from
Closed

Display housenumbers and bus stops on basemap #271

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4abe3bd
Activating name & house number rendering on base map
Teester May 25, 2017
b6db215
Show building numbers in black from z18 on base map
Teester May 26, 2017
f8e248c
Show building names from z18 on base map
Teester May 26, 2017
5b2ac41
Show bus stops from z18 on base map
Teester May 26, 2017
4da5fe6
Show building name only when building name and house number exist sin…
Teester May 26, 2017
a7ba1b0
Show building name in the same style as house number
Teester May 26, 2017
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
39 changes: 18 additions & 21 deletions app/src/main/assets/cinnabar-style-7.0.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -219,8 +215,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
Expand Down Expand Up @@ -3563,9 +3559,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
Expand All @@ -3577,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: 12px, 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:
Expand All @@ -3598,16 +3594,16 @@ 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
address-labels:
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 }
Expand All @@ -3617,7 +3613,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
Expand Down Expand Up @@ -5092,17 +5088,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 }
Expand Down