Use Wikimedia Maps server instead of Mapbox.

See issue #590
This switches to using the Wikimedia tile server for providing map data. It comes with a couple of drawbacks which are currently unavoidable, but such is the way of open-source...
- The WMF map server does not provide vector tiles, or rather it doesn't provide vectors that are compatible with the Mapbox SDK :(
- It provides only one "theme" of tiles, so you will no longer have a dark vs. light theme.
This commit is contained in:
Dmitry Brant 2017-12-05 22:40:19 -05:00
parent 3b8e3b3109
commit aac2478400
2 changed files with 28 additions and 6 deletions

View file

@ -0,0 +1,26 @@
{
"version": 8,
"sources": {
"wikimedia-osm": {
"type": "raster",
"tiles": [
"https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png"
],
"tileSize": 128
}
},
"layers": [
{
"id": "background",
"type": "background",
"paint": {
"background-color": "#606060"
}
},
{
"id": "osm",
"type": "raster",
"source": "wikimedia-osm"
}
]
}

View file

@ -3,7 +3,6 @@ package fr.free.nrw.commons.nearby;
import android.graphics.Color;
import android.net.Uri;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@ -99,11 +98,8 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
addCurrentLocationMarker(mapboxMap);
});
if (PreferenceManager.getDefaultSharedPreferences(getActivity()).getBoolean("theme",false)) {
mapView.setStyleUrl(getResources().getString(R.string.map_theme_dark));
} else {
mapView.setStyleUrl(getResources().getString(R.string.map_theme_light));
}
mapView.setStyleUrl("asset://mapstyle.json");
}
/**