Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
Added a Tiled 3D Building Deck.gl Layer (#270)
Cynthia(Lingyue) Zhangf7a6b159c857
diff --git a/package.json b/package.jsonindex cc370a190..517b6bee0 100644--- a/package.json+++ b/package.json@@ -56,9 +56,11 @@"styles.js"],"dependencies": {+ "@deck.gl/experimental-layers": "6.3.0","@mapbox/geo-viewport": "^0.2.2","@mapbox/geojson-extent": "^0.3.2","@mapbox/geojson-normalize": "0.0.1",+ "@mapbox/vector-tile": "^1.3.1","classnames": "^2.2.1","colorbrewer": "^1.0.0","d3-array": "^1.2.0",@@ -70,7 +72,7 @@"d3-hexbin": "^0.2.2","d3-request": "^1.0.6","d3-scale": "^1.0.6",- "deck.gl": "^6.2.3",+ "deck.gl": "6.3.0","fuzzy": "^0.1.3","global": "^4.3.0","h3-js": "^3.1.0",@@ -84,6 +86,7 @@"lodash.throttle": "^4.1.1","lodash.uniq": "^4.0.1","moment": "^2.10.6",+ "pbf": "^3.1.0","prop-types": "^15.6.0","react-anything-sortable": "^1.7.2","react-data-grid": "2.0.80-am-fix-defaultprops-warnings3337",@@ -103,6 +106,7 @@"supercluster": "^3.0.0","type-analyzer": "https://registry.npmjs.org/type-analyzer/-/type-analyzer-0.1.4.tgz","uber-licence": "^3.1.1",+ "viewport-mercator-project": "^6.0.0","wellknown": "^0.5.0"},"devDependencies": {diff --git a/src/components/map-container.js b/src/components/map-container.jsindex 8fe1ed351..6ab33e975 100644--- a/src/components/map-container.js+++ b/src/components/map-container.js@@ -40,6 +40,7 @@ import {transformRequest} from 'utils/map-style-utils/mapbox-utils';// default-settingsimport {LAYER_BLENDINGS} from 'constants/default-settings';+import ThreeDBuildingLayer from '../deckgl-layers/3d-building-layer/3d-building-layer';const MAP_STYLE = {container: {@@ -322,6 +323,7 @@ export default function MapContainerFactory(MapPopover, MapControl) {_renderOverlay() {const {mapState,+ mapStyle,layerData,layerOrder,visStateActions@@ -337,6 +339,10 @@ export default function MapContainerFactory(MapPopover, MapControl) {.reverse().reduce(this._renderLayer, []);}+ const threeDBuildingLayerId = '_keplergl_3d-building';+ if (mapStyle.visibleLayerGroups['3d building']) {+ deckGlLayers.push(new ThreeDBuildingLayer({id: threeDBuildingLayerId, threeDBuildingColor: mapStyle.threeDBuildingColor}));+ }return (<DeckGLdiff --git a/src/components/side-panel/map-manager.js b/src/components/side-panel/map-manager.jsindex c874326c9..81eb03c20 100644--- a/src/components/side-panel/map-manager.js+++ b/src/components/side-panel/map-manager.js@@ -26,6 +26,7 @@ import MapStyleSelectorFactory from 'components/side-panel/map-style-panel/map-simport LayerGroupSelectorFactory from 'components/side-panel/map-style-panel/map-layer-selector';import {Add} from 'components/common/icons';+import { DEFAULT_LAYER_GROUPS } from 'constants/default-settings';MapManagerFactory.deps = [MapStyleSelectorFactory,@@ -61,7 +62,9 @@ function MapManagerFactory(MapStyleSelector, LayerGroupSelector) {render() {const {mapStyle} = this.props;- const editableLayers = mapStyle.visibleLayerGroups;+ const editableLayers = DEFAULT_LAYER_GROUPS.map(lg =>+ lg.slug+ );return (<div className="map-style-panel">@@ -72,7 +75,7 @@ function MapManagerFactory(MapStyleSelector, LayerGroupSelector) {onChange={this._selectStyle}toggleActive={this._toggleSelecting}/>- {Object.keys(editableLayers).length ? (+ {editableLayers.length ? (<LayerGroupSelectorlayers={mapStyle.visibleLayerGroups}editableLayers={editableLayers}diff --git a/src/components/side-panel/map-style-panel/map-layer-selector.js b/src/components/side-panel/map-style-panel/map-layer-selector.jsindex 5e262e6a0..d88e8e98f 100644--- a/src/components/side-panel/map-style-panel/map-layer-selector.js+++ b/src/components/side-panel/map-style-panel/map-layer-selector.js@@ -61,7 +61,7 @@ function LayerGroupSelectorFactory() {<PanelLabel>Map Layers</PanelLabel></div><PanelContent className="map-style__layer-group">- {Object.keys(editableLayers).map(slug => (+ {editableLayers.map(slug => (<StyledLayerGroupItem className="layer-group__select" key={slug}><PanelLabelWrapper><PanelHeaderActiondiff --git a/src/constants/default-settings.js b/src/constants/default-settings.jsindex f3be728f9..a144f6806 100644--- a/src/constants/default-settings.js+++ b/src/constants/default-settings.js@@ -120,6 +120,11 @@ export const DEFAULT_LAYER_GROUPS = [slug: 'land',filter: ({id}) => id.match(/(?=(parks|landcover|industrial|sand|hillshade))/),defaultVisibility: true+ },+ {+ slug: '3d building',+ filter: () => false,+ defaultVisibility: false}];diff --git a/src/deckgl-layers/3d-building-layer/3d-building-layer.js b/src/deckgl-layers/3d-building-layer/3d-building-layer.jsnew file mode 100644index 000000000..5297f0d32--- /dev/null+++ b/src/deckgl-layers/3d-building-layer/3d-building-layer.js@@ -0,0 +1,62 @@+// Copyright (c) 2018 Uber Technologies, Inc.+//+// Permission is hereby granted, free of charge, to any person obtaining a copy+// of this software and associated documentation files (the "Software"), to deal+// in the Software without restriction, including without limitation the rights+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell+// copies of the Software, and to permit persons to whom the Software is+// furnished to do so, subject to the following conditions:+//+// The above copyright notice and this permission notice shall be included in+// all copies or substantial portions of the Software.+//+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN+// THE SOFTWARE.++import {CompositeLayer} from '@deck.gl/core';+import {TileLayer as DeckGLTileLayer} from '@deck.gl/experimental-layers';+import {getTileData} from './3d-building-utils';+import {_SolidPolygonLayer as SolidPolygonLayer} from '@deck.gl/layers';++export default class ThreeDBuildingLayer extends CompositeLayer {+ // this layer add its subLayers to the redux store, and push sample data++ renderSubLayers(props) {+ return new SolidPolygonLayer({+ ...props,+ parameter: {+ blendFunc: [+ 'SRC_ALPHA',+ 'ONE_MINUS_SRC_ALPHA',+ 'ONE',+ 'ONE_MINUS_SRC_ALPHA'+ ],+ blendEquation: ['FUNC_ADD', 'FUNC_ADD']+ },+ extruded: true,+ opacity: 1,+ filled: true,+ getElevation: (feature) => feature.properties.height || 0,+ getPolygon: (feature) => feature.coordinates,+ getFillColor: this.props.threeDBuildingColor,+ lightSetting: {+ ambientRatio: 0.2+ }+ });+ }++ renderLayers() {+ return [+ new DeckGLTileLayer({+ getTileData,+ minZoom: 13,+ renderSubLayers: this.renderSubLayers.bind(this)+ })+ ];+ }+}diff --git a/src/deckgl-layers/3d-building-layer/3d-building-utils.js b/src/deckgl-layers/3d-building-layer/3d-building-utils.jsnew file mode 100644index 000000000..0ea97ad7d--- /dev/null+++ b/src/deckgl-layers/3d-building-layer/3d-building-utils.js@@ -0,0 +1,195 @@+// Copyright (c) 2018 Uber Technologies, Inc.+//+// Permission is hereby granted, free of charge, to any person obtaining a copy+// of this software and associated documentation files (the "Software"), to deal+// in the Software without restriction, including without limitation the rights+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell+// copies of the Software, and to permit persons to whom the Software is+// furnished to do so, subject to the following conditions:+//+// The above copyright notice and this permission notice shall be included in+// all copies or substantial portions of the Software.+//+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN+// THE SOFTWARE.++import Protobuf from 'pbf';+import {VectorTile, VectorTileFeature} from '@mapbox/vector-tile';+import {worldToLngLat} from 'viewport-mercator-project';++/* global fetch process */+const TILE_SIZE = 512;+const MAPBOX_TOKEN = process.env.MapboxAccessToken;++export function getTileData({x, y, z}) {+ const mapSource = `https://a.tiles.mapbox.com/v4/mapbox.mapbox-streets-v7/${z}/${x}/${y}.vector.pbf?access_token=${MAPBOX_TOKEN}`;+ return fetch(mapSource)+ .then(response => {+ return response.arrayBuffer();+ })+ .then(buffer => {+ const data = decodeTile(x, y, z, buffer);+ return data;+ });+}++export function decodeTile(x, y, z, arrayBuffer) {+ const tile = new VectorTile(new Protobuf(arrayBuffer));++ const result = [];+ const xProj = x * TILE_SIZE;+ const yProj = y * TILE_SIZE;+ const scale = Math.pow(2, z);++ const projectFunc = project.bind(null, xProj, yProj, scale);++ /* eslint-disable guard-for-in */+ const layerName = "building";+ const vectorTileLayer = tile.layers[layerName];+ if (!vectorTileLayer) {+ return [];+ }+ for (let i = 0; i < vectorTileLayer.length; i++) {+ const vectorTileFeature = vectorTileLayer.feature(i);+ const features = vectorTileFeatureToProp(vectorTileFeature, projectFunc);+ features.forEach(f => {+ f.properties.layer = layerName;+ if (f.properties.height) {+ result.push(f);+ }+ });+ }+ return result;+}++function project(x, y, scale, line, extent) {+ const sizeToPixel = extent / TILE_SIZE;++ for (let ii = 0; ii < line.length; ii++) {+ const p = line[ii];+ // LNGLAT+ line[ii] = worldToLngLat([x + p[0] / sizeToPixel, y + p[1] / sizeToPixel], scale);+ }+}++/* adapted from @mapbox/vector-tile/lib/vectortilefeature.js for better perf */+/* eslint-disable */+export function vectorTileFeatureToProp(vectorTileFeature, project) {+ let coords = getCoordinates(vectorTileFeature);+ const type = VectorTileFeature.types[vectorTileFeature.type];+ const extent = vectorTileFeature.extent;+ let i;+ let j;++ coords = classifyRings(coords);+ for (i = 0; i < coords.length; i++) {+ for (j = 0; j < coords[i].length; j++) {+ project(coords[i][j], extent);+ }+ }++ return coords.map(coordinates => ({+ coordinates,+ properties: vectorTileFeature.properties+ }));+}++function getCoordinates(vectorTileFeature) {+ const pbf = vectorTileFeature._pbf;+ pbf.pos = vectorTileFeature._geometry;++ const end = pbf.readVarint() + pbf.pos;+ let cmd = 1;+ let length = 0;+ let x = 0;+ let y = 0;++ const lines = [];+ let line;++ while (pbf.pos < end) {+ if (length <= 0) {+ const cmdLen = pbf.readVarint();+ cmd = cmdLen & 0x7;+ length = cmdLen >> 3;+ }++ length--;++ if (cmd === 1 || cmd === 2) {+ x += pbf.readSVarint();+ y += pbf.readSVarint();++ if (cmd === 1) {+ // moveTo+ if (line) lines.push(line);+ line = [];+ }++ line.push([x, y]);+ } else if (cmd === 7) {+ // Workaround for https://github.com/mapbox/mapnik-vector-tile/issues/90+ if (line) {+ line.push(line[0].slice()); // closePolygon+ }+ } else {+ throw new Error(`unknown command ${cmd}`);+ }+ }++ if (line) lines.push(line);++ return lines;+}++// classifies an array of rings into polygons with outer rings and holes++function classifyRings(rings) {+ const len = rings.length;++ if (len <= 1) return [rings];++ const polygons = [];+ let polygon;+ let ccw;++ for (let i = 0; i < len; i++) {+ const area = signedArea(rings[i]);+ if (area === 0) {+ continue;+ }++ if (ccw === undefined) {+ ccw = area < 0;+ }++ if (ccw === area < 0) {+ if (polygon) {+ polygons.push(polygon);+ }+ polygon = [rings[i]];+ } else {+ polygon.push(rings[i]);+ }+ }+ if (polygon) {+ polygons.push(polygon);+ }++ return polygons;+}++function signedArea(ring) {+ let sum = 0;+ for (let i = 0, len = ring.length, j = len - 1, p1, p2; i < len; j = i++) {+ p1 = ring[i];+ p2 = ring[j];+ sum += (p2[0] - p1[0]) * (p1[1] + p2[1]);+ }+ return sum;+}diff --git a/src/reducers/map-style-updaters.js b/src/reducers/map-style-updaters.jsindex 32c044e88..43db48e38 100644--- a/src/reducers/map-style-updaters.js+++ b/src/reducers/map-style-updaters.js@@ -34,6 +34,10 @@ import {DEFAULT_MAP_STYLES, DEFAULT_LAYER_GROUPS} from 'constants/default-settinimport {generateHashId} from 'utils/utils';import {LOAD_MAP_STYLE_TASK} from 'tasks/tasks';import {loadMapStyles, loadMapStyleErr} from 'actions/map-style-actions';+import {rgb} from 'd3-color';+import { hexToRgb } from 'utils/color-utils';++const DEFAULT_BLDG_COLOR = '#D1CEC7';const getDefaultState = () => {const visibleLayerGroups = {};@@ -50,7 +54,8 @@ const getDefaultState = () => {}), {}),// save mapbox access tokenmapboxApiAccessToken: null,- inputStyle: getInitialInputStyle()+ inputStyle: getInitialInputStyle(),+ threeDBuildingColor: hexToRgb(DEFAULT_BLDG_COLOR)};};@@ -108,8 +113,19 @@ function getMapStyles({visibleLayerGroups: topLayers}): null;+ const threeDBuildingColor = get3DBuildingColor(mapStyle);+ return {bottomMapStyle, topMapStyle, editable, threeDBuildingColor};+}- return {bottomMapStyle, topMapStyle, editable};+function get3DBuildingColor(style) {+ // set building color to be the same as the background color.+ const backgroundLayer = (style.style.layers || []).find(({id}) => id === 'background');+ const buildingColor = backgroundLayer && backgroundLayer.paint && backgroundLayer.paint['background-color'] ?+ backgroundLayer.paint['background-color'] : DEFAULT_BLDG_COLOR;+ // brighten or darken building based on style+ const operation = style.id.match(/(?=(dark|night))/) ? 'brighter': 'darker';+ const rgbObj = rgb(buildingColor)[operation]([0.2]);+ return [rgbObj.r, rgbObj.g, rgbObj.b];}function getLayerGroupsFromStyle(style) {diff --git a/yarn.lock b/yarn.lockindex 42f4f048f..2a581489d 100644--- a/yarn.lock+++ b/yarn.lock@@ -3,14 +3,14 @@"@babel/runtime@^7.0.0":- version "7.1.5"- resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.1.5.tgz#4170907641cf1f61508f563ece3725150cc6fe39"+ version "7.1.2"+ resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.1.2.tgz#81c89935f4647706fc54541145e6b4ecfef4b8e3"dependencies:regenerator-runtime "^0.12.0"-"@deck.gl/core@^6.3.0":- version "6.3.0"- resolved "https://registry.yarnpkg.com/@deck.gl/core/-/core-6.3.0.tgz#35b3b4ead4afcfef8a67c288d9f13931741f9272"+"@deck.gl/core@^6.3.0", "@deck.gl/core@^6.3.1":+ version "6.3.1"+ resolved "https://registry.yarnpkg.com/@deck.gl/core/-/core-6.3.1.tgz#c9947524de119c9668966e0f704b410b50093f33"dependencies:luma.gl "^6.3.0"math.gl "^2.2.0"@@ -19,19 +19,26 @@seer "^0.2.4"viewport-mercator-project "^6.0.0"-"@deck.gl/layers@^6.3.0":+"@deck.gl/[email protected]":version "6.3.0"- resolved "https://registry.yarnpkg.com/@deck.gl/layers/-/layers-6.3.0.tgz#e317f24a29f68bddef7a3ab1eef5b47f3db9b3b3"+ resolved "https://registry.yarnpkg.com/@deck.gl/experimental-layers/-/experimental-layers-6.3.0.tgz#bafe9846144b7607f6982212ffafc7331570a8aa"dependencies:"@deck.gl/core" "^6.3.0"+ "@deck.gl/layers" "^6.3.0"++"@deck.gl/layers@^6.3.0":+ version "6.3.1"+ resolved "https://registry.yarnpkg.com/@deck.gl/layers/-/layers-6.3.1.tgz#aeae9fd44db20ff578af33fb8ae99be871da4d47"+ dependencies:+ "@deck.gl/core" "^6.3.1"d3-hexbin "^0.2.1"earcut "^2.0.6""@deck.gl/react@^6.3.0":- version "6.3.0"- resolved "https://registry.yarnpkg.com/@deck.gl/react/-/react-6.3.0.tgz#49b6d7edd6b60744c2d49eb786a7f6a4bb27e2f4"+ version "6.3.1"+ resolved "https://registry.yarnpkg.com/@deck.gl/react/-/react-6.3.1.tgz#265c7b68b432c5e97111e23abc2d7576ffef4552"dependencies:- "@deck.gl/core" "^6.3.0"+ "@deck.gl/core" "^6.3.1"prop-types "^15.6.0""@mapbox/[email protected]":@@ -109,8 +116,8 @@resolved "https://registry.yarnpkg.com/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz#497c67a1cef50d1a2459ba60f315e448d2ad87fe""@types/node@*":- version "10.12.7"- resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.7.tgz#195808b2d4b2e7c33e75e7d9b24aeee88f94660d"+ version "10.12.2"+ resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.2.tgz#d77f9faa027cadad9c912cd47f4f8b07b0fb0864"JSONStream@^1.0.3:version "1.3.5"@@ -119,6 +126,10 @@ JSONStream@^1.0.3:jsonparse "^1.2.0"through ">=2.2.7 <3"+abab@^1.0.4:+ version "1.0.4"+ resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"+abab@^2.0.0:version "2.0.0"resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f"@@ -171,8 +182,8 @@ acorn-node@^1.2.0, acorn-node@^1.3.0, acorn-node@^1.5.2:xtend "^4.0.1"acorn-walk@^6.0.1, acorn-walk@^6.1.0:- version "6.1.1"- resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.1.tgz#d363b66f5fac5f018ff9c3a1e7b6f8e310cc3913"+ version "6.1.0"+ resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.0.tgz#c957f4a1460da46af4a0388ce28b4c99355b0cbc"acorn@^3.0.4:version "3.3.0"@@ -182,13 +193,13 @@ acorn@^4.0.3:version "4.0.13"resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"-acorn@^5.0.0, acorn@^5.5.0, acorn@^5.5.3:+acorn@^5.0.0, acorn@^5.3.0, acorn@^5.5.0:version "5.7.3"resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"acorn@^6.0.1, acorn@^6.0.2:- version "6.0.4"- resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.4.tgz#77377e7353b72ec5104550aa2d2097a2fd40b754"+ version "6.0.2"+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.2.tgz#6a459041c320ab17592c6317abbfdf4bbaa98ca4"agent-base@^4.1.0:version "4.2.1"@@ -227,14 +238,14 @@ ajv@^4.7.0:co "^4.6.0"json-stable-stringify "^1.0.1"-ajv@^6.5.5:- version "6.5.5"- resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.5.tgz#cf97cdade71c6399a92c6d6c4177381291b781a1"+ajv@^5.3.0:+ version "5.5.2"+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"dependencies:- fast-deep-equal "^2.0.1"+ co "^4.6.0"+ fast-deep-equal "^1.0.0"fast-json-stable-stringify "^2.0.0"- json-schema-traverse "^0.4.1"- uri-js "^4.2.2"+ json-schema-traverse "^0.3.0"align-text@^0.1.1, align-text@^0.1.3:version "0.1.4"@@ -1721,7 +1732,7 @@ chokidar@^2.0.0, chokidar@^2.0.2:optionalDependencies:fsevents "^1.2.2"-chownr@^1.1.1:+chownr@^1.0.1:version "1.1.1"resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"@@ -2071,9 +2082,9 @@ [email protected], "cssom@>= 0.3.2 < 0.4.0":version "0.3.4"resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.4.tgz#8cd52e8a3acfd68d3aed38ee0a640177d2f9d797"-cssstyle@^1.0.0:- version "1.1.1"- resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.1.1.tgz#18b038a9c44d65f7a8e428a653b9f6fe42faf5fb"+"cssstyle@>= 0.2.37 < 0.3.0":+ version "0.2.37"+ resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.2.37.tgz#541097234cb2513c83ceed3acddc27ff27987d54"dependencies:cssom "0.3.x"@@ -2290,7 +2301,7 @@ decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:version "1.2.0"resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"-deck.gl@^6.2.3:version "6.3.0"resolved "https://registry.yarnpkg.com/deck.gl/-/deck.gl-6.3.0.tgz#23fdf5f3bc218ef32d67594c9e54ff38bc034a58"dependencies:@@ -2487,7 +2498,7 @@ domelementtype@~1.1.1:version "1.1.3"resolved "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"-domexception@^1.0.1:+domexception@^1.0.0:version "1.0.1"resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"dependencies:@@ -2584,15 +2595,15 @@ entities@^1.1.1, entities@~1.1.1:resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"enzyme-adapter-react-15.4@^1.0.5:- version "1.2.0"- resolved "https://registry.yarnpkg.com/enzyme-adapter-react-15.4/-/enzyme-adapter-react-15.4-1.2.0.tgz#2215276288c5d2ba56a2985c27409e27f782186b"+ version "1.1.1"+ resolved "https://registry.yarnpkg.com/enzyme-adapter-react-15.4/-/enzyme-adapter-react-15.4-1.1.1.tgz#c5e54f04e18de29b91681fcff08d8557b5eedd59"dependencies:enzyme-adapter-react-helper "^1.3.0"- enzyme-adapter-utils "^1.9.0"+ enzyme-adapter-utils "^1.8.0"object.assign "^4.1.0"object.values "^1.0.4"prop-types "^15.6.2"- react-is "^16.6.1"+ react-is "^16.5.2"enzyme-adapter-react-helper@^1.3.0:version "1.3.1"@@ -2606,14 +2617,13 @@ enzyme-adapter-react-helper@^1.3.0:rimraf "^2.6.2"semver "^5.5.1"-enzyme-adapter-utils@^1.5.0, enzyme-adapter-utils@^1.9.0:- version "1.9.0"- resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.9.0.tgz#3997c20f3387fdcd932b155b3740829ea10aa86c"+enzyme-adapter-utils@^1.5.0, enzyme-adapter-utils@^1.8.0:+ version "1.8.1"+ resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.8.1.tgz#a927d840ce2c14b42892a533aec836809d4e022b"dependencies:function.prototype.name "^1.1.0"object.assign "^4.1.0"prop-types "^15.6.2"- semver "^5.6.0"enzyme@^3.2.0, enzyme@^3.4.4:version "3.7.0"@@ -2765,7 +2775,7 @@ [email protected]:optionalDependencies:source-map "~0.2.0"-escodegen@^1.8.1, escodegen@^1.9.1:+escodegen@^1.8.1, escodegen@^1.9.0:version "1.11.0"resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.0.tgz#b27a9389481d5bfd5bec76f7bb1eb3f8f4556589"dependencies:@@ -3110,9 +3120,9 @@ falafel@^2.1.0:isarray "0.0.1"object-keys "^1.0.6"-fast-deep-equal@^2.0.1:- version "2.0.1"- resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"+fast-deep-equal@^1.0.0:+ version "1.1.0"+ resolved "http://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"fast-diff@^1.1.1:version "1.2.0"@@ -3553,8 +3563,8 @@ got@^5.0.0:url-parse-lax "^1.0.0"graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.4:- version "4.1.15"- resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"+ version "4.1.11"+ resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"grid-index@^1.0.0:version "1.0.0"@@ -3587,10 +3597,10 @@ har-schema@^2.0.0:resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"har-validator@~5.1.0:- version "5.1.3"- resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"+ version "5.1.0"+ resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"dependencies:- ajv "^6.5.5"+ ajv "^5.3.0"har-schema "^2.0.0"has-ansi@^2.0.0:@@ -4304,34 +4314,34 @@ jsbn@~0.1.0:resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"jsdom@^11.1.0:- version "11.12.0"- resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.12.0.tgz#1a80d40ddd378a1de59656e9e6dc5a3ba8657bc8"+ version "11.10.0"+ resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.10.0.tgz#a42cd54e88895dc765f03f15b807a474962ac3b5"dependencies:- abab "^2.0.0"- acorn "^5.5.3"+ abab "^1.0.4"+ acorn "^5.3.0"acorn-globals "^4.1.0"array-equal "^1.0.0"cssom ">= 0.3.2 < 0.4.0"- cssstyle "^1.0.0"+ cssstyle ">= 0.2.37 < 0.3.0"data-urls "^1.0.0"- domexception "^1.0.1"- escodegen "^1.9.1"+ domexception "^1.0.0"+ escodegen "^1.9.0"html-encoding-sniffer "^1.0.2"- left-pad "^1.3.0"- nwsapi "^2.0.7"+ left-pad "^1.2.0"+ nwmatcher "^1.4.3"parse5 "4.0.0"pn "^1.1.0"- request "^2.87.0"+ request "^2.83.0"request-promise-native "^1.0.5"sax "^1.2.4"symbol-tree "^3.2.2"- tough-cookie "^2.3.4"+ tough-cookie "^2.3.3"w3c-hr-time "^1.0.1"webidl-conversions "^4.0.2"whatwg-encoding "^1.0.3"whatwg-mimetype "^2.1.0"- whatwg-url "^6.4.1"- ws "^5.2.0"+ whatwg-url "^6.4.0"+ ws "^4.0.0"xml-name-validator "^3.0.0"jsesc@^1.3.0:@@ -4346,9 +4356,9 @@ json-loader@^0.5.4:version "0.5.7"resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d"-json-schema-traverse@^0.4.1:- version "0.4.1"- resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"+json-schema-traverse@^0.3.0:+ version "0.3.1"+ resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"version "0.2.3"@@ -4471,7 +4481,7 @@ lcid@^1.0.0:dependencies:invert-kv "^1.0.0"-left-pad@^1.3.0:+left-pad@^1.2.0:version "1.3.0"resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"@@ -4642,8 +4652,8 @@ [email protected]:es5-ext "~0.10.2"luma.gl@^6.3.0:- version "6.3.0"- resolved "https://registry.yarnpkg.com/luma.gl/-/luma.gl-6.3.0.tgz#05a253ea6912a8c075e85445275581b5369cde65"+ version "6.3.1"+ resolved "https://registry.yarnpkg.com/luma.gl/-/luma.gl-6.3.1.tgz#51a8a25f121edf636cf5a1d8db2ec2a525487596"dependencies:"@babel/runtime" "^7.0.0"math.gl "^2.2.0"@@ -4910,14 +4920,14 @@ minimist@~0.0.1:version "0.0.10"resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"-minipass@^2.2.1, minipass@^2.3.4:+minipass@^2.2.1, minipass@^2.3.3:version "2.3.5"resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"dependencies:safe-buffer "^5.1.2"yallist "^3.0.0"-minizlib@^1.1.1:+minizlib@^1.1.0:version "1.1.1"resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.1.tgz#6734acc045a46e61d596a43bb9d9cd326e19cc42"dependencies:@@ -4950,8 +4960,8 @@ [email protected], mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:minimist "0.0.8"module-deps@^6.0.0:- version "6.2.0"- resolved "https://registry.yarnpkg.com/module-deps/-/module-deps-6.2.0.tgz#d41a2e790245ce319171e4e7c4d8c73993ba3cd5"+ version "6.1.0"+ resolved "https://registry.yarnpkg.com/module-deps/-/module-deps-6.1.0.tgz#d1e1efc481c6886269f7112c52c3236188e16479"dependencies:JSONStream "^1.0.3"browser-resolve "^1.7.0"@@ -5122,7 +5132,7 @@ node-pre-gyp@^0.10.0:node-status-codes@^1.0.0:version "1.0.0"- resolved "http://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz#5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"+ resolved "https://registry.yarnpkg.com/node-status-codes/-/node-status-codes-1.0.0.tgz#5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"nomnom@~1.6.2:version "1.6.2"@@ -5218,9 +5228,9 @@ number-is-nan@^1.0.0:version "1.0.1"resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"-nwsapi@^2.0.7:- version "2.0.9"- resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.0.9.tgz#77ac0cdfdcad52b6a1151a84e73254edc33ed016"+nwmatcher@^1.4.3:+ version "1.4.4"+ resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.4.tgz#2285631f34a95f0d0395cd900c96ed39b58f346e"nyc@^11.4.1:version "11.9.0"@@ -5614,7 +5624,7 @@ path-type@^1.0.0:pify "^2.0.0"pinkie-promise "^2.0.0"-pbf@^3.0.5:+pbf@^3.0.5, pbf@^3.1.0:version "3.1.0"resolved "https://registry.yarnpkg.com/pbf/-/pbf-3.1.0.tgz#f70004badcb281761eabb1e76c92f179f08189e9"dependencies:@@ -5720,8 +5730,8 @@ preserve@^0.2.0:resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"prettier@^1.7.0:- version "1.15.2"- resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.15.2.tgz#d31abe22afa4351efa14c7f8b94b58bb7452205e"+ version "1.14.3"+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.14.3.tgz#90238dd4c0684b7edce5f83b0fb7328e48bd0895"pretty-ms@^2.1.0:version "2.1.0"@@ -5971,13 +5981,13 @@ react-dom@^15.6.1:prop-types "^15.5.10"react-dom@^16.4.2:- version "16.6.3"- resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.6.3.tgz#8fa7ba6883c85211b8da2d0efeffc9d3825cccc0"+ version "16.6.0"+ resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.6.0.tgz#6375b8391e019a632a89a0988bce85f0cc87a92f"dependencies:loose-envify "^1.1.0"object-assign "^4.1.1"prop-types "^15.6.2"- scheduler "^0.11.2"+ scheduler "^0.10.0"react-file-drop@^0.1.8:version "0.1.9"@@ -5996,9 +6006,9 @@ react-hot-loader@^3.0.0-beta.6:redbox-react "^1.3.6"source-map "^0.6.1"-react-is@^16.6.1, react-is@^16.6.3:- version "16.6.3"- resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.6.3.tgz#d2d7462fcfcbe6ec0da56ad69047e47e56e7eac0"+react-is@^16.5.2, react-is@^16.6.0:+ version "16.6.0"+ resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.6.0.tgz#456645144581a6e99f6816ae2bd24ee94bdd0c01"react-json-pretty@^1.7.9:version "1.7.9"@@ -6082,13 +6092,13 @@ react-redux@^4.0.0:prop-types "^15.5.4"react-test-renderer@^16.4.2:- version "16.6.3"- resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.6.3.tgz#5f3a1a7d5c3379d46f7052b848b4b72e47c89f38"+ version "16.6.0"+ resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.6.0.tgz#fe490096bed55c3f4e92c023da3b89f9d03fceb3"dependencies:object-assign "^4.1.1"prop-types "^15.6.2"- react-is "^16.6.3"- scheduler "^0.11.2"+ react-is "^16.6.0"+ scheduler "^0.10.0""react-tooltip@https://registry.npmjs.org/react-tooltip/-/react-tooltip-3.3.0.tgz":version "3.3.0"@@ -6164,7 +6174,7 @@ read@^1.0.4:dependencies:mute-stream "~0.0.4"-readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.3, readable-stream@~2.3.6:+readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.3:version "2.3.6"resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"dependencies:@@ -6383,7 +6393,7 @@ request-promise-native@^1.0.5:stealthy-require "^1.1.0"tough-cookie ">=2.3.3"-request@^2.83.0, request@^2.87.0:+request@^2.83.0:version "2.88.0"resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"dependencies:@@ -6558,9 +6568,9 @@ sax@^1.2.4:version "1.2.4"resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"-scheduler@^0.11.2:- version "0.11.2"- resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.11.2.tgz#a8db5399d06eba5abac51b705b7151d2319d33d3"+scheduler@^0.10.0:+ version "0.10.0"+ resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.10.0.tgz#7988de90fe7edccc774ea175a783e69c40c521e1"dependencies:loose-envify "^1.1.0"object-assign "^4.1.1"@@ -6585,7 +6595,7 @@ semver-diff@^2.0.0:dependencies:semver "^5.0.3"-"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:+"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1:version "5.6.0"resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"@@ -7145,8 +7155,8 @@ styled-components@^2.2.4:supports-color "^3.2.3"stylis@^3.4.0:- version "3.5.4"- resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.4.tgz#f665f25f5e299cf3d64654ab949a57c768b73fbe"+ version "3.5.3"+ resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.3.tgz#99fdc46afba6af4deff570825994181a5e6ce546"subarg@^1.0.0:version "1.0.0"@@ -7270,13 +7280,13 @@ [email protected]:through "~2.3.8"tar@^4:- version "4.4.8"- resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d"+ version "4.4.6"+ resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.6.tgz#63110f09c00b4e60ac8bcfe1bf3c8660235fbc9b"dependencies:- chownr "^1.1.1"+ chownr "^1.0.1"fs-minipass "^1.2.5"- minipass "^2.3.4"- minizlib "^1.1.1"+ minipass "^2.3.3"+ minizlib "^1.1.0"mkdirp "^0.5.0"safe-buffer "^5.1.2"yallist "^3.0.2"@@ -7300,10 +7310,10 @@ text-table@~0.2.0:resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"through2@^2.0.0, through2@~2.0.3:- version "2.0.5"- resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"+ version "2.0.3"+ resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"dependencies:- readable-stream "~2.3.6"+ readable-stream "^2.1.5"xtend "~4.0.1"through@2, "through@>=2.2.7 <3", through@^2.3.6, through@~2.3.4, through@~2.3.8:@@ -7391,7 +7401,7 @@ to-space-case@^1.0.0:dependencies:to-no-case "^1.0.0"-tough-cookie@>=2.3.3, tough-cookie@^2.3.4, tough-cookie@~2.4.3:+tough-cookie@>=2.3.3, tough-cookie@^2.3.3, tough-cookie@~2.4.3:version "2.4.3"resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"dependencies:@@ -7554,12 +7564,6 @@ update-notifier@^1.0.3:semver-diff "^2.0.0"xdg-basedir "^2.0.0"-uri-js@^4.2.2:- version "4.2.2"- resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"- dependencies:- punycode "^2.1.0"-urix@^0.1.0:version "0.1.0"resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"@@ -7578,8 +7582,8 @@ url-parse-lax@^1.0.0:prepend-http "^1.0.1"url-parse@^1.1.8, url-parse@^1.4.3:- version "1.4.4"- resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.4.tgz#cac1556e95faa0303691fec5cf9d5a1bc34648f8"+ version "1.4.3"+ resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.3.tgz#bfaee455c889023219d757e045fa6a684ec36c15"dependencies:querystringify "^2.0.0"requires-port "^1.0.0"@@ -7857,7 +7861,7 @@ whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0:version "2.2.0"resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.2.0.tgz#a3d58ef10b76009b042d03e25591ece89b88d171"-whatwg-url@^6.4.1:+whatwg-url@^6.4.0:version "6.5.0"resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.5.0.tgz#f2df02bff176fd65070df74ad5ccbb5a199965a8"dependencies:@@ -7946,11 +7950,12 @@ write@^0.2.1:dependencies:mkdirp "^0.5.1"-ws@^5.2.0:- version "5.2.2"- resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.2.tgz#dffef14866b8e8dc9133582514d1befaf96e980f"+ws@^4.0.0:+ version "4.1.0"+ resolved "http://registry.npmjs.org/ws/-/ws-4.1.0.tgz#a979b5d7d4da68bf54efe0408967c324869a7289"dependencies:async-limiter "~1.0.0"+ safe-buffer "~5.1.0"xdg-basedir@^2.0.0:version "2.0.0"