Skip to content

Check updateMapLocaleLanguage in frameUpdated #5010

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

Open
ihoryakovenko wants to merge 1 commit into
base: r5.2
Choose a base branch
from
Open

Check updateMapLocaleLanguage in frameUpdated #5010

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 13 additions & 17 deletions Sources/Controllers/Map/OAMapViewController.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,10 +348,6 @@ - (void) commonInit
withHandler:@selector(onAppModeChanged)
andObserve:[OsmAndApp instance].applicationModeChangedObservable];

_mapZoomObserver = [[OAAutoObserverProxy alloc] initWith:self
withHandler:@selector(onMapZoomChanged:withKey:andValue:)
andObserve:_zoomObservable];

// Subscribe to application notifications to correctly suspend and resume rendering
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(applicationDidEnterBackground:)
Expand Down Expand Up @@ -543,6 +539,10 @@ - (void) frameAnimatorsUpdated

- (void) frameUpdated
{
@synchronized(_rendererSync)
{
[self updateMapLocaleLanguage];
}
}

- (void) frameRendered
Expand Down Expand Up @@ -2307,14 +2307,6 @@ - (void) resetViewAngle
_map3DModeElevationAngle = _mapView.elevationAngle;
}

- (void)onMapZoomChanged:(id)observable withKey:(id)key andValue:(id)value
{
@synchronized(_rendererSync)
{
[self updateMapLocaleLanguage];
}
}

- (BOOL)isBasemapZoom:(int)zoom
{
return zoom < kDetailedMapZoom;
Expand All @@ -2324,15 +2316,19 @@ - (void)updateMapLocaleLanguage
{
if (_mapPresentationEnvironment != nullptr)
{
OAAppSettings *settings = [OAAppSettings sharedManager];

OsmAnd::MapPresentationEnvironment::LanguagePreference langPreferences = [self getLanguagePreference:settings.settingMapLanguage.get zoom:_mapView.zoomLevel];
NSString *langId = [self isBasemapZoom:_mapView.zoomLevel] ? [OAUtilities currentLang] : [[OAAppSettings sharedManager].settingPrefMapLanguage get];
if (![langId isEqualToString:_mapPresentationEnvironment->getLocaleLanguageId().toNSString()])

BOOL languageIdUpdated = ![langId isEqualToString:_mapPresentationEnvironment->getLocaleLanguageId().toNSString()];
BOOL languagePreferenceUpdated = _mapPresentationEnvironment->getLanguagePreference() != langPreferences;

if (languageIdUpdated || languagePreferenceUpdated)
{
_mapPresentationEnvironment->setLocaleLanguageId(QString::fromNSString(langId));
_mapPresentationEnvironment->setLanguagePreference(langPreferences);
}

OAAppSettings *settings = [OAAppSettings sharedManager];
OsmAnd::MapPresentationEnvironment::LanguagePreference langPreferences = [self getLanguagePreference:settings.settingMapLanguage.get zoom:_mapView.zoomLevel];
_mapPresentationEnvironment->setLanguagePreference(langPreferences);
}
}

Expand Down