@acalcutt/maplibre-gl-native-test 5.0.0 → 5.0.1-pre.7

package/platform/default/include/mbgl/storage/offline_schema.hpp

@@ -0,0 +1,63 @@
+#pragma once
+
+// THIS IS A GENERATED FILE; EDIT offline_schema.sql INSTEAD
+// To regenerate, run `node platform/default/include/mbgl/storage/offline_schema.js`
+
+namespace mbgl {
+
+static constexpr const char* offlineDatabaseSchema =
+"CREATE TABLE resources (\n"
+"  id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,\n"
+"  url TEXT NOT NULL,\n"
+"  kind INTEGER NOT NULL,\n"
+"  expires INTEGER,\n"
+"  modified INTEGER,\n"
+"  etag TEXT,\n"
+"  data BLOB,\n"
+"  compressed INTEGER NOT NULL DEFAULT 0,\n"
+"  accessed INTEGER NOT NULL,\n"
+"  must_revalidate INTEGER NOT NULL DEFAULT 0,\n"
+"  UNIQUE (url)\n"
+");\n"
+"CREATE TABLE tiles (\n"
+"  id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,\n"
+"  url_template TEXT NOT NULL,\n"
+"  pixel_ratio INTEGER NOT NULL,\n"
+"  z INTEGER NOT NULL,\n"
+"  x INTEGER NOT NULL,\n"
+"  y INTEGER NOT NULL,\n"
+"  expires INTEGER,\n"
+"  modified INTEGER,\n"
+"  etag TEXT,\n"
+"  data BLOB,\n"
+"  compressed INTEGER NOT NULL DEFAULT 0,\n"
+"  accessed INTEGER NOT NULL,\n"
+"  must_revalidate INTEGER NOT NULL DEFAULT 0,\n"
+"  UNIQUE (url_template, pixel_ratio, z, x, y)\n"
+");\n"
+"CREATE TABLE regions (\n"
+"  id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,\n"
+"  definition TEXT NOT NULL,\n"
+"  description BLOB\n"
+");\n"
+"CREATE TABLE region_resources (\n"
+"  region_id INTEGER NOT NULL REFERENCES regions(id) ON DELETE CASCADE,\n"
+"  resource_id INTEGER NOT NULL REFERENCES resources(id),\n"
+"  UNIQUE (region_id, resource_id)\n"
+");\n"
+"CREATE TABLE region_tiles (\n"
+"  region_id INTEGER NOT NULL REFERENCES regions(id) ON DELETE CASCADE,\n"
+"  tile_id INTEGER NOT NULL REFERENCES tiles(id),\n"
+"  UNIQUE (region_id, tile_id)\n"
+");\n"
+"CREATE INDEX resources_accessed\n"
+"ON resources (accessed);\n"
+"CREATE INDEX tiles_accessed\n"
+"ON tiles (accessed);\n"
+"CREATE INDEX region_resources_resource_id\n"
+"ON region_resources (resource_id);\n"
+"CREATE INDEX region_tiles_tile_id\n"
+"ON region_tiles (tile_id);\n"
+;
+
+} // namespace mbgl

package/platform/default/include/mbgl/storage/offline_schema.js

@@ -0,0 +1,23 @@
+#!/usr/bin/env node
+
+var fs = require('fs');
+fs.writeFileSync('platform/default/include/mbgl/storage/offline_schema.hpp', `#pragma once
+
+// THIS IS A GENERATED FILE; EDIT offline_schema.sql INSTEAD
+// To regenerate, run \`node platform/default/include/mbgl/storage/offline_schema.js\`
+
+namespace mbgl {
+
+static constexpr const char* offlineDatabaseSchema =
+${fs.readFileSync('platform/default/include/mbgl/storage/offline_schema.sql', 'utf8')
+    .replace(/ *--.*/g, '')
+    .split('\n')
+    .filter(a => a)
+    .map(line => '"' + line + '\\n"')
+    .join('\n')
+}
+;
+
+} // namespace mbgl
+`);
+

package/platform/default/include/mbgl/storage/offline_schema.sql

