Compare commits

..

1 Commits

Author SHA1 Message Date
Yannik Bloscheck
0ef8df3985 [styles] Have house numbers show up only from level 17
Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
2026-01-08 19:28:39 +01:00
6 changed files with 8 additions and 9 deletions

View File

@@ -660,9 +660,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),
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;}
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;}
node|z18-[entrance=main],

View File

@@ -2414,7 +2414,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-newspapers # 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-)
=== -9970

View File

@@ -2420,7 +2420,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-newspapers # 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-)
=== -9970

View File

@@ -41,14 +41,13 @@ final class ThemeManager: NSObject {
}
}(actualTheme)
let isCarPlayActive = CarPlayService.shared.isCarplayActivated
if !isCarPlayActive, Settings.mapAppearance == .light {
if Settings.mapAppearance == .light {
if actualTheme == .vehicleDay || actualTheme == .vehicleNight {
FrameworkHelper.setTheme(.vehicleDay)
} else {
FrameworkHelper.setTheme(.day)
}
} else if !isCarPlayActive, Settings.mapAppearance == .dark {
} else if Settings.mapAppearance == .dark {
if actualTheme == .vehicleDay || actualTheme == .vehicleNight {
FrameworkHelper.setTheme(.vehicleNight)
} else {

View File

@@ -186,7 +186,7 @@ import AVFoundation
return mapAppearance
}
return .light
return .auto
}
set {
UserDefaults.standard.set(newValue.rawValue, forKey: userDefaultsKeyMapAppearance)

View File

@@ -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,
// 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 &&
(auxCaptionExists || m_mainText.empty()))
{