summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Morris <michael.patrick.morris@gmail.com>2014-09-24 15:58:52 -0400
committerMike Morris <michael.patrick.morris@gmail.com>2014-09-24 15:58:52 -0400
commit3dec4933a9525b74c06d739adc4fdd9050b3f25f (patch)
treea28f772fabbb9ef5ccf95f56131ff5420f256add
parent9b6cff43011f7a9bb8ff19a28aa549126e96e160 (diff)
parent8a19896c3a0e450ba498281b8879eb86060fa0cb (diff)
downloadqtlocation-mapboxgl-3dec4933a9525b74c06d739adc4fdd9050b3f25f.tar.gz
Merge branch 'libuv010' into libuv-0.10-fix-context-shutdown
Conflicts: common/headless_view.cpp test/headless.cpp
-rw-r--r--common/headless_view.cpp16
-rw-r--r--common/headless_view.hpp2
-rw-r--r--include/mbgl/map/source.hpp3
-rw-r--r--include/mbgl/map/tile.hpp3
-rw-r--r--src/map/source.cpp173
-rw-r--r--src/map/tile.cpp88
-rw-r--r--src/style/style_parser.cpp62
-rw-r--r--test/headless.cpp16
8 files changed, 190 insertions, 173 deletions
diff --git a/common/headless_view.cpp b/common/headless_view.cpp
index 4ad22da9a5..d3c6491d0d 100644
--- a/common/headless_view.cpp
+++ b/common/headless_view.cpp
@@ -2,6 +2,7 @@
#include <mbgl/util/timer.hpp>
#include <stdexcept>
+#include <iostream>
namespace mbgl {
@@ -65,9 +66,12 @@ HeadlessView::HeadlessView() {
}
-void HeadlessView::resize(int width, int height) {
+void HeadlessView::resize(uint16_t width, uint16_t height, float pixelRatio) {
clear_buffers();
+ width *= pixelRatio;
+ height *= pixelRatio;
+
#if MBGL_USE_CGL
make_active();
@@ -154,6 +158,11 @@ HeadlessView::~HeadlessView() {
#endif
#if MBGL_USE_GLX
+ std::cerr << "~HeadlessView()" << '\n';
+ std::cerr << "x_display: " << x_display << '\n';
+ std::cerr << "glx_pixmap: " << glx_pixmap << '\n';
+ std::cerr << "gl_context: " << gl_context << '\n';
+
glXDestroyContext(x_display, gl_context);
XFree(x_info);
XCloseDisplay(x_display);
@@ -173,6 +182,11 @@ void HeadlessView::make_active() {
#endif
#if MBGL_USE_GLX
+ std::cerr << "make_active()" << '\n';
+ std::cerr << "x_display: " << x_display << '\n';
+ std::cerr << "glx_pixmap: " << glx_pixmap << '\n';
+ std::cerr << "gl_context: " << gl_context << '\n';
+
if (!glXMakeCurrent(x_display, glx_pixmap, gl_context)) {
fprintf(stderr, "Switching OpenGL context failed\n");
}
diff --git a/common/headless_view.hpp b/common/headless_view.hpp
index a4432bbae3..c8475a2516 100644
--- a/common/headless_view.hpp
+++ b/common/headless_view.hpp
@@ -19,7 +19,7 @@ public:
HeadlessView();
~HeadlessView();
- void resize(int width, int height);
+ void resize(uint16_t width, uint16_t height, float pixelRatio);
void notify_map_change(MapChange change, timestamp delay = 0);
void make_active();
diff --git a/include/mbgl/map/source.hpp b/include/mbgl/map/source.hpp
index 4bc4c86dd0..cb069db272 100644
--- a/include/mbgl/map/source.hpp
+++ b/include/mbgl/map/source.hpp
@@ -44,7 +44,8 @@ public:
private:
bool findLoadedChildren(const Tile::ID& id, int32_t maxCoveringZoom, std::forward_list<Tile::ID>& retain);
bool findLoadedParent(const Tile::ID& id, int32_t minCoveringZoom, std::forward_list<Tile::ID>& retain);
- std::forward_list<Tile::ID> covering_tiles(const TransformState &state, int32_t clamped_zoom, const box& points);
+ int32_t coveringZoomLevel(const TransformState&) const;
+ std::forward_list<Tile::ID> coveringTiles(const TransformState&) const;
bool updateTiles(Map &map);
diff --git a/include/mbgl/map/tile.hpp b/include/mbgl/map/tile.hpp
index 24845c81a0..75ced7e384 100644
--- a/include/mbgl/map/tile.hpp
+++ b/include/mbgl/map/tile.hpp
@@ -16,6 +16,7 @@
namespace mbgl {
class TileData;
+struct box;
struct ClipID {
inline ClipID() {}
@@ -68,6 +69,8 @@ public:
bool isChildOf(const Tile::ID &id) const;
};
+ static std::forward_list<Tile::ID> cover(int8_t z, const box& bounds);
+
public:
explicit Tile(const ID& id);
diff --git a/src/map/source.cpp b/src/map/source.cpp
index 3fe5bf42fa..083e931b7a 100644
--- a/src/map/source.cpp
+++ b/src/map/source.cpp
@@ -8,6 +8,7 @@
#include <mbgl/util/texturepool.hpp>
#include <mbgl/util/filesource.hpp>
#include <mbgl/util/vec.hpp>
+#include <mbgl/util/math.hpp>
#include <mbgl/util/std.hpp>
#include <mbgl/util/mapbox.hpp>
#include <mbgl/geometry/glyph_atlas.hpp>
@@ -197,6 +198,37 @@ TileData::State Source::addTile(Map &map, const Tile::ID& id) {
return new_tile.data->state;
}
+double Source::getZoom(const TransformState& state) const {
+ double offset = std::log(util::tileSize / info.tile_size) / std::log(2);
+ offset += (state.getPixelRatio() > 1.0 ? 1 :0);
+ return state.getZoom() + offset;
+}
+
+int32_t Source::coveringZoomLevel(const TransformState& state) const {
+ return std::floor(getZoom(state));
+}
+
+std::forward_list<Tile::ID> Source::coveringTiles(const TransformState& state) const {
+ int32_t z = coveringZoomLevel(state);
+
+ if (z < info.min_zoom) return {{}};
+ if (z > info.max_zoom) z = info.max_zoom;
+
+ // Map four viewport corners to pixel coordinates
+ box points = state.cornersToBox(z);
+ const vec2<double>& center = points.center;
+
+ std::forward_list<Tile::ID> tiles = Tile::cover(z, points);
+
+ tiles.sort([&center](const Tile::ID& a, const Tile::ID& b) {
+ // Sorts by distance from the box center
+ return std::fabs(a.x - center.x) + std::fabs(a.y - center.y) <
+ std::fabs(b.x - center.x) + std::fabs(b.y - center.y);
+ });
+
+ return tiles;
+}
+
/**
* Recursively find children of the given tile that are already loaded.
*
@@ -209,8 +241,6 @@ TileData::State Source::addTile(Map &map, const Tile::ID& id) {
bool Source::findLoadedChildren(const Tile::ID& id, int32_t maxCoveringZoom, std::forward_list<Tile::ID>& retain) {
bool complete = true;
int32_t z = id.z;
-
-
auto ids = id.children(z + 1);
for (const Tile::ID& child_id : ids) {
const TileData::State state = hasTile(child_id);
@@ -251,24 +281,12 @@ bool Source::findLoadedParent(const Tile::ID& id, int32_t minCoveringZoom, std::
bool Source::updateTiles(Map &map) {
bool changed = false;
- // Figure out what tiles we need to load
- int32_t clamped_zoom = map.getState().getIntegerZoom();
- if (clamped_zoom > info.max_zoom) clamped_zoom = info.max_zoom;
- if (clamped_zoom < info.min_zoom) clamped_zoom = info.min_zoom;
-
- int32_t max_covering_zoom = clamped_zoom + 1;
- if (max_covering_zoom > info.max_zoom) max_covering_zoom = info.max_zoom;
-
- int32_t min_covering_zoom = clamped_zoom - 10;
- if (min_covering_zoom < info.min_zoom) min_covering_zoom = info.min_zoom;
+ int32_t zoom = std::floor(getZoom(map.getState()));
+ std::forward_list<Tile::ID> required = coveringTiles(map.getState());
- // Map four viewport corners to pixel coordinates
- box box = map.getState().cornersToBox(clamped_zoom);
-
- // Performs a scanline algorithm search that covers the rectangle of the box
- // and sorts them by proximity to the center.
-
- std::forward_list<Tile::ID> required = covering_tiles(map.getState(), clamped_zoom, box);
+ // Determine the overzooming/underzooming amounts.
+ int32_t minCoveringZoom = util::clamp<int32_t>(zoom - 10, info.min_zoom, info.max_zoom);
+ int32_t maxCoveringZoom = util::clamp<int32_t>(zoom + 1, info.min_zoom, info.max_zoom);
// Retain is a list of tiles that we shouldn't delete, even if they are not
// the most ideal tile for the current viewport. This may include tiles like
@@ -280,20 +298,17 @@ bool Source::updateTiles(Map &map) {
const TileData::State state = addTile(map, id);
if (state != TileData::State::parsed) {
-// if (use_raster && (transform.rotating || transform.scaling || transform.panning))
-// break;
-
// The tile we require is not yet loaded. Try to find a parent or
// child tile that we already have.
// First, try to find existing child tiles that completely cover the
// missing tile.
- bool complete = findLoadedChildren(id, max_covering_zoom, retain);
+ bool complete = findLoadedChildren(id, maxCoveringZoom, retain);
// Then, if there are no complete child tiles, try to find existing
// parent tiles that completely cover the missing tile.
if (!complete) {
- findLoadedParent(id, min_covering_zoom, retain);
+ findLoadedParent(id, minCoveringZoom, retain);
}
}
@@ -337,114 +352,4 @@ bool Source::updateTiles(Map &map) {
return changed;
}
-// Taken from polymaps src/Layer.js
-// https://github.com/simplegeo/polymaps/blob/master/src/Layer.js#L333-L383
-
-struct edge {
- double x0 = 0, y0 = 0;
- double x1 = 0, y1 = 0;
- double dx = 0, dy = 0;
- edge(double x0, double y0, double x1, double y1, double dx, double dy)
- : x0(x0), y0(y0), x1(x1), y1(y1), dx(dx), dy(dy) {}
-};
-
-typedef const std::function<void(int32_t, int32_t, int32_t, int32_t)> ScanLine;
-
-// scan-line conversion
-edge _edge(const mbgl::vec2<double> a, const mbgl::vec2<double> b) {
- if (a.y > b.y) {
- return { b.x, b.y, a.x, a.y, a.x - b.x, a.y - b.y };
- } else {
- return { a.x, a.y, b.x, b.y, b.x - a.x, b.y - a.y };
- }
-}
-
-// scan-line conversion
-void _scanSpans(edge e0, edge e1, int32_t ymin, int32_t ymax, ScanLine scanLine) {
- double y0 = std::fmax(ymin, std::floor(e1.y0)),
- y1 = std::fmin(ymax, std::ceil(e1.y1));
-
- // sort edges by x-coordinate
- if ((e0.x0 == e1.x0 && e0.y0 == e1.y0) ?
- (e0.x0 + e1.dy / e0.dy * e0.dx < e1.x1) :
- (e0.x1 - e1.dy / e0.dy * e0.dx < e1.x0)) {
- std::swap(e0, e1);
- }
-
- // scan lines!
- double m0 = e0.dx / e0.dy,
- m1 = e1.dx / e1.dy,
- d0 = e0.dx > 0, // use y + 1 to compute x0
- d1 = e1.dx < 0; // use y + 1 to compute x1
- for (int32_t y = y0; y < y1; y++) {
- double x0 = m0 * std::fmax(0, std::fmin(e0.dy, y + d0 - e0.y0)) + e0.x0,
- x1 = m1 * std::fmax(0, std::fmin(e1.dy, y + d1 - e1.y0)) + e1.x0;
- scanLine(std::floor(x1), std::ceil(x0), y, ymax);
- }
-}
-
-// scan-line conversion
-void _scanTriangle(const mbgl::vec2<double> a, const mbgl::vec2<double> b, const mbgl::vec2<double> c, int32_t ymin, int32_t ymax, ScanLine& scanLine) {
- edge ab = _edge(a, b);
- edge bc = _edge(b, c);
- edge ca = _edge(c, a);
-
- // sort edges by y-length
- if (ab.dy > bc.dy) { std::swap(ab, bc); }
- if (ab.dy > ca.dy) { std::swap(ab, ca); }
- if (bc.dy > ca.dy) { std::swap(bc, ca); }
-
- // scan span! scan span!
- if (ab.dy) _scanSpans(ca, ab, ymin, ymax, scanLine);
- if (bc.dy) _scanSpans(ca, bc, ymin, ymax, scanLine);
-}
-
-double Source::getZoom(const TransformState &state) const {
- double offset = log(util::tileSize / info.tile_size) / log(2);
- offset += (state.getPixelRatio() > 1.0 ? 1 :0);
- return state.getZoom() + offset;
-}
-
-std::forward_list<mbgl::Tile::ID> Source::covering_tiles(const TransformState &state, int32_t clamped_zoom, const box& points) {
- int32_t dim = std::pow(2, clamped_zoom);
- std::forward_list<mbgl::Tile::ID> tiles;
- bool is_raster = (info.type == SourceType::Raster);
- double search_zoom = getZoom(state);
-
- auto scanLine = [&tiles, clamped_zoom, is_raster, search_zoom](int32_t x0, int32_t x1, int32_t y, int32_t ymax) {
- int32_t x;
- if (y >= 0 && y <= ymax) {
- for (x = x0; x < x1; x++) {
- if (is_raster) {
- Tile::ID id = Tile::ID(clamped_zoom, x, y);
- auto ids = id.children(search_zoom);
- for (const Tile::ID& child_id : ids) {
- tiles.emplace_front(child_id.z, child_id.x, child_id.y);
- }
- } else {
- tiles.emplace_front(clamped_zoom, x, y);
- }
- }
- }
- };
-
- // Divide the screen up in two triangles and scan each of them:
- // \---+
- // | \ |
- // +---\.
- _scanTriangle(points.tl, points.tr, points.br, 0, dim, scanLine);
- _scanTriangle(points.br, points.bl, points.tl, 0, dim, scanLine);
-
- const vec2<double>& center = points.center;
- tiles.sort([&center](const Tile::ID& a, const Tile::ID& b) {
- // Sorts by distance from the box center
- return std::fabs(a.x - center.x) + std::fabs(a.y - center.y) <
- std::fabs(b.x - center.x) + std::fabs(b.y - center.y);
- });
-
- tiles.unique();
-
- return tiles;
-}
-
}
diff --git a/src/map/tile.cpp b/src/map/tile.cpp
index e073960116..863fbfbece 100644
--- a/src/map/tile.cpp
+++ b/src/map/tile.cpp
@@ -1,4 +1,5 @@
#include <mbgl/map/tile.hpp>
+#include <mbgl/util/vec.hpp>
#include <cassert>
@@ -49,3 +50,90 @@ bool Tile::ID::isChildOf(const Tile::ID &parent) const {
return parent.x == ((x < 0 ? x - scale + 1 : x) / scale) &&
parent.y == y / scale;
}
+
+
+// Taken from polymaps src/Layer.js
+// https://github.com/simplegeo/polymaps/blob/master/src/Layer.js#L333-L383
+
+struct edge {
+ double x0 = 0, y0 = 0;
+ double x1 = 0, y1 = 0;
+ double dx = 0, dy = 0;
+
+ edge(vec2<double> a, vec2<double> b) {
+ if (a.y > b.y) { std::swap(a, b); }
+ x0 = a.x;
+ y0 = a.y;
+ x1 = b.x;
+ y1 = b.y;
+ dx = b.x - a.x;
+ dy = b.y - a.y;
+ }
+};
+
+typedef const std::function<void(int32_t x0, int32_t x1, int32_t y)> ScanLine;
+
+// scan-line conversion
+static void scanSpans(edge e0, edge e1, int32_t ymin, int32_t ymax, ScanLine scanLine) {
+ double y0 = std::fmax(ymin, std::floor(e1.y0));
+ double y1 = std::fmin(ymax, std::ceil(e1.y1));
+
+ // sort edges by x-coordinate
+ if ((e0.x0 == e1.x0 && e0.y0 == e1.y0) ?
+ (e0.x0 + e1.dy / e0.dy * e0.dx < e1.x1) :
+ (e0.x1 - e1.dy / e0.dy * e0.dx < e1.x0)) {
+ std::swap(e0, e1);
+ }
+
+ // scan lines!
+ double m0 = e0.dx / e0.dy;
+ double m1 = e1.dx / e1.dy;
+ double d0 = e0.dx > 0; // use y + 1 to compute x0
+ double d1 = e1.dx < 0; // use y + 1 to compute x1
+ for (int32_t y = y0; y < y1; y++) {
+ double x0 = m0 * std::fmax(0, std::fmin(e0.dy, y + d0 - e0.y0)) + e0.x0;
+ double x1 = m1 * std::fmax(0, std::fmin(e1.dy, y + d1 - e1.y0)) + e1.x0;
+ scanLine(std::floor(x1), std::ceil(x0), y);
+ }
+}
+
+// scan-line conversion
+static void scanTriangle(const mbgl::vec2<double> a, const mbgl::vec2<double> b, const mbgl::vec2<double> c, int32_t ymin, int32_t ymax, ScanLine& scanLine) {
+ edge ab = edge(a, b);
+ edge bc = edge(b, c);
+ edge ca = edge(c, a);
+
+ // sort edges by y-length
+ if (ab.dy > bc.dy) { std::swap(ab, bc); }
+ if (ab.dy > ca.dy) { std::swap(ab, ca); }
+ if (bc.dy > ca.dy) { std::swap(bc, ca); }
+
+ // scan span! scan span!
+ if (ab.dy) scanSpans(ca, ab, ymin, ymax, scanLine);
+ if (bc.dy) scanSpans(ca, bc, ymin, ymax, scanLine);
+}
+
+std::forward_list<Tile::ID> Tile::cover(int8_t z, const mbgl::box &bounds) {
+ int32_t tiles = 1 << z;
+ std::forward_list<mbgl::Tile::ID> t;
+
+ auto scanLine = [&](int32_t x0, int32_t x1, int32_t y) {
+ int32_t x;
+ if (y >= 0 && y <= tiles) {
+ for (x = x0; x < x1; x++) {
+ t.emplace_front(z, x, y);
+ }
+ }
+ };
+
+ // Divide the screen up in two triangles and scan each of them:
+ // \---+
+ // | \ |
+ // +---\.
+ scanTriangle(bounds.tl, bounds.tr, bounds.br, 0, tiles, scanLine);
+ scanTriangle(bounds.br, bounds.bl, bounds.tl, 0, tiles, scanLine);
+
+ t.unique();
+
+ return t;
+}
diff --git a/src/style/style_parser.cpp b/src/style/style_parser.cpp
index f0d6992318..7e695e71cb 100644
--- a/src/style/style_parser.cpp
+++ b/src/style/style_parser.cpp
@@ -565,78 +565,78 @@ void StyleParser::parseStyle(JSVal value, ClassProperties &klass) {
parseOptionalProperty<Function<bool>>("fill-antialias", Key::FillAntialias, klass, value);
parseOptionalProperty<Function<float>>("fill-opacity", Key::FillOpacity, klass, value);
- parseOptionalProperty<PropertyTransition>("transition-fill-opacity", Key::FillOpacity, klass, value);
+ parseOptionalProperty<PropertyTransition>("fill-opacity-transition", Key::FillOpacity, klass, value);
parseOptionalProperty<Function<Color>>("fill-color", Key::FillColor, klass, value);
- parseOptionalProperty<PropertyTransition>("transition-fill-color", Key::FillColor, klass, value);
+ parseOptionalProperty<PropertyTransition>("fill-color-transition", Key::FillColor, klass, value);
parseOptionalProperty<Function<Color>>("fill-outline-color", Key::FillOutlineColor, klass, value);
- parseOptionalProperty<PropertyTransition>("transition-fill-outline-color", Key::FillOutlineColor, klass, value);
+ parseOptionalProperty<PropertyTransition>("fill-outline-color-transition", Key::FillOutlineColor, klass, value);
parseOptionalProperty<Function<float>>("fill-translate", { Key::FillTranslateX, Key::FillTranslateY }, klass, value);
- parseOptionalProperty<PropertyTransition>("transition-fill-translate", Key::FillTranslate, klass, value);
+ parseOptionalProperty<PropertyTransition>("fill-translate-transition", Key::FillTranslate, klass, value);
parseOptionalProperty<TranslateAnchorType>("fill-translate-anchor", Key::FillTranslateAnchor, klass, value);
parseOptionalProperty<std::string>("fill-image", Key::FillImage, klass, value);
parseOptionalProperty<Function<float>>("line-opacity", Key::LineOpacity, klass, value);
- parseOptionalProperty<PropertyTransition>("transition-line-opacity", Key::LineOpacity, klass, value);
+ parseOptionalProperty<PropertyTransition>("line-opacity-transition", Key::LineOpacity, klass, value);
parseOptionalProperty<Function<Color>>("line-color", Key::LineColor, klass, value);
- parseOptionalProperty<PropertyTransition>("transition-line-color", Key::LineColor, klass, value);
+ parseOptionalProperty<PropertyTransition>("line-color-transition", Key::LineColor, klass, value);
parseOptionalProperty<Function<float>>("line-translate", { Key::LineTranslateX, Key::LineTranslateY }, klass, value);
- parseOptionalProperty<PropertyTransition>("transition-line-translate", Key::LineTranslate, klass, value);
+ parseOptionalProperty<PropertyTransition>("line-translate-transition", Key::LineTranslate, klass, value);
parseOptionalProperty<TranslateAnchorType>("line-translate-anchor", Key::LineTranslateAnchor, klass, value);
parseOptionalProperty<Function<float>>("line-width", Key::LineWidth, klass, value);
- parseOptionalProperty<PropertyTransition>("transition-line-width", Key::LineWidth, klass, value);
+ parseOptionalProperty<PropertyTransition>("line-width-transition", Key::LineWidth, klass, value);
parseOptionalProperty<Function<float>>("line-offset", Key::LineOffset, klass, value);
- parseOptionalProperty<PropertyTransition>("transition-line-offset", Key::LineOffset, klass, value);
+ parseOptionalProperty<PropertyTransition>("line-offset-transition", Key::LineOffset, klass, value);
parseOptionalProperty<Function<float>>("line-blur", Key::LineBlur, klass, value);
- parseOptionalProperty<PropertyTransition>("transition-line-blur", Key::LineBlur, klass, value);
+ parseOptionalProperty<PropertyTransition>("line-blur-transition", Key::LineBlur, klass, value);
parseOptionalProperty<Function<float>>("line-dasharray", { Key::LineDashLand, Key::LineDashGap }, klass, value);
- parseOptionalProperty<PropertyTransition>("transition-line-dasharray", Key::LineDashArray, klass, value);
+ parseOptionalProperty<PropertyTransition>("line-dasharray-transition", Key::LineDashArray, klass, value);
parseOptionalProperty<std::string>("line-image", Key::LineImage, klass, value);
parseOptionalProperty<Function<float>>("icon-opacity", Key::IconOpacity, klass, value);
- parseOptionalProperty<PropertyTransition>("transition-icon-opacity", Key::IconOpacity, klass, value);
+ parseOptionalProperty<PropertyTransition>("icon-opacity-transition", Key::IconOpacity, klass, value);
parseOptionalProperty<Function<float>>("icon-rotate", Key::IconRotate, klass, value);
parseOptionalProperty<Function<float>>("icon-size", Key::IconSize, klass, value);
- parseOptionalProperty<PropertyTransition>("transition-icon-size", Key::IconSize, klass, value);
+ parseOptionalProperty<PropertyTransition>("icon-size-transition", Key::IconSize, klass, value);
parseOptionalProperty<Function<Color>>("icon-color", Key::IconColor, klass, value);
- parseOptionalProperty<PropertyTransition>("transition-icon-color", Key::IconColor, klass, value);
+ parseOptionalProperty<PropertyTransition>("icon-color-transition", Key::IconColor, klass, value);
parseOptionalProperty<Function<Color>>("icon-halo-color", Key::IconHaloColor, klass, value);
- parseOptionalProperty<PropertyTransition>("transition-icon-halo-color", Key::IconHaloColor, klass, value);
+ parseOptionalProperty<PropertyTransition>("icon-halo-color-transition", Key::IconHaloColor, klass, value);
parseOptionalProperty<Function<float>>("icon-halo-width", Key::IconHaloWidth, klass, value);
- parseOptionalProperty<PropertyTransition>("transition-icon-halo-width", Key::IconHaloWidth, klass, value);
+ parseOptionalProperty<PropertyTransition>("icon-halo-width-transition", Key::IconHaloWidth, klass, value);
parseOptionalProperty<Function<float>>("icon-halo-blur", Key::IconHaloBlur, klass, value);
- parseOptionalProperty<PropertyTransition>("transition-icon-halo-blur", Key::IconHaloBlur, klass, value);
+ parseOptionalProperty<PropertyTransition>("icon-halo-blur-transition", Key::IconHaloBlur, klass, value);
parseOptionalProperty<Function<float>>("icon-translate", { Key::IconTranslateX, Key::IconTranslateY }, klass, value);
- parseOptionalProperty<PropertyTransition>("transition-icon-translate", Key::IconTranslate, klass, value);
+ parseOptionalProperty<PropertyTransition>("icon-translate-transition", Key::IconTranslate, klass, value);
parseOptionalProperty<TranslateAnchorType>("icon-translate-anchor", Key::IconTranslateAnchor, klass, value);
parseOptionalProperty<Function<float>>("text-opacity", Key::TextOpacity, klass, value);
- parseOptionalProperty<PropertyTransition>("transition-text-opacity", Key::TextOpacity, klass, value);
+ parseOptionalProperty<PropertyTransition>("text-opacity-transition", Key::TextOpacity, klass, value);
parseOptionalProperty<Function<float>>("text-size", Key::TextSize, klass, value);
- parseOptionalProperty<PropertyTransition>("transition-text-size", Key::TextSize, klass, value);
+ parseOptionalProperty<PropertyTransition>("text-size-transition", Key::TextSize, klass, value);
parseOptionalProperty<Function<Color>>("text-color", Key::TextColor, klass, value);
- parseOptionalProperty<PropertyTransition>("transition-text-color", Key::TextColor, klass, value);
+ parseOptionalProperty<PropertyTransition>("text-color-transition", Key::TextColor, klass, value);
parseOptionalProperty<Function<Color>>("text-halo-color", Key::TextHaloColor, klass, value);
- parseOptionalProperty<PropertyTransition>("transition-text-halo-color", Key::TextHaloColor, klass, value);
+ parseOptionalProperty<PropertyTransition>("text-halo-color-transition", Key::TextHaloColor, klass, value);
parseOptionalProperty<Function<float>>("text-halo-width", Key::TextHaloWidth, klass, value);
- parseOptionalProperty<PropertyTransition>("transition-text-halo-width", Key::TextHaloWidth, klass, value);
+ parseOptionalProperty<PropertyTransition>("text-halo-width-transition", Key::TextHaloWidth, klass, value);
parseOptionalProperty<Function<float>>("text-halo-blur", Key::TextHaloBlur, klass, value);
- parseOptionalProperty<PropertyTransition>("transition-text-halo-blur", Key::TextHaloBlur, klass, value);
+ parseOptionalProperty<PropertyTransition>("text-halo-blur-transition", Key::TextHaloBlur, klass, value);
parseOptionalProperty<Function<float>>("text-translate", { Key::TextTranslateX, Key::TextTranslateY }, klass, value);
- parseOptionalProperty<PropertyTransition>("transition-text-translate", Key::TextTranslate, klass, value);
+ parseOptionalProperty<PropertyTransition>("text-translate-transition", Key::TextTranslate, klass, value);
parseOptionalProperty<TranslateAnchorType>("text-translate-anchor", Key::TextTranslateAnchor, klass, value);
parseOptionalProperty<Function<float>>("raster-opacity", Key::RasterOpacity, klass, value);
- parseOptionalProperty<PropertyTransition>("transition-raster-opacity", Key::RasterOpacity, klass, value);
+ parseOptionalProperty<PropertyTransition>("raster-opacity-transition", Key::RasterOpacity, klass, value);
parseOptionalProperty<Function<float>>("raster-hue-rotate", Key::RasterHueRotate, klass, value);
- parseOptionalProperty<PropertyTransition>("transition-raster-hue-rotate", Key::RasterHueRotate, klass, value);
+ parseOptionalProperty<PropertyTransition>("raster-hue-rotate-transition", Key::RasterHueRotate, klass, value);
parseOptionalProperty<Function<float>>("raster-brightness", { Key::RasterBrightnessLow, Key::RasterBrightnessHigh }, klass, value);
- parseOptionalProperty<PropertyTransition>("transition-raster-brightness", Key::RasterBrightness, klass, value);
+ parseOptionalProperty<PropertyTransition>("raster-brightness-transition", Key::RasterBrightness, klass, value);
parseOptionalProperty<Function<float>>("raster-saturation", Key::RasterSaturation, klass, value);
- parseOptionalProperty<PropertyTransition>("transition-raster-saturation", Key::RasterSaturation, klass, value);
+ parseOptionalProperty<PropertyTransition>("raster-saturation-transition", Key::RasterSaturation, klass, value);
parseOptionalProperty<Function<float>>("raster-contrast", Key::RasterContrast, klass, value);
- parseOptionalProperty<PropertyTransition>("transition-raster-contrast", Key::RasterContrast, klass, value);
+ parseOptionalProperty<PropertyTransition>("raster-contrast-transition", Key::RasterContrast, klass, value);
parseOptionalProperty<Function<float>>("raster-fade-duration", Key::RasterFade, klass, value);
- parseOptionalProperty<PropertyTransition>("transition-raster-fade-duration", Key::RasterFade, klass, value);
+ parseOptionalProperty<PropertyTransition>("raster-fade-duration-transition", Key::RasterFade, klass, value);
parseOptionalProperty<Function<float>>("background-opacity", Key::BackgroundOpacity, klass, value);
parseOptionalProperty<Function<Color>>("background-color", Key::BackgroundColor, klass, value);
diff --git a/test/headless.cpp b/test/headless.cpp
index 9a4857dd1a..d4c4d6036e 100644
--- a/test/headless.cpp
+++ b/test/headless.cpp
@@ -65,6 +65,8 @@ TEST_P(HeadlessTest, render) {
const double longitude = value.HasMember("center") ? value["center"][rapidjson::SizeType(1)].GetDouble() : 0;
const unsigned int width = value.HasMember("width") ? value["width"].GetUint() : 512;
const unsigned int height = value.HasMember("height") ? value["height"].GetUint() : 512;
+ const unsigned int pixelRatio = value.HasMember("pixelRatio") ? value["pixelRatio"].GetUint() : 1;
+
std::vector<std::string> classes;
if (value.HasMember("classes")) {
const rapidjson::Value &js_classes = value["classes"];
@@ -82,20 +84,24 @@ TEST_P(HeadlessTest, render) {
map.setStyleJSON(style, base_directory);
map.setAppliedClasses(classes);
- view.resize(width, height);
- map.resize(width, height);
+ view.resize(width, height, pixelRatio);
+ map.resize(width, height, pixelRatio);
map.setLonLatZoom(longitude, latitude, zoom);
map.setBearing(bearing);
// Run the loop. It will terminate when we don't have any further listeners.
map.run();
- const std::unique_ptr<uint32_t[]> pixels(new uint32_t[width * height]);
+ const unsigned int w = width * pixelRatio;
+ const unsigned int h = height * pixelRatio;
+
+ const std::unique_ptr<uint32_t[]> pixels(new uint32_t[w * h]);
+
map.view.make_active();
- glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, pixels.get());
+ glReadPixels(0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, pixels.get());
map.view.make_inactive();
- const std::string image = util::compress_png(width, height, pixels.get(), true);
+ const std::string image = util::compress_png(w, h, pixels.get(), true);
util::write_file(actual_image, image);
}
}