@@ -0,0 +1,165 @@
+--
+-- Table containing the style, source, sprite, and glyph
+-- resources. Essentially everything that is not a tile.
+--
+CREATE TABLE resources (
+  id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,   -- Primary key.
+
+  url TEXT NOT NULL,                               -- The URL of the resource without the access token.Must be
+                                                   -- unique and that is enforced by the database schema.
+
+  kind INTEGER NOT NULL,                           -- Type of the resource, taken from Resource::Kind enumeration:
+                                                   -- style        = 1
+                                                   -- source       = 2
+                                                   -- tile         = 3
+                                                   -- glyphs       = 4
+                                                   -- sprite image = 5
+                                                   -- sprite JSON  = 6
+                                                   -- image        = 7
+
+  expires INTEGER,                                 -- Expiration time. The resource will be refreshed after this
+                                                   -- expiration is reached.
+
+  modified INTEGER,                                -- Last time the resource was modified.
+
+  etag TEXT,                                       -- Checksum used for cache optimization. If, when refreshing the
+                                                   -- resource, it matches the etag on the server, the resource will
+                                                   -- not get re-downloaded. See:
+                                                   -- https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/ETag
+
+  data BLOB,                                       -- Contents of the resource.
+
+  compressed INTEGER NOT NULL DEFAULT 0,           -- If the resource is compressed with Deflate or not. Compression is
+                                                   -- optional and should be used when the compression ratio is
+                                                   -- significant. Using compression will make decoding time slower
+                                                   -- because it will add an extra decompression step.
+
+  accessed INTEGER NOT NULL,                       -- Last time the resource was used by GL Native. Useful for when
+                                                   -- evicting the least used resources from the cache.
+
+  must_revalidate INTEGER NOT NULL DEFAULT 0,      -- When set to true, the resource will not be used unless it gets
+                                                   -- first revalidated by the server.
+  UNIQUE (url)
+);
+
+--
+-- Table containing all tiles, both vector and raster.
+--
+CREATE TABLE tiles (
+  id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,   -- Primary key.
+
+  url_template TEXT NOT NULL,                      -- The URL of the resource without the access token and without
+                                                   -- the tiles id substituted.
+
+  pixel_ratio INTEGER NOT NULL,                    -- The tile pixel ratio, typically 1 for vector tiles.
+
+  z INTEGER NOT NULL,                              -- The zoom level of the tile.
+
+  x INTEGER NOT NULL,                              -- The x position of the tile on the tile grid.
+
+  y INTEGER NOT NULL,                              -- The y position of the tile on the tile grid.
+
+  expires INTEGER,                                 -- Expiration time. The tile will be refreshed after this
+                                                   -- expiration is reached. Expired tiles can still be rendered,
+                                                   -- unless must_revalidate is set to true. If an expired tile
+                                                   -- gets rendered, it will be replaced by a newer version as soon
+                                                   -- as the network request with a new tile arrives.
+
+  modified INTEGER,                                -- Last time the tile was modified.
+
+  etag TEXT,                                       -- Checksum used for cache optimization. If, when refreshing the
+                                                   -- tile, it matches the etag on the server, the tile will not
+                                                   -- get re-downloaded. See:
+                                                   -- https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/ETag
+
+  data BLOB,                                       -- Contents of the tile.
+
+  compressed INTEGER NOT NULL DEFAULT 0,           -- If the tile is compressed with Deflate or not. Compression is
+                                                   -- optional and should be used when the compression ratio is
+                                                   -- significant. Using compression will make decoding time slower
+                                                   -- because it will add an extra decompression step.
+
+  accessed INTEGER NOT NULL,                       -- Last time the tile was used by GL Native. Useful for when
+                                                   -- evicting the least used tiles from the cache.
+
+  must_revalidate INTEGER NOT NULL DEFAULT 0,      -- When set to true, the tile will not be used unless it gets
+                                                   -- first revalidated by the server.
+  UNIQUE (url_template, pixel_ratio, z, x, y)
+);
+
+--
+-- Regions define the offline regions, which could be a GeoJSON geometry,
+-- or a bounding box like this example:
+--
+-- {
+--     "bounds": [
+--         37.2,
+--         -122.8,
+--         38.1,
+--         -121.7
+--     ],
+--     "include_ideographs": false,
+--     "max_zoom": 15.0,
+--     "min_zoom": 0.0,
+--     "pixel_ratio": 1.0,
+--     "style_url": "maptiler://maps/streets"
+-- }
+--
+-- The semantic definition of the region is up to the user and
+-- it could be a city, a country or an arbitrary bounding box.
+--
+-- Regions can overlap, which will cause them to share resources
+-- when it is the case.
+--
+-- "include_ideographs" is set to true when CJK characters are
+-- include on the offline package. By default, CJK is rendered
+-- by GL Native client side using local fonts. Downloading CJK
+-- will increase the size of the database considerably.
+--
+CREATE TABLE regions (
+  id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,    -- Primary key.
+
+  definition TEXT NOT NULL,                         -- JSON formatted definition of a region, a bounding box
+                                                    -- or a GeoJSON geometry. See https://geojson.org.
+
+  description BLOB                                  -- User provided data in user-defined format.
+);
+
+--
+-- Table mapping resources to regions. A resource
+-- might be part of many regions. Resources without
+-- regions are part of the ambient cache.
+--
+CREATE TABLE region_resources (
+  region_id INTEGER NOT NULL REFERENCES regions(id) ON DELETE CASCADE,
+  resource_id INTEGER NOT NULL REFERENCES resources(id),
+  UNIQUE (region_id, resource_id)
+);
+
+--
+-- Table mapping tiles to regions. A tile might
+-- be part of many regions, meaning that regions might
+-- overlap efficiently. Tiles without regions are part
+-- of the ambient cache.
+--
+CREATE TABLE region_tiles (
+  region_id INTEGER NOT NULL REFERENCES regions(id) ON DELETE CASCADE,
+  tile_id INTEGER NOT NULL REFERENCES tiles(id),
+  UNIQUE (region_id, tile_id)
+);
+
+--
+-- Indexes for efficient eviction queries.
+--
+
+CREATE INDEX resources_accessed
+ON resources (accessed);
+
+CREATE INDEX tiles_accessed
+ON tiles (accessed);
+
+CREATE INDEX region_resources_resource_id
+ON region_resources (resource_id);
+
+CREATE INDEX region_tiles_tile_id
+ON region_tiles (tile_id);

