diff options
| author | Jesse Bounds <jesse@rebounds.net> | 2016-11-02 11:31:55 -0700 |
|---|---|---|
| committer | Jesse Bounds <jesse@rebounds.net> | 2016-11-02 11:33:39 -0700 |
| commit | 14663a5185ef25c6ea9592f6e9c425a3890f4c92 (patch) | |
| tree | c41d7194c31656cf596fa892dfaeb91212cc2b88 | |
| parent | 6338a3e7f9aca0b771cad82ca52ebc9d6ad19871 (diff) | |
| download | qtlocation-mapboxgl-14663a5185ef25c6ea9592f6e9c425a3890f4c92.tar.gz | |
[ios] Fix bad merge in iosapp
Although functionality was not affected, a previous merge garbled
the language test with a temporary test done for annotation view
performance improvement.
| -rw-r--r-- | platform/ios/app/MBXViewController.m | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/platform/ios/app/MBXViewController.m b/platform/ios/app/MBXViewController.m index 6eae0ef777..a7ea429300 100644 --- a/platform/ios/app/MBXViewController.m +++ b/platform/ios/app/MBXViewController.m @@ -1527,11 +1527,8 @@ typedef NS_ENUM(NSInteger, MBXSettingsMiscellaneousRows) { - (void)mapView:(MGLMapView *)mapView didFinishLoadingStyle:(MGLStyle *)style { // Default Mapbox styles use {name_en} as their label language, which means - NSUInteger queuedAnnotations = 0; // that a device with an English-language locale is already effectively - { // using locale-based country labels. - } _usingLocaleBasedCountryLabels = [[self bestLanguageForUser] isEqualToString:@"en"]; } |