Skip to content

Commit

Permalink
Merge branch 'master' into jarroyo/pydeck-carto-v9
Browse files Browse the repository at this point in the history
  • Loading branch information
donmccurdy committed Apr 26, 2024
2 parents 2475ff4 + 3773e9f commit 5a98376
Show file tree
Hide file tree
Showing 37 changed files with 2,682 additions and 2,831 deletions.
51 changes: 40 additions & 11 deletions .github/workflows/release.yml
Expand Up @@ -5,35 +5,64 @@ on:
tags:
- v*

permissions:
contents: read

jobs:
release-notes:
check_branch:
runs-on: ubuntu-latest
outputs:
should_build: ${{ steps.permitted.outputs.result }}

steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

if: github.repository_owner == 'visgl'
- name: Fetch remote branches
run: |
git fetch origin --depth=1
- name: Check if on permitted branch
id: permitted
run: |
result=
branchName=$(git branch -a --contains $GITHUB_SHA | grep 'remotes/origin/' || echo "")
if [[ $branchName == *"master" || $branchName == *"-release" ]]; then
result=true
fi
echo "result=${result}" >> "$GITHUB_OUTPUT"
release:
runs-on: ubuntu-latest
needs: check_branch
permissions:
contents: write

if: ${{ github.repository_owner == 'visgl' && needs.check_branch.outputs.should_build }}

