diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-03-21 13:36:32 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-03-21 13:36:32 +0100 |
| commit | 3413ee536d1e3fdd30aeb8a0105f713115302279 (patch) | |
| tree | f5d622751328ab7233b3631ae167f781c6e7e292 /src/platform | |
| parent | 4ee0cf1791f8f4b787793d2612c583bfb8b9c62f (diff) | |
| parent | 0730ca640b095662a918fa55486c7b5bc4eba31c (diff) | |
| download | qtlocation-mapboxgl-3413ee536d1e3fdd30aeb8a0105f713115302279.tar.gz | |
Merge branch 'master' into sdf
Conflicts:
include/llmr/map/tile_data.hpp
include/llmr/shader/shaders.hpp
src/map/map.cpp
src/map/tile_data.cpp
src/platform/platform.cpp
src/shader/shaders.cpp
Diffstat (limited to 'src/platform')
| -rw-r--r-- | src/platform/platform.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/platform/platform.cpp b/src/platform/platform.cpp index e2d6d828cf..6d0f845bde 100644 --- a/src/platform/platform.cpp +++ b/src/platform/platform.cpp @@ -1,4 +1,8 @@ #include <llmr/platform/platform.hpp> -const char *llmr::kTileURL = "http://localhost:3333/v3/mapbox.mapbox-streets-v4/%d/%d/%d.gl.pbf"; +const char *llmr::kTileVectorURL = "http://localhost:3333/v3/mapbox.mapbox-streets-v4/%d/%d/%d.gl.pbf"; +const char *llmr::kTileRasterURL = "https://a.tiles.mapbox.com/v3/justin.map-pgygbwdm/%d/%d/%d%s.png256"; const char *llmr::kSpriteURL = "http://localhost:3333/images/sprite"; + +const int32_t llmr::kTileVectorMaxZoom = 14; +const int32_t llmr::kTileRasterMaxZoom = 21; |