package/platform/default/include/mbgl/storage/sqlite3.hpp

@@ -0,0 +1,180 @@
+#pragma once
+
+#include <string>
+#include <vector>
+#include <stdexcept>
+#include <chrono>
+#include <memory>
+#include <mapbox/variant.hpp>
+
+namespace mapbox {
+namespace sqlite {
+
+enum OpenFlag : int {
+    ReadOnly        = 0b001,
+    ReadWriteCreate = 0b110,
+};
+
+enum class ResultCode : uint8_t {
+    OK = 0,
+    Error = 1,
+    Internal = 2,
+    Perm = 3,
+    Abort = 4,
+    Busy = 5,
+    Locked = 6,
+    NoMem = 7,
+    ReadOnly = 8,
+    Interrupt = 9,
+    IOErr = 10,
+    Corrupt = 11,
+    NotFound = 12,
+    Full = 13,
+    CantOpen = 14,
+    Protocol = 15,
+    Schema = 17,
+    TooBig = 18,
+    Constraint = 19,
+    Mismatch = 20,
+    Misuse = 21,
+    NoLFS = 22,
+    Auth = 23,
+    Range = 25,
+    NotADB = 26,
+};
+
+enum class ExtendedResultCode : uint8_t {
+    Unknown = 0,
+    ReadOnlyDBMoved = 4,
+};
+
+class Exception : public std::runtime_error {
+public:
+    Exception(ResultCode err, const char* msg) : Exception(static_cast<int>(err), msg) {}
+    Exception(int err, const char* msg) : Exception(err, std::string{ msg }) {}
+    Exception(int err, const std::string& msg)
+        : std::runtime_error(msg),
+          code(static_cast<ResultCode>(err)),
+          extendedCode(static_cast<ExtendedResultCode>(err >> 8)) {
+    }
+    const ResultCode code = ResultCode::OK;
+    const ExtendedResultCode extendedCode = ExtendedResultCode::Unknown;
+};
+
+class DatabaseImpl;
+class Statement;
+class StatementImpl;
+class Query;
+class Transaction;
+
+void setTempPath(const std::string&);
+
+class Database {
+private:
+    Database(std::unique_ptr<DatabaseImpl>);
+
+public:
+    Database(const Database &) = delete;
+    Database &operator=(const Database &) = delete;
+    static mapbox::util::variant<Database, Exception> tryOpen(const std::string &filename, int flags = 0);
+    static Database open(const std::string &filename, int flags = 0);
+
+    Database(Database&&) noexcept;
+    ~Database();
+    Database& operator=(Database&&) noexcept;
+
+    void setBusyTimeout(std::chrono::milliseconds);
+    void exec(const std::string &sql);
+
+private:
+    std::unique_ptr<DatabaseImpl> impl;
+
+    friend class Statement;
+    friend class Transaction;
+};
+
+// A Statement object represents a prepared statement that can be run repeatedly run with a Query object.
+class Statement {
+public:
+    Statement(Database& db, const char* sql);
+    Statement(const Statement&) = delete;
+    Statement(Statement&&) = delete;
+    Statement& operator=(const Statement&) = delete;
+    Statement& operator=(Statement&&) = delete;
+    ~Statement();
+
+    friend class Query;
+
+private:
+    std::unique_ptr<StatementImpl> impl;
+
+#ifndef NDEBUG
+    // This flag stores whether there exists a Query object that uses this prepared statement.
+    // There may only be one Query object at a time. Statement objects must outlive Query objects.
+    // While a Query object exists, a Statement object may not be moved or deleted.
+    bool used = false;
+#endif
+};
+
+// A Query object is used to run a database query with a prepared statement (stored in a Statement
+// object). There may only exist one Query object per Statement object. Query objects are designed
+// to be constructed and destroyed frequently.
+class Query {
+public:
+    Query(Statement&);
+    Query(const Query&) = delete;
+    Query(Query&&) = delete;
+    Query& operator=(const Query&) = delete;
+    Query& operator=(Query&&) = delete;
+    ~Query();
+
+    template <typename T>
+    void bind(int offset, T value);
+
+    // Text
+    void bind(int offset, const char*, std::size_t length, bool retain = true);
+    void bind(int offset, const std::string&, bool retain = true);
+
+    // Blob
+    void bindBlob(int offset, const void*, std::size_t length, bool retain = true);
+    void bindBlob(int offset, const std::vector<uint8_t>&, bool retain = true);
+
+    template <typename T>
+    T get(int offset);
+
+    bool run();
+    void reset();
+    void clearBindings();
+
+    int64_t lastInsertRowId() const;
+    uint64_t changes() const;
+
+private:
+    Statement& stmt;
+};
+
+class Transaction {
+public:
+    Transaction(const Transaction&) = delete;
+    Transaction(Transaction&&) = delete;
+    Transaction& operator=(const Transaction&) = delete;
+
+    enum Mode {
+        Deferred,
+        Immediate,
+        Exclusive
+    };
+
+    Transaction(Database&, Mode = Deferred);
+    ~Transaction();
+
+    void commit();
+    void rollback();
+
+private:
+    DatabaseImpl& dbImpl;
+    bool needRollback = true;
+};
+
+} // namespace sqlite
+} // namespace mapbox

