From 2398eda6e20556e788070a587fead8ce2fdab9ba Mon Sep 17 00:00:00 2001 From: Xiaoji Chen Date: Mon, 5 Jul 2021 23:08:06 -0700 Subject: [PATCH 1/2] v8.5.0-beta.1 --- CHANGELOG.md | 15 +++++++++++++++ lerna.json | 2 +- modules/aggregation-layers/package.json | 2 +- modules/arcgis/package.json | 2 +- modules/carto/package.json | 2 +- modules/core/package.json | 2 +- modules/extensions/package.json | 2 +- modules/geo-layers/package.json | 2 +- modules/google-maps/package.json | 2 +- modules/json/package.json | 2 +- modules/jupyter-widget/package.json | 16 ++++++++-------- modules/layers/package.json | 2 +- modules/main/package.json | 24 ++++++++++++------------ modules/mapbox/package.json | 2 +- modules/mesh-layers/package.json | 2 +- modules/react/package.json | 2 +- modules/test-utils/package.json | 2 +- 17 files changed, 49 insertions(+), 34 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9a2c6d7542..5dc4b559265 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,21 @@ Ref: http://keepachangelog.com/en/0.3.0/ ### deck.gl v8.5 Prereleases +#### deck.gl [8.5.0-beta.1] - Jul 5 2021 + +- Bump dependencies (#5951) +- MVTLayer and TerrainLayer switch to use worker-only loaders (#5946) +- update bundle config (#5949) +- Bump loaders to 3.0.0-beta.6 (#5943) +- MVTLayer use all loaders (#5934) +- CARTO module: bearer token always in header (#5933) +- TileLayer: add zoomOffset prop (#5896) +- Don't Use `tileSize` for Determining `z` of Tile Indexing in InfoVis (#5895) +- CARTO module: rename code from cloud-native to carto3 (#5932) +- tile-3d: update with new loaders version (#5920) +- Fix: Initialize mapsUrl in cloud native (#5868) +- Upgrade ocular-dev-tools (#5910) + #### deck.gl [8.5.0-alpha.11] - Jun 21 2021 - Fix: CARTO module WebGL invalid value for table (#5894) diff --git a/lerna.json b/lerna.json index 2ee73e0d206..6178a34ec4d 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "2.0.0", - "version": "8.5.0-alpha.11", + "version": "8.5.0-beta.1", "npmClient": "yarn", "useWorkspaces": true, "packages": [ diff --git a/modules/aggregation-layers/package.json b/modules/aggregation-layers/package.json index a2adfde428d..dbbe56c9cfc 100644 --- a/modules/aggregation-layers/package.json +++ b/modules/aggregation-layers/package.json @@ -2,7 +2,7 @@ "name": "@deck.gl/aggregation-layers", "description": "deck.gl layers that aggregate the input data into alternative representations", "license": "MIT", - "version": "8.5.0-alpha.11", + "version": "8.5.0-beta.1", "publishConfig": { "access": "public" }, diff --git a/modules/arcgis/package.json b/modules/arcgis/package.json index 8b14d08f941..98b729d383e 100644 --- a/modules/arcgis/package.json +++ b/modules/arcgis/package.json @@ -2,7 +2,7 @@ "name": "@deck.gl/arcgis", "description": "Use deck.gl as a custom ArcGIS API for JavaScript layer", "license": "MIT", - "version": "8.5.0-alpha.11", + "version": "8.5.0-beta.1", "publishConfig": { "access": "public" }, diff --git a/modules/carto/package.json b/modules/carto/package.json index 3a8176d2b10..97109222850 100644 --- a/modules/carto/package.json +++ b/modules/carto/package.json @@ -2,7 +2,7 @@ "name": "@deck.gl/carto", "description": "CARTO official integration with Deck.gl. Build geospatial applications using CARTO and Deck.gl.", "license": "MIT", - "version": "8.5.0-alpha.11", + "version": "8.5.0-beta.1", "publishConfig": { "access": "public" }, diff --git a/modules/core/package.json b/modules/core/package.json index 69cae9c54ce..4128011c40a 100644 --- a/modules/core/package.json +++ b/modules/core/package.json @@ -2,7 +2,7 @@ "name": "@deck.gl/core", "description": "deck.gl core library", "license": "MIT", - "version": "8.5.0-alpha.11", + "version": "8.5.0-beta.1", "publishConfig": { "access": "public" }, diff --git a/modules/extensions/package.json b/modules/extensions/package.json index b73584c5bba..2d472019242 100644 --- a/modules/extensions/package.json +++ b/modules/extensions/package.json @@ -2,7 +2,7 @@ "name": "@deck.gl/extensions", "description": "Plug-and-play functionalities for deck.gl layers", "license": "MIT", - "version": "8.5.0-alpha.11", + "version": "8.5.0-beta.1", "publishConfig": { "access": "public" }, diff --git a/modules/geo-layers/package.json b/modules/geo-layers/package.json index 8a646e56df7..54c32e53b79 100644 --- a/modules/geo-layers/package.json +++ b/modules/geo-layers/package.json @@ -2,7 +2,7 @@ "name": "@deck.gl/geo-layers", "description": "deck.gl layers supporting geospatial use cases and GIS formats", "license": "MIT", - "version": "8.5.0-alpha.11", + "version": "8.5.0-beta.1", "publishConfig": { "access": "public" }, diff --git a/modules/google-maps/package.json b/modules/google-maps/package.json index 2d2cc4b9a8a..34b0d004af4 100644 --- a/modules/google-maps/package.json +++ b/modules/google-maps/package.json @@ -2,7 +2,7 @@ "name": "@deck.gl/google-maps", "description": "Use deck.gl as a custom Google Maps overlay", "license": "MIT", - "version": "8.5.0-alpha.11", + "version": "8.5.0-beta.1", "publishConfig": { "access": "public" }, diff --git a/modules/json/package.json b/modules/json/package.json index 0a18a43c281..c5219416fa0 100644 --- a/modules/json/package.json +++ b/modules/json/package.json @@ -2,7 +2,7 @@ "name": "@deck.gl/json", "description": "JSON format rendering components for deck.gl", "license": "MIT", - "version": "8.5.0-alpha.11", + "version": "8.5.0-beta.1", "publishConfig": { "access": "public" }, diff --git a/modules/jupyter-widget/package.json b/modules/jupyter-widget/package.json index a146dc332fa..587e5aecc07 100644 --- a/modules/jupyter-widget/package.json +++ b/modules/jupyter-widget/package.json @@ -2,7 +2,7 @@ "name": "@deck.gl/jupyter-widget", "description": "Jupyter widget for rendering deck.gl in a Jupyter notebook", "license": "MIT", - "version": "8.5.0-alpha.11", + "version": "8.5.0-beta.1", "keywords": [ "jupyter", "jupyterlab", @@ -29,13 +29,13 @@ "prepublishOnly": "webpack -p" }, "dependencies": { - "@deck.gl/aggregation-layers": "8.5.0-alpha.11", - "@deck.gl/carto": "8.5.0-alpha.11", - "@deck.gl/geo-layers": "8.5.0-alpha.11", - "@deck.gl/google-maps": "8.5.0-alpha.11", - "@deck.gl/json": "8.5.0-alpha.11", - "@deck.gl/layers": "8.5.0-alpha.11", - "@deck.gl/mesh-layers": "8.5.0-alpha.11", + "@deck.gl/aggregation-layers": "8.5.0-beta.1", + "@deck.gl/carto": "8.5.0-beta.1", + "@deck.gl/geo-layers": "8.5.0-beta.1", + "@deck.gl/google-maps": "8.5.0-beta.1", + "@deck.gl/json": "8.5.0-beta.1", + "@deck.gl/layers": "8.5.0-beta.1", + "@deck.gl/mesh-layers": "8.5.0-beta.1", "@jupyter-widgets/base": "^1.1.10 || ^2 || ^3", "@loaders.gl/3d-tiles": "^3.0.0-beta.8", "@loaders.gl/core": "^3.0.0-beta.8", diff --git a/modules/layers/package.json b/modules/layers/package.json index ace2d41d645..21f35159de7 100644 --- a/modules/layers/package.json +++ b/modules/layers/package.json @@ -2,7 +2,7 @@ "name": "@deck.gl/layers", "description": "deck.gl core layers", "license": "MIT", - "version": "8.5.0-alpha.11", + "version": "8.5.0-beta.1", "publishConfig": { "access": "public" }, diff --git a/modules/main/package.json b/modules/main/package.json index 4596cf6af98..b74699fb344 100644 --- a/modules/main/package.json +++ b/modules/main/package.json @@ -2,7 +2,7 @@ "name": "deck.gl", "description": "A suite of 3D-enabled data visualization overlays, suitable for react-map-gl", "license": "MIT", - "version": "8.5.0-alpha.11", + "version": "8.5.0-beta.1", "keywords": [ "webgl", "visualization", @@ -27,16 +27,16 @@ "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env.dev" }, "dependencies": { - "@deck.gl/aggregation-layers": "8.5.0-alpha.11", - "@deck.gl/carto": "8.5.0-alpha.11", - "@deck.gl/core": "8.5.0-alpha.11", - "@deck.gl/extensions": "8.5.0-alpha.11", - "@deck.gl/geo-layers": "8.5.0-alpha.11", - "@deck.gl/google-maps": "8.5.0-alpha.11", - "@deck.gl/json": "8.5.0-alpha.11", - "@deck.gl/layers": "8.5.0-alpha.11", - "@deck.gl/mapbox": "8.5.0-alpha.11", - "@deck.gl/mesh-layers": "8.5.0-alpha.11", - "@deck.gl/react": "8.5.0-alpha.11" + "@deck.gl/aggregation-layers": "8.5.0-beta.1", + "@deck.gl/carto": "8.5.0-beta.1", + "@deck.gl/core": "8.5.0-beta.1", + "@deck.gl/extensions": "8.5.0-beta.1", + "@deck.gl/geo-layers": "8.5.0-beta.1", + "@deck.gl/google-maps": "8.5.0-beta.1", + "@deck.gl/json": "8.5.0-beta.1", + "@deck.gl/layers": "8.5.0-beta.1", + "@deck.gl/mapbox": "8.5.0-beta.1", + "@deck.gl/mesh-layers": "8.5.0-beta.1", + "@deck.gl/react": "8.5.0-beta.1" } } diff --git a/modules/mapbox/package.json b/modules/mapbox/package.json index 38640d8eae6..1f3c8a61964 100644 --- a/modules/mapbox/package.json +++ b/modules/mapbox/package.json @@ -2,7 +2,7 @@ "name": "@deck.gl/mapbox", "description": "Use deck.gl layers as custom mapbox-gl-js layers", "license": "MIT", - "version": "8.5.0-alpha.11", + "version": "8.5.0-beta.1", "publishConfig": { "access": "public" }, diff --git a/modules/mesh-layers/package.json b/modules/mesh-layers/package.json index 464a5a740d0..bf8bb5edc0e 100644 --- a/modules/mesh-layers/package.json +++ b/modules/mesh-layers/package.json @@ -2,7 +2,7 @@ "name": "@deck.gl/mesh-layers", "description": "deck.gl layers that loads 3D meshes or scene graphs", "license": "MIT", - "version": "8.5.0-alpha.11", + "version": "8.5.0-beta.1", "publishConfig": { "access": "public" }, diff --git a/modules/react/package.json b/modules/react/package.json index 6932fd46a82..fd08a391b20 100644 --- a/modules/react/package.json +++ b/modules/react/package.json @@ -2,7 +2,7 @@ "name": "@deck.gl/react", "description": "React Components for deck.gl", "license": "MIT", - "version": "8.5.0-alpha.11", + "version": "8.5.0-beta.1", "publishConfig": { "access": "public" }, diff --git a/modules/test-utils/package.json b/modules/test-utils/package.json index 081144a950a..4182d8e031a 100644 --- a/modules/test-utils/package.json +++ b/modules/test-utils/package.json @@ -2,7 +2,7 @@ "name": "@deck.gl/test-utils", "description": "Test utilities for deck.gl layers", "license": "MIT", - "version": "8.5.0-alpha.11", + "version": "8.5.0-beta.1", "publishConfig": { "access": "public" }, From c13cf726d1060cec9155543337f668c2877ddcba Mon Sep 17 00:00:00 2001 From: Alberto Asuero <1161870+alasarr@users.noreply.github.com> Date: Tue, 6 Jul 2021 17:36:19 +0200 Subject: [PATCH 2/2] Update CARTO module documentation (#5957) Co-authored-by: unsaltedrhino <48286630+unsaltedrhino@users.noreply.github.com> --- .../carto/carto-bqtiler-layer.md | 4 +-- docs/api-reference/carto/carto-layer.md | 4 +-- docs/api-reference/carto/overview.md | 26 +++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/api-reference/carto/carto-bqtiler-layer.md b/docs/api-reference/carto/carto-bqtiler-layer.md index ae43603def4..a8fc2f2ac4f 100644 --- a/docs/api-reference/carto/carto-bqtiler-layer.md +++ b/docs/api-reference/carto/carto-bqtiler-layer.md @@ -1,9 +1,9 @@ # CartoBQTilerLayer ->CartoBQTilerLayer will be deprecated in future versions. Use CartoLayer instead. If you've existing code using this layer, check [the migration steps](#migration-to-cartolayer). +>CartoBQTilerLayer will be deprecated in future versions. Use CartoLayer instead. If you have existing code using this layer, check [the migration steps](#migration-to-cartolayer). `CartoBQTilerLayer` is a layer to visualize large datasets (millions or billions of rows) directly from [Google BigQuery](https://cloud.google.com/bigquery) without having to move data outside of BigQuery. -First you need first to generate a tileset of your dataset in your BigQuery account using CARTO BigQuery Tiler. For more info click [here](https://carto.com/bigquery-tiler/). +First you need to generate a tileset of your dataset in your BigQuery account using CARTO BigQuery Tiler. For more info click [here](https://carto.com/bigquery-tiler/). ```js import DeckGL from '@deck.gl/react'; diff --git a/docs/api-reference/carto/carto-layer.md b/docs/api-reference/carto/carto-layer.md index 386fc4668a6..e4feaa08bd5 100644 --- a/docs/api-reference/carto/carto-layer.md +++ b/docs/api-reference/carto/carto-layer.md @@ -55,7 +55,7 @@ function App({viewState}) { } ``` -> **CARTO 3** is currently available only in a private beta. If you want to test it, please contact us at [support@carto.com](mailto:support@carto.com?subject=Access%20to%20CARTO%203). +> **CARTO 3** is our new cloud-native platform. If you'd like to get access, click on the following link for more information: [https://carto.com/carto3](https://carto.com/carto3). ## Installation @@ -91,7 +91,7 @@ new deck.carto.CartoLayer({}); ## Properties -This layer allows to work with the different CARTO Maps API versions (v1, v2 and v3). When using version v1 and v2, the layer always works with vector tiles so it inherits all properties from [`MVTLayer`](/docs/api-reference/geo-layers/mvt-layer.md). When using v3, the layer works with vector tiles if the `type` property is `MAP_TYPES.TILESET` and with GeoJSON data if the `type` is `MAP_TYPES.QUERY` or `MAP_TYPES.TABLE`. When using GeoJSON data, the layer inherits all properties from [`GeoJsonLayer`](/docs/api-reference/layers/geojson-layer.md). +This layer allows to work with the different CARTO Maps API versions (v1, v2, and v3). When using version v1 and v2, the layer always works with vector tiles so it inherits all properties from [`MVTLayer`](/docs/api-reference/geo-layers/mvt-layer.md). When using v3, the layer works with vector tiles if the `type` property is `MAP_TYPES.TILESET` and with GeoJSON data if the `type` is `MAP_TYPES.QUERY` or `MAP_TYPES.TABLE`. When using GeoJSON data, the layer inherits all properties from [`GeoJsonLayer`](/docs/api-reference/layers/geojson-layer.md). ##### `data` (String) diff --git a/docs/api-reference/carto/overview.md b/docs/api-reference/carto/overview.md index f2a20fb7e6c..fe9d2b24a25 100644 --- a/docs/api-reference/carto/overview.md +++ b/docs/api-reference/carto/overview.md @@ -1,16 +1,16 @@ # @deck.gl/carto -The preferred and official solution for creating modern web apps using the [CARTO Location Intelligence platform](https://carto.com/) is deck.gl. +Deck.gl is the preferred and official solution for creating modern geospatial web applications using [CARTO Location Intelligence platform](https://carto.com/). -With deck.gl and the **CARTO 3 platform** you can access directly your datasets and tilesets hosted in your current data warehouse. The CARTO 3 platform provides integrations with Google BigQuery, Amazon Redshift, Snowflake and PostgreSQL-compatible databases. You don't need to move your data to CARTO plaform. +With deck.gl and the all-new **CARTO 3 platform** you can directly access spatial datasets and tilesets that are hosted in your current cloud data warehouse. CARTO 3 provides seamless integrations with Google BigQuery, Amazon Redshift, Snowflake and PostgreSQL-compatible databases, eliminating the need to move your data into CARTO. -It integrates with the CARTO Maps API to: +The platform integrates with the CARTO Maps API to: * Provide a geospatial backend storage for your geospatial data. -* Visualize large datasets which do not fit within browser memory. -* Provide an SQL spatial interface to work with your data. +* Visualize large datasets overcoming browser memory limitations. +* Provide an SQL spatial interface to work directly with your data. @@ -76,21 +76,21 @@ function App({viewState}) { } ``` -> **CARTO 3** is currently available only in a private beta. If you want to test it, please contact us at [support@carto.com](mailto:support@carto.com?subject=Access%20to%20CARTO%203). +> **CARTO 3** is our new cloud-native platform. If you'd like to get access, click on the following link for more information: [https://carto.com/carto3](https://carto.com/carto3). ### Examples -You can see real examples for the following: +You can see working examples for the following: * [Scripting](https://carto.com/developers/deck-gl/examples/): Quick scripting examples to play with the module without NPM or Webpack. If you're not a web developer, this is probably what you're looking for. -* [React](https://github.com/CartoDB/viz-doc/tree/master/deck.gl/examples/react): integrate in a React application. +* [React](https://github.com/CartoDB/viz-doc/tree/master/deck.gl/examples/react): Integrate in a React application. -* [Pure JS](https://github.com/CartoDB/viz-doc/tree/master/deck.gl/examples/pure-js): integrate in a pure js application, using webpack. +* [Pure JS](https://github.com/CartoDB/viz-doc/tree/master/deck.gl/examples/pure-js): Integrate in a pure js application, using webpack. ### CARTO credentials -This is an object to define the connection to CARTO, including the credentials (and optionally the parameters to point to specific api endpoints). The configuration properties that must be defined depend on the CARTO API version used: +This is an object to define the connection to CARTO, including the credentials (and optionally the parameters to point to specific API endpoints). The configuration properties that must be defined depend on the CARTO API version used: * `apiVersion` (optional): API version. Default: `API_VERSIONS.V2`. Possible values are: * API_VERSIONS.V1 @@ -113,7 +113,7 @@ If using API v3, these are the available properties: * `mapsUrl` (optional): Maps API URL Template. Default: * `https://{apiBaseUrl}/v3/maps` -If you have a custom CARTO deployment (on-premise user or you're running CARTO from [Google Cloud Marketplace](https://console.cloud.google.com/marketplace/product/cartodb-public/carto-enterprise-byol)), you need to set the URLs to point to your instance. +If you have a custom CARTO deployment (an on-premise user or you're running CARTO from [Google Cloud Marketplace](https://console.cloud.google.com/marketplace/product/cartodb-public/carto-enterprise-byol)), you’ll need to set the URLs to point to your instance. ```js setDefaultCredentials({ @@ -125,7 +125,7 @@ setDefaultCredentials({ ### Support for other deck.gl layers -The CARTO submodule includes the CartoLayer that simplify interaction with the CARTO platform. If you want to use other deck.gl layers (i.e. ArcLayer, H3HexagonLayer...), there are two possibilities depending on the API version you are using: +The CARTO submodule includes the CartoLayer that simplifies the interaction with the CARTO platform. If you want to use other deck.gl layers (i.e. ArcLayer, H3HexagonLayer...), there are two possibilities depending on the API version you are using: * If you are using the API v3, you can directly retrieve the data in the format expected by the layer using the `getData` function: @@ -151,7 +151,7 @@ The CARTO submodule includes the CartoLayer that simplify interaction with the C }); ``` - The formats available are JSON, GEOJSON, TILEJSON and NDJSON. [NDJSON](http://ndjson.org/) (Newline Delimited JSON) allows to handle incremental data loading https://deck.gl/docs/developer-guide/performance#handle-incremental-data-loading. + The formats available are JSON, GEOJSON, TILEJSON, and NDJSON. [NDJSON](http://ndjson.org/) (Newline Delimited JSON) allows to handle incremental data loading https://deck.gl/docs/developer-guide/performance#handle-incremental-data-loading. * If not using the CARTO 3 API version, you can use the SQL API to retrieve the data in the required format. Please check the examples [here](https://docs.carto.com/deck-gl/examples/clustering-and-aggregation/h3-hexagon-layer/)