Skip to content

Fixed nearby map not localized(Fixed #2335) #2504

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

Closed
wants to merge 1 commit into from
Closed

Fixed nearby map not localized(Fixed #2335) #2504

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
35 changes: 33 additions & 2 deletions app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,13 @@
import com.mapbox.mapboxsdk.maps.MapboxMap;
import com.mapbox.mapboxsdk.maps.MapboxMapOptions;

import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;

import javax.inject.Inject;
import javax.inject.Named;
Expand Down Expand Up @@ -505,16 +509,44 @@ public void onSlide(@NonNull View bottomSheet, float slideOffset) {
});
}

private String getLocaleMapStyleJson() {
String styleFileName = "mapstyle.json";
String suffix = "png\"";
StringBuilder styleJson = new StringBuilder(4096);
String language = Locale.getDefault().getLanguage();

try {
BufferedReader reader = new BufferedReader(new InputStreamReader(getActivity().getAssets().open(styleFileName)));
String line = reader.readLine();
while (line != null) {
if (line.endsWith(suffix)) {
String newSuffix = suffix.replace("\"", String.format("?lang=%s\"", language));
styleJson.append(line.replace(suffix, newSuffix));
Timber.d("Localized tiles url: %s", line.replace(suffix, newSuffix));
} else {
styleJson.append(line);
}

line = reader.readLine();
}
} catch (IOException e){
Timber.e(e, "failed to read file: %s", styleFileName);
}

return styleJson.toString();
}

/**
* Sets up map view of first time it created, it passes MapBoxMap options and style assets.
* @param savedInstanceState bundle coming from Nearby Fragment
*/
private void setupMapView(Bundle savedInstanceState) {
Timber.d("setupMapView called");
String styleJson = getLocaleMapStyleJson();
MapboxMapOptions options = new MapboxMapOptions()
.compassGravity(Gravity.BOTTOM | Gravity.LEFT)
.compassMargins(new int[]{12, 0, 0, 24})
.styleUrl(Style.OUTDOORS)
.styleJson(styleJson)
.logoEnabled(false)
.attributionEnabled(false)
.camera(new CameraPosition.Builder()
Expand All @@ -531,7 +563,6 @@ private void setupMapView(Bundle savedInstanceState) {
addMapMovementListeners();
updateMapSignificantlyForCurrentLocation();
});
mapView.setStyleUrl("asset://mapstyle.json");
}
}

Expand Down