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: use our fork of csv2geojson to be able to parse lat/lon with commas (#2263)

Browse source
This commit is contained in:
Yohan Boniface 2024-11-15 18:44:01 +01:00 committed by GitHub
commit 57a670d64c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 52 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -40,7 +40,7 @@
"@placemarkio/tokml": "0.3.4",
"@tmcw/togeojson": "^5.8.0",
"colorbrewer": "1.5.7",
"csv2geojson": "5.1.2",
"csv2geojson": "github:umap-project/csv2geojson#patched",
"dompurify": "3.1.7",
"georsstogeojson": "^0.2.0",
"jsdom": "^24.0.0",

6
umap/static/umap/js/modules/formatter.js
View file

@ -81,6 +81,8 @@ export class Formatter {
{
delimiter: 'auto',
includeLatLon: false,
sexagesimal: false,
parseLatLon: (raw) => Number.parseFloat(raw.toString().replace(',', '.')),
},
(err, result) => {
// csv2geojson fallback to null geometries when it cannot determine
@ -115,7 +117,9 @@ export class Formatter {
}
async fromGeoRSS(str) {
const GeoRSSToGeoJSON = await import('../../vendors/georsstogeojson/GeoRSSToGeoJSON.js')
const GeoRSSToGeoJSON = await import(
'../../vendors/georsstogeojson/GeoRSSToGeoJSON.js'
)
return GeoRSSToGeoJSON.parse(this.toDom(str))
}

21
umap/static/umap/vendors/csv2geojson/csv2geojson.js vendored
View file

@ -81,6 +81,8 @@ function csv2geojson(x, options, callback) {
}
options.delimiter = options.delimiter || ',';
options.parseLatLon = options.parseLatLon || parseFloat;
options.sexagesimal = options.sexagesimal !== false;
var latfield = options.latfield || '',
lonfield = options.lonfield || '',
@ -129,6 +131,7 @@ function csv2geojson(x, options, callback) {
if (!latfield) latfield = guessLatHeader(parsed[0]);
if (!lonfield) lonfield = guessLonHeader(parsed[0]);
var noGeometry = (!latfield || !lonfield);
if (noGeometry) {
@ -152,13 +155,15 @@ function csv2geojson(x, options, callback) {
lonf, latf,
a;
a = sexagesimal(lonk, 'EW');
if (a) lonk = a;
a = sexagesimal(latk, 'NS');
if (a) latk = a;
if (options.sexagesimal) {
a = sexagesimal(lonk, 'EW');
if (a) lonk = a;
a = sexagesimal(latk, 'NS');
if (a) latk = a;
}
lonf = parseFloat(lonk);
latf = parseFloat(latk);
lonf = options.parseLatLon(lonk);
latf = options.parseLatLon(latk);
if (isNaN(lonf) ||
isNaN(latf)) {
@ -179,8 +184,8 @@ function csv2geojson(x, options, callback) {
geometry: {
type: 'Point',
coordinates: [
parseFloat(lonf),
parseFloat(latf)
lonf,
latf
]
}
});

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

@ -494,6 +494,39 @@ def test_import_csv_without_valid_latlon_headers(tilelayer, live_server, page):
expect(page.locator('umap-alert div[data-level="error"]')).to_be_visible()
def test_import_csv_with_commas_in_latlon(tilelayer, live_server, page, settings):
settings.UMAP_ALLOW_ANONYMOUS = True
page.goto(f"{live_server.url}/map/new/")
page.get_by_title("Open browser").click()
layers = page.locator(".umap-browser .datalayer")
markers = page.locator(".leaflet-marker-icon")
page.get_by_title("Import data").click()
textarea = page.locator(".umap-upload textarea")
textarea.fill("lat;lon;foobar\n12,24;48,34;mypoint\n12,23;48,35;mypoint2")
page.locator('select[name="format"]').select_option("csv")
page.get_by_role("button", name="Import data", exact=True).click()
expect(layers).to_have_count(1)
expect(markers).to_have_count(2)
with page.expect_response(re.compile(r".*/datalayer/create/.*")):
page.get_by_role("button", name="Save").click()
datalayer = DataLayer.objects.last()
saved_data = json.loads(Path(datalayer.geojson.path).read_text())
assert saved_data["features"][0]["geometry"] == {
"coordinates": [
48.35,
12.23,
],
"type": "Point",
}
assert saved_data["features"][1]["geometry"] == {
"coordinates": [
48.34,
12.24,
],
"type": "Point",
}
def test_create_remote_data(page, live_server, tilelayer):
def handle(route):
route.fulfill(