@carto/kepler.gl 0.0.68 → 0.0.69-alpha.hackathon-3dtiles.2

package/src/components/map-container.js

@@ -54,6 +54,43 @@ import {
 import {observeDimensions, unobserveDimensions} from '../utils/observe-dimensions';
 import {LOCALE_CODES} from 'localization/locales';
 
+// 3D tiles
+import {_TerrainExtension as TerrainExtension} from '@deck.gl/extensions';
+import {Tile3DLayer} from '@deck.gl/geo-layers';
+
+const GOOGLE_MAPS_API_KEY = 'AIzaSyCpvQymc5wjSYIsxy3RV1widM3p3h78CAk';
+
+let h = 0;
+const tiles3d = new Tile3DLayer({
+  id: 'google-3d-tiles',
+  data: 'https://tile.googleapis.com/v1/3dtiles/root.json',
+  onTilesetLoad: tileset3d => {
+    // tileset3d.options.maximumScreenSpaceError = 4;
+    tileset3d._onTileLoadError = () => {};
+    tileset3d.options.onTraversalComplete = selectedTiles => {
+      // Do not show tiles which are many layers too low in resolution (avoids artifacts)
+      let maxDepth = 0;
+      for (const {depth} of selectedTiles) {
+        if (depth > maxDepth) maxDepth = depth;
+      }
+      const filtered = selectedTiles.filter(t => t.depth > maxDepth - 4);
+
+      // Hacky way to obtain height above sea level to improve controls
+      if (filtered.length) {
+        h = filtered.map(t => t.boundingBox[0][2]).reduce((a, n) => a + n) / filtered.length;
+      }
+
+      return filtered;
+    };
+  },
+  loadOptions: {
+    fetch: {headers: {'X-GOOG-API-KEY': GOOGLE_MAPS_API_KEY}}
+  },
+  // @ts-ignore
+  operation: 'terrain+draw' // Required to enable draping of other layers
+});
+const terrainExtension = new TerrainExtension();
+
 // Performance debugging
 import {createTracker, createLayerUpdateTracker, renderPerformanceStats} from './performance';
 const trackers = {};
@@ -404,6 +441,17 @@ export default function MapContainerFactory(MapPopover, MapControl, Editor) {
         );
       }
 
+      if (
+        mapStyle.styleType === 'voyager' &&
+        Object.values(mapStyle.visibleLayerGroups).filter(x => x).length === 0
+      ) {
+        // Inject 3D tiles when map style is Voyager without layers (hack until UI is built)
+        deckGlLayers = deckGlLayers
+          .filter(l => Boolean(l && l.clone))
+          .map(l => l.clone({extensions: [...l.props.extensions, terrainExtension]}));
+        deckGlLayers.push(tiles3d.clone());
+      }
+
       // Limit renders
       const hasRendered = this._hasRendered;
       const resetHasRendered = () => (hasRendered.current = false);
@@ -427,7 +475,10 @@ export default function MapContainerFactory(MapPopover, MapControl, Editor) {
           }}
           onHover={visStateActions.onLayerHover}
           onClick={visStateActions.onLayerClick}
