mirror of
https://codeberg.org/comaps/comaps
synced 2025-12-19 21:13:35 +00:00
[styles] Have house numbers show up only from level 17
Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
This commit is contained in:
@@ -658,9 +658,9 @@ node|z17-[building]::int_name,
|
|||||||
Housenumbers and main captions are displaced independently (e.g. a housenumber will stay if a building name is displaced),
|
Housenumbers and main captions are displaced independently (e.g. a housenumber will stay if a building name is displaced),
|
||||||
but are bound to icons (e.g. a housenumber will disappear if a parent icon is displaced).
|
but are bound to icons (e.g. a housenumber will disappear if a parent icon is displaced).
|
||||||
*/
|
*/
|
||||||
node|z16-[addr:housenumber][addr:street],
|
node|z17-[addr:housenumber][addr:street],
|
||||||
{text: name; text-color: @housenumber; text-position: center;}
|
{text: name; text-color: @housenumber; text-position: center;}
|
||||||
node|z16-[addr:housenumber][addr:street]::int_name,
|
node|z17-[addr:housenumber][addr:street]::int_name,
|
||||||
{text: int_name; text-color: @housenumber; text-position: center;}
|
{text: int_name; text-color: @housenumber; text-position: center;}
|
||||||
|
|
||||||
node|z18-[entrance=main],
|
node|z18-[entrance=main],
|
||||||
|
|||||||
@@ -2352,7 +2352,7 @@ amenity-vending_machine-excrement_bags # icon z18- (also has captio
|
|||||||
amenity-vending_machine-food # icon z18- (also has caption(optional) z18-)
|
amenity-vending_machine-food # icon z18- (also has caption(optional) z18-)
|
||||||
amenity-vending_machine-newspapers # icon z18- (also has caption(optional) z18-)
|
amenity-vending_machine-newspapers # icon z18- (also has caption(optional) z18-)
|
||||||
amenity-vending_machine-sweets # icon z18- (also has caption(optional) z18-)
|
amenity-vending_machine-sweets # icon z18- (also has caption(optional) z18-)
|
||||||
building-address # caption z16-
|
building-address # caption z17-
|
||||||
man_made-telescope-optical # icon z17- (also has caption(optional) z17-)
|
man_made-telescope-optical # icon z17- (also has caption(optional) z17-)
|
||||||
=== -9970
|
=== -9970
|
||||||
|
|
||||||
|
|||||||
@@ -2358,7 +2358,7 @@ amenity-vending_machine-excrement_bags # icon z18- (also has captio
|
|||||||
amenity-vending_machine-food # icon z18- (also has caption(optional) z18-)
|
amenity-vending_machine-food # icon z18- (also has caption(optional) z18-)
|
||||||
amenity-vending_machine-newspapers # icon z18- (also has caption(optional) z18-)
|
amenity-vending_machine-newspapers # icon z18- (also has caption(optional) z18-)
|
||||||
amenity-vending_machine-sweets # icon z18- (also has caption(optional) z18-)
|
amenity-vending_machine-sweets # icon z18- (also has caption(optional) z18-)
|
||||||
building-address # caption z16-
|
building-address # caption z17-
|
||||||
man_made-telescope-optical # icon z17- (also has caption(optional) z17-)
|
man_made-telescope-optical # icon z17- (also has caption(optional) z17-)
|
||||||
=== -9970
|
=== -9970
|
||||||
|
|
||||||
|
|||||||
@@ -87,7 +87,7 @@ void CaptionDescription::Init(FeatureType & f, int8_t deviceLang, int zoomLevel,
|
|||||||
|
|
||||||
// TODO(pastk) : its better to determine housenumbers minZoom once upon drules load and cache it,
|
// TODO(pastk) : its better to determine housenumbers minZoom once upon drules load and cache it,
|
||||||
// but it'd mean a lot of housenumbers-specific logic in otherwise generic RulesHolder..
|
// but it'd mean a lot of housenumbers-specific logic in otherwise generic RulesHolder..
|
||||||
uint8_t constexpr kHousenumbersMinZoom = 16;
|
uint8_t constexpr kHousenumbersMinZoom = 17;
|
||||||
if (geomType != feature::GeomType::Line && zoomLevel >= kHousenumbersMinZoom &&
|
if (geomType != feature::GeomType::Line && zoomLevel >= kHousenumbersMinZoom &&
|
||||||
(auxCaptionExists || m_mainText.empty()))
|
(auxCaptionExists || m_mainText.empty()))
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user