From 8140827f285c8c30d5ea84c096ca6f92f060381f Mon Sep 17 00:00:00 2001 From: "Justin R. Miller" Date: Fri, 20 Jun 2014 11:20:11 -0700 Subject: [PATCH] refs #168: no longer need zooms --- include/llmr/map/source.hpp | 7 ++----- src/map/map.cpp | 1 - src/map/source.cpp | 3 +-- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/include/llmr/map/source.hpp b/include/llmr/map/source.hpp index 7ce6aa632..08a8771ba 100644 --- a/include/llmr/map/source.hpp +++ b/include/llmr/map/source.hpp @@ -30,10 +30,8 @@ public: public: Source(Map &map, Painter &painter, - const char *url = "", Type type = Type::vector, std::vector zooms = {0}, - uint32_t tile_size = 512, uint32_t min_zoom = 0, uint32_t max_zoom = 14, - bool enabled = true); - + const char *url = "", Type type = Type::vector, uint32_t tile_size = 512, + uint32_t min_zoom = 0, uint32_t max_zoom = 14, bool enabled = true); bool update(); void updateMatrices(const TransformState &transform); @@ -65,7 +63,6 @@ private: Painter& painter; const Type type; - const std::vector zooms; const std::string url; const uint32_t tile_size; const int32_t min_zoom; diff --git a/src/map/map.cpp b/src/map/map.cpp index 2a3f366f1..3f65afcd0 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -172,7 +172,6 @@ void Map::setup() { painter, kVectorTileURL, Source::Type::vector, - {{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 }}, 512, 0, 14, diff --git a/src/map/source.cpp b/src/map/source.cpp index 2491e083e..89527e7ef 100644 --- a/src/map/source.cpp +++ b/src/map/source.cpp @@ -17,13 +17,12 @@ using namespace llmr; Source::Source(Map &map, Painter &painter, - const char *url, Source::Type type, std::vector zooms, uint32_t tile_size, + const char *url, Source::Type type, uint32_t tile_size, uint32_t min_zoom, uint32_t max_zoom, bool enabled) : enabled(enabled), map(map), painter(painter), type(type), - zooms(zooms), url(url), tile_size(tile_size), min_zoom(min_zoom),