diff --git a/umap/static/umap/js/modules/utils.js b/umap/static/umap/js/modules/utils.js index 1493b4e9..0a315b68 100644 --- a/umap/static/umap/js/modules/utils.js +++ b/umap/static/umap/js/modules/utils.js @@ -65,6 +65,7 @@ export function getImpactsFromSchema(fields, schema) { export function propertyBelongsTo(property, subject, schema) { schema = schema || U.SCHEMA if (subject === 'feature') { + // FIXME allow properties.whatever property = property.replace('properties.', '').replace('_umap_options.', '') } property = property.replace('options.', '') diff --git a/umap/static/umap/js/umap.controls.js b/umap/static/umap/js/umap.controls.js index b8461ef2..4ae4ffbc 100644 --- a/umap/static/umap/js/umap.controls.js +++ b/umap/static/umap/js/umap.controls.js @@ -1249,7 +1249,6 @@ U.Editable = L.Editable.extend({ L.Editable.prototype.initialize.call(this, map, options) this.on('editable:drawing:click editable:drawing:move', this.drawingTooltip) this.on('editable:drawing:end', (e) => { - console.log('editable:drawing:end') this.map.tooltip.close() // Leaflet.Editable will delete the drawn shape if invalid // (eg. line has only one drawn point) @@ -1259,16 +1258,13 @@ U.Editable = L.Editable.extend({ }) // Layer for items added by users this.on('editable:drawing:cancel', (e) => { - console.log('editable:drawing:cancel') if (e.layer instanceof U.Marker) e.layer.del() }) this.on('editable:drawing:commit', function (e) { - console.log('editable:drawing:commit') e.layer.isDirty = true if (this.map.editedFeature !== e.layer) e.layer.edit(e) }) this.on('editable:editing', (e) => { - console.log('editable:editing') const layer = e.layer layer.isDirty = true if (layer._tooltip && layer.isTooltipOpen()) { @@ -1277,13 +1273,11 @@ U.Editable = L.Editable.extend({ } }) this.on('editable:vertex:ctrlclick', (e) => { - console.log('editable:vertex:ctrlclick') const index = e.vertex.getIndex() if (index === 0 || (index === e.vertex.getLastIndex() && e.vertex.continue)) e.vertex.continue() }) this.on('editable:vertex:altclick', (e) => { - console.log('editable:vertex:altclick') if (e.vertex.editor.vertexCanBeDeleted(e.vertex)) e.vertex.delete() }) this.on('editable:vertex:rawclick', this.onVertexRawClick) @@ -1371,7 +1365,6 @@ U.Editable = L.Editable.extend({ }, onVertexRawClick: function (e) { - console.log('editable:vertex:rawclick') e.layer.onVertexRawClick(e) L.DomEvent.stop(e) e.cancel()