almet/umap
1
0
Fork 0
mirror of https://github.com/umap-project/umap.git synced 2025-04-28 19:42:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: do not import empty features (#2485)

Browse source
This commit is contained in:
Yohan Boniface 2025-02-07 15:26:42 +01:00 committed by GitHub
commit ad51f674ef
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 69 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
umap/static/umap/js/modules/data/features.js
View file

@ -564,6 +564,10 @@ class Feature {
return false
}
isEmpty() {
return !this.coordinates.length
}
clone() {
const geojson = this.toGeoJSON()
delete geojson.id
@ -951,10 +955,6 @@ export class LineString extends Path {
return { coordinates, type }
}
isEmpty() {
return !this.coordinates.length
}
getUIClass() {
return super.getUIClass() || LeafletPolyline
}

2
umap/static/umap/js/modules/data/layer.js
View file

@ -522,7 +522,7 @@ export class DataLayer extends ServerStored {
})
)
}
if (feature) {
if (feature && !feature.isEmpty()) {
this.addFeature(feature)
if (sync) feature.onCommit()
return feature

64
umap/tests/integration/test_import.py
View file

@ -500,6 +500,70 @@ def test_import_multipolyline(live_server, page, tilelayer):
expect(paths).to_have_count(1)
def test_should_not_import_empty_coordinates(live_server, page, tilelayer):
data = {
"type": "FeatureCollection",
"features": [
{
"type": "Feature",
"properties": {"name": "An empty polygon"},
"geometry": {
"type": "Polygon",
"coordinates": [],
},
},
{
"type": "Feature",
"properties": {"name": "An empty linestring"},
"geometry": {
"type": "LineString",
"coordinates": [],
},
},
{
"type": "Feature",
"properties": {"name": "An empty point"},
"geometry": {
"type": "Point",
"coordinates": [],
},
},
{
"geometry": {
"type": "Point",
"coordinates": [6.922931671142578, 47.481161607175736],
},
"type": "Feature",
"properties": {"name": "A point"},
},
{
"geometry": {
"type": "LineString",
"coordinates": [
[2.4609375, 48.88639177703194],
[2.48291015625, 48.76343113791796],
[2.164306640625, 48.719961222646276],
],
},
"type": "Feature",
"properties": {
"name": "A linestring",
},
},
],
}
page.goto(f"{live_server.url}/map/new/")
page.get_by_title("Open browser").click()
page.get_by_title("Import data").click()
textarea = page.locator(".umap-import textarea")
textarea.fill(json.dumps(data))
page.locator('select[name="format"]').select_option("geojson")
page.get_by_role("button", name="Import data", exact=True).click()
page.locator("#map").click(button="right")
page.get_by_role("button", name="browse data").click()
expect(page.locator("li.feature")).to_have_count(2)
def test_import_csv_without_valid_latlon_headers(tilelayer, live_server, page):
page.goto(f"{live_server.url}/map/new/")
page.get_by_title("Open browser").click()