rename llmr => mbgl

.gitignore

@@ -12,7 +12,7 @@
 /config/constants_local.cpp
 /build
 /bin/node_modules
-/include/llmr/shader/shaders.hpp
+/include/mbgl/shader/shaders.hpp
 /src/shader/shaders_gl.cpp
 /src/shader/shaders_gles2.cpp
 /bin/style.bin.js

Makefile

@@ -12,9 +12,9 @@ config.gypi:
 	./setup-libraries.sh
 
 # Builds the regular library
-llmr: config.gypi llmr.gyp node
-	deps/run_gyp llmr.gyp --depth=. -Goutput_dir=.. --generator-output=./build/llmr -f make
-	$(MAKE) -C build/llmr BUILDTYPE=$(BUILDTYPE) V=$(V) llmr-x86
+mbgl: config.gypi mbgl.gyp node
+	deps/run_gyp mbgl.gyp --depth=. -Goutput_dir=.. --generator-output=./build/mbgl -f make
+	$(MAKE) -C build/mbgl BUILDTYPE=$(BUILDTYPE) V=$(V) mbgl-x86
 
 node:
 	@if [ ! `which node` ]; then echo 'error: depends on node.js. please make sure node is on your PATH'; exit 1; fi;
@@ -40,8 +40,8 @@ xtest: config.gypi clear_xcode_cache node
 
 
 # Builds the linux app with make. This is also used by Travis CI
-linux: config.gypi linux/llmr-app.gyp node
-	deps/run_gyp linux/llmr-app.gyp --depth=. -Goutput_dir=.. --generator-output=./build/linux -f make
+linux: config.gypi linux/mbgl-app.gyp node
+	deps/run_gyp linux/mbgl-app.gyp --depth=. -Goutput_dir=.. --generator-output=./build/linux -f make
 	$(MAKE) -C build/linux BUILDTYPE=$(BUILDTYPE) V=$(V) linuxapp
 
 # Executes the Linux binary
@@ -51,8 +51,8 @@ run-linux: linux
 
 
 # Builds the OS X app with make.
-osx: config.gypi macosx/llmr-app.gyp node
-	deps/run_gyp macosx/llmr-app.gyp --depth=. -Goutput_dir=.. --generator-output=./build/macosx -f make
+osx: config.gypi macosx/mbgl-app.gyp node
+	deps/run_gyp macosx/mbgl-app.gyp --depth=. -Goutput_dir=.. --generator-output=./build/macosx -f make
 	$(MAKE) -C build/macosx BUILDTYPE=$(BUILDTYPE) V=$(V) osxapp
 
 # Executes the OS X binary
@@ -65,27 +65,27 @@ clear_xcode_cache:
     @CUSTOM_DD=`defaults read com.apple.dt.Xcode IDECustomDerivedDataLocation 2>/dev/null`; \
     if [[ $$CUSTOM_DD ]]; then \
         echo clearing files in $$CUSTOM_DD older than one day; \
-        find $$CUSTOM_DD/llmr-app-* -mtime +1 | xargs rm -rf; \
+        find $$CUSTOM_DD/mbgl-app-* -mtime +1 | xargs rm -rf; \
     fi; \
     if [[ -d ~/Library/Developer/Xcode/DerivedData/ ]] && [[ ! $$CUSTOM_DD ]]; then \
-        echo 'clearing files in ~/Library/Developer/Xcode/DerivedData/llmr-app-* older than one day'; \
-        find ~/Library/Developer/Xcode/DerivedData/llmr-app-* -mtime +1 | xargs rm -rf; \
+        echo 'clearing files in ~/Library/Developer/Xcode/DerivedData/mbgl-app-* older than one day'; \
+        find ~/Library/Developer/Xcode/DerivedData/mbgl-app-* -mtime +1 | xargs rm -rf; \
     fi
 
 # build Mac OS X project for Xcode
-xproj: config.gypi macosx/llmr-app.gyp clear_xcode_cache node
-	deps/run_gyp macosx/llmr-app.gyp --depth=. --generator-output=./build -f xcode
-	open ./build/macosx/llmr-app.xcodeproj
+xproj: config.gypi macosx/mbgl-app.gyp clear_xcode_cache node
+	deps/run_gyp macosx/mbgl-app.gyp --depth=. --generator-output=./build -f xcode
+	open ./build/macosx/mbgl-app.xcodeproj
 
 # build iOS project for Xcode
-iproj: config.gypi ios/mapbox-gl-cocoa/app/llmr-app.gyp clear_xcode_cache node
-	deps/run_gyp ios/mapbox-gl-cocoa/app/llmr-app.gyp --depth=. --generator-output=./build -f xcode
-	open ./build/ios/mapbox-gl-cocoa/app/llmr-app.xcodeproj
+iproj: config.gypi ios/mapbox-gl-cocoa/app/mbgl-app.gyp clear_xcode_cache node
+	deps/run_gyp ios/mapbox-gl-cocoa/app/mbgl-app.gyp --depth=. --generator-output=./build -f xcode
+	open ./build/ios/mapbox-gl-cocoa/app/mbgl-app.xcodeproj
 
 # build Linux project for Xcode (Runs on Mac OS X too, but without platform-specific code)
-lproj: config.gypi linux/llmr-app.gyp clear_xcode_cache node
-	deps/run_gyp linux/llmr-app.gyp --depth=. --generator-output=./build -f xcode
-	open ./build/linux/llmr-app.xcodeproj
+lproj: config.gypi linux/mbgl-app.gyp clear_xcode_cache node
+	deps/run_gyp linux/mbgl-app.gyp --depth=. --generator-output=./build -f xcode
+	open ./build/linux/mbgl-app.xcodeproj
 
 
 ##### Maintenace operations ####################################################
@@ -101,4 +101,4 @@ distclean: clean
 	-rm -rf ./config.gypi
 	-rm -rf ./mapnik-packaging/osx/out/
 
-.PHONY: llmr test linux
+.PHONY: mbgl test linux

bin/build-shaders.js

@@ -83,10 +83,10 @@ module.exports = function(shader_type, prefix, suffix) {
     }
 
     var header = '// NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED.\n\n';
-    header += '#ifndef LLMR_SHADER_SHADERS\n';
-    header += '#define LLMR_SHADER_SHADERS\n';
+    header += '#ifndef MBGL_SHADER_SHADERS\n';
+    header += '#define MBGL_SHADER_SHADERS\n';
     header += '\n';
-    header += 'namespace llmr {\n';
+    header += 'namespace mbgl {\n';
     header += '\n';
     header += 'struct shader_source {\n';
     header += '    const char *vertex;\n';
