v8.0.2 (#40)

* Fix: getLocationIdsInViewport didn't use location id accessor

* v8.0.2

* Changelog

* Build before publish

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change log
 
+## [8.0.2] - 2024-03-06
+
+- Fix: getLocationIdsInViewport didn't use location id accessor
+
 ## [8.0.1] - 2023-10-09
 
 - Publishing first release

examples/common/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@flowmap.gl/examples-common",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "private": true,
   "main": "src/index.js",
   "types": "src/index.d.ts",
   "module": "src/index.js",
   "license": "MIT",
   "dependencies": {
-    "@flowmap.gl/data": "^8.0.1",
-    "@flowmap.gl/layers": "^8.0.1",
+    "@flowmap.gl/data": "^8.0.2",
+    "@flowmap.gl/layers": "^8.0.2",
     "d3-fetch": "^3.0.1",
     "h3-js": "^4.1.0",
     "lil-gui": "^0.18.2"

examples/react-app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@flowmap.gl/react-app",
   "private": true,
-  "version": "8.0.1",
+  "version": "8.0.2",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -12,8 +12,8 @@
   },
   "dependencies": {
     "@deck.gl/react": "^8.9.28",
-    "@flowmap.gl/data": "^8.0.1",
-    "@flowmap.gl/layers": "^8.0.1",
+    "@flowmap.gl/data": "^8.0.2",
+    "@flowmap.gl/layers": "^8.0.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-map-gl": "^7.1.6"

examples/react-worker-app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@flowmap.gl/react-worker-app",
   "private": true,
-  "version": "8.0.1",
+  "version": "8.0.2",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -11,8 +11,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@flowmap.gl/data": "^8.0.1",
-    "@flowmap.gl/layers": "^8.0.1",
+    "@flowmap.gl/data": "^8.0.2",
+    "@flowmap.gl/layers": "^8.0.2",
     "@loaders.gl/core": "^3.4.14",
     "@loaders.gl/csv": "^3.4.14",
     "comlink": "^4.4.1",

examples/svelte-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowmap.gl/svelte-app",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "private": true,
   "scripts": {
     "build": "rollup -c",
@@ -11,8 +11,8 @@
     "@deck.gl/core": "^8.9.28",
     "@deck.gl/layers": "^8.9.28",
     "@deck.gl/react": "^8.9.28",
-    "@flowmap.gl/data": "^8.0.1",
-    "@flowmap.gl/layers": "^8.0.1",
+    "@flowmap.gl/data": "^8.0.2",
+    "@flowmap.gl/layers": "^8.0.2",
     "@luma.gl/constants": "^8.5.21",
     "@luma.gl/core": "^8.5.21",
     "@rollup/plugin-commonjs": "^25.0.0",

examples/vite-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowmap.gl/webpack-app",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "private": true,
   "scripts": {
     "dev": "vite",
@@ -10,8 +10,8 @@
   "dependencies": {
     "@deck.gl/core": "^8.9.28",
     "@deck.gl/layers": "^8.9.28",
-    "@flowmap.gl/data": "^8.0.1",
-    "@flowmap.gl/layers": "^8.0.1",
+    "@flowmap.gl/data": "^8.0.2",
+    "@flowmap.gl/layers": "^8.0.2",
     "@luma.gl/constants": "^8.5.21",
     "@luma.gl/core": "^8.5.21",
     "d3-fetch": "^3.0.1",

lerna.json

@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "8.0.1",
+  "version": "8.0.2",
   "npmClient": "yarn",
   "useWorkspaces": true
 }

package.json

@@ -17,8 +17,8 @@
     "prepare": "./node_modules/.bin/husky install",
     "deploy": "yarn build:example && gh-pages -d examples/react-app/build/",
     "bump": "lerna version --no-push --force-publish",
-    "publish-release": "lerna publish from-package",
-    "publish-prerelease": "lerna publish --dist-tag next from-package",
+    "publish-release": "yarn build && lerna publish from-package",
+    "publish-prerelease": "yarn build && lerna publish --dist-tag next from-package",
     "typecheck": "lerna run --stream typecheck"
   },
   "prettier": {

packages/data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowmap.gl/data",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",

packages/data/src/FlowmapSelectors.ts

@@ -8,20 +8,22 @@ import {ascending, descending, extent, min, rollup} from 'd3-array';
 import {ScaleLinear, scaleSqrt} from 'd3-scale';
 import KDBush from 'kdbush';
 import {
+  ParametricSelector,
   createSelector,
   createSelectorCreator,
   defaultMemoize,
-  ParametricSelector,
 } from 'reselect';
 import {alea} from 'seedrandom';
-import {clusterLocations} from './cluster/cluster';
+import FlowmapAggregateAccessors from './FlowmapAggregateAccessors';
+import {FlowmapState} from './FlowmapState';
 import {
-  buildIndex,
   ClusterIndex,
-  findAppropriateZoomLevel,
   LocationWeightGetter,
+  buildIndex,
+  findAppropriateZoomLevel,
   makeLocationWeightGetter,
 } from './cluster/ClusterIndex';
+import {clusterLocations} from './cluster/cluster';
 import getColors, {
   ColorsRGBA,
   DiffColorsRGBA,
@@ -31,18 +33,16 @@ import getColors, {
   isDiffColors,
   isDiffColorsRGBA,
 } from './colors';
-import FlowmapAggregateAccessors from './FlowmapAggregateAccessors';
-import {FlowmapState} from './FlowmapState';
 import {
   addClusterNames,
   getFlowThicknessScale,
   getViewportBoundingBox,
 } from './selector-functions';
 import {
+  TimeGranularityKey,
   getTimeGranularityByKey,
   getTimeGranularityByOrder,
   getTimeGranularityForDate,
-  TimeGranularityKey,
 } from './time';
 import {
   AggregateFlow,
@@ -55,11 +55,10 @@ import {
   FlowLinesLayerAttributes,
   FlowmapData,
   FlowmapDataAccessors,
-  isCluster,
-  isLocationClusterNode,
   LayersData,
   LocationFilterMode,
   LocationTotals,
+  isLocationClusterNode,
 } from './types';
 
 const MAX_CLUSTER_ZOOM_LEVEL = 20;
@@ -753,7 +752,9 @@ export default class FlowmapSelectors<
         const ids = this._getLocationsInBboxIndices(tree, bbox);
         if (ids) {
           return new Set(
-            ids.map((idx: number) => tree.points[idx].id) as Array<string>,
+            ids.map((idx: number) =>
+              this.accessors.getLocationId(tree.points[idx]),
+            ) as Array<string>,
           );
         }
         return undefined;

packages/layers/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowmap.gl/layers",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -14,7 +14,7 @@
     "prepare": "yarn build"
   },
   "dependencies": {
-    "@flowmap.gl/data": "*"
+    "@flowmap.gl/data": "^8.0.2"
   },
   "peerDependencies": {
     "@deck.gl/core": "^8.6.5",

packages/layers/src/FlowmapLayer.ts

@@ -6,22 +6,22 @@
 import {CompositeLayer} from '@deck.gl/core';
 import {ScatterplotLayer, TextLayer} from '@deck.gl/layers';
 import {
-  colorAsRgba,
   FilterState,
   FlowLinesLayerAttributes,
   FlowmapAggregateAccessors,
   FlowmapData,
   FlowmapDataAccessors,
   FlowmapDataProvider,
+  LayersData,
+  LocalFlowmapDataProvider,
+  ViewportProps,
+  colorAsRgba,
   getFlowLineAttributesByIndex,
   getFlowmapColors,
   getLocationCoordsByIndex,
   getOuterCircleRadiusByIndex,
   isFlowmapData,
   isFlowmapDataProvider,
-  LayersData,
-  LocalFlowmapDataProvider,
-  ViewportProps,
 } from '@flowmap.gl/data';
 import AnimatedFlowLinesLayer from './AnimatedFlowLinesLayer';
 import FlowCirclesLayer from './FlowCirclesLayer';