Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use unique feature id from tileset if provided #463

Merged
merged 4 commits into from
Sep 2, 2022
Merged

Use unique feature id from tileset if provided #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f826a35
Use unique feature id from tileset if provided
bbecquet Sep 1, 2022
0417ea1
changelog
bbecquet Sep 1, 2022
db60905
Add unit test
bbecquet Sep 1, 2022
485c686
Remove buggy import
bbecquet Sep 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Not released

- Use unique feature id from tileset if provided [#463](https://github.com/CartoDB/carto-react/pull/463)

## 1.4

### 1.4.0-alpha.4 (2022-08-02)
Expand Down
57 changes: 54 additions & 3 deletions packages/react-core/__tests__/filters/tileFeatures.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,58 @@ describe('viewport features with binary mode', () => {
});

describe('uniqueIdProperty is undefined', () => {
describe('dataset has cartodb_id field', () => {
describe('tiles provide unique id field', () => {
test('linestrings', () => {
const linestrings = [...Array(3)].map((_, i) => ({
type: 'Feature',
geometry: {
type: 'LineString',
// prettier-ignore
coordinates: [[0, 0], [0, 1], [1, 2]]
},
properties: {
other_prop: i
}
}));

// Two tiles, linestrings[0] is present in both
const binaryData1 = geojsonToBinary([linestrings[0], linestrings[1]]);
// @ts-ignore
binaryData1.lines.fields = [{ id: 100 }, { id: 101 }];

const binaryData2 = geojsonToBinary([linestrings[0], linestrings[2]]);
// @ts-ignore
binaryData2.lines.fields = [{ id: 100 }, { id: 102 }];

const mockedTiles = [
{
isVisible: true,
data: binaryData1,
bbox: { west, east, north, south }
},
{
isVisible: true,
data: binaryData2,
bbox: { west, east, north, south }
}
];

const properties = tileFeatures({
tiles: mockedTiles,
viewport,
uniqueIdProperty: undefined
});

// prettier-ignore
expect(properties).toEqual([
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice test here @bbecquet 👍🏻

{ 'other_prop': 0 },
{ 'other_prop': 1 },
{ 'other_prop': 2 }
]);
});
});

describe('features have cartodb_id field', () => {
test('points', () => {
const points = [...Array(3)].map((_, i) => ({
type: 'Feature',
Expand Down Expand Up @@ -386,7 +437,7 @@ describe('viewport features with binary mode', () => {
});
});

describe('dataset has geoid field', () => {
describe('features have geoid field', () => {
test('points', () => {
const points = [...Array(3)].map((_, i) => ({
type: 'Feature',
Expand Down Expand Up @@ -422,7 +473,7 @@ describe('viewport features with binary mode', () => {
});
});

describe('dataset has no cartodb_id or geoid fields', () => {
describe('no explicit id field', () => {
test('points', () => {
const points = [...Array(3)].map((_, i) => ({
type: 'Feature',
Expand Down
7 changes: 6 additions & 1 deletion packages/react-core/src/filters/tileFeaturesGeometries.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,9 @@ function getFeatureId(data, startIndex) {

function getPropertiesFromTile(data, startIndex) {
const featureId = getFeatureId(data, startIndex);
const { properties, numericProps } = data;
const { properties, numericProps, fields } = data;
const result = {
uniqueId: fields?.[featureId]?.id,
properties: properties[featureId],
numericProps: {}
};
Expand All @@ -71,6 +72,10 @@ function getUniquePropertyValue(tileProps, uniqueIdProperty, map) {
return getValueFromTileProps(tileProps, uniqueIdProperty);
}

if (tileProps.uniqueId) {
return tileProps.uniqueId;
}

const artificialId = map.size + 1; // a counter, assumed as a valid new id
return (
getValueFromTileProps(tileProps, 'cartodb_id') ||
Expand Down