Merge pull request #293 from mapbox/livestyle-squash

merge programmatic styling API

1 files changed, 5 insertions, 11 deletions

diff --git a/src/style/style.cpp b/src/style/style.cpp
index f1694694c0..9ae0b273f4 100644
--- a/src/style/style.cpp
+++ b/src/style/style.cpp
@@ -965,20 +965,14 @@ size_t Style::layerCount() const {
     return count;
 }
 
-void Style::setDefaultTransitionDuration(uint64_t duration) {
-    default_transition_duration = duration;
+void Style::setDefaultTransitionDuration(uint64_t duration_milliseconds) {
+    default_transition_duration = duration_milliseconds;
 }
 
-void Style::loadJSON(const uint8_t *const data, size_t bytes) {
-    rapidjson::Document doc;
-
-    if (bytes <= 0) {
-        return;
-    }
+void Style::loadJSON(const uint8_t *const data) {
+    uv::writelock lock(mtx);
 
-    if (data[bytes - 1] != 0) {
-        throw exception("style JSON string is not 0-terminated");
-    }
+    rapidjson::Document doc;
 
     doc.Parse<0>((const char *const)data);