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

Jump to bottom

Render addr:flats #4082

Merged
merged 7 commits into from
Apr 7, 2020
Merged

Render addr:flats #4082

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9e2eca3
Add rendering of addr:flats
richlv Mar 16, 2020
cfc3741
Mimic changes from addr:unit for addr:flats
richlv Mar 16, 2020
d90a945
Add missing closing curly brace
richlv Mar 16, 2020
67c8c4e
Fix the parenthesis nesting
richlv Mar 20, 2020
893047e
Demote addr:flats and addr:unit to z18. Move addr:flats to the same l…
Mar 27, 2020
8d773f3
Move the addr conditionals to their own line
richlv Apr 2, 2020
2c03357
Fix newline -> space
richlv Apr 2, 2020
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
6 changes: 4 additions & 2 deletions project.mml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2083,9 +2083,10 @@ Layer:
"addr:housenumber" AS addr_housenumber,
"addr:housename" AS addr_housename,
tags->'addr:unit' AS addr_unit,
tags->'addr:flats' AS addr_flats,
way_area/NULLIF(POW(!scale_denominator!*0.001*0.28,2),0) AS way_pixels
FROM planet_osm_polygon
WHERE way && !bbox! AND (("addr:housenumber" IS NOT NULL) OR ("addr:housename" IS NOT NULL) OR ((tags->'addr:unit') IS NOT NULL))
WHERE way && !bbox! AND (("addr:housenumber" IS NOT NULL) OR ("addr:housename" IS NOT NULL) OR ((tags->'addr:unit') IS NOT NULL) OR ((tags->'addr:flats') IS NOT NULL))
richlv marked this conversation as resolved.
Show resolved Hide resolved
AND building IS NOT NULL
AND way_area < 4000000*POW(!scale_denominator!*0.001*0.28,2)
UNION ALL
Expand All @@ -2094,9 +2095,10 @@ Layer:
"addr:housenumber" AS addr_housenumber,
"addr:housename" AS addr_housename,
tags->'addr:unit' AS addr_unit,
tags->'addr:flats' AS addr_flats,
NULL AS way_pixels
FROM planet_osm_point
WHERE way && !bbox! AND (("addr:housenumber" IS NOT NULL) OR ("addr:housename" IS NOT NULL) OR ((tags->'addr:unit') IS NOT NULL))
WHERE way && !bbox! AND (("addr:housenumber" IS NOT NULL) OR ("addr:housename" IS NOT NULL) OR ((tags->'addr:unit') IS NOT NULL) OR ((tags->'addr:flats') IS NOT NULL))
richlv marked this conversation as resolved.
Show resolved Hide resolved
ORDER BY way_pixels DESC NULLS LAST
) AS addresses
properties:
Expand Down
22 changes: 16 additions & 6 deletions style/addressing.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,7 @@
["addr_housename" != null] {
text-name: [addr_housenumber] + "\n" + [addr_housename];
}
["addr_unit" != null] {
text-name: [addr_housenumber] + " " + [addr_unit];
["addr_housename" != null] {
text-name: [addr_housenumber] + " " + [addr_unit] + "\n" + [addr_housename];
}
}

}
text-face-name: @book-fonts;
text-fill: @address-color;
Expand All @@ -38,6 +33,21 @@
["addr_unit" != null]["addr_housenumber" = null] {
text-name: [addr_unit];
}
["addr_flats" != null]["addr_housenumber" = null] {
text-name: [addr_flats];
}
["addr_unit" != null] {
text-name: [addr_housenumber] + " " + [addr_unit];
["addr_housename" != null] {
text-name: [addr_housenumber] + " " + [addr_unit] + "\n" + [addr_housename];
}
}
["addr_flats" != null] {
text-name: [addr_housenumber] + " " + [addr_flats];
["addr_housename" != null] {
text-name: [addr_housenumber] + "\n" + [addr_flats] + "\n" + [addr_housename];
richlv marked this conversation as resolved.
Show resolved Hide resolved
}
}
}
[zoom >= 20] {
text-size: 11;
Expand Down