@@ -106,18 +106,19 @@ module.exports = function(shader_type, prefix, suffix) {
 
 
     var code = '// NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED.\n';
-    code += '#include <llmr/platform/gl.hpp>\n';
+    code += '#include <mbgl/platform/gl.hpp>\n';
     code += prefix + '\n';
-    code += '#include <llmr/shader/shaders.hpp>\n';
+    code += '#include <mbgl/shader/shaders.hpp>\n';
     code += '\n';
-    code += 'using namespace llmr;\n';
+    code += 'namespace mbgl {\n';
     code += '\n';
-    code += 'const shader_source llmr::shaders[SHADER_COUNT] = {\n';
+    code += 'const shader_source shaders[SHADER_COUNT] = {\n';
     code += lines.join(',\n');
     code += '\n};\n';
+    code += '\n}\n';
     code += suffix + '\n';
 
-    var header_path = path.join(process.argv[2], 'include/llmr/shader/shaders.hpp');
+    var header_path = path.join(process.argv[2], 'include/mbgl/shader/shaders.hpp');
     mkdirp.sync(path.dirname(header_path));
     fs.writeFileSync(header_path, header);
     console.warn('wrote file ' + header_path);

bin/package.json

@@ -1,5 +1,5 @@
 {
-    "name": "llmr-native",
+    "name": "mbgl-native",
     "version": "0.0.1",
     "dependencies": {
         "glsl-optimizer": "git://github.com/kkaefer/glsl-optimizer.git#amalgamation"

common/curl_request.cpp

@@ -1,8 +1,8 @@
 
-#include <llmr/platform/platform.hpp>
-#include <llmr/platform/request.hpp>
-#include <llmr/util/uv.hpp>
-#include <llmr/util/std.hpp>
+#include <mbgl/platform/platform.hpp>
+#include <mbgl/platform/request.hpp>
+#include <mbgl/util/uv.hpp>
+#include <mbgl/util/std.hpp>
 
 #include <queue>
 #include <boost/lockfree/queue.hpp>
@@ -47,7 +47,7 @@
    See http://nikhilm.github.com/uvbook/ for more information on libuv.
 */
 
-namespace llmr {
+namespace mbgl {
 namespace platform {
 namespace request {
 
@@ -66,8 +66,8 @@ static uv_async_t async_cancel;
 // Stores pointers (!) to shared_ptrs. We use shared_ptrs so that request objects don't get
 // auto-destructed while they're in progress. The TileData object retains a weak_ptr to this
 // request, so we have to use a shared_ptr here to ensure that this object stays alive.
-static boost::lockfree::queue<std::shared_ptr<llmr::platform::Request> *> add_queue(8);
-static boost::lockfree::queue<std::shared_ptr<llmr::platform::Request> *> cancel_queue(8);
+static boost::lockfree::queue<std::shared_ptr<mbgl::platform::Request> *> add_queue(8);
+static boost::lockfree::queue<std::shared_ptr<mbgl::platform::Request> *> cancel_queue(8);
 
 // Used as the CURL timer function to periodically check for socket updates.
 static uv_timer_t timeout;
@@ -85,10 +85,10 @@ static CURLSH *curl_share = nullptr;
 static std::queue<CURL *> curl_handle_cache;
 
 
-class CURLRequest : public llmr::platform::Request {
+class CURLRequest : public mbgl::platform::Request {
 public:
     CURLRequest(const std::string &url,
-                std::function<void(llmr::platform::Response *)> callback,
+                std::function<void(mbgl::platform::Response *)> callback,
                 std::shared_ptr<uv::loop> loop)
         : Request(url, callback, loop) {}
 
@@ -380,4 +380,4 @@ void platform::cancel_request_http(const std::shared_ptr<Request> &req) {
         uv_async_send(&async_cancel);
     }
 }
-} // end namespace llmr
+} // end namespace mbgl

common/foundation_request.mm

@@ -9,9 +9,9 @@
 #include <memory>
 #include <string>
 #include <functional>
-#include <llmr/platform/request.hpp>
-#include <llmr/platform/platform.hpp>
-#include <llmr/util/std.hpp>
+#include <mbgl/platform/request.hpp>
+#include <mbgl/platform/platform.hpp>
+#include <mbgl/util/std.hpp>
 #include <uv.h>
 
 uv_once_t request_initialize = UV_ONCE_INIT;
@@ -37,10 +37,10 @@ void request_initialize_cb() {
 
 // We're using a child class to make sure ARC is working correctly, as well as to add activity
 // indicators on iOS.
-class FoundationRequest : public llmr::platform::Request {
+class FoundationRequest : public mbgl::platform::Request {
 public:
     FoundationRequest(const std::string &url,
-                      std::function<void(llmr::platform::Response *)> callback,
+                      std::function<void(mbgl::platform::Response *)> callback,
                       std::shared_ptr<uv::loop> loop)
         : Request(url, callback, loop) {
 #if TARGET_OS_IPHONE
@@ -65,8 +65,8 @@ public:
     NSURLSessionDataTask *task = nullptr;
 };
 
-std::shared_ptr<llmr::platform::Request>
-llmr::platform::request_http(const std::string &url,
+std::shared_ptr<mbgl::platform::Request>
+mbgl::platform::request_http(const std::string &url,
                              std::function<void(Response *)> callback,
                              std::shared_ptr<uv::loop> loop) {
     uv_once(&request_initialize, request_initialize_cb);
@@ -109,7 +109,7 @@ llmr::platform::request_http(const std::string &url,
     return req;
 }
 
-void llmr::platform::cancel_request_http(const std::shared_ptr<Request> &req) {
+void mbgl::platform::cancel_request_http(const std::shared_ptr<Request> &req) {
     if (req) {
         [((FoundationRequest *)(req.get()))->task cancel];
     }

common/glfw_view.cpp

@@ -8,7 +8,7 @@ GLFWView::GLFWView(bool fullscreen) : fullscreen(fullscreen) {
 
 GLFWView::~GLFWView() { glfwTerminate(); }
 
-void GLFWView::initialize(llmr::Map *map) {
+void GLFWView::initialize(mbgl::Map *map) {
     View::initialize(map);
 
     if (!glfwInit()) {
@@ -34,7 +34,7 @@ void GLFWView::initialize(llmr::Map *map) {
     glfwWindowHint(GLFW_STENCIL_BITS, 8);
     glfwWindowHint(GLFW_DEPTH_BITS, 16);
 
-    window = glfwCreateWindow(1024, 768, "llmr", monitor, NULL);
+    window = glfwCreateWindow(1024, 768, "Mapbox GL", monitor, NULL);
     if (!window) {
         glfwTerminate();
         fprintf(stderr, "Failed to initialize window\n");
@@ -194,7 +194,7 @@ void GLFWView::swap() {
     glfwPostEmptyEvent();
 }
 
-void GLFWView::notify_map_change(llmr::MapChange change, llmr::timestamp delay) {
+void GLFWView::notify_map_change(mbgl::MapChange change, mbgl::timestamp delay) {
     // no-op
 }
 
@@ -212,7 +212,7 @@ void GLFWView::fps() {
     }
 }
 
-namespace llmr {
+namespace mbgl {
 namespace platform {
 
 double elapsed() { return glfwGetTime(); }

common/glfw_view.hpp

@@ -1,8 +1,8 @@
-#ifndef LLMR_COMMON_GLFW_VIEW
-#define LLMR_COMMON_GLFW_VIEW
+#ifndef MBGL_COMMON_GLFW_VIEW
+#define MBGL_COMMON_GLFW_VIEW
 
-#include <llmr/llmr.hpp>
-#include <llmr/util/time.hpp>
+#include <mbgl/mbgl.hpp>
+#include <mbgl/util/time.hpp>
 
 #ifdef NVIDIA
 #define GLFW_INCLUDE_ES2
@@ -11,15 +11,15 @@
 
 #include <uv.h>
 
-class GLFWView : public llmr::View {
+class GLFWView : public mbgl::View {
 public:
     GLFWView(bool fullscreen = false);
     ~GLFWView();
 
-    void initialize(llmr::Map *map);
+    void initialize(mbgl::Map *map);
     void swap();
     void make_active();
-    void notify_map_change(llmr::MapChange change, llmr::timestamp delay = 0);
+    void notify_map_change(mbgl::MapChange change, mbgl::timestamp delay = 0);
 
     static void key(GLFWwindow *window, int key, int scancode, int action, int mods);
     static void scroll(GLFWwindow *window, double xoffset, double yoffset);

common/headless_view.cpp

@@ -1,10 +1,10 @@
 #include "headless_view.hpp"
-#include <llmr/util/timer.hpp>
+#include <mbgl/util/timer.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 HeadlessView::HeadlessView() {
-#if LLMR_USE_CGL
+#if MBGL_USE_CGL
     // TODO: test if OpenGL 4.1 with GL_ARB_ES2_compatibility is supported
     // If it is, use kCGLOGLPVersion_3_2_Core and enable that extension.
     CGLPixelFormatAttribute attributes[] = {
@@ -30,7 +30,7 @@ HeadlessView::HeadlessView() {
     }
 #endif
 
-#if LLMR_USE_GLX
+#if MBGL_USE_GLX
     x_display = XOpenDisplay(0);
 
     if (x_display == nullptr) {
@@ -66,7 +66,7 @@ HeadlessView::HeadlessView() {
 void HeadlessView::resize(int width, int height) {
     clear_buffers();
 
-#if LLMR_USE_CGL
+#if MBGL_USE_CGL
     make_active();
 
     // Create depth/stencil buffer
@@ -101,7 +101,7 @@ void HeadlessView::resize(int width, int height) {
     }
 #endif
 
-#if LLMR_USE_GLX
+#if MBGL_USE_GLX
     x_pixmap = XCreatePixmap(x_display, DefaultRootWindow(x_display), width, height, 32);
     glx_pixmap = glXCreateGLXPixmap(x_display, x_info, x_pixmap);
 
@@ -111,7 +111,7 @@ void HeadlessView::resize(int width, int height) {
 }
 
 void HeadlessView::clear_buffers() {
-#if LLMR_USE_CGL
+#if MBGL_USE_CGL
     glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
 
     if (fbo) {
@@ -130,7 +130,7 @@ void HeadlessView::clear_buffers() {
     }
 #endif
 
-#if LLMR_USE_GLX
+#if MBGL_USE_GLX
     if (glx_pixmap) {
         glXDestroyGLXPixmap(x_display, glx_pixmap);
         glx_pixmap = 0;
@@ -146,24 +146,24 @@ void HeadlessView::clear_buffers() {
 HeadlessView::~HeadlessView() {
     clear_buffers();
 
-#if LLMR_USE_CGL
+#if MBGL_USE_CGL
     CGLDestroyContext(gl_context);
 #endif
 }
 
-void HeadlessView::notify_map_change(llmr::MapChange change, llmr::timestamp delay) {
+void HeadlessView::notify_map_change(mbgl::MapChange change, mbgl::timestamp delay) {
     // no-op
 }
 
 void HeadlessView::make_active() {
-#if LLMR_USE_CGL
+#if MBGL_USE_CGL
     CGLError error = CGLSetCurrentContext(gl_context);
     if (error) {
         fprintf(stderr, "Switching OpenGL context failed\n");
     }
 #endif
 
-#if LLMR_USE_GLX
+#if MBGL_USE_GLX
     if (!glXMakeCurrent(x_display, glx_pixmap, gl_context)) {
         fprintf(stderr, "Switching OpenGL context failed\n");
     }
@@ -173,7 +173,7 @@ void HeadlessView::make_active() {
 void HeadlessView::swap() {}
 
 unsigned int HeadlessView::root_fbo() {
-#if LLMR_USE_CGL
+#if MBGL_USE_CGL
     return fbo;
 #endif
 

common/headless_view.hpp

@@ -1,18 +1,18 @@
-#ifndef LLMR_COMMON_HEADLESS_CGL
-#define LLMR_COMMON_HEADLESS_CGL
+#ifndef MBGL_COMMON_HEADLESS_CGL
+#define MBGL_COMMON_HEADLESS_CGL
 
 #ifdef __APPLE__
-#define LLMR_USE_CGL 1
+#define MBGL_USE_CGL 1
 #else
 #include <GL/glx.h>
-#define LLMR_USE_GLX 1
+#define MBGL_USE_GLX 1
 #endif
 
-#include <llmr/map/view.hpp>
-#include <llmr/platform/gl.hpp>
-#include <llmr/util/time.hpp>
+#include <mbgl/map/view.hpp>
+#include <mbgl/platform/gl.hpp>
+#include <mbgl/util/time.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 class HeadlessView : public View {
 public:
@@ -31,14 +31,14 @@ private:
 
 
 private:
-#if LLMR_USE_CGL
+#if MBGL_USE_CGL
     CGLContextObj gl_context;
     GLuint fbo = 0;
     GLuint fbo_depth_stencil = 0;
     GLuint fbo_color = 0;
 #endif
 
-#if LLMR_USE_GLX
+#if MBGL_USE_GLX
     GLXContext gl_context = nullptr;
     XVisualInfo *x_info = nullptr;
     Display *x_display = nullptr;

common/nslog_log.hpp

@@ -1,9 +1,9 @@
-#ifndef LLMR_COMMON_NSLOG_LOG
-#define LLMR_COMMON_NSLOG_LOG
+#ifndef MBGL_COMMON_NSLOG_LOG
+#define MBGL_COMMON_NSLOG_LOG
 
-#include <llmr/platform/log.hpp>
+#include <mbgl/platform/log.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 class NSLogBackend : public LogBackend {
 public:

common/nslog_log.mm

@@ -4,7 +4,7 @@
 
 #include <cstdarg>
 
-namespace llmr {
+namespace mbgl {
 
 void NSLogBackend::record(EventSeverity severity, Event event, const std::string &msg) {
     NSLog(@"[%s] %s: %@", EventSeverityClass(severity).c_str(), EventClass(event).c_str(),

common/settings_json.cpp

@@ -4,12 +4,12 @@
 #include <rapidjson/document.h>
 #include <stdio.h>
 
-using namespace llmr;
+using namespace mbgl;
 
 Settings_JSON::Settings_JSON() { load(); }
 
 void Settings_JSON::load() {
-    FILE *settingsFile = fopen("/tmp/llmr-native.json", "r");
+    FILE *settingsFile = fopen("/tmp/mbgl-native.json", "r");
     if (settingsFile != NULL) {
         rapidjson::FileStream is(settingsFile);
         rapidjson::Document document;
@@ -26,7 +26,7 @@ void Settings_JSON::load() {
 
 void Settings_JSON::save() {
 
-    rapidjson::FileStream s(fopen("/tmp/llmr-native.json", "w"));
+    rapidjson::FileStream s(fopen("/tmp/mbgl-native.json", "w"));
     rapidjson::PrettyWriter<rapidjson::FileStream> writer(s);
     writer.StartArray();
     writer.Double(longitude);

common/settings_json.hpp

@@ -1,7 +1,7 @@
-#ifndef LLMR_JSON_SETTINGS
-#define LLMR_JSON_SETTINGS
+#ifndef MBGL_JSON_SETTINGS
+#define MBGL_JSON_SETTINGS
 
-namespace llmr {
+namespace mbgl {
 
 class Settings_JSON {
 public:

common/settings_nsuserdefaults.hpp

@@ -1,7 +1,7 @@
-#ifndef LLMR_COMMON_SETTINGS_NSUSERDEFAULTS
-#define LLMR_COMMON_SETTINGS_NSUSERDEFAULTS
+#ifndef MBGL_COMMON_SETTINGS_NSUSERDEFAULTS
+#define MBGL_COMMON_SETTINGS_NSUSERDEFAULTS
 
-namespace llmr {
+namespace mbgl {
 
 class Settings_NSUserDefaults {
 public:

common/settings_nsuserdefaults.mm

@@ -2,7 +2,7 @@
 
 #include "settings_nsuserdefaults.hpp"
 
-using namespace llmr;
+using namespace mbgl;
 
 Settings_NSUserDefaults::Settings_NSUserDefaults()
 {

common/stderr_log.cpp

@@ -3,7 +3,7 @@
 #include <iostream>
 #include <cstdarg>
 
-namespace llmr {
+namespace mbgl {
 
 void StderrLogBackend::record(EventSeverity severity, Event event, const std::string &msg) {
     std::cerr << "[" << severity << "] " << event << ": " << msg << std::endl;

common/stderr_log.hpp

@@ -1,9 +1,9 @@
-#ifndef LLMR_COMMON_STDERR_LOG
-#define LLMR_COMMON_STDERR_LOG
+#ifndef MBGL_COMMON_STDERR_LOG
+#define MBGL_COMMON_STDERR_LOG
 
-#include <llmr/platform/log.hpp>
+#include <mbgl/platform/log.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 class StderrLogBackend : public LogBackend {
 public:

config/constants.cpp

@@ -1,27 +1,27 @@
-#include <llmr/util/constants.hpp>
+#include <mbgl/util/constants.hpp>
 
-const float llmr::util::tileSize = 512.0f;
+const float mbgl::util::tileSize = 512.0f;
 
 #if defined(DEBUG)
-const bool llmr::debug::tileParseWarnings = false;
-const bool llmr::debug::styleParseWarnings = false;
-const bool llmr::debug::spriteWarnings = false;
-const bool llmr::debug::renderWarnings = false;
-const bool llmr::debug::renderTree = false;
-const bool llmr::debug::labelTextMissingWarning = true;
-const bool llmr::debug::missingFontStackWarning = true;
-const bool llmr::debug::missingFontFaceWarning = true;
-const bool llmr::debug::glyphWarning = true;
-const bool llmr::debug::shapingWarning = true;
+const bool mbgl::debug::tileParseWarnings = false;
+const bool mbgl::debug::styleParseWarnings = false;
+const bool mbgl::debug::spriteWarnings = false;
+const bool mbgl::debug::renderWarnings = false;
+const bool mbgl::debug::renderTree = false;
+const bool mbgl::debug::labelTextMissingWarning = true;
+const bool mbgl::debug::missingFontStackWarning = true;
+const bool mbgl::debug::missingFontFaceWarning = true;
+const bool mbgl::debug::glyphWarning = true;
+const bool mbgl::debug::shapingWarning = true;
 #else
-const bool llmr::debug::tileParseWarnings = false;
-const bool llmr::debug::styleParseWarnings = false;
-const bool llmr::debug::spriteWarnings = false;
-const bool llmr::debug::renderWarnings = false;
-const bool llmr::debug::renderTree = false;
-const bool llmr::debug::labelTextMissingWarning = false;
-const bool llmr::debug::missingFontStackWarning = false;
-const bool llmr::debug::missingFontFaceWarning = false;
-const bool llmr::debug::glyphWarning = false;
-const bool llmr::debug::shapingWarning = false;
+const bool mbgl::debug::tileParseWarnings = false;
+const bool mbgl::debug::styleParseWarnings = false;
+const bool mbgl::debug::spriteWarnings = false;
+const bool mbgl::debug::renderWarnings = false;
+const bool mbgl::debug::renderTree = false;
+const bool mbgl::debug::labelTextMissingWarning = false;
+const bool mbgl::debug::missingFontStackWarning = false;
+const bool mbgl::debug::missingFontFaceWarning = false;
+const bool mbgl::debug::glyphWarning = false;
+const bool mbgl::debug::shapingWarning = false;
 #endif

configure

@@ -50,7 +50,7 @@ def pkg_config(pkg, pkgconfig_root):
 
   return (libs, cflags)
 
-def configure_llmr(o):
+def configure_mbgl(o):
   if options.boost_root:
       o['variables']['boost_root'] = options.boost_root
   else:
@@ -115,7 +115,7 @@ output = {
 }
 
 if __name__ == '__main__':
-  configure_llmr(output)
+  configure_mbgl(output)
   configure_glfw3(output)
   configure_uv(output)
   configure_png(output)

include/llmr/geometry/interpolate.hpp

@@ -1,13 +0,0 @@
-#ifndef LLMR_GEOMETRY_INTERPOLATE
-#define LLMR_GEOMETRY_INTERPOLATE
-
-#include <llmr/geometry/anchor.hpp>
-#include <llmr/util/math.hpp>
-
-namespace llmr {
-
-Anchors interpolate(const std::vector<Coordinate> &vertices, float spacing,
-                    float minScale = 0.0f, int start = 0);
-}
-
-#endif

include/llmr/style/property_value.hpp

@@ -1,21 +0,0 @@
-#ifndef LLMR_STYLE_PROPERTY_VALUE
-#define LLMR_STYLE_PROPERTY_VALUE
-
-#include <llmr/util/variant.hpp>
-#include <llmr/style/function_properties.hpp>
-#include <llmr/style/types.hpp>
-
-namespace llmr {
-
-typedef util::variant<
-    std::string,
-    TranslateAnchorType,
-    RotateAnchorType,
-    Function<bool>,
-    Function<float>,
-    Function<Color>
-> PropertyValue;
-
-}
-
-#endif

include/mbgl/geometry/anchor.hpp

@@ -1,9 +1,9 @@
-#ifndef LLMR_GEOMETRY_ANCHOR
-#define LLMR_GEOMETRY_ANCHOR
+#ifndef MBGL_GEOMETRY_ANCHOR
+#define MBGL_GEOMETRY_ANCHOR
 
 #include <vector>
 
-namespace llmr {
+namespace mbgl {
 
 struct Anchor {
     float x = 0.0f;

include/mbgl/geometry/binpack.hpp

@@ -1,12 +1,12 @@
-#ifndef LLMR_GEOMETRY_BINPACK
-#define LLMR_GEOMETRY_BINPACK
+#ifndef MBGL_GEOMETRY_BINPACK
+#define MBGL_GEOMETRY_BINPACK
 
-#include <llmr/util/noncopyable.hpp>
-#include <llmr/util/rect.hpp>
+#include <mbgl/util/noncopyable.hpp>
+#include <mbgl/util/rect.hpp>
 #include <cstdint>
 #include <list>
 
-namespace llmr {
+namespace mbgl {
 
 template <typename T>
 class BinPack : private util::noncopyable {

include/mbgl/geometry/buffer.hpp

@@ -1,14 +1,14 @@
-#ifndef LLMR_GEOMETRY_BUFFER
-#define LLMR_GEOMETRY_BUFFER
+#ifndef MBGL_GEOMETRY_BUFFER
+#define MBGL_GEOMETRY_BUFFER
 
-#include <llmr/platform/gl.hpp>
-#include <llmr/util/noncopyable.hpp>
+#include <mbgl/platform/gl.hpp>
+#include <mbgl/util/noncopyable.hpp>
 
 #include <cstdlib>
 #include <cassert>
 #include <stdexcept>
 
-namespace llmr {
+namespace mbgl {
 
 template <
     size_t item_size,

include/mbgl/geometry/debug_font_buffer.hpp

@@ -1,9 +1,9 @@
-#ifndef LLMR_GEOMETRY_DEBUG_FONT_BUFFER
-#define LLMR_GEOMETRY_DEBUG_FONT_BUFFER
+#ifndef MBGL_GEOMETRY_DEBUG_FONT_BUFFER
+#define MBGL_GEOMETRY_DEBUG_FONT_BUFFER
 
 #include "buffer.hpp"
 
-namespace llmr {
+namespace mbgl {
 
 class DebugFontBuffer : public Buffer<
     4 // 2 bytes per coordinate, 2 coordinates

include/mbgl/geometry/elements_buffer.hpp

@@ -1,10 +1,10 @@
-#ifndef LLMR_GEOMETRY_TRIANGLE_ELEMENTS_BUFFER
-#define LLMR_GEOMETRY_TRIANGLE_ELEMENTS_BUFFER
+#ifndef MBGL_GEOMETRY_TRIANGLE_ELEMENTS_BUFFER
+#define MBGL_GEOMETRY_TRIANGLE_ELEMENTS_BUFFER
 
-#include <llmr/geometry/buffer.hpp>
-#include <llmr/geometry/vao.hpp>
+#include <mbgl/geometry/buffer.hpp>
+#include <mbgl/geometry/vao.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 struct ElementGroup {
     VertexArrayObject array;

include/mbgl/geometry/fill_buffer.hpp

@@ -1,11 +1,11 @@
-#ifndef LLMR_GEOMETRY_FILL_BUFFER
-#define LLMR_GEOMETRY_FILL_BUFFER
+#ifndef MBGL_GEOMETRY_FILL_BUFFER
+#define MBGL_GEOMETRY_FILL_BUFFER
 
 #include "buffer.hpp"
 #include <vector>
 #include <cstdint>
 
-namespace llmr {
+namespace mbgl {
 
 class FillVertexBuffer : public Buffer<
     4 // bytes per coordinates (2 * unsigned short == 4 bytes)

include/mbgl/geometry/geometry.hpp

@@ -1,12 +1,12 @@
-#ifndef LLMR_GEOMETRY_GEOMETRY
-#define LLMR_GEOMETRY_GEOMETRY
+#ifndef MBGL_GEOMETRY_GEOMETRY
+#define MBGL_GEOMETRY_GEOMETRY
 
-#include <llmr/util/pbf.hpp>
-#include <llmr/util/noncopyable.hpp>
+#include <mbgl/util/pbf.hpp>
+#include <mbgl/util/noncopyable.hpp>
 
 #include <cstdlib>
 
-namespace llmr {
+namespace mbgl {
 
 class Geometry : private util::noncopyable {
 

include/mbgl/geometry/glyph_atlas.hpp

@@ -1,8 +1,8 @@
-#ifndef LLMR_GEOMETRY_GLYPH_ATLAS
-#define LLMR_GEOMETRY_GLYPH_ATLAS
+#ifndef MBGL_GEOMETRY_GLYPH_ATLAS
+#define MBGL_GEOMETRY_GLYPH_ATLAS
 
-#include <llmr/geometry/binpack.hpp>
-#include <llmr/text/glyph_store.hpp>
+#include <mbgl/geometry/binpack.hpp>
+#include <mbgl/text/glyph_store.hpp>
 
 #include <string>
 #include <set>
@@ -10,7 +10,7 @@
 #include <mutex>
 #include <atomic>
 
-namespace llmr {
+namespace mbgl {
 
 class GlyphAtlas {
 public:

include/mbgl/geometry/icon_buffer.hpp

@@ -1,9 +1,9 @@
-#ifndef LLMR_GEOMETRY_ICON_BUFFER
-#define LLMR_GEOMETRY_ICON_BUFFER
+#ifndef MBGL_GEOMETRY_ICON_BUFFER
+#define MBGL_GEOMETRY_ICON_BUFFER
 
 #include "buffer.hpp"
 
-namespace llmr {
+namespace mbgl {
 
     class IconVertexBuffer : public Buffer<
     4 + // int16 x/y coordinates per vertex (== 4 bytes)

include/mbgl/geometry/interpolate.hpp

@@ -0,0 +1,13 @@
+#ifndef MBGL_GEOMETRY_INTERPOLATE
+#define MBGL_GEOMETRY_INTERPOLATE
+
+#include <mbgl/geometry/anchor.hpp>
+#include <mbgl/util/math.hpp>
+
+namespace mbgl {
+
+Anchors interpolate(const std::vector<Coordinate> &vertices, float spacing,
+                    float minScale = 0.0f, int start = 0);
+}
+
+#endif

include/mbgl/geometry/line_buffer.hpp

@@ -1,9 +1,9 @@
-#ifndef LLMR_GEOMETRY_LINE_BUFFER
-#define LLMR_GEOMETRY_LINE_BUFFER
+#ifndef MBGL_GEOMETRY_LINE_BUFFER
+#define MBGL_GEOMETRY_LINE_BUFFER
 
 #include "buffer.hpp"
 
-namespace llmr {
+namespace mbgl {
 
 class LineVertexBuffer : public Buffer<
     8 // 2 coordinates per vertex + 1 linesofar + 1 extrude coord pair == 4 (== 8 bytes)

include/mbgl/geometry/sprite_atlas.hpp

@@ -1,7 +1,7 @@
-#ifndef LLMR_GEOMETRY_SPRITE_ATLAS
-#define LLMR_GEOMETRY_SPRITE_ATLAS
+#ifndef MBGL_GEOMETRY_SPRITE_ATLAS
+#define MBGL_GEOMETRY_SPRITE_ATLAS
 
-#include <llmr/geometry/binpack.hpp>
+#include <mbgl/geometry/binpack.hpp>
 
 #include <string>
 #include <map>
@@ -9,7 +9,7 @@
 #include <atomic>
 #include <set>
 
-namespace llmr {
+namespace mbgl {
 
 class Sprite;
 class SpritePosition;

include/mbgl/geometry/text_buffer.hpp

@@ -1,10 +1,10 @@
-#ifndef LLMR_GEOMETRY_TEXT_BUFFER
-#define LLMR_GEOMETRY_TEXT_BUFFER
+#ifndef MBGL_GEOMETRY_TEXT_BUFFER
+#define MBGL_GEOMETRY_TEXT_BUFFER
 
 #include "buffer.hpp"
 #include <array>
 
-namespace llmr {
+namespace mbgl {
 
 class TextVertexBuffer : public Buffer <
     16,

include/mbgl/geometry/vao.hpp

@@ -1,11 +1,11 @@
-#ifndef LLMR_GEOMETRY_VAO
-#define LLMR_GEOMETRY_VAO
+#ifndef MBGL_GEOMETRY_VAO
+#define MBGL_GEOMETRY_VAO
 
-#include <llmr/platform/gl.hpp>
+#include <mbgl/platform/gl.hpp>
 
 #include <stdexcept>
 
-namespace llmr {
+namespace mbgl {
 
 class VertexArrayObject {
 public:

include/mbgl/geometry/vertex_buffer.hpp

@@ -1,12 +1,12 @@
-#ifndef LLMR_GEOMETRY_VERTEX_BUFFER
-#define LLMR_GEOMETRY_VERTEX_BUFFER
+#ifndef MBGL_GEOMETRY_VERTEX_BUFFER
+#define MBGL_GEOMETRY_VERTEX_BUFFER
 
 #include <vector>
 #include <cstddef>
 #include <cstdint>
 #include <cmath>
 
-namespace llmr {
+namespace mbgl {
 
 class VertexBuffer {
 public:

include/mbgl/map/map.hpp

@@ -1,23 +1,23 @@
 
-#ifndef LLMR_MAP_MAP
-#define LLMR_MAP_MAP
+#ifndef MBGL_MAP_MAP
+#define MBGL_MAP_MAP
 
 #include <uv.h>
 
-#include <llmr/map/view.hpp>
-#include <llmr/map/transform.hpp>
-#include <llmr/style/style.hpp>
-#include <llmr/geometry/glyph_atlas.hpp>
-#include <llmr/text/glyph_store.hpp>
-#include <llmr/renderer/painter.hpp>
-#include <llmr/util/noncopyable.hpp>
-#include <llmr/util/texturepool.hpp>
+#include <mbgl/map/view.hpp>
+#include <mbgl/map/transform.hpp>
+#include <mbgl/style/style.hpp>
+#include <mbgl/geometry/glyph_atlas.hpp>
+#include <mbgl/text/glyph_store.hpp>
+#include <mbgl/renderer/painter.hpp>
+#include <mbgl/util/noncopyable.hpp>
+#include <mbgl/util/texturepool.hpp>
 
 #include <cstdint>
 #include <string>
 #include <map>
 
-namespace llmr {
+namespace mbgl {
 
 class Source;
 class SpriteAtlas;

include/mbgl/map/raster_tile_data.hpp

@@ -1,12 +1,12 @@
-#ifndef LLMR_MAP_RASTER_TILE_DATA
-#define LLMR_MAP_RASTER_TILE_DATA
+#ifndef MBGL_MAP_RASTER_TILE_DATA
+#define MBGL_MAP_RASTER_TILE_DATA
 
-#include <llmr/map/tile_data.hpp>
+#include <mbgl/map/tile_data.hpp>
 
-#include <llmr/renderer/raster_bucket.hpp>
+#include <mbgl/renderer/raster_bucket.hpp>
 
 
-namespace llmr {
+namespace mbgl {
 
 class RasterTileData : public TileData {
     friend class TileParser;

include/mbgl/map/source.hpp

@@ -1,12 +1,12 @@
-#ifndef LLMR_MAP_SOURCE
-#define LLMR_MAP_SOURCE
+#ifndef MBGL_MAP_SOURCE
+#define MBGL_MAP_SOURCE
 
-#include <llmr/map/tile.hpp>
-#include <llmr/map/tile_data.hpp>
-#include <llmr/util/noncopyable.hpp>
-#include <llmr/util/time.hpp>
-#include <llmr/style/style_source.hpp>
-#include <llmr/style/types.hpp>
+#include <mbgl/map/tile.hpp>
+#include <mbgl/map/tile_data.hpp>
+#include <mbgl/util/noncopyable.hpp>
+#include <mbgl/util/time.hpp>
+#include <mbgl/style/style_source.hpp>
+#include <mbgl/style/types.hpp>
 
 #include <list>
 #include <forward_list>
@@ -16,7 +16,7 @@
 #include <map>
 #include <set>
 
-namespace llmr {
+namespace mbgl {
 
 class TransformState;
 class Texturepool;

include/mbgl/map/sprite.hpp

@@ -1,8 +1,8 @@
-#ifndef LLMR_STYLE_SPRITE
-#define LLMR_STYLE_SPRITE
+#ifndef MBGL_STYLE_SPRITE
+#define MBGL_STYLE_SPRITE
 
-#include <llmr/util/raster.hpp>
-#include <llmr/util/vec.hpp>
+#include <mbgl/util/raster.hpp>
+#include <mbgl/util/vec.hpp>
 
 #include <string>
 #include <mutex>
@@ -10,7 +10,7 @@
 #include <atomic>
 #include <unordered_map>
 
-namespace llmr {
+namespace mbgl {
 
 class Map;
 

include/mbgl/map/tile.hpp

@@ -1,9 +1,9 @@
-#ifndef LLMR_MAP_TILE
-#define LLMR_MAP_TILE
+#ifndef MBGL_MAP_TILE
+#define MBGL_MAP_TILE
 
-#include <llmr/util/vec.hpp>
-#include <llmr/util/mat4.hpp>
-#include <llmr/util/noncopyable.hpp>
+#include <mbgl/util/vec.hpp>
+#include <mbgl/util/mat4.hpp>
+#include <mbgl/util/noncopyable.hpp>
 
 #include <cstdint>
 #include <forward_list>
@@ -11,7 +11,7 @@
 #include <bitset>
 #include <memory>
 
-namespace llmr {
+namespace mbgl {
 
 class TileData;
 

include/mbgl/map/tile_data.hpp

@@ -1,18 +1,18 @@
-#ifndef LLMR_MAP_TILE_DATA
-#define LLMR_MAP_TILE_DATA
+#ifndef MBGL_MAP_TILE_DATA
+#define MBGL_MAP_TILE_DATA
 
-#include <llmr/map/tile.hpp>
-#include <llmr/util/noncopyable.hpp>
-#include <llmr/platform/platform.hpp>
-#include <llmr/geometry/vao.hpp>
-#include <llmr/renderer/debug_bucket.hpp>
+#include <mbgl/map/tile.hpp>
+#include <mbgl/util/noncopyable.hpp>
+#include <mbgl/platform/platform.hpp>
+#include <mbgl/geometry/vao.hpp>
+#include <mbgl/renderer/debug_bucket.hpp>
 
 #include <cstdint>
 #include <string>
 #include <memory>
 #include <atomic>
 
-namespace llmr {
+namespace mbgl {
 
 class Map;
 class Painter;

include/mbgl/map/tile_parser.hpp

@@ -1,14 +1,14 @@
-#ifndef LLMR_MAP_TILE_PARSER
-#define LLMR_MAP_TILE_PARSER
+#ifndef MBGL_MAP_TILE_PARSER
+#define MBGL_MAP_TILE_PARSER
 
-#include <llmr/map/vector_tile.hpp>
-#include <llmr/text/placement.hpp>
-#include <llmr/text/glyph_store.hpp>
-#include <llmr/text/glyph.hpp>
-#include <llmr/util/utf.hpp>
-#include <llmr/style/filter_expression.hpp>
+#include <mbgl/map/vector_tile.hpp>
+#include <mbgl/text/placement.hpp>
+#include <mbgl/text/glyph_store.hpp>
+#include <mbgl/text/glyph.hpp>
+#include <mbgl/util/utf.hpp>
+#include <mbgl/style/filter_expression.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 class Style;
 class GlyphAtlas;

include/mbgl/map/transform.hpp

@@ -1,16 +1,16 @@
-#ifndef LLMR_MAP_TRANSFORM
-#define LLMR_MAP_TRANSFORM
+#ifndef MBGL_MAP_TRANSFORM
+#define MBGL_MAP_TRANSFORM
 
-#include <llmr/util/transition.hpp>
-#include <llmr/util/noncopyable.hpp>
-#include <llmr/util/uv.hpp>
+#include <mbgl/util/transition.hpp>
+#include <mbgl/util/noncopyable.hpp>
+#include <mbgl/util/uv.hpp>
 
 #include "view.hpp"
 #include "transform_state.hpp"
 
 #include <forward_list>
 
-namespace llmr {
+namespace mbgl {
 
 struct box;
 

include/mbgl/map/transform_state.hpp

@@ -1,12 +1,12 @@
-#ifndef LLMR_MAP_TRANSFORM_STATE
-#define LLMR_MAP_TRANSFORM_STATE
+#ifndef MBGL_MAP_TRANSFORM_STATE
+#define MBGL_MAP_TRANSFORM_STATE
 
-#include <llmr/util/mat4.hpp>
-#include <llmr/map/tile.hpp>
+#include <mbgl/util/mat4.hpp>
+#include <mbgl/map/tile.hpp>
 
 #include <cstdint>
 
-namespace llmr {
+namespace mbgl {
 
 class Transform;
 

include/mbgl/map/vector_tile.hpp

@@ -1,18 +1,18 @@
-#ifndef LLMR_MAP_VECTOR_TILE
-#define LLMR_MAP_VECTOR_TILE
+#ifndef MBGL_MAP_VECTOR_TILE
+#define MBGL_MAP_VECTOR_TILE
 
-#include <llmr/util/pbf.hpp>
-#include <llmr/util/vec.hpp>
-#include <llmr/style/value.hpp>
-#include <llmr/text/glyph.hpp>
-#include <llmr/style/filter_expression.hpp>
+#include <mbgl/util/pbf.hpp>
+#include <mbgl/util/vec.hpp>
+#include <mbgl/style/value.hpp>
+#include <mbgl/text/glyph.hpp>
+#include <mbgl/style/filter_expression.hpp>
 #include <vector>
 #include <map>
 #include <unordered_map>
 #include <set>
 #include <limits>
 
-namespace llmr {
+namespace mbgl {
 
 class BucketDescription;
 class VectorTileLayer;

include/mbgl/map/vector_tile_data.hpp

@@ -1,22 +1,22 @@
-#ifndef LLMR_MAP_VECTOR_TILE_DATA
-#define LLMR_MAP_VECTOR_TILE_DATA
+#ifndef MBGL_MAP_VECTOR_TILE_DATA
+#define MBGL_MAP_VECTOR_TILE_DATA
 
-#include <llmr/map/tile_data.hpp>
+#include <mbgl/map/tile_data.hpp>
 
 
-#include <llmr/renderer/bucket.hpp>
+#include <mbgl/renderer/bucket.hpp>
 
-#include <llmr/geometry/vertex_buffer.hpp>
-#include <llmr/geometry/elements_buffer.hpp>
-#include <llmr/geometry/fill_buffer.hpp>
-#include <llmr/geometry/line_buffer.hpp>
-#include <llmr/geometry/icon_buffer.hpp>
-#include <llmr/geometry/text_buffer.hpp>
-#include <llmr/map/tile_parser.hpp>
+#include <mbgl/geometry/vertex_buffer.hpp>
+#include <mbgl/geometry/elements_buffer.hpp>
+#include <mbgl/geometry/fill_buffer.hpp>
+#include <mbgl/geometry/line_buffer.hpp>
+#include <mbgl/geometry/icon_buffer.hpp>
+#include <mbgl/geometry/text_buffer.hpp>
+#include <mbgl/map/tile_parser.hpp>
 
 #include <unordered_map>
 
-namespace llmr {
+namespace mbgl {
 
 
 class VectorTileData : public TileData {

include/mbgl/map/view.hpp

@@ -1,9 +1,9 @@
-#ifndef LLMR_MAP_VIEW
-#define LLMR_MAP_VIEW
+#ifndef MBGL_MAP_VIEW
+#define MBGL_MAP_VIEW
 
-#include <llmr/util/time.hpp>
+#include <mbgl/util/time.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 class Map;
 
@@ -47,7 +47,7 @@ public:
     virtual void notify_map_change(MapChange change, timestamp delay = 0) = 0;
 
 protected:
-    llmr::Map *map = nullptr;
+    mbgl::Map *map = nullptr;
 };
 }
 

include/mbgl/mbgl.hpp

@@ -1,5 +1,5 @@
-#ifndef LLMR_MAIN
-#define LLMR_MAIN
+#ifndef MBGL_MAIN
+#define MBGL_MAIN
 
 #include "map/map.hpp"
 #include "map/view.hpp"

include/mbgl/platform/event.hpp

@@ -1,11 +1,11 @@
-#ifndef LLMR_PLATFORM_EVENT
-#define LLMR_PLATFORM_EVENT
+#ifndef MBGL_PLATFORM_EVENT
+#define MBGL_PLATFORM_EVENT
 
-#include <llmr/util/enum.hpp>
+#include <mbgl/util/enum.hpp>
 
 #include <cstdint>
 
-namespace llmr {
+namespace mbgl {
 
 enum class EventSeverity : uint8_t {
     Debug,
@@ -15,7 +15,7 @@ enum class EventSeverity : uint8_t {
     Error,
 };
 
-LLMR_DEFINE_ENUM_CLASS(EventSeverityClass, EventSeverity, {
+MBGL_DEFINE_ENUM_CLASS(EventSeverityClass, EventSeverity, {
     { EventSeverity::Debug, "DEBUG" },
     { EventSeverity::Info, "INFO" },
     { EventSeverity::Test, "TEST" },
@@ -35,7 +35,7 @@ enum class Event : uint8_t {
     Sprite,
 };
 
-LLMR_DEFINE_ENUM_CLASS(EventClass, Event, {
+MBGL_DEFINE_ENUM_CLASS(EventClass, Event, {
     { Event::General, "General" },
     { Event::Setup, "Setup" },
     { Event::Shader, "Shader" },

include/mbgl/platform/gl.hpp

@@ -1,5 +1,5 @@
-#ifndef LLMR_RENDERER_GL
-#define LLMR_RENDERER_GL
+#ifndef MBGL_RENDERER_GL
+#define MBGL_RENDERER_GL
 
 #include <string>
 
@@ -39,7 +39,7 @@
     #include <GL/glext.h>
 #endif
 
-namespace llmr {
+namespace mbgl {
 namespace gl {
 // Debug group markers, useful for debuggin on iOS
 #if defined(__APPLE__) && defined(DEBUG) && defined(GL_EXT_debug_marker)

include/mbgl/platform/log.hpp

@@ -1,12 +1,12 @@
-#ifndef LLMR_PLATFORM_LOG
-#define LLMR_PLATFORM_LOG
+#ifndef MBGL_PLATFORM_LOG
+#define MBGL_PLATFORM_LOG
 
 #include "event.hpp"
 
 #include <memory>
 #include <string>
 
-namespace llmr {
+namespace mbgl {
 
 class LogBackend {
 public:

include/mbgl/platform/platform.hpp

@@ -1,5 +1,5 @@
-#ifndef LLMR_PLATFORM_PLATFORM
-#define LLMR_PLATFORM_PLATFORM
+#ifndef MBGL_PLATFORM_PLATFORM
+#define MBGL_PLATFORM_PLATFORM
 
 #include <memory>
 #include <functional>
@@ -11,7 +11,7 @@ namespace uv {
 class loop;
 }
 
-namespace llmr {
+namespace mbgl {
 namespace platform {
 
 class Request;

include/mbgl/platform/request.hpp

@@ -1,12 +1,12 @@
-#ifndef LLMR_PLATFORM_REQUEST
-#define LLMR_PLATFORM_REQUEST
+#ifndef MBGL_PLATFORM_REQUEST
+#define MBGL_PLATFORM_REQUEST
 
 #include <string>
 #include <functional>
 #include <memory>
 #include <atomic>
 
-#include <llmr/util/noncopyable.hpp>
+#include <mbgl/util/noncopyable.hpp>
 
 // Forward definition.
 typedef struct uv_loop_s uv_loop_t;
@@ -16,7 +16,7 @@ namespace uv {
 class loop;
 }
 
-namespace llmr {
+namespace mbgl {
 namespace platform {
 
 struct Response;

include/mbgl/renderer/bucket.hpp

@@ -1,13 +1,13 @@
-#ifndef LLMR_RENDERER_BUCKET
-#define LLMR_RENDERER_BUCKET
+#ifndef MBGL_RENDERER_BUCKET
+#define MBGL_RENDERER_BUCKET
 
 #include <string>
 #include <memory>
-#include <llmr/map/tile.hpp>
-#include <llmr/util/noncopyable.hpp>
-#include <llmr/renderer/prerendered_texture.hpp>
+#include <mbgl/map/tile.hpp>
+#include <mbgl/util/noncopyable.hpp>
+#include <mbgl/renderer/prerendered_texture.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 class Painter;
 class StyleLayer;

include/mbgl/renderer/debug_bucket.hpp

@@ -1,9 +1,9 @@
-#ifndef LLMR_RENDERER_DEBUGBUCKET
-#define LLMR_RENDERER_DEBUGBUCKET
+#ifndef MBGL_RENDERER_DEBUGBUCKET
+#define MBGL_RENDERER_DEBUGBUCKET
 
-#include <llmr/renderer/bucket.hpp>
-#include <llmr/geometry/debug_font_buffer.hpp>
-#include <llmr/geometry/vao.hpp>
+#include <mbgl/renderer/bucket.hpp>
+#include <mbgl/geometry/debug_font_buffer.hpp>
+#include <mbgl/geometry/vao.hpp>
 
 #include <vector>
 #include <memory>
@@ -12,7 +12,7 @@
 #define BUFFER_OFFSET(i) ((char *)nullptr + (i))
 #endif
 
-namespace llmr {
+namespace mbgl {
 
 class PlainShader;
 

include/mbgl/renderer/fill_bucket.hpp

@@ -1,10 +1,10 @@
-#ifndef LLMR_RENDERER_FILLBUCKET
-#define LLMR_RENDERER_FILLBUCKET
+#ifndef MBGL_RENDERER_FILLBUCKET
+#define MBGL_RENDERER_FILLBUCKET
 
-#include <llmr/renderer/bucket.hpp>
-#include <llmr/geometry/elements_buffer.hpp>
-#include <llmr/geometry/fill_buffer.hpp>
-#include <llmr/style/style_bucket.hpp>
+#include <mbgl/renderer/bucket.hpp>
+#include <mbgl/geometry/elements_buffer.hpp>
+#include <mbgl/geometry/fill_buffer.hpp>
+#include <mbgl/style/style_bucket.hpp>
 
 #include <clipper/clipper.hpp>
 #include <libtess2/tesselator.h>
@@ -16,7 +16,7 @@
 #define BUFFER_OFFSET(i) ((char *)nullptr + (i))
 #endif
 
-namespace llmr {
+namespace mbgl {
 
 class Style;
 class FillVertexBuffer;

include/mbgl/renderer/frame_history.hpp

@@ -1,14 +1,14 @@
-#ifndef LLMR_RENDERER_FRAME_HISTORY
-#define LLMR_RENDERER_FRAME_HISTORY
+#ifndef MBGL_RENDERER_FRAME_HISTORY
+#define MBGL_RENDERER_FRAME_HISTORY
 
 #include <deque>
 #include <cassert>
 #include <cmath>
 
-#include <llmr/platform/platform.hpp>
-#include <llmr/util/time.hpp>
+#include <mbgl/platform/platform.hpp>
+#include <mbgl/util/time.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 struct FrameSnapshot {
     explicit inline FrameSnapshot(timestamp t, float z) : t(t), z(z) {}

include/mbgl/renderer/icon_bucket.hpp

@@ -1,10 +1,10 @@
-#ifndef LLMR_RENDERER_ICONBUCKET
-#define LLMR_RENDERER_ICONBUCKET
+#ifndef MBGL_RENDERER_ICONBUCKET
+#define MBGL_RENDERER_ICONBUCKET
 
-#include <llmr/renderer/bucket.hpp>
-#include <llmr/geometry/elements_buffer.hpp>
-#include <llmr/geometry/icon_buffer.hpp>
-#include <llmr/style/style_bucket.hpp>
+#include <mbgl/renderer/bucket.hpp>
+#include <mbgl/geometry/elements_buffer.hpp>
+#include <mbgl/geometry/icon_buffer.hpp>
+#include <mbgl/style/style_bucket.hpp>
 
 #include <vector>
 #include <memory>
@@ -13,7 +13,7 @@
 #define BUFFER_OFFSET(i) ((char *)nullptr + (i))
 #endif
 
-namespace llmr {
+namespace mbgl {
 
 class Style;
 class IconVertexBuffer;

include/mbgl/renderer/line_bucket.hpp

@@ -1,16 +1,16 @@
-#ifndef LLMR_RENDERER_LINEBUCKET
-#define LLMR_RENDERER_LINEBUCKET
+#ifndef MBGL_RENDERER_LINEBUCKET
+#define MBGL_RENDERER_LINEBUCKET
 
 #include "bucket.hpp"
-#include <llmr/geometry/vao.hpp>
-#include <llmr/geometry/elements_buffer.hpp>
-#include <llmr/geometry/line_buffer.hpp>
-#include <llmr/style/style_bucket.hpp>
+#include <mbgl/geometry/vao.hpp>
+#include <mbgl/geometry/elements_buffer.hpp>
+#include <mbgl/geometry/line_buffer.hpp>
+#include <mbgl/style/style_bucket.hpp>
 
 #include <memory>
 #include <vector>
 
-namespace llmr {
+namespace mbgl {
 
 class Style;
 class LineVertexBuffer;

include/mbgl/renderer/painter.hpp

@@ -1,33 +1,33 @@
-#ifndef LLMR_RENDERER_PAINTER
-#define LLMR_RENDERER_PAINTER
+#ifndef MBGL_RENDERER_PAINTER
+#define MBGL_RENDERER_PAINTER
 
-#include <llmr/map/tile_data.hpp>
-#include <llmr/geometry/vao.hpp>
-#include <llmr/geometry/vertex_buffer.hpp>
-#include <llmr/util/mat4.hpp>
-#include <llmr/util/noncopyable.hpp>
-#include <llmr/renderer/frame_history.hpp>
-#include <llmr/style/types.hpp>
+#include <mbgl/map/tile_data.hpp>
+#include <mbgl/geometry/vao.hpp>
+#include <mbgl/geometry/vertex_buffer.hpp>
+#include <mbgl/util/mat4.hpp>
+#include <mbgl/util/noncopyable.hpp>
+#include <mbgl/renderer/frame_history.hpp>
+#include <mbgl/style/types.hpp>
 
-#include <llmr/shader/plain_shader.hpp>
-#include <llmr/shader/outline_shader.hpp>
-#include <llmr/shader/pattern_shader.hpp>
-#include <llmr/shader/line_shader.hpp>
-#include <llmr/shader/linejoin_shader.hpp>
-#include <llmr/shader/icon_shader.hpp>
-#include <llmr/shader/raster_shader.hpp>
-#include <llmr/shader/text_shader.hpp>
-#include <llmr/shader/dot_shader.hpp>
-#include <llmr/shader/composite_shader.hpp>
-#include <llmr/shader/gaussian_shader.hpp>
+#include <mbgl/shader/plain_shader.hpp>
+#include <mbgl/shader/outline_shader.hpp>
+#include <mbgl/shader/pattern_shader.hpp>
+#include <mbgl/shader/line_shader.hpp>
+#include <mbgl/shader/linejoin_shader.hpp>
+#include <mbgl/shader/icon_shader.hpp>
+#include <mbgl/shader/raster_shader.hpp>
+#include <mbgl/shader/text_shader.hpp>
+#include <mbgl/shader/dot_shader.hpp>
+#include <mbgl/shader/composite_shader.hpp>
+#include <mbgl/shader/gaussian_shader.hpp>
 
-#include <llmr/map/transform_state.hpp>
+#include <mbgl/map/transform_state.hpp>
 
 #include <map>
 #include <unordered_map>
 #include <set>
 
-namespace llmr {
+namespace mbgl {
 
 class Transform;
 class Style;

include/mbgl/renderer/prerendered_texture.hpp

@@ -1,11 +1,11 @@
-#ifndef LLMR_RENDERER_PRERENDERED_TEXTURE
-#define LLMR_RENDERER_PRERENDERED_TEXTURE
+#ifndef MBGL_RENDERER_PRERENDERED_TEXTURE
+#define MBGL_RENDERER_PRERENDERED_TEXTURE
 
-#include <llmr/util/noncopyable.hpp>
-#include <llmr/platform/gl.hpp>
-#include <llmr/style/rasterize_properties.hpp>
+#include <mbgl/util/noncopyable.hpp>
+#include <mbgl/platform/gl.hpp>
+#include <mbgl/style/rasterize_properties.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 class Painter;
 

include/mbgl/renderer/raster_bucket.hpp

@@ -1,10 +1,10 @@
-#ifndef LLMR_RENDERER_RASTERBUCKET
-#define LLMR_RENDERER_RASTERBUCKET
+#ifndef MBGL_RENDERER_RASTERBUCKET
+#define MBGL_RENDERER_RASTERBUCKET
 
-#include <llmr/renderer/bucket.hpp>
-#include <llmr/util/raster.hpp>
+#include <mbgl/renderer/bucket.hpp>
+#include <mbgl/util/raster.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 class RasterShader;
 class VertexBuffer;

include/mbgl/renderer/text_bucket.hpp

@@ -1,19 +1,19 @@
-#ifndef LLMR_RENDERER_TEXTBUCKET
-#define LLMR_RENDERER_TEXTBUCKET
+#ifndef MBGL_RENDERER_TEXTBUCKET
+#define MBGL_RENDERER_TEXTBUCKET
 
 #include "bucket.hpp"
-#include <llmr/geometry/vao.hpp>
-#include <llmr/geometry/elements_buffer.hpp>
-#include <llmr/map/vector_tile.hpp>
-#include <llmr/text/types.hpp>
-#include <llmr/text/glyph.hpp>
-#include <llmr/style/style_bucket.hpp>
+#include <mbgl/geometry/vao.hpp>
+#include <mbgl/geometry/elements_buffer.hpp>
+#include <mbgl/map/vector_tile.hpp>
+#include <mbgl/text/types.hpp>
+#include <mbgl/text/glyph.hpp>
+#include <mbgl/style/style_bucket.hpp>
 
 #include <memory>
 #include <map>
 #include <vector>
 
-namespace llmr {
+namespace mbgl {
 
 class Style;
 class TextVertexBuffer;

include/mbgl/shader/composite_shader.hpp

@@ -1,9 +1,9 @@
-#ifndef LLMR_SHADER_COMPOSITE_SHADER
-#define LLMR_SHADER_COMPOSITE_SHADER
+#ifndef MBGL_SHADER_COMPOSITE_SHADER
+#define MBGL_SHADER_COMPOSITE_SHADER
 
-#include <llmr/shader/shader.hpp>
+#include <mbgl/shader/shader.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 class CompositeShader : public Shader {
 public:

include/mbgl/shader/dot_shader.hpp

@@ -1,9 +1,9 @@
-#ifndef LLMR_SHADER_SHADER_DOT
-#define LLMR_SHADER_SHADER_DOT
+#ifndef MBGL_SHADER_SHADER_DOT
+#define MBGL_SHADER_SHADER_DOT
 
-#include <llmr/shader/shader.hpp>
+#include <mbgl/shader/shader.hpp>
 
-namespace llmr {
+namespace mbgl {
 
     class DotShader : public Shader {
     public:

include/mbgl/shader/gaussian_shader.hpp

@@ -1,9 +1,9 @@
-#ifndef LLMR_RENDERER_SHADER_GAUSSIAN
-#define LLMR_RENDERER_SHADER_GAUSSIAN
+#ifndef MBGL_RENDERER_SHADER_GAUSSIAN
+#define MBGL_RENDERER_SHADER_GAUSSIAN
 
-#include <llmr/shader/shader.hpp>
+#include <mbgl/shader/shader.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 class GaussianShader : public Shader {
 public:

include/mbgl/shader/icon_shader.hpp

@@ -1,9 +1,9 @@
-#ifndef LLMR_SHADER_SHADER_ICON
-#define LLMR_SHADER_SHADER_ICON
+#ifndef MBGL_SHADER_SHADER_ICON
+#define MBGL_SHADER_SHADER_ICON
 
-#include <llmr/shader/shader.hpp>
+#include <mbgl/shader/shader.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 class IconShader : public Shader {
 public:

include/mbgl/shader/line_shader.hpp

@@ -1,9 +1,9 @@
-#ifndef LLMR_SHADER_SHADER_LINE
-#define LLMR_SHADER_SHADER_LINE
+#ifndef MBGL_SHADER_SHADER_LINE
+#define MBGL_SHADER_SHADER_LINE
 
-#include <llmr/shader/shader.hpp>
+#include <mbgl/shader/shader.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 class LineShader : public Shader {
 public:

include/mbgl/shader/linejoin_shader.hpp

@@ -1,9 +1,9 @@
-#ifndef LLMR_SHADER_SHADER_LINEJOIN
-#define LLMR_SHADER_SHADER_LINEJOIN
+#ifndef MBGL_SHADER_SHADER_LINEJOIN
+#define MBGL_SHADER_SHADER_LINEJOIN
 
-#include <llmr/shader/shader.hpp>
+#include <mbgl/shader/shader.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 class LinejoinShader : public Shader {
 public:

include/mbgl/shader/outline_shader.hpp

@@ -1,9 +1,9 @@
-#ifndef LLMR_SHADER_SHADER_OUTLINE
-#define LLMR_SHADER_SHADER_OUTLINE
+#ifndef MBGL_SHADER_SHADER_OUTLINE
+#define MBGL_SHADER_SHADER_OUTLINE
 
-#include <llmr/shader/shader.hpp>
+#include <mbgl/shader/shader.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 class OutlineShader : public Shader {
 public:

include/mbgl/shader/pattern_shader.hpp

@@ -1,9 +1,9 @@
-#ifndef LLMR_SHADER_SHADER_PATTERN
-#define LLMR_SHADER_SHADER_PATTERN
+#ifndef MBGL_SHADER_SHADER_PATTERN
+#define MBGL_SHADER_SHADER_PATTERN
 
-#include <llmr/shader/shader.hpp>
+#include <mbgl/shader/shader.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 class PatternShader : public Shader {
 public:

include/mbgl/shader/plain_shader.hpp

@@ -1,9 +1,9 @@
-#ifndef LLMR_SHADER_SHADER_PLAIN
-#define LLMR_SHADER_SHADER_PLAIN
+#ifndef MBGL_SHADER_SHADER_PLAIN
+#define MBGL_SHADER_SHADER_PLAIN
 
-#include <llmr/shader/shader.hpp>
+#include <mbgl/shader/shader.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 class PlainShader : public Shader {
 public:

include/mbgl/shader/raster_shader.hpp

@@ -1,9 +1,9 @@
-#ifndef LLMR_RENDERER_SHADER_RASTER
-#define LLMR_RENDERER_SHADER_RASTER
+#ifndef MBGL_RENDERER_SHADER_RASTER
+#define MBGL_RENDERER_SHADER_RASTER
 
-#include <llmr/shader/shader.hpp>
+#include <mbgl/shader/shader.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 class RasterShader : public Shader {
 public:

include/mbgl/shader/shader.hpp

@@ -1,11 +1,11 @@
-#ifndef LLMR_RENDERER_SHADER
-#define LLMR_RENDERER_SHADER
+#ifndef MBGL_RENDERER_SHADER
+#define MBGL_RENDERER_SHADER
 
 #include <cstdint>
 #include <array>
-#include <llmr/util/noncopyable.hpp>
+#include <mbgl/util/noncopyable.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 class Shader : private util::noncopyable {
 public:

include/mbgl/shader/text_shader.hpp

@@ -1,9 +1,9 @@
-#ifndef LLMR_SHADER_TEXT_SHADER
-#define LLMR_SHADER_TEXT_SHADER
+#ifndef MBGL_SHADER_TEXT_SHADER
+#define MBGL_SHADER_TEXT_SHADER
 
 #include "shader.hpp"
 
-namespace llmr {
+namespace mbgl {
 
 class TextShader : public Shader {
 public:

include/mbgl/style/applied_class_properties.hpp

@@ -1,13 +1,13 @@
-#ifndef LLMR_STYLE_APPLIED_CLASS_PROPERTIES
-#define LLMR_STYLE_APPLIED_CLASS_PROPERTIES
+#ifndef MBGL_STYLE_APPLIED_CLASS_PROPERTIES
+#define MBGL_STYLE_APPLIED_CLASS_PROPERTIES
 
-#include <llmr/style/property_value.hpp>
-#include <llmr/style/class_dictionary.hpp>
-#include <llmr/util/time.hpp>
+#include <mbgl/style/property_value.hpp>
+#include <mbgl/style/class_dictionary.hpp>
+#include <mbgl/util/time.hpp>
 
 #include <list>
 
-namespace llmr {
+namespace mbgl {
 
 class AppliedClassProperty {
 public:

include/mbgl/style/class_dictionary.hpp

@@ -1,11 +1,11 @@
-#ifndef LLMR_STYLE_CLASS_DICTIONARY
-#define LLMR_STYLE_CLASS_DICTIONARY
+#ifndef MBGL_STYLE_CLASS_DICTIONARY
+#define MBGL_STYLE_CLASS_DICTIONARY
 
 #include <cstdint>
 #include <string>
 #include <unordered_map>
 
-namespace llmr {
+namespace mbgl {
 
 enum class ClassID : uint32_t {
     Fallback = 0, // These values are from the fallback properties

include/mbgl/style/class_properties.hpp

@@ -1,13 +1,13 @@
-#ifndef LLMR_STYLE_CLASS_PROPERTIES
-#define LLMR_STYLE_CLASS_PROPERTIES
+#ifndef MBGL_STYLE_CLASS_PROPERTIES
+#define MBGL_STYLE_CLASS_PROPERTIES
 
-#include <llmr/style/property_key.hpp>
-#include <llmr/style/property_value.hpp>
-#include <llmr/style/property_transition.hpp>
+#include <mbgl/style/property_key.hpp>
+#include <mbgl/style/property_value.hpp>
+#include <mbgl/style/property_transition.hpp>
 
 #include <map>
 
-namespace llmr {
+namespace mbgl {
 
 class ClassProperties {
 public:

include/mbgl/style/filter_comparison.hpp

@@ -1,13 +1,13 @@
-#ifndef LLMR_STYLE_FILTER_COMPARISON
-#define LLMR_STYLE_FILTER_COMPARISON
+#ifndef MBGL_STYLE_FILTER_COMPARISON
+#define MBGL_STYLE_FILTER_COMPARISON
 
-#include <llmr/style/value.hpp>
+#include <mbgl/style/value.hpp>
 
 #include <vector>
 #include <string>
 #include <iosfwd>
 
-namespace llmr {
+namespace mbgl {
 
 class FilterComparison {
 public:

include/mbgl/style/filter_comparison_private.hpp

@@ -1,9 +1,9 @@
-#ifndef LLMR_STYLE_FILTER_COMPARISON_PRIVATE
-#define LLMR_STYLE_FILTER_COMPARISON_PRIVATE
+#ifndef MBGL_STYLE_FILTER_COMPARISON_PRIVATE
+#define MBGL_STYLE_FILTER_COMPARISON_PRIVATE
 
 #include "filter_comparison.hpp"
 
-namespace llmr {
+namespace mbgl {
 
 template <typename Extractor>
 inline bool FilterComparison::compare(const Extractor &extractor) const {

include/mbgl/style/filter_expression.hpp

@@ -1,12 +1,12 @@
-#ifndef LLMR_STYLE_FILTER_EXPRESSION
-#define LLMR_STYLE_FILTER_EXPRESSION
+#ifndef MBGL_STYLE_FILTER_EXPRESSION
+#define MBGL_STYLE_FILTER_EXPRESSION
 
-#include <llmr/style/filter_comparison.hpp>
-#include <llmr/util/recursive_wrapper.hpp>
+#include <mbgl/style/filter_comparison.hpp>
+#include <mbgl/util/recursive_wrapper.hpp>
 
 #include <iosfwd>
 
-namespace llmr {
+namespace mbgl {
 
 class FilterExpression {
 public:

include/mbgl/style/filter_expression_private.hpp

@@ -1,10 +1,10 @@
-#ifndef LLMR_STYLE_FILTER_EXPRESSION_PRIVATE
-#define LLMR_STYLE_FILTER_EXPRESSION_PRIVATE
+#ifndef MBGL_STYLE_FILTER_EXPRESSION_PRIVATE
+#define MBGL_STYLE_FILTER_EXPRESSION_PRIVATE
 
 #include "filter_expression.hpp"
 #include "filter_comparison_private.hpp"
 
-namespace llmr {
+namespace mbgl {
 
 template <typename Extractor>
 bool FilterExpression::compare(const Extractor &extractor) const {

include/mbgl/style/function_properties.hpp

@@ -1,11 +1,11 @@
-#ifndef LLMR_STYLE_FUNCTION_PROPERTIES
-#define LLMR_STYLE_FUNCTION_PROPERTIES
+#ifndef MBGL_STYLE_FUNCTION_PROPERTIES
+#define MBGL_STYLE_FUNCTION_PROPERTIES
 
-#include <llmr/util/variant.hpp>
+#include <mbgl/util/variant.hpp>
 
 #include <vector>
 
-namespace llmr {
+namespace mbgl {
 
 template <typename T>
 struct ConstantFunction {

include/mbgl/style/property_fallback.hpp

@@ -1,12 +1,12 @@
-#ifndef LLMR_STYLE_PROPERTY_FALLBACK
-#define LLMR_STYLE_PROPERTY_FALLBACK
+#ifndef MBGL_STYLE_PROPERTY_FALLBACK
+#define MBGL_STYLE_PROPERTY_FALLBACK
 
-#include <llmr/style/property_key.hpp>
-#include <llmr/style/property_value.hpp>
+#include <mbgl/style/property_key.hpp>
+#include <mbgl/style/property_value.hpp>
 
 #include <map>
 
-namespace llmr {
+namespace mbgl {
 
 class PropertyFallbackValue {
 public:

include/mbgl/style/property_key.hpp

@@ -1,7 +1,7 @@
-#ifndef LLMR_STYLE_PROPERTY_KEY
-#define LLMR_STYLE_PROPERTY_KEY
+#ifndef MBGL_STYLE_PROPERTY_KEY
+#define MBGL_STYLE_PROPERTY_KEY
 
-namespace llmr {
+namespace mbgl {
 
 enum class PropertyKey {
     FillAntialias,

include/mbgl/style/property_transition.hpp

@@ -1,9 +1,9 @@
-#ifndef LLMR_STYLE_PROPERTY_TRANSITION
-#define LLMR_STYLE_PROPERTY_TRANSITION
+#ifndef MBGL_STYLE_PROPERTY_TRANSITION
+#define MBGL_STYLE_PROPERTY_TRANSITION
 
 #include <cstdint>
 
-namespace llmr {
+namespace mbgl {
 
 struct PropertyTransition {
     uint16_t duration = 0;

include/mbgl/style/property_value.hpp

@@ -0,0 +1,21 @@
+#ifndef MBGL_STYLE_PROPERTY_VALUE
+#define MBGL_STYLE_PROPERTY_VALUE
+
+#include <mbgl/util/variant.hpp>
+#include <mbgl/style/function_properties.hpp>
+#include <mbgl/style/types.hpp>
+
+namespace mbgl {
+
+typedef util::variant<
+    std::string,
+    TranslateAnchorType,
+    RotateAnchorType,
+    Function<bool>,
+    Function<float>,
+    Function<Color>
+> PropertyValue;
+
+}
+
+#endif

include/mbgl/style/rasterize_properties.hpp

@@ -1,9 +1,9 @@
-#ifndef LLMR_STYLE_RASTERIZE_PROPERTIES
-#define LLMR_STYLE_RASTERIZE_PROPERTIES
+#ifndef MBGL_STYLE_RASTERIZE_PROPERTIES
+#define MBGL_STYLE_RASTERIZE_PROPERTIES
 
-#include <llmr/style/function_properties.hpp>
+#include <mbgl/style/function_properties.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 // The calculated properties for a layer in a tile.
 class RasterizedProperties {

include/mbgl/style/style.hpp

@@ -1,11 +1,11 @@
-#ifndef LLMR_STYLE_STYLE
-#define LLMR_STYLE_STYLE
+#ifndef MBGL_STYLE_STYLE
+#define MBGL_STYLE_STYLE
 
-#include <llmr/style/property_transition.hpp>
-#include <llmr/style/style_source.hpp>
+#include <mbgl/style/property_transition.hpp>
+#include <mbgl/style/style_source.hpp>
 
-#include <llmr/util/time.hpp>
-#include <llmr/util/uv.hpp>
+#include <mbgl/util/time.hpp>
+#include <mbgl/util/uv.hpp>
 
 #include <cstdint>
 #include <map>
@@ -15,7 +15,7 @@
 #include <set>
 #include <memory>
 
-namespace llmr {
+namespace mbgl {
 
 class Sprite;
 class StyleLayer;

include/mbgl/style/style_bucket.hpp

@@ -1,16 +1,16 @@
-#ifndef LLMR_STYLE_STYLE_BUCKET
-#define LLMR_STYLE_STYLE_BUCKET
+#ifndef MBGL_STYLE_STYLE_BUCKET
+#define MBGL_STYLE_STYLE_BUCKET
 
-#include <llmr/style/types.hpp>
-#include <llmr/style/filter_expression.hpp>
-#include <llmr/style/style_source.hpp>
-#include <llmr/util/vec.hpp>
-#include <llmr/util/variant.hpp>
+#include <mbgl/style/types.hpp>
+#include <mbgl/style/filter_expression.hpp>
+#include <mbgl/style/style_source.hpp>
+#include <mbgl/util/vec.hpp>
+#include <mbgl/util/variant.hpp>
 
 #include <memory>
 #include <forward_list>
 
-namespace llmr {
+namespace mbgl {
 
 class Source;
 

include/mbgl/style/style_layer.hpp

@@ -1,11 +1,11 @@
-#ifndef LLMR_STYLE_STYLE_LAYER
-#define LLMR_STYLE_STYLE_LAYER
+#ifndef MBGL_STYLE_STYLE_LAYER
+#define MBGL_STYLE_STYLE_LAYER
 
-#include <llmr/style/class_dictionary.hpp>
-#include <llmr/style/class_properties.hpp>
-#include <llmr/style/style_properties.hpp>
-#include <llmr/style/rasterize_properties.hpp>
-#include <llmr/style/applied_class_properties.hpp>
+#include <mbgl/style/class_dictionary.hpp>
+#include <mbgl/style/class_properties.hpp>
+#include <mbgl/style/style_properties.hpp>
+#include <mbgl/style/rasterize_properties.hpp>
+#include <mbgl/style/applied_class_properties.hpp>
 
 #include <vector>
 #include <memory>
@@ -13,7 +13,7 @@
 #include <map>
 #include <set>
 
-namespace llmr {
+namespace mbgl {
 
 class StyleBucket;
 class StyleLayerGroup;

include/mbgl/style/style_layer_group.hpp

@@ -1,11 +1,11 @@
-#ifndef LLMR_STYLE_STYLE_LAYER_GROUP
-#define LLMR_STYLE_STYLE_LAYER_GROUP
+#ifndef MBGL_STYLE_STYLE_LAYER_GROUP
+#define MBGL_STYLE_STYLE_LAYER_GROUP
 
-#include <llmr/style/style_layer.hpp>
+#include <mbgl/style/style_layer.hpp>
 
 #include <vector>
 
-namespace llmr {
+namespace mbgl {
 
 class StyleLayerGroup {
 public:

include/mbgl/style/style_parser.hpp

@@ -1,19 +1,19 @@
-#ifndef LLMR_STYLE_STYLE_PARSER
-#define LLMR_STYLE_STYLE_PARSER
+#ifndef MBGL_STYLE_STYLE_PARSER
+#define MBGL_STYLE_STYLE_PARSER
 
 #include <rapidjson/document.h>
-#include <llmr/style/style.hpp>
-#include <llmr/style/style_source.hpp>
-#include <llmr/style/filter_expression.hpp>
-#include <llmr/style/class_properties.hpp>
-#include <llmr/style/rasterize_properties.hpp>
-#include <llmr/style/style_bucket.hpp>
+#include <mbgl/style/style.hpp>
+#include <mbgl/style/style_source.hpp>
+#include <mbgl/style/filter_expression.hpp>
+#include <mbgl/style/class_properties.hpp>
+#include <mbgl/style/rasterize_properties.hpp>
+#include <mbgl/style/style_bucket.hpp>
 
 #include <unordered_map>
 #include <forward_list>
 #include <tuple>
 
-namespace llmr {
+namespace mbgl {
 
 enum class ClassID : uint32_t;
 

include/mbgl/style/style_properties.hpp

@@ -1,16 +1,16 @@
-#ifndef LLMR_STYLE_STYLE_PROPERTIES
-#define LLMR_STYLE_STYLE_PROPERTIES
+#ifndef MBGL_STYLE_STYLE_PROPERTIES
+#define MBGL_STYLE_STYLE_PROPERTIES
 
-#include <llmr/util/variant.hpp>
-#include <llmr/style/types.hpp>
-#include <llmr/style/function_properties.hpp>
+#include <mbgl/util/variant.hpp>
+#include <mbgl/style/types.hpp>
+#include <mbgl/style/function_properties.hpp>
 
 #include <array>
 #include <string>
 #include <type_traits>
 #include <memory>
 
-namespace llmr {
+namespace mbgl {
 
 struct FillProperties {
     FillProperties() {}

include/mbgl/style/style_source.hpp

@@ -1,11 +1,11 @@
-#ifndef LLMR_STYLE_STYLE_SOURCE
-#define LLMR_STYLE_STYLE_SOURCE
+#ifndef MBGL_STYLE_STYLE_SOURCE
+#define MBGL_STYLE_STYLE_SOURCE
 
-#include <llmr/style/types.hpp>
+#include <mbgl/style/types.hpp>
 
 #include <memory>
 
-namespace llmr {
+namespace mbgl {
 
 class Source;
 

include/mbgl/style/types.hpp

@@ -1,12 +1,12 @@
-#ifndef LLMR_STYLE_TYPES
-#define LLMR_STYLE_TYPES
+#ifndef MBGL_STYLE_TYPES
+#define MBGL_STYLE_TYPES
 
-#include <llmr/util/enum.hpp>
+#include <mbgl/util/enum.hpp>
 
 #include <string>
 #include <array>
 
-namespace llmr {
+namespace mbgl {
 
 // Stores a premultiplied color, with all four channels ranging from 0..1
 typedef std::array<float, 4> Color;
@@ -22,7 +22,7 @@ enum class StyleLayerType : uint8_t {
     Background
 };
 
-LLMR_DEFINE_ENUM_CLASS(StyleLayerTypeClass, StyleLayerType, {
+MBGL_DEFINE_ENUM_CLASS(StyleLayerTypeClass, StyleLayerType, {
     { StyleLayerType::Unknown, "unknown" },
     { StyleLayerType::Fill, "fill" },
     { StyleLayerType::Line, "line" },

include/mbgl/style/value.hpp

@@ -1,13 +1,13 @@
-#ifndef LLMR_STYLE_VALUE
-#define LLMR_STYLE_VALUE
+#ifndef MBGL_STYLE_VALUE
+#define MBGL_STYLE_VALUE
 
-#include <llmr/util/variant.hpp>
-#include <llmr/util/pbf.hpp>
+#include <mbgl/util/variant.hpp>
+#include <mbgl/util/pbf.hpp>
 
 #include <cstdlib>
 #include <cerrno>
 
-namespace llmr {
+namespace mbgl {
 
 typedef util::variant<bool, int64_t, uint64_t, double, std::string> Value;
 

include/mbgl/style/value_comparison.hpp

@@ -1,11 +1,11 @@
-#ifndef LLMR_STYLE_VALUE_COMPARISON
-#define LLMR_STYLE_VALUE_COMPARISON
+#ifndef MBGL_STYLE_VALUE_COMPARISON
+#define MBGL_STYLE_VALUE_COMPARISON
 
 #include "value.hpp"
 #include <cstdlib>
 #include <cerrno>
 
-namespace llmr {
+namespace mbgl {
 
 namespace util {