-          onError={this._onDeckError}
+          onError={e => {
+            debugger;
+            this._onDeckError(e);
+          }}
           ref={comp => {
             if (comp && comp.deck && comp.deck !== this._deck) {
               this._deck = comp.deck;
@@ -477,6 +528,8 @@ export default function MapContainerFactory(MapPopover, MapControl, Editor) {
       // after we have received proper dimensions from observeDimensions
       const next = {
         ...(width > 0 && height > 0 ? viewState : restViewState),
+        // Only works with Mapbox basemap (Google ignores this)
+        position: [0, 0, h],
         // enabling transition in two maps may lead to endless update loops
         transitionDuration: primary ? TRANSITION_DURATION : 0
       };

package/src/constants/tooltip.js

@@ -84,6 +84,12 @@ export const TOOLTIP_FORMATS = {
     format: '.4~r',
     type: TOOLTIP_FORMAT_TYPES.DECIMAL
   },
+  DECIMAL_ZERO: {
+    id: 'DECIMAL_ZERO',
+    label: '12,345,678',
+    format: ',.0f',
+    type: TOOLTIP_FORMAT_TYPES.DECIMAL
+  },
   DECIMAL_THREE: {
     id: 'DECIMAL_THREE',
     label: '12,345.432',

package/src/localization/index.js

@@ -20,17 +20,12 @@
 
 import en from './en';
 import {flattenMessages} from 'utils/locale-utils';
-import {LOCALE_CODES} from './locales';
 
 const enFlat = flattenMessages(en);
 
-export const messages = Object.keys(LOCALE_CODES).reduce(
-  (acc, key) => ({
-    ...acc,
-    [key]: key === 'en' ? enFlat : {...enFlat, ...flattenMessages(require(`./${key}`).default)}
-  }),
-  {}
-);
+export const messages = {
+  en: enFlat
+};
 
 export {LOCALE_CODES, LOCALES} from './locales';
 

package/src/localization/locales.js

@@ -19,14 +19,7 @@
 // THE SOFTWARE.
 
 export const LOCALES = {
-  en: 'English',
-  fi: 'Suomi',
-  pt: 'Português',
-  es: 'Español',
-  ca: 'Català',
-  ja: '日本語',
-  cn: '简体中文',
-  ru: 'Русский'
+  en: 'English'
 };
 
 /**

package/dist/components/side-panel/layer-panel/custom-marker-categories-selector.js

@@ -1,45 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
-var _reactIntl = require("react-intl");
-
-// Copyright (c) 2022 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.
-CustomMarkerCategoriesSelectorFactory.deps = [];
-
-function CustomMarkerCategoriesSelectorFactory() {
-  var CustomMarkerCategoriesSelector = function CustomMarkerCategoriesSelector() {
-    return /*#__PURE__*/_react["default"].createElement("div", null, "Component replaced by cloud native");
-  };
-
-  return (0, _reactIntl.injectIntl)(CustomMarkerCategoriesSelector);
-}
-
-var _default = CustomMarkerCategoriesSelectorFactory;
-exports["default"] = _default;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9jb21wb25lbnRzL3NpZGUtcGFuZWwvbGF5ZXItcGFuZWwvY3VzdG9tLW1hcmtlci1jYXRlZ29yaWVzLXNlbGVjdG9yLmpzIl0sIm5hbWVzIjpbIkN1c3RvbU1hcmtlckNhdGVnb3JpZXNTZWxlY3RvckZhY3RvcnkiLCJkZXBzIiwiQ3VzdG9tTWFya2VyQ2F0ZWdvcmllc1NlbGVjdG9yIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFvQkE7O0FBQ0E7O0FBckJBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBS0FBLHFDQUFxQyxDQUFDQyxJQUF0QyxHQUE2QyxFQUE3Qzs7QUFDQSxTQUFTRCxxQ0FBVCxHQUFpRDtBQUMvQyxNQUFNRSw4QkFBOEIsR0FBRyxTQUFqQ0EsOEJBQWlDLEdBQU07QUFDM0Msd0JBQU8sa0ZBQVA7QUFDRCxHQUZEOztBQUlBLFNBQU8sMkJBQVdBLDhCQUFYLENBQVA7QUFDRDs7ZUFFY0YscUMiLCJzb3VyY2VzQ29udGVudCI6WyIvLyBDb3B5cmlnaHQgKGMpIDIwMjIgVWJlciBUZWNobm9sb2dpZXMsIEluYy5cbi8vXG4vLyBQZXJtaXNzaW9uIGlzIGhlcmVieSBncmFudGVkLCBmcmVlIG9mIGNoYXJnZSwgdG8gYW55IHBlcnNvbiBvYnRhaW5pbmcgYSBjb3B5XG4vLyBvZiB0aGlzIHNvZnR3YXJlIGFuZCBhc3NvY2lhdGVkIGRvY3VtZW50YXRpb24gZmlsZXMgKHRoZSBcIlNvZnR3YXJlXCIpLCB0byBkZWFsXG4vLyBpbiB0aGUgU29mdHdhcmUgd2l0aG91dCByZXN0cmljdGlvbiwgaW5jbHVkaW5nIHdpdGhvdXQgbGltaXRhdGlvbiB0aGUgcmlnaHRzXG4vLyB0byB1c2UsIGNvcHksIG1vZGlmeSwgbWVyZ2UsIHB1Ymxpc2gsIGRpc3RyaWJ1dGUsIHN1YmxpY2Vuc2UsIGFuZC9vciBzZWxsXG4vLyBjb3BpZXMgb2YgdGhlIFNvZnR3YXJlLCBhbmQgdG8gcGVybWl0IHBlcnNvbnMgdG8gd2hvbSB0aGUgU29mdHdhcmUgaXNcbi8vIGZ1cm5pc2hlZCB0byBkbyBzbywgc3ViamVjdCB0byB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnM6XG4vL1xuLy8gVGhlIGFib3ZlIGNvcHlyaWdodCBub3RpY2UgYW5kIHRoaXMgcGVybWlzc2lvbiBub3RpY2Ugc2hhbGwgYmUgaW5jbHVkZWQgaW5cbi8vIGFsbCBjb3BpZXMgb3Igc3Vic3RhbnRpYWwgcG9ydGlvbnMgb2YgdGhlIFNvZnR3YXJlLlxuLy9cbi8vIFRIRSBTT0ZUV0FSRSBJUyBQUk9WSURFRCBcIkFTIElTXCIsIFdJVEhPVVQgV0FSUkFOVFkgT0YgQU5ZIEtJTkQsIEVYUFJFU1MgT1Jcbi8vIElNUExJRUQsIElOQ0xVRElORyBCVVQgTk9UIExJTUlURUQgVE8gVEhFIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZLFxuLy8gRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UgQU5EIE5PTklORlJJTkdFTUVOVC4gSU4gTk8gRVZFTlQgU0hBTEwgVEhFXG4vLyBBVVRIT1JTIE9SIENPUFlSSUdIVCBIT0xERVJTIEJFIExJQUJMRSBGT1IgQU5ZIENMQUlNLCBEQU1BR0VTIE9SIE9USEVSXG4vLyBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQU4gQUNUSU9OIE9GIENPTlRSQUNULCBUT1JUIE9SIE9USEVSV0lTRSwgQVJJU0lORyBGUk9NLFxuLy8gT1VUIE9GIE9SIElOIENPTk5FQ1RJT04gV0lUSCBUSEUgU09GVFdBUkUgT1IgVEhFIFVTRSBPUiBPVEhFUiBERUFMSU5HUyBJTlxuLy8gVEhFIFNPRlRXQVJFLlxuXG5pbXBvcnQgUmVhY3QgZnJvbSAncmVhY3QnO1xuaW1wb3J0IHtpbmplY3RJbnRsfSBmcm9tICdyZWFjdC1pbnRsJztcblxuQ3VzdG9tTWFya2VyQ2F0ZWdvcmllc1NlbGVjdG9yRmFjdG9yeS5kZXBzID0gW107XG5mdW5jdGlvbiBDdXN0b21NYXJrZXJDYXRlZ29yaWVzU2VsZWN0b3JGYWN0b3J5KCkge1xuICBjb25zdCBDdXN0b21NYXJrZXJDYXRlZ29yaWVzU2VsZWN0b3IgPSAoKSA9PiB7XG4gICAgcmV0dXJuIDxkaXY+Q29tcG9uZW50IHJlcGxhY2VkIGJ5IGNsb3VkIG5hdGl2ZTwvZGl2PjtcbiAgfTtcblxuICByZXR1cm4gaW5qZWN0SW50bChDdXN0b21NYXJrZXJDYXRlZ29yaWVzU2VsZWN0b3IpO1xufVxuXG5leHBvcnQgZGVmYXVsdCBDdXN0b21NYXJrZXJDYXRlZ29yaWVzU2VsZWN0b3JGYWN0b3J5O1xuIl19