diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/mbgl.cmake | 2 | ||||
| m--------- | mapbox-gl-js | 0 | ||||
| -rw-r--r-- | platform/android/scripts/generate-style-code.js | 2 | ||||
| -rw-r--r-- | platform/darwin/scripts/generate-style-code.js | 2 | ||||
| -rwxr-xr-x | scripts/generate-shaders.js | 2 | ||||
| -rw-r--r-- | scripts/generate-style-code.js | 2 | ||||
| -rw-r--r-- | src/mbgl/tile/geojson_tile.cpp | 4 |
8 files changed, 10 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ca19d3e41..56c1fc684d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,7 +44,7 @@ mason_use(variant VERSION 1.1.4 HEADER_ONLY) mason_use(unique_resource VERSION cba309e HEADER_ONLY) mason_use(rapidjson VERSION 1.1.0 HEADER_ONLY) mason_use(boost VERSION 1.62.0 HEADER_ONLY) -mason_use(geojsonvt VERSION 6.1.3 HEADER_ONLY) +mason_use(geojsonvt VERSION 6.2.0 HEADER_ONLY) mason_use(supercluster VERSION 0.2.0-1 HEADER_ONLY) mason_use(kdbush VERSION 0.1.1-1 HEADER_ONLY) mason_use(earcut VERSION 0.12.1 HEADER_ONLY) diff --git a/cmake/mbgl.cmake b/cmake/mbgl.cmake index 813e4ba071..41d820a077 100644 --- a/cmake/mbgl.cmake +++ b/cmake/mbgl.cmake @@ -71,7 +71,7 @@ add_custom_target( # Run npm install for both directories, and add custom commands, and a target that depends on them. _npm_install("${CMAKE_SOURCE_DIR}" mapbox-gl-native update-submodules) -_npm_install("${CMAKE_SOURCE_DIR}/mapbox-gl-js" mapbox-gl-js "${CMAKE_SOURCE_DIR}/node_modules/.mapbox-gl-native.stamp") +_npm_install("${CMAKE_SOURCE_DIR}/mapbox-gl-js/test/integration" mapbox-gl-js "${CMAKE_SOURCE_DIR}/node_modules/.mapbox-gl-native.stamp") add_custom_target( npm-install ALL DEPENDS "${CMAKE_SOURCE_DIR}/node_modules/.mapbox-gl-js.stamp" diff --git a/mapbox-gl-js b/mapbox-gl-js -Subproject 5ce6c1404e084418eaf6d9317f2bc1eda0c850a +Subproject cf031a6d072bda98b51c57021dfd767eb598ab4 diff --git a/platform/android/scripts/generate-style-code.js b/platform/android/scripts/generate-style-code.js index b9e0d6dfd9..32458b1876 100644 --- a/platform/android/scripts/generate-style-code.js +++ b/platform/android/scripts/generate-style-code.js @@ -2,7 +2,7 @@ const fs = require('fs'); const ejs = require('ejs'); -const spec = require('../../../mapbox-gl-js/js/style-spec').latest; +const spec = require('../../../mapbox-gl-js/src/style-spec/reference/v8'); const _ = require('lodash'); require('../../../scripts/style-code'); diff --git a/platform/darwin/scripts/generate-style-code.js b/platform/darwin/scripts/generate-style-code.js index a305367afd..72aacbc742 100644 --- a/platform/darwin/scripts/generate-style-code.js +++ b/platform/darwin/scripts/generate-style-code.js @@ -11,7 +11,7 @@ const cocoaConventions = require('./style-spec-cocoa-conventions-v8.json'); const prefix = 'MGL'; const suffix = 'StyleLayer'; -let spec = _.merge(require('../../../mapbox-gl-js/js/style-spec').latest, require('./style-spec-overrides-v8.json')); +let spec = _.merge(require('../../../mapbox-gl-js/src/style-spec/reference/v8'), require('./style-spec-overrides-v8.json')); /// // Temporarily IGNORE layers that are in the spec yet still not supported in mbgl core diff --git a/scripts/generate-shaders.js b/scripts/generate-shaders.js index eb15ea907b..97b5bd11bc 100755 --- a/scripts/generate-shaders.js +++ b/scripts/generate-shaders.js @@ -3,7 +3,7 @@ const path = require('path'); const fs = require('fs'); -const inputPath = 'mapbox-gl-js/shaders'; +const inputPath = 'mapbox-gl-js/src/shaders'; const outputPath = 'src/mbgl/shaders'; require('./style-code'); diff --git a/scripts/generate-style-code.js b/scripts/generate-style-code.js index de68c33ceb..bf9bef837a 100644 --- a/scripts/generate-style-code.js +++ b/scripts/generate-style-code.js @@ -2,7 +2,7 @@ const fs = require('fs'); const ejs = require('ejs'); -const spec = require('../mapbox-gl-js/js/style-spec').latest; +const spec = require('../mapbox-gl-js/src/style-spec/reference/v8'); const colorParser = require('csscolorparser'); require('./style-code'); diff --git a/src/mbgl/tile/geojson_tile.cpp b/src/mbgl/tile/geojson_tile.cpp index db2f37f96c..85d8b75619 100644 --- a/src/mbgl/tile/geojson_tile.cpp +++ b/src/mbgl/tile/geojson_tile.cpp @@ -25,6 +25,10 @@ public: return feature.properties; } + optional<FeatureIdentifier> getID() const override { + return feature.id; + } + GeometryCollection getGeometries() const override { GeometryCollection geometry = apply_visitor(ToGeometryCollection(), feature.geometry); |