Skip to content

[Backport geonode-5.1.x] Fix #12788 style missing geometry in imported vector files #12819

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

Open
offtherailz wants to merge 1 commit into
base: geonode-5.1.x
Choose a base branch
from
Open

[Backport geonode-5.1.x] Fix #12788 style missing geometry in imported vector files #12819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 9 additions & 3 deletions web/client/utils/LayersUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ export const getLayerId = (layerObj) => {
export const createFeatureId = (feature = {}) => {
return {
...feature,
id: feature.id || feature.properties?.id || uuidv1()
id: !isNil(feature.id) ? feature.id : (feature.properties?.id ?? uuidv1())
};
};
/**
Expand All @@ -436,9 +436,15 @@ export const normalizeLayer = (layer) => {
// con uuid
let _layer = layer;
if (layer.type === "vector") {
const seen = new Set(); // must be unique id for features, so we need to check if there are duplicates
_layer = _layer?.features?.length ? {
..._layer,
features: _layer?.features?.map(createFeatureId)
features: _layer?.features?.map((f) => {
const feature = createFeatureId(f);
const id = seen.has(String(feature.id)) ? uuidv1() : feature.id;
seen.add(String(id));
return { ...feature, id };
})
} : layer;
}
// regenerate geodesic lines as property since that info has not been saved
Expand Down Expand Up @@ -654,7 +660,7 @@ export const geoJSONToLayer = (geoJSON, id) => {
let features = [];
if (geoJSON.type === "FeatureCollection") {
features = geoJSON.features.map((feature, idx) => {
if (!feature.id) {
if (isNil(feature.id)) {
feature.id = idx;
}
if (feature.geometry && feature.geometry.bbox && isNaN(feature.geometry.bbox[0])) {
Expand Down
89 changes: 89 additions & 0 deletions web/client/utils/__tests__/LayersUtils-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
import expect from 'expect';
import uuidv1 from 'uuid/v1';
import * as LayersUtils from '../LayersUtils';
import { readZip, shpToGeoJSON } from '../FileUtils';
import axios from '../../libs/ajax';

const { extractTileMatrixSetFromLayers, splitMapAndLayers, flattenGroups, getTitle, isBackgroundCompatibleWithProjection} = LayersUtils;
const typeV1 = "empty";
Expand Down Expand Up @@ -126,13 +128,53 @@ describe('LayersUtils', () => {
});
expect(layer.features[0].id.length).toEqual(36);
});
it('test normalizeLayer deduplicates vector feature ids', () => {
const geometry = {
"type": "LineString",
"coordinates": [[0, 39], [28, 48]]
};
const layer = LayersUtils.normalizeLayer({
type: "vector",
features: [
{ type: "Feature", geometry, id: 2 },
{ type: "Feature", geometry, id: 1 },
{ type: "Feature", geometry, id: 2 },
{ type: "Feature", geometry, id: 3 }
]
});
expect(layer.features[0].id).toEqual(2);
expect(layer.features[1].id).toEqual(1);
expect(layer.features[2].id.length).toEqual(36);
expect(layer.features[3].id).toEqual(3);
expect([...new Set(layer.features.map(f => f.id))].length).toEqual(4);
});
it('test normalizeLayer deduplicates vector feature ids with mixed types', () => {
const geometry = {
"type": "LineString",
"coordinates": [[0, 39], [28, 48]]
};
const layer = LayersUtils.normalizeLayer({
type: "vector",
features: [
{ type: "Feature", geometry, id: 2 },
{ type: "Feature", geometry, id: "2" }
]
});
expect(layer.features[0].id).toEqual(2);
expect(layer.features[1].id.length).toEqual(36);
expect(layer.features.map(f => String(f.id)).filter(id => id === "2").length).toEqual(1);
});
it('test createFeatureId', () => {
let feature = LayersUtils.createFeatureId({});
expect(feature.id.length).toEqual(uuidv1().length);
feature = LayersUtils.createFeatureId({id: "test"});
expect(feature.id).toEqual("test");
feature = LayersUtils.createFeatureId({properties: {id: "test"}});
expect(feature.id).toEqual("test");
feature = LayersUtils.createFeatureId({id: 0, properties: {id: "test"}});
expect(feature.id).toEqual(0);
feature = LayersUtils.createFeatureId({properties: {id: 0}});
expect(feature.id).toEqual(0);
});
it('getLayerUrl supports single and multiple url layers', () => {
expect(['a', 'b']).toContain(LayersUtils.getLayerUrl({url: ['a', 'b']}));
Expand Down Expand Up @@ -1288,6 +1330,53 @@ describe('LayersUtils', () => {
"type": "Feature"
}]);
});
it('geoJSONToLayer from imported shapefile (TestShape.zip)', (done) => {
axios.get("base/web/client/test-resources/TestShape.zip", { responseType: "blob" }).then(({data}) => {
readZip(data).then((buffer) => {
const collections = shpToGeoJSON(buffer);
expect(collections.length).toEqual(1);
const geoJson = collections[0];
const layer = LayersUtils.geoJSONToLayer(geoJson, "TestShape__0");
expect(layer.features.length).toEqual(geoJson.features.length);
layer.features.forEach((f) => expect(f.id).toNotBe(undefined));
expect(new Set(layer.features.map(f => f.id)).size).toEqual(layer.features.length);
expect(layer.features[0].id).toEqual(0);
done();
}).catch(done);
}).catch(done);
});
it('normalizeLayer keeps imported shapefile features coherent', (done) => {
axios.get("base/web/client/test-resources/TestShape.zip", { responseType: "blob" }).then(({data}) => {
readZip(data).then((buffer) => {
const geoJson = shpToGeoJSON(buffer)[0];
const layer = LayersUtils.geoJSONToLayer(geoJson, "TestShape__0");
const normalized = LayersUtils.normalizeLayer(layer);
expect(normalized.features.length).toEqual(layer.features.length);
expect(normalized.features.map(f => f.id)).toEqual(layer.features.map(f => f.id));
expect(new Set(normalized.features.map(f => f.id)).size).toEqual(normalized.features.length);
done();
}).catch(done);
}).catch(done);
});
it('import with dbf id column does not produce duplicated ids', () => {
const geometry = {
"type": "Point",
"coordinates": [0, 0]
};
const ftColl = {
type: "FeatureCollection",
fileName: "Poly_3943",
features: [
{ type: "Feature", geometry, properties: { id: 2 } },
{ type: "Feature", geometry, properties: { id: 3 } },
{ type: "Feature", geometry, properties: { id: 1 } }
]
};
const layer = LayersUtils.geoJSONToLayer(ftColl, "layer-id");
expect(layer.features.map(f => f.id)).toEqual([0, 1, 2]);
const normalized = LayersUtils.normalizeLayer(layer);
expect(normalized.features.map(f => f.id)).toEqual([0, 1, 2]);
});
it('saveLayer', () => {
const layers = [
// no params if not present
Expand Down