1 files changed, 56 insertions, 2 deletions
diff --git a/platform/darwin/src/MGLVectorSource.mm b/platform/darwin/src/MGLVectorSource.mm
index 7265690f4d..90ffe6f98b 100644
--- a/platform/darwin/src/MGLVectorSource.mm
+++ b/platform/darwin/src/MGLVectorSource.mm
@@ -5,11 +5,13 @@
 #import "MGLTileSource_Private.h"
 #import "MGLStyle_Private.h"
 #import "MGLMapView_Private.h"
+
 #import "NSPredicate+MGLAdditions.h"
 #import "NSURL+MGLAdditions.h"
 
 #include <mbgl/map/map.hpp>
 #include <mbgl/style/sources/vector_source.hpp>
+#include <mbgl/renderer/renderer.hpp>
 
 @interface MGLVectorSource ()
 
@@ -63,10 +65,62 @@
     }
     
     std::vector<mbgl::Feature> features;
-    if (self.style) {
-        features = self.style.mapView.mbglMap->querySourceFeatures(self.rawSource->getID(), { optionalSourceLayerIDs, optionalFilter });
+    if (self.mapView) {
+        features = self.mapView.renderer->querySourceFeatures(self.rawSource->getID(), { optionalSourceLayerIDs, optionalFilter });
     }
     return MGLFeaturesFromMBGLFeatures(features);
 }
 
 @end
+
+@implementation MGLVectorSource (Private)
+
++ (NS_SET_OF(NSString *) *)mapboxStreetsLanguages {
+    // https://www.mapbox.com/vector-tiles/mapbox-streets-v7/#overview
+    static dispatch_once_t onceToken;
+    static NS_SET_OF(NSString *) *mapboxStreetsLanguages;
+    dispatch_once(&onceToken, ^{
+        // https://www.mapbox.com/vector-tiles/mapbox-streets-v7/#overview
+        mapboxStreetsLanguages = [NSSet setWithObjects:@"ar", @"de", @"en", @"es", @"fr", @"pt", @"ru", @"zh", @"zh-Hans", nil];
+    });
+    return mapboxStreetsLanguages;
+}
+
++ (NSString *)preferredMapboxStreetsLanguage {
+    NSArray<NSString *> *supportedLanguages = [MGLVectorSource mapboxStreetsLanguages].allObjects;
+    NSArray<NSString *> *preferredLanguages = [NSBundle preferredLocalizationsFromArray:supportedLanguages
+                                                                         forPreferences:[NSLocale preferredLanguages]];
+    NSString *mostSpecificLanguage;
+    for (NSString *language in preferredLanguages) {
+        if (language.length > mostSpecificLanguage.length) {
+            mostSpecificLanguage = language;
+        }
+    }
+    return mostSpecificLanguage ?: @"en";
+}
+
+- (BOOL)isMapboxStreets {
+    NSURL *url = self.configurationURL;
+    if (![url.scheme isEqualToString:@"mapbox"]) {
+        return NO;
+    }
+    NSArray *identifiers = [url.host componentsSeparatedByString:@","];
+    return [identifiers containsObject:@"mapbox.mapbox-streets-v7"] || [identifiers containsObject:@"mapbox.mapbox-streets-v6"];
+}
+
+- (NS_DICTIONARY_OF(NSString *, NSString *) *)localizedKeysByKeyForPreferredLanguage:(nullable NSString *)preferredLanguage {
+    if (!self.mapboxStreets) {
+        return @{};
+    }
+
+    // Replace {name} and {name_*} with the matching localized name tag.
+    NSString *localizedKey = preferredLanguage ? [NSString stringWithFormat:@"name_%@", preferredLanguage] : @"name";
+    NSMutableDictionary *localizedKeysByKey = [NSMutableDictionary dictionaryWithObject:localizedKey forKey:@"name"];
+    for (NSString *languageCode in [MGLVectorSource mapboxStreetsLanguages]) {
+        NSString *key = [NSString stringWithFormat:@"name_%@", languageCode];
+        localizedKeysByKey[key] = localizedKey;
+    }
+    return localizedKeysByKey;
+}
+
+@end