[core] Update gl-js; fix $id filters with GeoJSON source

Author: jfirebaugh

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)

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"

mapbox-gl-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');

platform/android/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

platform/darwin/scripts/generate-style-code.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');

scripts/generate-shaders.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');

scripts/generate-style-code.js

@@ -25,6 +25,10 @@ class GeoJSONTileFeature : public GeometryTileFeature {
         return feature.properties;
     }
 
+    optional<FeatureIdentifier> getID() const override {
+        return feature.id;
+    }
+
     GeometryCollection getGeometries() const override {
         GeometryCollection geometry = apply_visitor(ToGeometryCollection(), feature.geometry);