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

refactor: rename geometrytoFeatures to geoJSONToLeaflet

Browse source 
Because we are dealing with technologies using overlapping vocabulary,
it is easy to get lost. Hopefully this change makes it clear that it
converts geoJSON inputs in Leaflet / uMap objects.
This commit is contained in:
Alexis Métaireau 2024-05-31 19:28:42 +02:00
parent 137cc21af2
commit 149a0c1680
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
umap/static/umap/js/modules/sync/updaters.js
View file

@ -73,7 +73,7 @@ export class FeatureUpdater extends BaseUpdater {
const datalayer = this.getDataLayerFromID(layerId)
let feature = this.getFeatureFromMetadata(metadata, value)
feature = datalayer.geometryToFeature({
feature = datalayer.geoJSONToLeaflet({
geometry: value.geometry,
geojson: value,
id,
@ -91,7 +91,7 @@ export class FeatureUpdater extends BaseUpdater {
switch (key) {
case 'geometry':
const datalayer = this.getDataLayerFromID(metadata.layerId)
datalayer.geometryToFeature({ geometry: value, id: metadata.id, feature })
datalayer.geoJSONToLeaflet({ geometry: value, id: metadata.id, feature })
default:
this.updateObjectValue(feature, key, value)
feature.datalayer.indexProperties(feature)

7
umap/static/umap/js/umap.layer.js
View file

@ -1031,6 +1031,9 @@ U.DataLayer = L.Evented.extend({
}
},
// The choice of the name is not ours, because it is required by Leaflet.
// It is misleading, as the returned objects are uMap objects, and not
// GeoJSON features.
geojsonToFeatures: function (geojson) {
if (!geojson) return
const features = geojson instanceof Array ? geojson : geojson.features
@ -1047,7 +1050,7 @@ U.DataLayer = L.Evented.extend({
const geometry = geojson.type === 'Feature' ? geojson.geometry : geojson
let feature = this.geometryToFeature({ geometry, geojson })
let feature = this.geoJSONToLeaflet({ geometry, geojson })
if (feature) {
this.addLayer(feature)
feature.onCommit()
@ -1071,7 +1074,7 @@ U.DataLayer = L.Evented.extend({
* @param feature Leaflet feature that should be updated with the new geometry
* @returns Leaflet feature.
*/
geometryToFeature: function ({
geoJSONToLeaflet: function ({
geometry,
geojson = null,
id = null,