From dfdb2dbac353857ea59ba1fd6c826e9371658b3e Mon Sep 17 00:00:00 2001 From: jannis Date: Sun, 5 Jan 2020 17:01:49 +0100 Subject: [PATCH] Use ThunderForest tiles only to level 19 because of licence to reduce tile requests --- app/src/main/java/de/tadris/fitness/map/MapManager.java | 7 ++++--- .../fitness/map/tilesource/ThunderforestTileSource.java | 4 ++-- .../java/de/tadris/fitness/map/tilesource/TileSources.java | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/de/tadris/fitness/map/MapManager.java b/app/src/main/java/de/tadris/fitness/map/MapManager.java index 23efa99..498d06e 100644 --- a/app/src/main/java/de/tadris/fitness/map/MapManager.java +++ b/app/src/main/java/de/tadris/fitness/map/MapManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Jannis Scheibe + * Copyright (c) 2020 Jannis Scheibe * * This file is part of FitoTrack * @@ -19,7 +19,6 @@ package de.tadris.fitness.map; -import org.mapsforge.core.model.LatLong; import org.mapsforge.map.android.graphics.AndroidGraphicFactory; import org.mapsforge.map.android.util.AndroidUtil; import org.mapsforge.map.android.view.MapView; @@ -42,7 +41,9 @@ public class MapManager { switch (chosenTileLayer){ case "osm.humanitarian": tileSource= HumanitarianTileSource.INSTANCE; break; case "thunderforest.outdoors": tileSource= ThunderforestTileSource.OUTDOORS; break; - case "thunderforest.cycle": tileSource= ThunderforestTileSource.CYLE_MAP; break; + case "thunderforest.cycle": + tileSource = ThunderforestTileSource.CYCLE_MAP; + break; default: tileSource= MapnikTileSource.INSTANCE; break; // Inclusive "osm.mapnik" } tileSource.setUserAgent("mapsforge-android"); diff --git a/app/src/main/java/de/tadris/fitness/map/tilesource/ThunderforestTileSource.java b/app/src/main/java/de/tadris/fitness/map/tilesource/ThunderforestTileSource.java index d238651..ce54c96 100644 --- a/app/src/main/java/de/tadris/fitness/map/tilesource/ThunderforestTileSource.java +++ b/app/src/main/java/de/tadris/fitness/map/tilesource/ThunderforestTileSource.java @@ -29,10 +29,10 @@ public class ThunderforestTileSource extends FitoTrackTileSource{ private static final String API_KEY = "87b07337e42c405db6d8d39b1c0c179e"; public static final ThunderforestTileSource OUTDOORS = new ThunderforestTileSource("outdoors", "Outdoor"); - public static final ThunderforestTileSource CYLE_MAP = new ThunderforestTileSource("cycle", "Cycle Map"); + public static final ThunderforestTileSource CYCLE_MAP = new ThunderforestTileSource("cycle", "Cycle Map"); private static final int PARALLEL_REQUESTS_LIMIT = 8; private static final String PROTOCOL = "https"; - private static final int ZOOM_LEVEL_MAX = 22; + private static final int ZOOM_LEVEL_MAX = 19; private static final int ZOOM_LEVEL_MIN = 0; private final String mapName; diff --git a/app/src/main/java/de/tadris/fitness/map/tilesource/TileSources.java b/app/src/main/java/de/tadris/fitness/map/tilesource/TileSources.java index 75c78b5..38d328e 100644 --- a/app/src/main/java/de/tadris/fitness/map/tilesource/TileSources.java +++ b/app/src/main/java/de/tadris/fitness/map/tilesource/TileSources.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Jannis Scheibe + * Copyright (c) 2020 Jannis Scheibe * * This file is part of FitoTrack * @@ -23,7 +23,7 @@ package de.tadris.fitness.map.tilesource; public class TileSources { public static FitoTrackTileSource[] tileSources= new FitoTrackTileSource[]{ - MapnikTileSource.INSTANCE, HumanitarianTileSource.INSTANCE, ThunderforestTileSource.OUTDOORS, ThunderforestTileSource.CYLE_MAP + MapnikTileSource.INSTANCE, HumanitarianTileSource.INSTANCE, ThunderforestTileSource.OUTDOORS, ThunderforestTileSource.CYCLE_MAP }; public enum Purpose{