250-change-language-fixes #275
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| @file:JvmName("MapboxMapUtils") | ||
|
|
||
| package com.mapbox.mapboxgl | ||
|
|
||
| import com.mapbox.mapboxsdk.maps.MapboxMap | ||
| import com.mapbox.mapboxsdk.style.expressions.Expression | ||
| import com.mapbox.mapboxsdk.style.layers.PropertyFactory | ||
| import com.mapbox.mapboxsdk.style.layers.SymbolLayer | ||
|
|
||
| fun MapboxMap.setMapLanguage(language: String) { | ||
| val layers = this.style?.layers ?: emptyList() | ||
|
|
||
| val languageRegex = Regex("(name:[a-z]+)") | ||
|
|
||
| val symbolLayers = layers.filterIsInstance<SymbolLayer>() | ||
|
|
||
| for (layer in symbolLayers) { | ||
| // continue when there is no current expression | ||
| val expression = layer.textField.expression ?: continue | ||
|
|
||
| // We could skip the current iteration, whenever there is not current language. | ||
| if (!expression.toString().contains(languageRegex)) { | ||
| continue | ||
| } | ||
|
|
||
| val properties = "[\"coalesce\", [\"get\",\"name:$language\"],[\"get\",\"name:latin\"]]" | ||
|
There was a problem hiding this comment. Would we maybe also want to also coalesce to just "name" as an ultimate fallback here? There was a problem hiding this comment. I haven't tested it, but I think otherwise non-latin-names might be completely missing from the map (if there is no latin transliteration for the name in the tiles)? There was a problem hiding this comment.
|
||
|
|
||
| layer.setProperties(PropertyFactory.textField(Expression.raw(properties))) | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| import 'dart:async'; | ||
|
|
||
| import 'package:flutter/material.dart'; | ||
| import 'package:maplibre_gl/mapbox_gl.dart'; | ||
|
|
||
| import 'page.dart'; | ||
|
|
||
| class LocalizedMapPage extends ExamplePage { | ||
| const LocalizedMapPage({super.key}) | ||
| : super(const Icon(Icons.map), 'Localized screen map'); | ||
|
|
||
| @override | ||
| Widget build(BuildContext context) { | ||
| return const LocalizedMap(); | ||
| } | ||
| } | ||
|
|
||
| class LocalizedMap extends StatefulWidget { | ||
| const LocalizedMap({super.key}); | ||
|
|
||
| @override | ||
| State createState() => LocalizedMapState(); | ||
| } | ||
|
|
||
| class LocalizedMapState extends State<LocalizedMap> { | ||
| final _mapReadyCompleter = Completer<MaplibreMapController>(); | ||
|
|
||
| var _mapLanguage = "en"; | ||
|
|
||
| @override | ||
| Widget build(BuildContext context) { | ||
| return Scaffold( | ||
| body: Column( | ||
| children: [ | ||
| DropdownButton<String>( | ||
| value: _mapLanguage, | ||
| icon: const Icon(Icons.arrow_drop_down), | ||
| elevation: 16, | ||
| onChanged: (value) { | ||
| if (value == null) return; | ||
|
|
||
| setState(() => _mapLanguage = value); | ||
| _setMapLanguage(); | ||
| }, | ||
| items: ["en", "de", "es", "pl"] | ||
| .map<DropdownMenuItem<String>>((String value) { | ||
| return DropdownMenuItem<String>( | ||
| value: value, | ||
| child: Text(value), | ||
| ); | ||
| }).toList(), | ||
| ), | ||
| Expanded( | ||
| child: MaplibreMap( | ||
| onMapCreated: _onMapCreated, | ||
| initialCameraPosition: | ||
| const CameraPosition(target: LatLng(0.0, 0.0)), | ||
| onStyleLoadedCallback: _onStyleLoadedCallback, | ||
| ), | ||
| ), | ||
| ], | ||
| ), | ||
| ); | ||
| } | ||
|
|
||
| void _onMapCreated(MaplibreMapController controller) { | ||
| _mapReadyCompleter.complete(controller); | ||
| } | ||
|
|
||
| void _onStyleLoadedCallback() { | ||
| _setMapLanguage(); | ||
| } | ||
|
|
||
| Future<void> _setMapLanguage() async { | ||
| final controller = await _mapReadyCompleter.future; | ||
| controller.setMapLanguage(_mapLanguage); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| // | ||
| // MLNMapView+setLanguage.swift | ||
| // maplibre_gl | ||
| // | ||
| // Created by Julian Bissekkou on 09.08.23. | ||
| // | ||
|
|
||
| import Foundation | ||
| import Mapbox | ||
|
|
||
| extension MGLMapView { | ||
| func setMapLanguage(_ language: String) { | ||
| guard let style = style else { return } | ||
|
|
||
| let layers = style.layers | ||
|
|
||
| for layer in layers { | ||
| if let symbolLayer = layer as? MGLSymbolStyleLayer { | ||
| if symbolLayer.text == nil { | ||
| continue | ||
| } | ||
|
|
||
| // We could skip the current iteration, whenever there is not current language. | ||
| if !symbolLayer.text.description.containsLanguage() { | ||
| continue | ||
| } | ||
|
|
||
| let properties = ["text-field": "[\"coalesce\", [\"get\",\"name:\(language)\"],[\"get\",\"name:latin\"]]"] | ||
|
|
||
| LayerPropertyConverter.addSymbolProperties( | ||
| symbolLayer: symbolLayer, | ||
| properties: properties | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
||
| private extension String { | ||
| func containsLanguage() -> Bool { | ||
| do { | ||
| let regex = try NSRegularExpression(pattern: "(name:[a-z]+)") | ||
| let range = NSRange(location: 0, length: self.utf16.count) | ||
|
|
||
| if let _ = regex.firstMatch(in: self, options: [], range: range) { | ||
| return true | ||
| } else { | ||
| return false | ||
| } | ||
| } catch { | ||
| return false | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I assume the idea here is to skip any layers with textfields that do not depend on the name from the tiles. But is also on purpose to ignore layers with
text = ["get", "name"]?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We already ignore layers where
["get", "name"]is present, since the layer check for at least a:.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, that's my question: is that on purpose?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not saying it's right or wrong, just occurred to me that I'm not sure whether a developer would expect such a layer to be localized or not...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thinking about it more, i think there is a good argument for either approach:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would definitely go with option 1 because of multiple reasons:
["get", "name"]or[ref], they want the plain name for sure.setMapLanguagefunction would not work in our case, since we have a lot of usages of["get", "name"]and[ref], and the text is just empty in that cases.