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: explicit batch instead of blindly on add data (#2601)

Browse source
This commit is contained in:
Yohan Boniface 2025-04-04 18:54:31 +02:00 committed by GitHub
commit 50e354cb18
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -327,7 +327,7 @@ export class DataLayer {
this.clear() this.clear()
return this._umap.formatter return this._umap.formatter
.parse(raw, this.options.remoteData.format) .parse(raw, this.options.remoteData.format)
.then((geojson) => this.fromGeoJSON(geojson)) .then((geojson) => this.fromGeoJSON(geojson, false))
.catch((error) => { .catch((error) => {
console.debug(error) console.debug(error)
Alert.error( Alert.error(
@ -460,10 +460,7 @@ export class DataLayer {
try { try {
// Do not fail if remote data is somehow invalid, // Do not fail if remote data is somehow invalid,
// otherwise the layer becomes uneditable. // otherwise the layer becomes uneditable.
this.sync.startBatch() return this.makeFeatures(geojson, sync)
const features = this.makeFeatures(geojson, sync)
this.sync.commitBatch()
return features
} catch (err) { } catch (err) {
console.debug('Error with DataLayer', this.id) console.debug('Error with DataLayer', this.id)
console.error(err) console.error(err)
@ -529,7 +526,12 @@ export class DataLayer {
async importRaw(raw, format) { async importRaw(raw, format) {
return this._umap.formatter return this._umap.formatter
.parse(raw, format) .parse(raw, format)
.then((geojson) => this.addData(geojson)) .then((geojson) => {
this.sync.startBatch()
const data = this.addData(geojson)
this.sync.commitBatch()
return data
})
.catch((error) => { .catch((error) => {
console.debug(error) console.debug(error)
Alert.error(translate('Import failed: invalid data')) Alert.error(translate('Import failed: invalid data'))
@ -926,8 +928,13 @@ export class DataLayer {
this.sync.update('options', this.options, oldOptions) this.sync.update('options', this.options, oldOptions)
} }
this.empty() this.empty()
if (this.isRemoteLayer()) this.fetchRemoteData() if (this.isRemoteLayer()) {
else this.addData(geojson) this.fetchRemoteData()
} else {
this.sync.startBatch()
this.addData(geojson)
this.sync.commitBatch()
}
} }
}) })
} }