remove old localization module, fix android + web

maplibre · Aug 7, 2023 · 79650c0 · 79650c0
1 parent ec9808e
commit 79650c0
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 11 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -42,7 +42,6 @@ android {
     dependencies {
         implementation 'org.maplibre.gl:android-sdk:10.2.0'
         implementation 'org.maplibre.gl:android-plugin-annotation-v9:2.0.0'
-        implementation 'org.maplibre.gl:android-plugin-localization-v9:2.0.0'
         implementation 'org.maplibre.gl:android-plugin-offline-v9:2.0.0'
         implementation 'com.squareup.okhttp3:okhttp:4.10.0'
     }

diff --git a/android/src/main/java/com/mapbox/mapboxgl/MapboxMapController.java b/android/src/main/java/com/mapbox/mapboxgl/MapboxMapController.java
@@ -57,7 +57,6 @@
 import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
 import com.mapbox.mapboxsdk.maps.Style;
 import com.mapbox.mapboxsdk.offline.OfflineManager;
-import com.mapbox.mapboxsdk.plugins.localization.LocalizationPlugin;
 import com.mapbox.mapboxsdk.style.expressions.Expression;
 import com.mapbox.mapboxsdk.style.layers.CircleLayer;
 import com.mapbox.mapboxsdk.style.layers.FillExtrusionLayer;
@@ -89,6 +88,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
@@ -131,7 +131,6 @@ final class MapboxMapController
   private MethodChannel.Result mapReadyResult;
   private LocationComponent locationComponent = null;
   private LocationEngineCallback<LocationEngineResult> locationEngineCallback = null;
-  private LocalizationPlugin localizationPlugin;
   private Style style;
   private Feature draggedFeature;
   private AndroidGesturesManager androidGesturesManager;
@@ -163,7 +162,6 @@ public void onStyleLoaded(@NonNull Style style) {
 
           mapboxMap.addOnMapClickListener(MapboxMapController.this);
           mapboxMap.addOnMapLongClickListener(MapboxMapController.this);
-          localizationPlugin = new LocalizationPlugin(mapView, mapboxMap, style);
 
           methodChannel.invokeMethod("map#onStyleLoaded", null);
         }
@@ -644,7 +642,10 @@ public void onMethodCall(MethodCall call, MethodChannel.Result result) {
       case "map#matchMapLanguageWithDeviceDefault":
         {
           try {
-            localizationPlugin.matchMapLanguageWithDeviceDefault();
+            final Locale deviceLocale = Locale.getDefault();
+
+            setMapLanguage(deviceLocale.getLanguage());
+
             result.success(null);
           } catch (RuntimeException exception) {
             Log.d(TAG, exception.toString());
@@ -673,7 +674,7 @@ public void onMethodCall(MethodCall call, MethodChannel.Result result) {
         {
           final String language = call.argument("language");
           try {
-            localizationPlugin.setMapLanguage(language);
+            setMapLanguage(language);
             result.success(null);
           } catch (RuntimeException exception) {
             Log.d(TAG, exception.toString());
@@ -1794,6 +1795,21 @@ public void setAttributionButtonMargins(int x, int y) {
     }
   }
 
+  private void setMapLanguage(String language){
+    final List<Layer> layers = mapboxMap.getStyle().getLayers();
+
+    final String expressionValue = String.format("['get', 'name:%s']", language);
+
+    final PropertyValue<Expression> newExpression =
+            PropertyFactory.textField(Expression.raw(expressionValue));
+
+    for (final Layer layer : layers) {
+      if(layer instanceof SymbolLayer) {
+        layer.setProperties(newExpression);
+      }
+    }
+  }
+
   private void updateMyLocationEnabled() {
     if (this.locationComponent == null && myLocationEnabled) {
       enableLocationComponent(mapboxMap.getStyle());

diff --git a/maplibre_gl_web/lib/src/mapbox_web_gl_platform.dart b/maplibre_gl_web/lib/src/mapbox_web_gl_platform.dart
@@ -236,11 +236,15 @@ class MaplibreMapController extends MapLibreGlPlatform
 
   @override
   Future<void> setMapLanguage(String language) async {
-    _map.setLayoutProperty(
-      'country-label',
-      'text-field',
-      ['get', 'name_' + language],
-    );
+    final List<dynamic> layers = _map.getStyle().layers;
+
+    final newExpression = ['get', 'name:' + language];
+
+    for (final layer in layers) {
+      if (layer.type == 'symbol') {
+        _map.setLayoutProperty(layer.id, 'text-field', newExpression);
+      }
+    }
   }
 
   @override