Merge pull request #217 from mapbox/outdoors-style

Outdoors style

3 files changed, 6 insertions, 3 deletions

diff --git a/include/llmr/map/transform.hpp b/include/llmr/map/transform.hpp
index 472d01ab7e..550d14b146 100644
--- 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 = std::pow(2, 0);
-    const double max_scale = std::pow(2, 20);
+    const double max_scale = std::pow(2, 18);
 
     // cache values for spherical mercator math
     double zc, Bc, Cc;
diff --git a/include/llmr/style/properties.hpp b/include/llmr/style/properties.hpp
index 90cd6e6882..41481fbbc9 100644
--- a/include/llmr/style/properties.hpp
+++ b/include/llmr/style/properties.hpp
@@ -137,6 +137,7 @@ struct TextClass {
     Color color = {{ 0, 0, 0, 1 }};
     Color halo = {{ 1, 1, 1, 0.75 }};
     FunctionProperty haloRadius = 0.25f;
+    FunctionProperty haloBlur = 1.0f;
     FunctionProperty size = 12.0f;
     FunctionProperty rotate = 0.0f;
     FunctionProperty alwaysVisible = false;
@@ -150,6 +151,7 @@ struct TextProperties {
     Color color = {{ 0, 0, 0, 1 }};
     Color halo = {{ 1, 1, 1, 0.75 }};
     float haloRadius = 0.25f;
+    float haloBlur = 1.0f;
     float size = 12.0f;
     float rotate = 0.0f;
     bool alwaysVisible = false;
diff --git a/include/llmr/text/collision.hpp b/include/llmr/text/collision.hpp
index 364a255a97..ef4899c264 100644
--- a/include/llmr/text/collision.hpp
+++ b/include/llmr/text/collision.hpp
@@ -18,13 +18,14 @@ public:
     float getPlacementScale(const GlyphBoxes &glyphs, float minPlacementScale,
                             float maxPlacementScale, float pad);
     PlacementRange getPlacementRange(const GlyphBoxes &glyphs,
-                                     float placementScale);
+                                     float placementScale, bool horizontal);
     void insert(const GlyphBoxes &glyphs, const CollisionAnchor &anchor,
                 float placementScale, const PlacementRange &placementRange,
                 bool horizontal, float padding);
 
 private:
-    void *tree;
+    void *cTree;
+    void *hTree;
 };
 }