Android 9 compatibility, fix #550

This commit is contained in:
Emux
2018-06-10 16:00:50 +03:00
parent e6a90a8da5
commit 4ebca73023
7 changed files with 24 additions and 25 deletions

View File

@@ -1,6 +1,7 @@
/*
* Copyright 2013 Hannes Janetzek
* Copyright 2016 Andrey Novikov
* Copyright 2016 devemux86
* Copyright 2016-2018 devemux86
*
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
*
@@ -28,45 +29,36 @@ public class DefaultSources {
private static final FadeStep[] FADE_STEPS = new FadeStep[]{
new FadeStep(0, 8 - 1, 1, 0.7f),
// dont fade between zoom-min/max
// don't fade between zoom-min/max
// fade above zoom max + 2, interpolate 1 to 0
new FadeStep(8 - 1, 8 + 1, 0.7f, 0)
};
public static Builder<?> OPENSTREETMAP = BitmapTileSource.builder()
.url("http://tile.openstreetmap.org")
.zoomMax(18);
public static Builder<?> OSM_TRANSPORT = BitmapTileSource.builder()
.url("http://a.tile.thunderforest.com/transport")
.url("https://tile.openstreetmap.org")
.zoomMax(18);
public static Builder<?> STAMEN_TONER = BitmapTileSource.builder()
.url("http://a.tile.stamen.com/toner")
.url("https://stamen-tiles.a.ssl.fastly.net/toner")
.zoomMax(18);
public static Builder<?> STAMEN_WATERCOLOR = BitmapTileSource.builder()
.url("http://a.tile.stamen.com/watercolor")
.url("https://stamen-tiles.a.ssl.fastly.net/watercolor")
.tilePath("/{Z}/{X}/{Y}.jpg")
.zoomMax(18);
public static Builder<?> IMAGICO_LANDCOVER = BitmapTileSource.builder()
.url("http://www.imagico.de/map/tiles/landcover")
.tilePath("/{Z}/{X}/{Y}.jpg")
.zoomMax(6);
public static Builder<?> NE_LANDCOVER = BitmapTileSource.builder()
.url("http://opensciencemap.org/tiles/ne")
.fadeSteps(FADE_STEPS)
.zoomMax(8);
public static Builder<?> HIKEBIKE = BitmapTileSource.builder()
.url("http://tiles.wmflabs.org/hikebike")
.url("https://tiles.wmflabs.org/hikebike")
.tilePath("/{Z}/{X}/{Y}.png")
.zoomMax(17);
public static Builder<?> HIKEBIKE_HILLSHADE = BitmapTileSource.builder()
.url("http://tiles.wmflabs.org/hillshading")
.url("https://tiles.wmflabs.org/hillshading")
.tilePath("/{Z}/{X}/{Y}.png")
.zoomMax(14);
}