package/platform/default/include/mbgl/text/unaccent.hpp

@@ -0,0 +1,13 @@
+#pragma once
+
+#include <string>
+
+namespace mbgl {
+namespace platform {
+
+// Non-locale-aware diacritic folding based on nunicode
+// Used as a fallback when locale-aware comparisons aren't available
+std::string unaccent(const std::string &string);
+
+} // namespace platform
+} // namespace mbgl

package/platform/default/resources/attribution-logo.svg

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 84.49 21" style="enable-background:new 0 0 84.49 21;" xml:space="preserve">
+<style type="text/css">
+	.st0{opacity:0.9;fill:#FFFFFF;enable-background:new    ;}
+	.st1{opacity:0.35;enable-background:new    ;}
+</style>
+<g>
+	<path class="st0" d="M83.25,14.26c0,0.12-0.09,0.21-0.21,0.21h-1.61c-0.13,0-0.24-0.06-0.3-0.17l-1.44-2.39l-1.44,2.39
+		c-0.06,0.11-0.18,0.17-0.3,0.17h-1.61c-0.04,0-0.08-0.01-0.12-0.03c-0.09-0.06-0.13-0.19-0.06-0.28l0,0l2.43-3.68L76.2,6.84
+		c-0.02-0.03-0.03-0.07-0.03-0.12c0-0.12,0.09-0.21,0.21-0.21h1.61c0.13,0,0.24,0.06,0.3,0.17l1.41,2.36l1.4-2.35
+		c0.06-0.11,0.18-0.17,0.3-0.17H83c0.04,0,0.08,0.01,0.12,0.03c0.09,0.06,0.13,0.19,0.06,0.28l0,0l-2.37,3.63l2.43,3.67
+		C83.24,14.18,83.25,14.22,83.25,14.26z"/>
+	<path class="st0" d="M66.24,9.59c-0.39-1.88-1.96-3.28-3.84-3.28c-1.03,0-2.03,0.42-2.73,1.18V3.51c0-0.13-0.1-0.23-0.23-0.23h-1.4
+		c-0.13,0-0.23,0.11-0.23,0.23v10.72c0,0.13,0.1,0.23,0.23,0.23h1.4c0.13,0,0.23-0.11,0.23-0.23V13.5c0.71,0.75,1.7,1.18,2.73,1.18
+		c1.88,0,3.45-1.41,3.84-3.29C66.37,10.79,66.37,10.18,66.24,9.59L66.24,9.59z M62.08,13c-1.32,0-2.39-1.11-2.41-2.48v-0.06
+		c0.02-1.38,1.09-2.48,2.41-2.48s2.42,1.12,2.42,2.51S63.41,13,62.08,13z"/>
+	<path class="st0" d="M71.67,6.32c-1.98-0.01-3.72,1.35-4.16,3.29c-0.13,0.59-0.13,1.19,0,1.77c0.44,1.94,2.17,3.32,4.17,3.3
+		c2.35,0,4.26-1.87,4.26-4.19S74.04,6.32,71.67,6.32z M71.65,13.01c-1.33,0-2.42-1.12-2.42-2.51s1.08-2.52,2.42-2.52
+		c1.33,0,2.42,1.12,2.42,2.51S72.99,13,71.65,13.01L71.65,13.01z"/>
+	<path class="st1" d="M62.08,7.98c-1.32,0-2.39,1.11-2.41,2.48v0.06C59.68,11.9,60.75,13,62.08,13s2.42-1.12,2.42-2.51
+		S63.41,7.98,62.08,7.98z M62.08,11.76c-0.63,0-1.14-0.56-1.17-1.25v-0.04c0.01-0.69,0.54-1.25,1.17-1.25
+		c0.63,0,1.17,0.57,1.17,1.27C63.24,11.2,62.73,11.76,62.08,11.76z"/>
+	<path class="st1" d="M71.65,7.98c-1.33,0-2.42,1.12-2.42,2.51S70.32,13,71.65,13s2.42-1.12,2.42-2.51S72.99,7.98,71.65,7.98z
+		 M71.65,11.76c-0.64,0-1.17-0.57-1.17-1.27c0-0.7,0.53-1.26,1.17-1.26s1.17,0.57,1.17,1.27C72.82,11.21,72.29,11.76,71.65,11.76z"
+		/>
+	<path class="st0" d="M45.74,6.53h-1.4c-0.13,0-0.23,0.11-0.23,0.23v0.73c-0.71-0.75-1.7-1.18-2.73-1.18
+		c-2.17,0-3.94,1.87-3.94,4.19s1.77,4.19,3.94,4.19c1.04,0,2.03-0.43,2.73-1.19v0.73c0,0.13,0.1,0.23,0.23,0.23h1.4
+		c0.13,0,0.23-0.11,0.23-0.23V6.74c0-0.12-0.09-0.22-0.22-0.22C45.75,6.53,45.75,6.53,45.74,6.53z M44.12,10.53
+		C44.11,11.9,43.03,13,41.71,13s-2.42-1.12-2.42-2.51s1.08-2.52,2.4-2.52c1.33,0,2.39,1.11,2.41,2.48L44.12,10.53z"/>
+	<path class="st1" d="M41.71,7.98c-1.33,0-2.42,1.12-2.42,2.51S40.37,13,41.71,13s2.39-1.11,2.41-2.48v-0.06
+		C44.1,9.09,43.03,7.98,41.71,7.98z M40.55,10.49c0-0.7,0.52-1.27,1.17-1.27c0.64,0,1.14,0.56,1.17,1.25v0.04
+		c-0.01,0.68-0.53,1.24-1.17,1.24C41.08,11.75,40.55,11.19,40.55,10.49z"/>
+	<path class="st0" d="M52.41,6.32c-1.03,0-2.03,0.42-2.73,1.18V6.75c0-0.13-0.1-0.23-0.23-0.23h-1.4c-0.13,0-0.23,0.11-0.23,0.23
+		v10.72c0,0.13,0.1,0.23,0.23,0.23h1.4c0.13,0,0.23-0.1,0.23-0.23V13.5c0.71,0.75,1.7,1.18,2.74,1.18c2.17,0,3.94-1.87,3.94-4.19
+		S54.58,6.32,52.41,6.32z M52.08,13.01c-1.32,0-2.39-1.11-2.42-2.48v-0.07c0.02-1.38,1.09-2.49,2.4-2.49c1.32,0,2.41,1.12,2.41,2.51
+		S53.4,13,52.08,13.01L52.08,13.01z"/>
+	<path class="st1" d="M52.08,7.98c-1.32,0-2.39,1.11-2.42,2.48v0.06c0.03,1.38,1.1,2.48,2.42,2.48s2.41-1.12,2.41-2.51
+		S53.4,7.98,52.08,7.98z M52.08,11.76c-0.63,0-1.14-0.56-1.17-1.25v-0.04c0.01-0.69,0.54-1.25,1.17-1.25c0.63,0,1.17,0.58,1.17,1.27
+		S52.72,11.76,52.08,11.76z"/>
+	<path class="st0" d="M36.08,14.24c0,0.13-0.1,0.23-0.23,0.23h-1.41c-0.13,0-0.23-0.11-0.23-0.23V9.68c0-0.98-0.74-1.71-1.62-1.71
+		c-0.8,0-1.46,0.7-1.59,1.62l0.01,4.66c0,0.13-0.11,0.23-0.23,0.23h-1.41c-0.13,0-0.23-0.11-0.23-0.23V9.68
+		c0-0.98-0.74-1.71-1.62-1.71c-0.85,0-1.54,0.79-1.6,1.8v4.48c0,0.13-0.1,0.23-0.23,0.23h-1.4c-0.13,0-0.23-0.11-0.23-0.23V6.74
+		c0.01-0.13,0.1-0.22,0.23-0.22h1.4c0.13,0,0.22,0.11,0.23,0.22V7.4c0.5-0.68,1.3-1.09,2.16-1.1h0.03c1.09,0,2.09,0.6,2.6,1.55
+		c0.45-0.95,1.4-1.55,2.44-1.56c1.62,0,2.93,1.25,2.9,2.78L36.08,14.24z"/>
+	<path class="st1" d="M84.34,13.59l-0.07-0.13l-1.96-2.99l1.94-2.95c0.44-0.67,0.26-1.56-0.41-2.02c-0.02,0-0.03,0-0.04-0.01
+		c-0.23-0.15-0.5-0.22-0.78-0.22h-1.61c-0.56,0-1.08,0.29-1.37,0.78L79.72,6.6l-0.34-0.56C79.09,5.56,78.57,5.27,78,5.27h-1.6
+		c-0.6,0-1.13,0.37-1.35,0.92c-2.19-1.66-5.28-1.47-7.26,0.45c-0.35,0.34-0.65,0.72-0.89,1.14c-0.9-1.62-2.58-2.72-4.5-2.72
+		c-0.5,0-1.01,0.07-1.48,0.23V3.51c0-0.82-0.66-1.48-1.47-1.48h-1.4c-0.81,0-1.47,0.66-1.47,1.47v3.75
+		c-0.95-1.36-2.5-2.18-4.17-2.19c-0.74,0-1.46,0.16-2.12,0.47c-0.24-0.17-0.54-0.26-0.84-0.26h-1.4c-0.45,0-0.87,0.21-1.15,0.56
+		c-0.02-0.03-0.04-0.05-0.07-0.08c-0.28-0.3-0.68-0.47-1.09-0.47h-1.39c-0.3,0-0.6,0.09-0.84,0.26c-0.67-0.3-1.39-0.46-2.12-0.46
+		c-1.83,0-3.43,1-4.37,2.5c-0.2-0.46-0.48-0.89-0.83-1.25c-0.8-0.81-1.89-1.25-3.02-1.25h-0.01c-0.89,0.01-1.75,0.33-2.46,0.88
+		c-0.74-0.57-1.64-0.88-2.57-0.88H28.1c-0.29,0-0.58,0.03-0.86,0.11c-0.28,0.06-0.56,0.16-0.82,0.28c-0.21-0.12-0.45-0.18-0.7-0.18
+		h-1.4c-0.82,0-1.47,0.66-1.47,1.47v7.5c0,0.82,0.66,1.47,1.47,1.47h1.4c0.82,0,1.48-0.66,1.48-1.48l0,0V9.79
+		c0.03-0.36,0.23-0.59,0.36-0.59c0.18,0,0.38,0.18,0.38,0.47v4.57c0,0.82,0.66,1.47,1.47,1.47h1.41c0.82,0,1.47-0.66,1.47-1.47
+		l-0.01-4.57c0.06-0.32,0.25-0.47,0.35-0.47c0.18,0,0.38,0.18,0.38,0.47v4.57c0,0.82,0.66,1.47,1.47,1.47h1.41
+		c0.82,0,1.47-0.66,1.47-1.47v-0.38c0.96,1.29,2.46,2.06,4.06,2.06c0.74,0,1.46-0.16,2.12-0.47c0.24,0.17,0.54,0.26,0.84,0.26h1.39
+		c0.3,0,0.6-0.09,0.84-0.26v2.01c0,0.82,0.66,1.47,1.47,1.47h1.4c0.82,0,1.47-0.66,1.47-1.47v-1.77c0.48,0.15,0.99,0.23,1.49,0.22
+		c1.7,0,3.22-0.87,4.17-2.2v0.52c0,0.82,0.66,1.47,1.47,1.47h1.4c0.3,0,0.6-0.09,0.84-0.26c0.66,0.31,1.39,0.47,2.12,0.47
+		c1.92,0,3.6-1.1,4.49-2.73c1.54,2.65,4.95,3.53,7.58,1.98c0.18-0.11,0.36-0.22,0.53-0.36c0.22,0.55,0.76,0.91,1.35,0.9H78
+		c0.56,0,1.08-0.29,1.37-0.78l0.37-0.61l0.37,0.61c0.29,0.48,0.81,0.78,1.38,0.78h1.6c0.81,0,1.46-0.66,1.45-1.46
+		C84.49,14.02,84.44,13.8,84.34,13.59L84.34,13.59z M35.86,14.47h-1.41c-0.13,0-0.23-0.11-0.23-0.23V9.68
+		c0-0.98-0.74-1.71-1.62-1.71c-0.8,0-1.46,0.7-1.59,1.62l0.01,4.66c0,0.13-0.1,0.23-0.23,0.23h-1.41c-0.13,0-0.23-0.11-0.23-0.23
+		V9.68c0-0.98-0.74-1.71-1.62-1.71c-0.85,0-1.54,0.79-1.6,1.8v4.48c0,0.13-0.1,0.23-0.23,0.23h-1.4c-0.13,0-0.23-0.11-0.23-0.23
+		V6.74c0.01-0.13,0.11-0.22,0.23-0.22h1.4c0.13,0,0.22,0.11,0.23,0.22V7.4c0.5-0.68,1.3-1.09,2.16-1.1h0.03
+		c1.09,0,2.09,0.6,2.6,1.55c0.45-0.95,1.4-1.55,2.44-1.56c1.62,0,2.93,1.25,2.9,2.78l0.01,5.16C36.09,14.36,35.98,14.46,35.86,14.47
+		L35.86,14.47z M45.97,14.24c0,0.13-0.1,0.23-0.23,0.23h-1.4c-0.13,0-0.23-0.11-0.23-0.23V13.5c-0.7,0.76-1.69,1.18-2.72,1.18
+		c-2.17,0-3.94-1.87-3.94-4.19s1.77-4.19,3.94-4.19c1.03,0,2.02,0.43,2.73,1.18V6.74c0-0.13,0.1-0.23,0.23-0.23h1.4
+		c0.12-0.01,0.22,0.08,0.23,0.21c0,0.01,0,0.01,0,0.02v7.51h-0.01V14.24z M52.41,14.67c-1.03,0-2.02-0.43-2.73-1.18v3.97
+		c0,0.13-0.1,0.23-0.23,0.23h-1.4c-0.13,0-0.23-0.1-0.23-0.23V6.75c0-0.13,0.1-0.22,0.23-0.22h1.4c0.13,0,0.23,0.11,0.23,0.23v0.73
+		c0.71-0.76,1.7-1.18,2.73-1.18c2.17,0,3.94,1.86,3.94,4.18S54.58,14.67,52.41,14.67z M66.24,11.39c-0.39,1.87-1.96,3.29-3.84,3.29
+		c-1.03,0-2.02-0.43-2.73-1.18v0.73c0,0.13-0.1,0.23-0.23,0.23h-1.4c-0.13,0-0.23-0.11-0.23-0.23V3.51c0-0.13,0.1-0.23,0.23-0.23
+		h1.4c0.13,0,0.23,0.11,0.23,0.23v3.97c0.71-0.75,1.7-1.18,2.73-1.17c1.88,0,3.45,1.4,3.84,3.28C66.37,10.19,66.37,10.8,66.24,11.39
+		L66.24,11.39L66.24,11.39z M71.67,14.68c-2,0.01-3.73-1.35-4.17-3.3c-0.13-0.59-0.13-1.19,0-1.77c0.44-1.94,2.17-3.31,4.17-3.3
+		c2.36,0,4.26,1.87,4.26,4.19S74.03,14.68,71.67,14.68L71.67,14.68z M83.04,14.47h-1.61c-0.13,0-0.24-0.06-0.3-0.17l-1.44-2.39
+		l-1.44,2.39c-0.06,0.11-0.18,0.17-0.3,0.17h-1.61c-0.04,0-0.08-0.01-0.12-0.03c-0.09-0.06-0.13-0.19-0.06-0.28l0,0l2.43-3.68
+		L76.2,6.84c-0.02-0.03-0.03-0.07-0.03-0.12c0-0.12,0.09-0.21,0.21-0.21h1.61c0.13,0,0.24,0.06,0.3,0.17l1.41,2.36l1.41-2.36
+		c0.06-0.11,0.18-0.17,0.3-0.17h1.61c0.04,0,0.08,0.01,0.12,0.03c0.09,0.06,0.13,0.19,0.06,0.28l0,0l-2.38,3.64l2.43,3.67
+		c0.02,0.03,0.03,0.07,0.03,0.12C83.25,14.38,83.16,14.47,83.04,14.47L83.04,14.47L83.04,14.47z"/>
+	<path class="st0" d="M10.5,1.24c-5.11,0-9.25,4.15-9.25,9.25s4.15,9.25,9.25,9.25s9.25-4.15,9.25-9.25
+		C19.75,5.38,15.61,1.24,10.5,1.24z M14.89,12.77c-1.93,1.93-4.78,2.31-6.7,2.31c-0.7,0-1.41-0.05-2.1-0.16c0,0-1.02-5.64,2.14-8.81
+		c0.83-0.83,1.95-1.28,3.13-1.28c1.27,0,2.49,0.51,3.39,1.42C16.59,8.09,16.64,11,14.89,12.77z"/>
+	<path class="st1" d="M10.5-0.01C4.7-0.01,0,4.7,0,10.49s4.7,10.5,10.5,10.5S21,16.29,21,10.49C20.99,4.7,16.3-0.01,10.5-0.01z
+		 M10.5,19.74c-5.11,0-9.25-4.15-9.25-9.25s4.14-9.26,9.25-9.26s9.25,4.15,9.25,9.25C19.75,15.61,15.61,19.74,10.5,19.74z"/>
+	<path class="st1" d="M14.74,6.25C12.9,4.41,9.98,4.35,8.23,6.1c-3.16,3.17-2.14,8.81-2.14,8.81s5.64,1.02,8.81-2.14
+		C16.64,11,16.59,8.09,14.74,6.25z M12.47,10.34l-0.91,1.87l-0.9-1.87L8.8,9.43l1.86-0.9l0.9-1.87l0.91,1.87l1.86,0.9L12.47,10.34z"
+		/>
+	<polygon class="st0" points="14.33,9.43 12.47,10.34 11.56,12.21 10.66,10.34 8.8,9.43 10.66,8.53 11.56,6.66 12.47,8.53 	"/>
+</g>
+</svg>

package/platform/default/resources/default_marker.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="20px" height="56px" viewBox="0 0 20 56" enable-background="new 0 0 20 56" xml:space="preserve">
+<ellipse opacity="0.2" fill="#262626" cx="10" cy="27" rx="9" ry="5"/>
+<path id="path5359" fill="#F84D4D" stroke="#951212" stroke-width="1.0229" stroke-linecap="round" stroke-linejoin="round" d="
+	M19.5,10.4c0,6.3-9.5,17.1-9.5,17.1S0.5,16.6,0.5,10.4c0-5.5,4.3-9.9,9.5-9.9S19.5,4.9,19.5,10.4z"/>
+<circle id="path5990" fill="#FFFFFF" stroke="#7C2525" stroke-linecap="round" stroke-linejoin="round" cx="10" cy="10" r="3.8"/>
+</svg>

package/platform/default/src/mbgl/benchmark/main.cpp

@@ -0,0 +1,5 @@
+#include <mbgl/benchmark.hpp>
+
+int main(int argc, char* argv[]) {
+    return mbgl::runBenchmark(argc, argv);
+}

package/platform/default/src/mbgl/gfx/headless_backend.cpp

@@ -0,0 +1,16 @@
+#include <mbgl/gfx/headless_backend.hpp>
+
+namespace mbgl {
+namespace gfx {
+
+HeadlessBackend::HeadlessBackend(Size size_)
+    : mbgl::gfx::Renderable(size_, nullptr) {
+}
+
+void HeadlessBackend::setSize(Size size_) {
+    size = size_;
+    resource.reset();
+}
+
+} // namespace gfx
+} // namespace mbgl