update style with labels

2014-05-09 16:51:09 -07:00
parent 11c8be6f94
commit db013095e9
3 changed files with 621 additions and 187 deletions
--- a/bin/style.js
+++ b/bin/style.js
--- a/include/llmr/map/transform.hpp
+++ b/include/llmr/map/transform.hpp
@@ -82,7 +82,7 @@ private:
    // Limit the amount of zooming possible on the map.
    // TODO: make these modifiable from outside.
    const double min_scale = pow(2, 0);
-    const double max_scale = pow(2, 20);
+    const double max_scale = pow(2, 18);

    // cache values for spherical mercator math
    double zc, Bc, Cc;
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -135,7 +135,7 @@ void Map::setup() {

    painter.setup();

-    sources.emplace("mapbox streets",
+    sources.emplace("outdoors",
                    std::unique_ptr<Source>(new Source(*this,
                           painter,
                           texturepool,