Skip to content

Commit

Permalink
Merge 03d7bee into c424f2b
Browse files Browse the repository at this point in the history
  • Loading branch information
@Pessimistress
Pessimistress committed Mar 14, 2020
2 parents c424f2b + 03d7bee commit ba28f45
Show file tree
Hide file tree
Showing 21 changed files with 167 additions and 157 deletions.
4 changes: 2 additions & 2 deletions examples/layer-browser/package.json
View file
Expand Up @@ -9,8 +9,8 @@
"start-local-production": "webpack-dev-server --env.local --env.production --progress --hot --open"
},
"dependencies": {
"@loaders.gl/ply": "^2.1.0-beta.1",
"@loaders.gl/gltf": "^2.1.0-beta.1",
"@loaders.gl/ply": "^2.1.0-beta.2",
"@loaders.gl/gltf": "^2.1.0-beta.2",
"@luma.gl/experimental": "^8.1.0-beta.4",
"@luma.gl/debug": "^8.1.0-beta.4",
"colorbrewer": "^1.0.0",
Expand Down
8 changes: 4 additions & 4 deletions examples/playground/package.json
View file
Expand Up @@ -9,11 +9,11 @@
},
"dependencies": {
"deck.gl": "^8.0.0",
"@loaders.gl/csv": "^2.1.0-beta.1",
"@loaders.gl/core": "^2.1.0-beta.1",
"@loaders.gl/csv": "^2.1.0-beta.2",
"@loaders.gl/core": "^2.1.0-beta.2",
"@loaders.gl/draco": "^2.1.0-beta.1",
"@loaders.gl/3d-tiles": "^2.1.0-beta.1",
"@loaders.gl/gltf": "^2.1.0-beta.1",
"@loaders.gl/3d-tiles": "^2.1.0-beta.2",
"@loaders.gl/gltf": "^2.1.0-beta.2",
"@luma.gl/constants": "^8.1.0-beta.4",
"brace": "^0.11.1",
"react": "~16.9.0",
Expand Down
6 changes: 3 additions & 3 deletions examples/website/3d-tiles/package.json
View file
Expand Up @@ -5,10 +5,10 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open"
},
"dependencies": {
"deck.gl": "^8.0.0",
"@loaders.gl/core": "^2.1.0-beta.1",
"deck.gl": "^8.1.0-beta",
"@loaders.gl/core": "^2.1.0-beta.2",
"@loaders.gl/draco": "^2.1.0-beta.1",
"@loaders.gl/3d-tiles": "^2.1.0-beta.1",
"@loaders.gl/3d-tiles": "^2.1.0-beta.2",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"react-map-gl": "^5.0.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/website/mesh/package.json
View file
Expand Up @@ -7,7 +7,7 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open"
},
"dependencies": {
"@loaders.gl/obj": "^2.1.0-beta.1",
"@loaders.gl/obj": "^2.1.0-beta.2",
"deck.gl": "^8.0.0",
"react": "^16.3.0",
"react-dom": "^16.3.0",
Expand Down
4 changes: 2 additions & 2 deletions examples/website/point-cloud/package.json
View file
Expand Up @@ -7,8 +7,8 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open"
},
"dependencies": {
"@loaders.gl/las": "^2.1.0-beta.1",
"@loaders.gl/ply": "^2.1.0-beta.1",
"@loaders.gl/las": "^2.1.0-beta.2",
"@loaders.gl/ply": "^2.1.0-beta.2",
"deck.gl": "^8.0.0",
"react": "^16.3.0",
"react-dom": "^16.3.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/website/scenegraph-layer/package.json
View file
Expand Up @@ -8,7 +8,7 @@
},
"dependencies": {
"deck.gl": "^8.0.0",
"@loaders.gl/gltf": "^2.1.0-beta.1",
"@loaders.gl/gltf": "^2.1.0-beta.2",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react-map-gl": "^5.0.0"
Expand Down
4 changes: 2 additions & 2 deletions modules/core/bundle/index.js
View file
Expand Up @@ -3,7 +3,7 @@ const LumaGL = require('./lumagl');
const deckGLCore = require('../src');

const DeckGL = require('./deckgl').default;
const {registerLoaders, load, parse} = require('@loaders.gl/core');
const {registerLoaders, load, parse, fetchFile} = require('@loaders.gl/core');

/* global window, global */
const _global = typeof window === 'undefined' ? global : window;
Expand All @@ -13,6 +13,6 @@ _global.loaders = _global.loaders || {};

Object.assign(_global.deck, deckGLCore, {DeckGL});
Object.assign(_global.luma, LumaGL);
Object.assign(_global.loaders, {registerLoaders, load, parse});
Object.assign(_global.loaders, {registerLoaders, load, parse, fetchFile});

module.exports = _global.deck;
4 changes: 2 additions & 2 deletions modules/core/package.json
View file
Expand Up @@ -32,8 +32,8 @@
"prepublishOnly": "npm run build-debugger && npm run build-bundle && npm run build-bundle -- --env.dev"
},
"dependencies": {
"@loaders.gl/core": "^2.1.0-beta.1",
"@loaders.gl/images": "^2.1.0-beta.1",
"@loaders.gl/core": "^2.1.0-beta.2",
"@loaders.gl/images": "^2.1.0-beta.2",
"@luma.gl/core": "^8.1.0-beta.4",
"@math.gl/web-mercator": "^3.1.3",
"gl-matrix": "^3.0.0",
Expand Down
12 changes: 6 additions & 6 deletions modules/geo-layers/package.json
View file
Expand Up @@ -30,11 +30,11 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env.dev"
},
"dependencies": {
"@loaders.gl/3d-tiles": "^2.1.0-beta.1",
"@loaders.gl/core": "^2.1.0-beta.1",
"@loaders.gl/mvt": "^2.1.0-beta.1",
"@loaders.gl/terrain": "^2.1.0-beta.1",
"@loaders.gl/tiles": "^2.1.0-beta.1",
"@loaders.gl/3d-tiles": "^2.1.0-beta.2",
"@loaders.gl/core": "^2.1.0-beta.2",
"@loaders.gl/mvt": "^2.1.0-beta.2",
"@loaders.gl/terrain": "^2.1.0-beta.2",
"@loaders.gl/tiles": "^2.1.0-beta.2",
"@math.gl/core": "^3.1.3",
"@math.gl/web-mercator": "^3.1.3",
"h3-js": "^3.6.0",
Expand All @@ -45,6 +45,6 @@
"@deck.gl/core": "^8.0.0",
"@deck.gl/layers": "^8.0.0",
"@deck.gl/mesh-layers": "^8.0.0",
"@loaders.gl/core": "^2.1.0-beta.1"
"@loaders.gl/core": "^2.1.0-beta.2"
}
}
6 changes: 3 additions & 3 deletions modules/jupyter-widget/package.json
View file
Expand Up @@ -35,9 +35,9 @@
"@deck.gl/layers": "8.1.0-beta.3",
"@deck.gl/mesh-layers": "8.1.0-beta.3",
"@jupyter-widgets/base": "^2",
"@loaders.gl/3d-tiles": "^2.1.0-beta.1",
"@loaders.gl/core": "^2.1.0-beta.1",
"@loaders.gl/csv": "^2.1.0-beta.1",
"@loaders.gl/3d-tiles": "^2.1.0-beta.2",
"@loaders.gl/core": "^2.1.0-beta.2",
"@loaders.gl/csv": "^2.1.0-beta.2",
"@luma.gl/constants": "^8.1.0-beta.4",
"mapbox-gl": "^1.2.1"
},
Expand Down
4 changes: 2 additions & 2 deletions modules/layers/package.json
View file
Expand Up @@ -29,8 +29,8 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env.dev"
},
"dependencies": {
"@loaders.gl/core": "^2.1.0-beta.1",
"@loaders.gl/images": "^2.1.0-beta.1",
"@loaders.gl/core": "^2.1.0-beta.2",
"@loaders.gl/images": "^2.1.0-beta.2",
"@mapbox/tiny-sdf": "^1.1.0",
"earcut": "^2.0.6"
},
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Expand Up @@ -41,8 +41,8 @@
"jsdom": false
},
"devDependencies": {
"@loaders.gl/csv": "^2.1.0-beta.1",
"@loaders.gl/polyfills": "^2.1.0-beta.1",
"@loaders.gl/csv": "^2.1.0-beta.2",
"@loaders.gl/polyfills": "^2.1.0-beta.2",
"@luma.gl/engine": "^8.1.0-beta.4",
"@luma.gl/test-utils": "^8.1.0-beta.4",
"@probe.gl/bench": "^3.2.1",
Expand Down
2 changes: 1 addition & 1 deletion website-gatsby/package.json
View file
Expand Up @@ -16,7 +16,7 @@
},
"dependencies": {
"@loaders.gl/draco": "^2.1.0-beta.1",
"@loaders.gl/las": "^2.1.0-beta.1",
"@loaders.gl/las": "^2.1.0-beta.2",
"@luma.gl/constants": "^8.1.0-beta.4",
"@luma.gl/core": "^8.1.0-beta.4",
"@luma.gl/webgl": "^8.1.0-beta.4",
Expand Down
100 changes: 50 additions & 50 deletions website/contents/pages.js
View file
Expand Up @@ -451,83 +451,79 @@ export const docPages = generatePath([
content: getDocUrl('layers/contour-layer.md')
},
{
name: 'GeoJsonLayer',
content: getDocUrl('layers/geojson-layer.md')
},
{
name: 'HeatmapLayer',
content: getDocUrl('layers/heatmap-layer.md')
},
{
name: 'IconLayer',
content: getDocUrl('layers/icon-layer.md')
name: 'CPUGridLayer',
tag: 'advanced',
content: getDocUrl('layers/cpu-grid-layer.md')
},
{
name: 'LineLayer',
content: getDocUrl('layers/line-layer.md')
name: 'GeoJsonLayer',
content: getDocUrl('layers/geojson-layer.md')
},
{
name: 'PathLayer',
content: getDocUrl('layers/path-layer.md')
name: 'GPUGridLayer',
tag: 'advanced',
content: getDocUrl('layers/gpu-grid-layer.md')
},
{
name: 'PointCloudLayer',
content: getDocUrl('layers/point-cloud-layer.md')
name: 'GreatCircleLayer',
content: getDocUrl('layers/great-circle-layer.md')
},
{
name: 'PolygonLayer',
content: getDocUrl('layers/polygon-layer.md')
name: 'GridLayer',
content: getDocUrl('layers/grid-layer.md')
},
{
name: 'SolidPolygonLayer',
content: getDocUrl('layers/solid-polygon-layer.md')
name: 'GridCellLayer',
content: getDocUrl('layers/grid-cell-layer.md')
},
{
name: 'ScatterplotLayer',
content: getDocUrl('layers/scatterplot-layer.md')
name: 'H3ClusterLayer',
content: getDocUrl('layers/h3-cluster-layer.md')
},
{
name: 'TextLayer',
content: getDocUrl('layers/text-layer.md')
name: 'H3HexagonLayer',
content: getDocUrl('layers/h3-hexagon-layer.md')
},
{
name: 'GPUGridLayer',
tag: 'advanced',
content: getDocUrl('layers/gpu-grid-layer.md')
name: 'HeatmapLayer',
content: getDocUrl('layers/heatmap-layer.md')
},
{
name: 'GreatCircleLayer',
content: getDocUrl('layers/great-circle-layer.md')
name: 'HexagonLayer',
content: getDocUrl('layers/hexagon-layer.md')
},
{
name: 'CPUGridLayer',
tag: 'advanced',
content: getDocUrl('layers/cpu-grid-layer.md')
name: 'IconLayer',
content: getDocUrl('layers/icon-layer.md')
},
{
name: 'GridCellLayer',
content: getDocUrl('layers/grid-cell-layer.md')
name: 'LineLayer',
content: getDocUrl('layers/line-layer.md')
},
{
name: 'HexagonLayer',
content: getDocUrl('layers/hexagon-layer.md')
name: 'MVTLayer',
content: getDocUrl('layers/mvt-layer.md')
},
{
name: 'H3ClusterLayer',
content: getDocUrl('layers/h3-cluster-layer.md')
name: 'PathLayer',
content: getDocUrl('layers/path-layer.md')
},
{
name: 'H3HexagonLayer',
content: getDocUrl('layers/h3-hexagon-layer.md')
name: 'PointCloudLayer',
content: getDocUrl('layers/point-cloud-layer.md')
},
{
name: 'GridLayer',
content: getDocUrl('layers/grid-layer.md')
name: 'PolygonLayer',
content: getDocUrl('layers/polygon-layer.md')
},
{
name: 'S2Layer',
content: getDocUrl('layers/s2-layer.md')
},
{
name: 'ScatterplotLayer',
content: getDocUrl('layers/scatterplot-layer.md')
},
{
name: 'ScenegraphLayer',
content: getDocUrl('layers/scenegraph-layer.md')
Expand All @@ -540,6 +536,18 @@ export const docPages = generatePath([
name: 'SimpleMeshLayer',
content: getDocUrl('layers/simple-mesh-layer.md')
},
{
name: 'SolidPolygonLayer',
content: getDocUrl('layers/solid-polygon-layer.md')
},
{
name: 'TerrainLayer',
content: getDocUrl('layers/terrain-layer.md')
},
{
name: 'TextLayer',
content: getDocUrl('layers/text-layer.md')
},
{
name: 'TileLayer',
content: getDocUrl('layers/tile-layer.md')
Expand All @@ -551,14 +559,6 @@ export const docPages = generatePath([
{
name: 'TripsLayer',
content: getDocUrl('layers/trips-layer.md')
},
{
name: 'TerrainLayer',
content: getDocUrl('layers/terrain-layer.md')
},
{
name: 'MVTLayer',
content: getDocUrl('layers/mvt-layer.md')
}
]
},
Expand Down
6 changes: 3 additions & 3 deletions website/package.json
View file
Expand Up @@ -14,10 +14,10 @@
"lint": "eslint src --ignore-pattern workers"
},
"dependencies": {
"@loaders.gl/csv": "^2.1.0-beta.1",
"@loaders.gl/core": "^2.1.0-beta.1",
"@loaders.gl/csv": "^2.1.0-beta.2",
"@loaders.gl/core": "^2.1.0-beta.2",
"@loaders.gl/draco": "^2.1.0-beta.1",
"@loaders.gl/las": "^2.1.0-beta.1",
"@loaders.gl/las": "^2.1.0-beta.2",
"@mapbox/vector-tile": "^1.3.1",
"@tweenjs/tween.js": "^16.7.0",
"autobind-decorator": "^1.3.3",
Expand Down
2 changes: 1 addition & 1 deletion website/src/actions/app-actions.js
View file
Expand Up @@ -59,7 +59,7 @@ const loadDataSuccess = (context, index, data, meta) => {
*/
export const loadData = (owner, source) => {
return (dispatch, getState) => {
if (getState().vis.owner === owner) {
if (getState().vis.owner === owner || !source) {
// already loading / loaded
return;
}
Expand Down
6 changes: 1 addition & 5 deletions website/src/components/demos/map-tile-demo.js
View file
Expand Up @@ -2,17 +2,13 @@ import React, {Component} from 'react';
import {MAPBOX_STYLES} from '../../constants/defaults';
import App from 'website-examples/map-tile/app';

export default class LineDemo extends Component {
export default class MapTileDemo extends Component {
static get parameters() {
return {
autoHighlight: {displayName: 'Highlight on hover', type: 'checkbox', value: true}
};
}

static get allowMissingData() {
return true;
}

static get mapStyle() {
return MAPBOX_STYLES.BLANK;
}
Expand Down
4 changes: 0 additions & 4 deletions website/src/components/demos/terrain-demo.js
View file
Expand Up @@ -59,10 +59,6 @@ export default class TerrainDemo extends Component {
};
}

static get allowMissingData() {
return true;
}

static get mapStyle() {
return MAPBOX_STYLES.BLANK;
}
Expand Down
1 change: 0 additions & 1 deletion website/src/static/index-prod.html
View file
Expand Up @@ -15,7 +15,6 @@
<script src='https://api.tiles.mapbox.com/mapbox-gl-js/v1.3.1/mapbox-gl.js'></script>

<script src="https://unpkg.com/h3-js"></script>
<script src="https://bundle.run/s2-geometry@1.2.10"></script>
<script src="https://unpkg.com/deck.gl@^8.0.0/dist.min.js"></script>

<!-— facebook open graph tags -->
Expand Down
1 change: 0 additions & 1 deletion website/src/static/index-staging.html
View file
Expand Up @@ -15,7 +15,6 @@
<script src='https://api.tiles.mapbox.com/mapbox-gl-js/v1.3.1/mapbox-gl.js'></script>

<script src="https://unpkg.com/h3-js"></script>
<script src="https://bundle.run/s2-geometry@1.2.10"></script>
<script src="./dist.min.js"></script>
<script src="./debug.min.js"></script>

Expand Down

0 comments on commit ba28f45

Please sign in to comment.