Skip to content

Commit 4065dbe

Browse files
ilyaboilyabo
authored
v8.0.2 (#40)
* Fix: getLocationIdsInViewport didn't use location id accessor * v8.0.2 * Changelog * Build before publish
1 parent ed3fbf5 commit 4065dbe

File tree

12 files changed

+40
-35
lines changed

12 files changed

+40
-35
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Change log
22

3+
## [8.0.2] - 2024-03-06
4+
5+
- Fix: getLocationIdsInViewport didn't use location id accessor
6+
37
## [8.0.1] - 2023-10-09
48

59
- Publishing first release

‎examples/common/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"name": "@flowmap.gl/examples-common",
3-
"version": "8.0.1",
3+
"version": "8.0.2",
44
"private": true,
55
"main": "src/index.js",
66
"types": "src/index.d.ts",
77
"module": "src/index.js",
88
"license": "MIT",
99
"dependencies": {
10-
"@flowmap.gl/data": "^8.0.1",
11-
"@flowmap.gl/layers": "^8.0.1",
10+
"@flowmap.gl/data": "^8.0.2",
11+
"@flowmap.gl/layers": "^8.0.2",
1212
"d3-fetch": "^3.0.1",
1313
"h3-js": "^4.1.0",
1414
"lil-gui": "^0.18.2"

‎examples/react-app/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@flowmap.gl/react-app",
33
"private": true,
4-
"version": "8.0.1",
4+
"version": "8.0.2",
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
@@ -12,8 +12,8 @@
1212
},
1313
"dependencies": {
1414
"@deck.gl/react": "^8.9.28",
15-
"@flowmap.gl/data": "^8.0.1",
16-
"@flowmap.gl/layers": "^8.0.1",
15+
"@flowmap.gl/data": "^8.0.2",
16+
"@flowmap.gl/layers": "^8.0.2",
1717
"react": "^18.2.0",
1818
"react-dom": "^18.2.0",
1919
"react-map-gl": "^7.1.6"

‎examples/react-worker-app/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@flowmap.gl/react-worker-app",
33
"private": true,
4-
"version": "8.0.1",
4+
"version": "8.0.2",
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
@@ -11,8 +11,8 @@
1111
"preview": "vite preview"
1212
},
1313
"dependencies": {
14-
"@flowmap.gl/data": "^8.0.1",
15-
"@flowmap.gl/layers": "^8.0.1",
14+
"@flowmap.gl/data": "^8.0.2",
15+
"@flowmap.gl/layers": "^8.0.2",
1616
"@loaders.gl/core": "^3.4.14",
1717
"@loaders.gl/csv": "^3.4.14",
1818
"comlink": "^4.4.1",

‎examples/svelte-app/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@flowmap.gl/svelte-app",
3-
"version": "8.0.1",
3+
"version": "8.0.2",
44
"private": true,
55
"scripts": {
66
"build": "rollup -c",
@@ -11,8 +11,8 @@
1111
"@deck.gl/core": "^8.9.28",
1212
"@deck.gl/layers": "^8.9.28",
1313
"@deck.gl/react": "^8.9.28",
14-
"@flowmap.gl/data": "^8.0.1",
15-
"@flowmap.gl/layers": "^8.0.1",
14+
"@flowmap.gl/data": "^8.0.2",
15+
"@flowmap.gl/layers": "^8.0.2",
1616
"@luma.gl/constants": "^8.5.21",
1717
"@luma.gl/core": "^8.5.21",
1818
"@rollup/plugin-commonjs": "^25.0.0",

‎examples/vite-app/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@flowmap.gl/webpack-app",
3-
"version": "8.0.1",
3+
"version": "8.0.2",
44
"private": true,
55
"scripts": {
66
"dev": "vite",
@@ -10,8 +10,8 @@
1010
"dependencies": {
1111
"@deck.gl/core": "^8.9.28",
1212
"@deck.gl/layers": "^8.9.28",
13-
"@flowmap.gl/data": "^8.0.1",
14-
"@flowmap.gl/layers": "^8.0.1",
13+
"@flowmap.gl/data": "^8.0.2",
14+
"@flowmap.gl/layers": "^8.0.2",
1515
"@luma.gl/constants": "^8.5.21",
1616
"@luma.gl/core": "^8.5.21",
1717
"d3-fetch": "^3.0.1",

‎lerna.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"packages": [
33
"packages/*"
44
],
5-
"version": "8.0.1",
5+
"version": "8.0.2",
66
"npmClient": "yarn",
77
"useWorkspaces": true
88
}

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"prepare": "./node_modules/.bin/husky install",
1818
"deploy": "yarn build:example && gh-pages -d examples/react-app/build/",
1919
"bump": "lerna version --no-push --force-publish",
20-
"publish-release": "lerna publish from-package",
21-
"publish-prerelease": "lerna publish --dist-tag next from-package",
20+
"publish-release": "yarn build && lerna publish from-package",
21+
"publish-prerelease": "yarn build && lerna publish --dist-tag next from-package",
2222
"typecheck": "lerna run --stream typecheck"
2323
},
2424
"prettier": {

‎packages/data/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@flowmap.gl/data",
3-
"version": "8.0.1",
3+
"version": "8.0.2",
44
"main": "dist/index.js",
55
"module": "dist/index.js",
66
"types": "dist/index.d.ts",

‎packages/data/src/FlowmapSelectors.ts‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,22 @@ import {ascending, descending, extent, min, rollup} from 'd3-array';
88
import {ScaleLinear, scaleSqrt} from 'd3-scale';
99
import KDBush from 'kdbush';
1010
import {
11+
ParametricSelector,
1112
createSelector,
1213
createSelectorCreator,
1314
defaultMemoize,
14-
ParametricSelector,
1515
} from 'reselect';
1616
import {alea} from 'seedrandom';
17-
import {clusterLocations} from './cluster/cluster';
17+
import FlowmapAggregateAccessors from './FlowmapAggregateAccessors';
18+
import {FlowmapState} from './FlowmapState';
1819
import {
19-
buildIndex,
2020
ClusterIndex,
21-
findAppropriateZoomLevel,
2221
LocationWeightGetter,
22+
buildIndex,
23+
findAppropriateZoomLevel,
2324
makeLocationWeightGetter,
2425
} from './cluster/ClusterIndex';
26+
import {clusterLocations} from './cluster/cluster';
2527
import getColors, {
2628
ColorsRGBA,
2729
DiffColorsRGBA,
@@ -31,18 +33,16 @@ import getColors, {
3133
isDiffColors,
3234
isDiffColorsRGBA,
3335
} from './colors';
34-
import FlowmapAggregateAccessors from './FlowmapAggregateAccessors';
35-
import {FlowmapState} from './FlowmapState';
3636
import {
3737
addClusterNames,
3838
getFlowThicknessScale,
3939
getViewportBoundingBox,
4040
} from './selector-functions';
4141
import {
42+
TimeGranularityKey,
4243
getTimeGranularityByKey,
4344
getTimeGranularityByOrder,
4445
getTimeGranularityForDate,
45-
TimeGranularityKey,
4646
} from './time';
4747
import {
4848
AggregateFlow,
@@ -55,11 +55,10 @@ import {
5555
FlowLinesLayerAttributes,
5656
FlowmapData,
5757
FlowmapDataAccessors,
58-
isCluster,
59-
isLocationClusterNode,
6058
LayersData,
6159
LocationFilterMode,
6260
LocationTotals,
61+
isLocationClusterNode,
6362
} from './types';
6463

6564
const MAX_CLUSTER_ZOOM_LEVEL = 20;
@@ -753,7 +752,9 @@ export default class FlowmapSelectors<
753752
const ids = this._getLocationsInBboxIndices(tree, bbox);
754753
if (ids) {
755754
return new Set(
756-
ids.map((idx: number) => tree.points[idx].id) as Array<string>,
755+
ids.map((idx: number) =>
756+
this.accessors.getLocationId(tree.points[idx]),
757+
) as Array<string>,
757758
);
758759
}
759760
return undefined;

0 commit comments

Comments
 (0)