diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-05-20 12:21:59 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-05-20 12:21:59 +0200 |
| commit | fde4f2cd7006f65635c88f60ad4fb4ceefa081a2 (patch) | |
| tree | c1560f2b222f8dbce9ed6d7c55599a57cf3b0796 /src/style/style.cpp | |
| parent | a81f41f41f6b72ff1e5cdfbd291840e38e304e72 (diff) | |
| parent | 142084831417c666bc9c14d88d2c7851727704bc (diff) | |
| download | qtlocation-mapboxgl-fde4f2cd7006f65635c88f60ad4fb4ceefa081a2.tar.gz | |
Merge branch 'master' into outdoors-style
Diffstat (limited to 'src/style/style.cpp')
| -rw-r--r-- | src/style/style.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/style/style.cpp b/src/style/style.cpp index 00c0d2acf5..6450fede5c 100644 --- a/src/style/style.cpp +++ b/src/style/style.cpp @@ -1,5 +1,6 @@ #include <llmr/style/style.hpp> #include <llmr/style/style_parser.hpp> +#include <llmr/util/constants.hpp> #include <csscolorparser/csscolorparser.hpp> #include <rapidjson/document.h> @@ -22,6 +23,10 @@ void Style::reset() { void Style::cascade(float z) { reset(); + // Accomodate for different tile size. + // TODO: Make this per-layer once individual layers have a specific tile size. + z += std::log(util::tileSize / 256.0f) / M_LN2; + // Recalculate style // Basic cascading for (const auto& class_pair : classes) { |