diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-05-06 10:58:07 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-05-06 11:59:29 -0700 |
commit | 771e79a76988acadf4255d794c94b5688151c7e7 (patch) | |
tree | 6b784b8c3a44445a1cb8b9e2c964c9e35812598d | |
parent | 5035dc8418d931551bd58360bc82de2ae34cb066 (diff) | |
download | qtlocation-mapboxgl-771e79a76988acadf4255d794c94b5688151c7e7.tar.gz |
[core] Update geometry to 0.3.0
m--------- | .mason | 0 | ||||
-rw-r--r-- | platform/android/scripts/configure.sh | 2 | ||||
-rw-r--r-- | platform/ios/scripts/configure.sh | 2 | ||||
-rw-r--r-- | platform/linux/scripts/configure.sh | 2 | ||||
-rw-r--r-- | platform/node/src/node_feature.cpp | 21 | ||||
-rw-r--r-- | platform/osx/scripts/configure.sh | 2 | ||||
-rw-r--r-- | platform/qt/scripts/configure.sh | 2 |
7 files changed, 8 insertions, 23 deletions
diff --git a/.mason b/.mason -Subproject 79234f915fa159f027c6c268ff2e5ececdb9c51 +Subproject 742e3e406ef4836db37c5616add091821763ac0 diff --git a/platform/android/scripts/configure.sh b/platform/android/scripts/configure.sh index 9470563517..c97bbc6136 100644 --- a/platform/android/scripts/configure.sh +++ b/platform/android/scripts/configure.sh @@ -8,7 +8,7 @@ SQLITE_VERSION=3.9.1 ZLIB_VERSION=system NUNICODE_VERSION=1.6 LIBZIP_VERSION=0.11.2 -GEOMETRY_VERSION=0.2.0 +GEOMETRY_VERSION=0.3.0 GEOJSONVT_VERSION=4.1.2 VARIANT_VERSION=1.1.0 RAPIDJSON_VERSION=1.0.2 diff --git a/platform/ios/scripts/configure.sh b/platform/ios/scripts/configure.sh index 796564095d..d0e3347690 100644 --- a/platform/ios/scripts/configure.sh +++ b/platform/ios/scripts/configure.sh @@ -4,7 +4,7 @@ PROTOZERO_VERSION=1.3.0 BOOST_VERSION=1.60.0 SQLITE_VERSION=system ZLIB_VERSION=system -GEOMETRY_VERSION=0.2.0 +GEOMETRY_VERSION=0.3.0 GEOJSONVT_VERSION=4.1.2 VARIANT_VERSION=1.1.0 RAPIDJSON_VERSION=1.0.2 diff --git a/platform/linux/scripts/configure.sh b/platform/linux/scripts/configure.sh index a55545434e..01b7541200 100644 --- a/platform/linux/scripts/configure.sh +++ b/platform/linux/scripts/configure.sh @@ -11,7 +11,7 @@ SQLITE_VERSION=3.9.1 LIBUV_VERSION=1.7.5 ZLIB_VERSION=system NUNICODE_VERSION=1.6 -GEOMETRY_VERSION=0.2.0 +GEOMETRY_VERSION=0.3.0 GEOJSONVT_VERSION=4.1.2 VARIANT_VERSION=1.1.0 RAPIDJSON_VERSION=1.0.2 diff --git a/platform/node/src/node_feature.cpp b/platform/node/src/node_feature.cpp index 0a9e70cc2b..2f0541dd59 100644 --- a/platform/node/src/node_feature.cpp +++ b/platform/node/src/node_feature.cpp @@ -50,7 +50,7 @@ private: template <class T> struct ToCoordinates { public: - // Handles line_string, multi_point, multi_line_string, and multi_polygon. + // Handles line_string, polygon, multi_point, multi_line_string, multi_polygon, and geometry_collection. template <class E> v8::Local<v8::Object> operator()(const std::vector<E>& vector) { Nan::EscapableHandleScope scope; @@ -69,23 +69,8 @@ public: return scope.Escape(result); } - v8::Local<v8::Object> operator()(const polygon<T>& polygon) { - Nan::EscapableHandleScope scope; - v8::Local<v8::Array> result = Nan::New<v8::Array>(1 + polygon.interior_rings.size()); - Nan::Set(result, 0, operator()(polygon.exterior_ring)); - for (std::size_t i = 0; i < polygon.interior_rings.size(); ++i) { - Nan::Set(result, i + 1, operator()(polygon.interior_rings[i])); - } - return scope.Escape(result); - } - - v8::Local<v8::Object> operator()(const geometry_collection<T>& collection) { - Nan::EscapableHandleScope scope; - v8::Local<v8::Array> result = Nan::New<v8::Array>(collection.size()); - for (std::size_t i = 0; i < collection.size(); ++i) { - Nan::Set(result, i, toJS(collection[i])); - } - return scope.Escape(result); + v8::Local<v8::Object> operator()(const geometry<T>& geometry) { + return toJS(geometry); } }; diff --git a/platform/osx/scripts/configure.sh b/platform/osx/scripts/configure.sh index 8a5c457b73..45a451e0d4 100644 --- a/platform/osx/scripts/configure.sh +++ b/platform/osx/scripts/configure.sh @@ -7,7 +7,7 @@ GLFW_VERSION=3.1.2 SQLITE_VERSION=3.9.1 ZLIB_VERSION=system NUNICODE_VERSION=1.6 -GEOMETRY_VERSION=0.2.0 +GEOMETRY_VERSION=0.3.0 GEOJSONVT_VERSION=4.1.2 VARIANT_VERSION=1.1.0 RAPIDJSON_VERSION=1.0.2 diff --git a/platform/qt/scripts/configure.sh b/platform/qt/scripts/configure.sh index d956100d4e..500ef2663a 100644 --- a/platform/qt/scripts/configure.sh +++ b/platform/qt/scripts/configure.sh @@ -2,7 +2,7 @@ PROTOZERO_VERSION=1.3.0 BOOST_VERSION=1.60.0 -GEOMETRY_VERSION=0.2.0 +GEOMETRY_VERSION=0.3.0 GEOJSONVT_VERSION=4.1.2 GTEST_VERSION=1.7.0 LIBJPEG_TURBO_VERSION=1.4.2 |