env:
ADMIN_TOKEN: ${{ secrets.ADMIN_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_ACCESS_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}

steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Get git tags (https://github.com/actions/checkout/issues/206)
run: git fetch --tags -f

- name: Use Node.js
uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
with:
node-version: '18.x'

- name: Publish release
- name: Create GitHub release entry
run: |
body=$(node scripts/github-release.js) &&
curl \
-X POST \
-H "Accept: application/vnd.github.v3+json" \
https://api.github.com/repos/visgl/deck.gl/releases \
-d "${body}" \
-H "Authorization: token ${ADMIN_TOKEN}"
-H "Authorization: token ${GITHUB_TOKEN}"
- name: Login to NPM
run: npm config set "//registry.npmjs.org/:_authToken=${NPM_ACCESS_TOKEN}"

- name: Install dependencies
run: yarn

- name: Publish to NPM
run: npx ocular-publish from-git
4 changes: 4 additions & 0 deletions CHANGELOG.md
Expand Up @@ -21,6 +21,10 @@ Ref: http://keepachangelog.com/en/0.3.0/

### deck.gl v9.0 Prereleases

#### deck.gl [9.0.0-beta.11] - Apr 24 2024

- Publish NPM packages from CI (#8828)

#### deck.gl [9.0.0-beta.10] - Mar 20 2024

- Add Zoom and Compass widgets (#8072)
Expand Down
2 changes: 1 addition & 1 deletion bindings/pydeck/docs/tooltip.rst
Expand Up @@ -111,7 +111,7 @@ A full demo is below:
r.to_html()
.. _pickingInfo.object:
https://github.com/visgl/deck.gl/blob/master/docs/developer-guide/interactivity.md#the-picking-info-object
https://github.com/visgl/deck.gl/blob/master/docs/developer-guide/interactivity.md#the-pickinginfo-object
.. _innerHTML:
https://developer.mozilla.org/en-US/docs/Web/API/Element/innerHTML
.. _innerText:
Expand Down
6 changes: 3 additions & 3 deletions docs/api-reference/aggregation-layers/contour-layer.md
Expand Up @@ -15,7 +15,7 @@ import TabItem from '@theme/TabItem';

```js
import {Deck} from '@deck.gl/core';
import {ContourLayer} from '@deck.gl/geo-layers';
import {ContourLayer} from '@deck.gl/aggregation-layers';

const layer = new ContourLayer({
id: 'ContourLayer',
Expand Down Expand Up @@ -50,7 +50,7 @@ new Deck({

```ts
import {Deck, PickingInfo} from '@deck.gl/core';
import {ContourLayer} from '@deck.gl/geo-layers';
import {ContourLayer} from '@deck.gl/aggregation-layers';

type BikeRack = {
ADDRESS: string;
Expand Down Expand Up @@ -92,7 +92,7 @@ new Deck({
```tsx
import React from 'react';
import DeckGL from '@deck.gl/react';
import {ContourLayer} from '@deck.gl/geo-layers';
import {ContourLayer} from '@deck.gl/aggregation-layers';
import type {PickingInfo} from '@deck.gl/core';

type BikeRack = {
Expand Down
6 changes: 3 additions & 3 deletions docs/api-reference/aggregation-layers/cpu-grid-layer.md
Expand Up @@ -19,7 +19,7 @@ import TabItem from '@theme/TabItem';

```js
import {Deck} from '@deck.gl/core';
import {CPUGridLayer} from '@deck.gl/geo-layers';
import {CPUGridLayer} from '@deck.gl/aggregation-layers';

const layer = new CPUGridLayer({
id: 'CPUGridLayer',
Expand Down Expand Up @@ -51,7 +51,7 @@ new Deck({

```ts
import {Deck, PickingInfo} from '@deck.gl/core';
import {CPUGridLayer} from '@deck.gl/geo-layers';
import {CPUGridLayer} from '@deck.gl/aggregation-layers';

type BikeRack = {
ADDRESS: string;
Expand Down Expand Up @@ -90,7 +90,7 @@ new Deck({
```tsx
import React from 'react';
import DeckGL from '@deck.gl/react';
import {CPUGridLayer} from '@deck.gl/geo-layers';
import {CPUGridLayer} from '@deck.gl/aggregation-layers';
import type {PickingInfo} from '@deck.gl/core';

type BikeRack = {
Expand Down
6 changes: 3 additions & 3 deletions docs/api-reference/aggregation-layers/gpu-grid-layer.md
Expand Up @@ -20,7 +20,7 @@ import TabItem from '@theme/TabItem';

```js
import {Deck} from '@deck.gl/core';
import {GPUGridLayer} from '@deck.gl/geo-layers';
import {GPUGridLayer} from '@deck.gl/aggregation-layers';

const layer = new GPUGridLayer({
id: 'GPUGridLayer',
Expand Down Expand Up @@ -52,7 +52,7 @@ new Deck({

```ts
import {Deck, PickingInfo} from '@deck.gl/core';
import {GPUGridLayer} from '@deck.gl/geo-layers';
import {GPUGridLayer} from '@deck.gl/aggregation-layers';

type BikeRack = {
ADDRESS: string;
Expand Down Expand Up @@ -91,7 +91,7 @@ new Deck({
```tsx
import React from 'react';
import DeckGL from '@deck.gl/react';
import {GPUGridLayer} from '@deck.gl/geo-layers';
import {GPUGridLayer} from '@deck.gl/aggregation-layers';
import type {PickingInfo} from '@deck.gl/core';

type BikeRack = {
Expand Down
6 changes: 3 additions & 3 deletions docs/api-reference/aggregation-layers/grid-layer.md
Expand Up @@ -19,7 +19,7 @@ import TabItem from '@theme/TabItem';

```js
import {Deck} from '@deck.gl/core';
import {GridLayer} from '@deck.gl/geo-layers';
import {GridLayer} from '@deck.gl/aggregation-layers';

const layer = new GridLayer({
id: 'GridLayer',
Expand Down Expand Up @@ -51,7 +51,7 @@ new Deck({

```ts
import {Deck, PickingInfo} from '@deck.gl/core';
import {GridLayer} from '@deck.gl/geo-layers';
import {GridLayer} from '@deck.gl/aggregation-layers';

type BikeRack = {
ADDRESS: string;
Expand Down Expand Up @@ -90,7 +90,7 @@ new Deck({
```tsx
import React from 'react';
import DeckGL from '@deck.gl/react';
import {GridLayer} from '@deck.gl/geo-layers';
import {GridLayer} from '@deck.gl/aggregation-layers';
import type {PickingInfo} from '@deck.gl/core';

type BikeRack = {
Expand Down
4 changes: 2 additions & 2 deletions docs/api-reference/aggregation-layers/heatmap-layer.md
Expand Up @@ -43,7 +43,7 @@ new Deck({

```ts
import {Deck} from '@deck.gl/core';
import {HeatmapLayer} from '@deck.gl/geo-layers';
import {HeatmapLayer} from '@deck.gl/aggregation-layers';

type BikeRack = {
ADDRESS: string;
Expand Down Expand Up @@ -78,7 +78,7 @@ new Deck({
```tsx
import React from 'react';
import DeckGL from '@deck.gl/react';
import {HeatmapLayer} from '@deck.gl/geo-layers';
import {HeatmapLayer} from '@deck.gl/aggregation-layers';

type BikeRack = {
ADDRESS: string;
Expand Down
6 changes: 3 additions & 3 deletions docs/api-reference/aggregation-layers/hexagon-layer.md
Expand Up @@ -17,7 +17,7 @@ import TabItem from '@theme/TabItem';

```js
import {Deck} from '@deck.gl/core';
import {HexagonLayer} from '@deck.gl/geo-layers';
import {HexagonLayer} from '@deck.gl/aggregation-layers';

const layer = new HexagonLayer({
id: 'HexagonLayer',
Expand Down Expand Up @@ -49,7 +49,7 @@ new Deck({

```ts
import {Deck, PickingInfo} from '@deck.gl/core';
import {HexagonLayer} from '@deck.gl/geo-layers';
import {HexagonLayer} from '@deck.gl/aggregation-layers';

type BikeRack = {
ADDRESS: string;
Expand Down Expand Up @@ -88,7 +88,7 @@ new Deck({
```tsx
import React from 'react';
import DeckGL from '@deck.gl/react';
import {HexagonLayer} from '@deck.gl/geo-layers';
import {HexagonLayer} from '@deck.gl/aggregation-layers';
import type {PickingInfo} from '@deck.gl/core';

type BikeRack = {
Expand Down
18 changes: 9 additions & 9 deletions docs/api-reference/core/deck.md
Expand Up @@ -360,7 +360,7 @@ Callback that takes a hovered-over point and renders a tooltip. If the prop is n
Receives arguments:
* `info` - the [picking info](../../developer-guide/interactivity.md#the-picking-info-object) describing the object being hovered.
* `info` - the [picking info](../../developer-guide/interactivity.md#the-pickinginfo-object) describing the object being hovered.
Returns one of the following:
Expand Down Expand Up @@ -484,7 +484,7 @@ Called when the pointer moves over the canvas.
Receives arguments:
* `info` - the [picking info](../../developer-guide/interactivity.md#the-picking-info-object) describing the object being hovered.
* `info` - the [picking info](../../developer-guide/interactivity.md#the-pickinginfo-object) describing the object being hovered.
* `event` - the original gesture event
#### `onClick` (Function) {#onclick}
Expand All @@ -493,7 +493,7 @@ Called when clicking on the canvas.
Receives arguments:
* `info` - the [picking info](../../developer-guide/interactivity.md#the-picking-info-object) describing the object being clicked.
* `info` - the [picking info](../../developer-guide/interactivity.md#the-pickinginfo-object) describing the object being clicked.
* `event` - the original gesture event
#### `onDragStart` (Function) {#ondragstart}
Expand All @@ -502,7 +502,7 @@ Called when the user starts dragging on the canvas.
Receives arguments:
* `info` - the [picking info](../../developer-guide/interactivity.md#the-picking-info-object) describing the object being dragged.
* `info` - the [picking info](../../developer-guide/interactivity.md#the-pickinginfo-object) describing the object being dragged.
* `event` - the original gesture event
#### `onDrag` (Function) {#ondrag}
Expand All @@ -511,7 +511,7 @@ Called when dragging the canvas.
Receives arguments:
* `info` - the [picking info](../../developer-guide/interactivity.md#the-picking-info-object) describing the object being dragged.
* `info` - the [picking info](../../developer-guide/interactivity.md#the-pickinginfo-object) describing the object being dragged.
* `event` - the original gesture event
#### `onDragEnd` (Function) {#ondragend}
Expand All @@ -520,7 +520,7 @@ Called when the user releases from dragging the canvas.
Receives arguments:
* `info` - the [picking info](../../developer-guide/interactivity.md#the-picking-info-object) describing the object being dragged.
* `info` - the [picking info](../../developer-guide/interactivity.md#the-pickinginfo-object) describing the object being dragged.
* `event` - the original gesture event
Expand Down Expand Up @@ -646,7 +646,7 @@ Parameters:
Returns:
* a single [`info`](../../developer-guide/interactivity.md#the-picking-info-object) object, or `null` if nothing is found.
* a single [`info`](../../developer-guide/interactivity.md#the-pickinginfo-object) object, or `null` if nothing is found.
#### `pickMultipleObjects` {#pickmultipleobjects}
Expand All @@ -668,7 +668,7 @@ Parameters:
Returns:
* An array of [`info`](../../developer-guide/interactivity.md#the-picking-info-object) objects. The array will be empty if no object was picked.
* An array of [`info`](../../developer-guide/interactivity.md#the-pickinginfo-object) objects. The array will be empty if no object was picked.
Notes:
Expand All @@ -694,7 +694,7 @@ Parameters:
Returns:
* an array of unique [`info`](../../developer-guide/interactivity.md#the-picking-info-object) objects
* an array of unique [`info`](../../developer-guide/interactivity.md#the-pickinginfo-object) objects
Notes:
Expand Down
12 changes: 6 additions & 6 deletions docs/api-reference/core/layer.md
Expand Up @@ -152,7 +152,7 @@ Whether the layer responds to mouse pointer picking events.

This callback will be called when the mouse enters/leaves an object of this deck.gl layer with the following parameters:

* [`info`](../../developer-guide/interactivity.md#the-picking-info-object)
* [`info`](../../developer-guide/interactivity.md#the-pickinginfo-object)
* `event` - the source event

If this callback returns a truthy value, the `hover` event is marked as handled and will not bubble up to the [`onHover`](../react/deckgl.md#onhover) callback of the `DeckGL` canvas.
Expand All @@ -163,7 +163,7 @@ Requires `pickable` to be true.

This callback will be called when the mouse clicks over an object of this deck.gl layer with the following parameters:

* [`info`](../../developer-guide/interactivity.md#the-picking-info-object)
* [`info`](../../developer-guide/interactivity.md#the-pickinginfo-object)
* `event` - the source event

If this callback returns a truthy value, the `click` event is marked as handled and will not bubble up to the [`onClick`](../react/deckgl.md#onclick) callback of the `DeckGL` canvas.
Expand All @@ -174,7 +174,7 @@ Requires `pickable` to be true.

This callback will be called when the mouse starts dragging an object of this deck.gl layer with the following parameters:

* [`info`](../../developer-guide/interactivity.md#the-picking-info-object)
* [`info`](../../developer-guide/interactivity.md#the-pickinginfo-object)
* `event` - the source event

If this callback returns a truthy value, the `dragstart` event is marked as handled and will not bubble up to the [`onDragStart`](../react/deckgl.md#ondragstart) callback of the `DeckGL` canvas.
Expand All @@ -185,7 +185,7 @@ Requires `pickable` to be true.

This callback will be called when the mouse drags an object of this deck.gl layer with the following parameters:

* [`info`](../../developer-guide/interactivity.md#the-picking-info-object)
* [`info`](../../developer-guide/interactivity.md#the-pickinginfo-object)
* `event` - the source event

If this callback returns a truthy value, the `drag` event is marked as handled and will not bubble up to the [`onDrag`](../react/deckgl.md#ondrag) callback of the `DeckGL` canvas.
Expand All @@ -196,7 +196,7 @@ Requires `pickable` to be true.

This callback will be called when the mouse releases an object of this deck.gl layer with the following parameters:

* [`info`](../../developer-guide/interactivity.md#the-picking-info-object)
* [`info`](../../developer-guide/interactivity.md#the-pickinginfo-object)
* `event` - the source event

If this callback returns a truthy value, the `dragend` event is marked as handled and will not bubble up to the [`onDragEnd`](../react/deckgl.md#ondragend) callback of the `DeckGL` canvas.
Expand All @@ -210,7 +210,7 @@ Requires `pickable` to be true.
RGBA color to blend with the highlighted object (either the hovered over object if `autoHighlight: true`, or the object at the index specified by `highlightedObjectIndex`). When the value is a 3 component (RGB) array, a default alpha of 255 is applied.

- If an array is supplied, it is used for the object that is currently highlighted.
- If a function is supplied, it is called with a [pickingInfo](../../developer-guide/interactivity.md#the-picking-info-object) object when the hovered object changes. The return value is used as the highlight color for the picked object. Only works with `autoHighlight: true`.
- If a function is supplied, it is called with a [pickingInfo](../../developer-guide/interactivity.md#the-pickinginfo-object) object when the hovered object changes. The return value is used as the highlight color for the picked object. Only works with `autoHighlight: true`.

#### `highlightedObjectIndex` (number | null, optional) {#highlightedobjectindex}

Expand Down

0 comments on commit 5a98376

Please sign in to comment.