From ef87bae51f13117294df7878db08676018e3fa46 Mon Sep 17 00:00:00 2001 From: Emux Date: Wed, 23 Jan 2019 10:38:54 +0200 Subject: [PATCH] Mapilion: more hillshading options #614 --- .../oscim/android/test/MapilionMvtActivity.java | 4 ++-- .../src/org/oscim/test/MapilionMvtTest.java | 4 ++-- .../tiling/source/bitmap/DefaultSources.java | 16 +++++++++++++--- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/vtm-android-example/src/org/oscim/android/test/MapilionMvtActivity.java b/vtm-android-example/src/org/oscim/android/test/MapilionMvtActivity.java index 51d04d74..5a9d6d80 100644 --- a/vtm-android-example/src/org/oscim/android/test/MapilionMvtActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/MapilionMvtActivity.java @@ -1,5 +1,5 @@ /* - * Copyright 2018 devemux86 + * Copyright 2018-2019 devemux86 * * This program is free software: you can redistribute it and/or modify it under the * terms of the GNU Lesser General Public License as published by the Free Software @@ -59,7 +59,7 @@ public class MapilionMvtActivity extends MapActivity { mMap.setTheme(VtmThemes.OPENMAPTILES); // Hillshading - UrlTileSource shadedTileSource = DefaultSources.MAPILION_HILLSHADE + UrlTileSource shadedTileSource = DefaultSources.MAPILION_HILLSHADE_2 .apiKey(API_KEY) .httpFactory(factory) .build(); diff --git a/vtm-playground/src/org/oscim/test/MapilionMvtTest.java b/vtm-playground/src/org/oscim/test/MapilionMvtTest.java index d8215487..d1412ba3 100644 --- a/vtm-playground/src/org/oscim/test/MapilionMvtTest.java +++ b/vtm-playground/src/org/oscim/test/MapilionMvtTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2018 devemux86 + * Copyright 2018-2019 devemux86 * * This program is free software: you can redistribute it and/or modify it under the * terms of the GNU Lesser General Public License as published by the Free Software @@ -61,7 +61,7 @@ public class MapilionMvtTest extends GdxMapApp { mMap.setTheme(VtmThemes.OPENMAPTILES); // Hillshading - UrlTileSource shadedTileSource = DefaultSources.MAPILION_HILLSHADE + UrlTileSource shadedTileSource = DefaultSources.MAPILION_HILLSHADE_2 .apiKey(API_KEY) .httpFactory(factory) .build(); diff --git a/vtm/src/org/oscim/tiling/source/bitmap/DefaultSources.java b/vtm/src/org/oscim/tiling/source/bitmap/DefaultSources.java index 35664206..5134f0fd 100644 --- a/vtm/src/org/oscim/tiling/source/bitmap/DefaultSources.java +++ b/vtm/src/org/oscim/tiling/source/bitmap/DefaultSources.java @@ -1,7 +1,7 @@ /* * Copyright 2013 Hannes Janetzek * Copyright 2016 Andrey Novikov - * Copyright 2016-2018 devemux86 + * Copyright 2016-2019 devemux86 * * This file is part of the OpenScienceMap project (http://www.opensciencemap.org). * @@ -19,6 +19,7 @@ package org.oscim.tiling.source.bitmap; import org.oscim.layers.tile.bitmap.BitmapTileLayer.FadeStep; +import org.oscim.map.Viewport; import org.oscim.tiling.source.bitmap.BitmapTileSource.Builder; /** @@ -63,9 +64,18 @@ public class DefaultSources { .zoomMax(14); // Needs an API key - public static Builder MAPILION_HILLSHADE = BitmapTileSource.builder() - .url("https://tiles.mapilion.com/hillshades") + public static Builder MAPILION_HILLSHADE_1 = BitmapTileSource.builder() + .url("https://tiles.mapilion.com/hillshades/v1") .tilePath("/{Z}/{X}/{Y}.png") .zoomMin(1) .zoomMax(12); + + // Needs an API key + public static Builder MAPILION_HILLSHADE_2 = BitmapTileSource.builder() + .url("https://tiles.mapilion.com/hillshades/v2") + .tilePath("/{Z}/{X}/{Y}.png") + .fadeSteps(new FadeStep[]{ + new FadeStep(0, Viewport.MAX_ZOOM_LEVEL, 1, 0.2f) + }) + .zoomMax(12); }