port labeling, symbol sorting, and reparsing overscaled tiles

README.md

@@ -256,6 +256,7 @@ Some styles in JSON format are included at `./styles`. See the [style spec](http
 - Press `X` to reset the transform
 - Press `N` to reset north
 - Press `Tab` to toggle debug information
+- Press 'C' to toggle symbol collision debug boxes
 - Press `Esc` to quit
 
 ## Mobile

include/mbgl/map/map.hpp

@@ -127,6 +127,9 @@ class Map : private util::noncopyable {
     void setDebug(bool value);
     void toggleDebug();
     bool getDebug() const;
+    void setCollisionDebug(bool value);
+    void toggleCollisionDebug();
+    bool getCollisionDebug() const;
     bool isFullyLoaded() const;
 
 private:

platform/default/glfw_view.cpp

@@ -87,6 +87,9 @@ void GLFWView::onKey(GLFWwindow *window, int key, int /*scancode*/, int action,
         case GLFW_KEY_TAB:
             view->map->toggleDebug();
             break;
+        case GLFW_KEY_C:
+            view->map->toggleCollisionDebug();
+            break;
         case GLFW_KEY_X:
             if (!mods)
                 view->map->resetPosition();

src/mbgl/geometry/anchor.hpp

@@ -16,10 +16,11 @@ struct Anchor {
         : x(x_), y(y_), angle(angle_), scale(scale_) {}
     explicit Anchor(float x_, float y_, float angle_, float scale_, int segment_)
         : x(x_), y(y_), angle(angle_), scale(scale_), segment(segment_) {}
+
 };
 
 typedef std::vector<Anchor> Anchors;
 
 }
 
-#endif
+#endif

src/mbgl/geometry/collision_box_buffer.cpp

@@ -0,0 +1,27 @@
+#include <mbgl/geometry/collision_box_buffer.hpp>
+#include <mbgl/platform/gl.hpp>
+#include <mbgl/util/math.hpp>
+
+#include <cmath>
+
+namespace mbgl {
+
+size_t CollisionBoxVertexBuffer::add(int16_t x, int16_t y, float ox, float oy, float maxzoom, float placementZoom) {
+    const size_t idx = index();
+    void *data = addElement();
+
+    int16_t *shorts = static_cast<int16_t *>(data);
+    shorts[0] /* pos */ = x;
+    shorts[1] /* pos */ = y;
+    shorts[2] /* offset */ = std::round(ox); // use 1/64 pixels for placement
+    shorts[3] /* offset */ = std::round(oy);
+
+    uint8_t *ubytes = static_cast<uint8_t *>(data);
+    // a_data1
+    ubytes[8] = maxzoom * 10;
+    ubytes[9] = placementZoom * 10;
+
+    return idx;
+}
+
+}

src/mbgl/geometry/collision_box_buffer.hpp

@@ -0,0 +1,23 @@
+#ifndef MBGL_GEOMETRY_COLLISIONBOX_BUFFER
+#define MBGL_GEOMETRY_COLLISIONBOX_BUFFER
+
+#include <mbgl/geometry/buffer.hpp>
+#include <array>
+
+namespace mbgl {
+
+class CollisionBoxVertexBuffer : public Buffer <
+    12,
+    GL_ARRAY_BUFFER,
+    32768
+> {
+public:
+    typedef int16_t vertex_type;
+
+    size_t add(int16_t x, int16_t y, float ex, float ey, float maxzoom, float placementZoom);
+};
+
+
+}
+
+#endif

src/mbgl/geometry/icon_buffer.cpp

@@ -6,9 +6,7 @@
 
 namespace mbgl {
 
-const double IconVertexBuffer::angleFactor = 128.0 / M_PI;
-
-size_t IconVertexBuffer::add(int16_t x, int16_t y, float ox, float oy, int16_t tx, int16_t ty, float angle, float minzoom, std::array<float, 2> range, float maxzoom, float labelminzoom) {
+size_t IconVertexBuffer::add(int16_t x, int16_t y, float ox, float oy, int16_t tx, int16_t ty, float minzoom, float maxzoom, float labelminzoom) {
     const size_t idx = index();
     void *data = addElement();
 
@@ -23,13 +21,10 @@ size_t IconVertexBuffer::add(int16_t x, int16_t y, float ox, float oy, int16_t t
     ubytes[8] /* tex */ = tx / 4;
     ubytes[9] /* tex */ = ty / 4;
     ubytes[10] /* labelminzoom */ = labelminzoom * 10;
-    ubytes[11] /* angle */ = (int16_t)std::round(angle * angleFactor) % 256;
 
     // a_data2
     ubytes[12] /* minzoom */ = minzoom * 10; // 1/10 zoom levels: z16 == 160.
     ubytes[13] /* maxzoom */ = std::fmin(maxzoom, 25) * 10; // 1/10 zoom levels: z16 == 160.
-    ubytes[14] /* rangeend */ = util::max((int16_t)std::round(range[0] * angleFactor), (int16_t)0) % 256;
-    ubytes[15] /* rangestart */ = util::min((int16_t)std::round(range[1] * angleFactor), (int16_t)255) % 256;
 
     return idx;
 }

src/mbgl/geometry/icon_buffer.hpp

@@ -11,9 +11,7 @@ namespace mbgl {
     16
     > {
     public:
-        static const double angleFactor;
-
-        size_t add(int16_t x, int16_t y, float ox, float oy, int16_t tx, int16_t ty, float angle, float minzoom, std::array<float, 2> range, float maxzoom, float labelminzoom);
+        size_t add(int16_t x, int16_t y, float ox, float oy, int16_t tx, int16_t ty, float minzoom, float maxzoom, float labelminzoom);
 
     };
 

src/mbgl/geometry/text_buffer.cpp

@@ -6,9 +6,7 @@
 
 namespace mbgl {
 
-const double TextVertexBuffer::angleFactor = 128.0 / M_PI;
-
-size_t TextVertexBuffer::add(int16_t x, int16_t y, float ox, float oy, uint16_t tx, uint16_t ty, float angle, float minzoom, std::array<float, 2> range, float maxzoom, float labelminzoom) {
+size_t TextVertexBuffer::add(int16_t x, int16_t y, float ox, float oy, uint16_t tx, uint16_t ty, float minzoom, float maxzoom, float labelminzoom) {
     const size_t idx = index();
     void *data = addElement();
 
@@ -23,13 +21,10 @@ size_t TextVertexBuffer::add(int16_t x, int16_t y, float ox, float oy, uint16_t
     ubytes[8] /* tex */ = tx / 4;
     ubytes[9] /* tex */ = ty / 4;
     ubytes[10] /* labelminzoom */ = labelminzoom * 10;
-    ubytes[11] /* angle */ = (int16_t)std::round(angle * angleFactor) % 256;
 
     // a_data2
     ubytes[12] /* minzoom */ = minzoom * 10; // 1/10 zoom levels: z16 == 160.
     ubytes[13] /* maxzoom */ = std::fmin(maxzoom, 25) * 10; // 1/10 zoom levels: z16 == 160.
-    ubytes[14] /* rangeend */ = util::max((int16_t)std::round(range[0] * angleFactor), (int16_t)0) % 256;
-    ubytes[15] /* rangestart */ = util::min((int16_t)std::round(range[1] * angleFactor), (int16_t)255) % 256;
 
     return idx;
 }

src/mbgl/geometry/text_buffer.hpp

@@ -14,9 +14,7 @@ class TextVertexBuffer : public Buffer <
 public:
     typedef int16_t vertex_type;
 
-    static const double angleFactor;
-
-    size_t add(int16_t x, int16_t y, float ox, float oy, uint16_t tx, uint16_t ty, float angle, float minzoom, std::array<float, 2> range, float maxzoom, float labelminzoom);
+    size_t add(int16_t x, int16_t y, float ox, float oy, uint16_t tx, uint16_t ty, float minzoom, float maxzoom, float labelminzoom);
 };
 
 

src/mbgl/map/annotation.cpp

@@ -124,7 +124,7 @@ AnnotationManager::addPointAnnotations(const std::vector<LatLng>& points,
         uint32_t y = p.y * z2;
 
         for (int8_t z = maxZoom; z >= 0; z--) {
-            affectedTiles.emplace_back(z, x, y);
+            affectedTiles.emplace_back(z, x, y, z);
             TileID tileID = affectedTiles.back();
 
             // calculate tile coordinate
@@ -213,7 +213,7 @@ std::vector<TileID> AnnotationManager::removeAnnotations(const AnnotationIDs& id
                 p = projectPoint(latLng);
                 x = z2s[z] * p.x;
                 y = z2s[z] * p.y;
-                TileID tid(z, x, y);
+                TileID tid(z, x, y, z);
                 // erase annotation from tile's list
                 auto& tileAnnotations = tiles[tid].first;
                 tileAnnotations.erase(annotationID);
@@ -244,8 +244,8 @@ std::vector<uint32_t> AnnotationManager::getAnnotationsInBounds(const LatLngBoun
     const vec2<double> nePoint = projectPoint(queryBounds.ne);
 
     // tiles number y from top down
-    const TileID nwTile(z, swPoint.x * z2, nePoint.y * z2);
-    const TileID seTile(z, nePoint.x * z2, swPoint.y * z2);
+    const TileID nwTile(z, swPoint.x * z2, nePoint.y * z2, z);
+    const TileID seTile(z, nePoint.x * z2, swPoint.y * z2, z);
 
     std::vector<uint32_t> matchingAnnotations;
 

src/mbgl/map/live_tile_data.cpp

@@ -10,15 +10,17 @@ using namespace mbgl;
 
 LiveTileData::LiveTileData(const TileID& id_,
                            AnnotationManager& annotationManager_,
-                           float mapMaxZoom,
                            Style& style_,
                            GlyphAtlas& glyphAtlas_,
                            GlyphStore& glyphStore_,
                            SpriteAtlas& spriteAtlas_,
                            util::ptr<Sprite> sprite_,
-                           const SourceInfo& source_)
-    : VectorTileData::VectorTileData(id_, mapMaxZoom, style_, glyphAtlas_, glyphStore_,
-                                     spriteAtlas_, sprite_, source_),
+                           const SourceInfo& source_,
+                           float overscaling_,
+                           float angle_,
+                           bool collisionDebug_)
+    : VectorTileData::VectorTileData(id_, style_, glyphAtlas_, glyphStore_,
+                                     spriteAtlas_, sprite_, source_, overscaling_, angle_, collisionDebug_),
       annotationManager(annotationManager_) {
     // live features are always ready
     setState(State::loaded);

src/mbgl/map/live_tile_data.hpp

@@ -11,13 +11,15 @@ class LiveTileData : public VectorTileData {
 public:
     LiveTileData(const TileID&,
                  AnnotationManager&,
-                 float mapMaxZoom,
                  Style&,
                  GlyphAtlas&,
                  GlyphStore&,
                  SpriteAtlas&,
                  util::ptr<Sprite>,
-                 const SourceInfo&);
+                 const SourceInfo&,
+                 float overscaling_,
+                 float angle_,
+                 bool collisionDebug_);
     ~LiveTileData();
 
     void parse() override;

src/mbgl/map/map.cpp

@@ -278,6 +278,20 @@ bool Map::getDebug() const {
     return data->getDebug();
 }
 
+void Map::setCollisionDebug(bool value) {
+    data->setCollisionDebug(value);
+    update();
+}
+
+void Map::toggleCollisionDebug() {
+    data->toggleCollisionDebug();
+    update();
+}
+
+bool Map::getCollisionDebug() const {
+    return data->getCollisionDebug();
+}
+
 bool Map::isFullyLoaded() const {
     return data->getFullyLoaded();
 }

src/mbgl/map/map_data.cpp

@@ -41,4 +41,4 @@ std::vector<std::string> MapData::getClasses() const {
     return classes;
 }
 
-}
+}

src/mbgl/map/map_data.hpp

@@ -55,6 +55,16 @@ class MapData {
         debug = value;
     }
 
+    inline bool getCollisionDebug() const {
+        return collisionDebug;
+    }
+    inline bool toggleCollisionDebug() {
+        return collisionDebug ^= 1u;
+    }
+    inline void setCollisionDebug(bool value) {
+        collisionDebug = value;
+    }
+
     inline bool getFullyLoaded() const {
         return loaded;
     }
@@ -88,6 +98,7 @@ class MapData {
 
     std::vector<std::string> classes;
     std::atomic<uint8_t> debug { false };
+    std::atomic<uint8_t> collisionDebug { false };
     std::atomic<bool> loaded { false };
     std::atomic<Duration> animationTime;
     std::atomic<Duration> defaultTransitionDuration;