fix: use real redraw for datalayer, instead of hide/show (#2568)

The problem we've tried to fix is, during sync:
- peer A is editing a feature
- peer B changes the datalayer of this feature
- edit panel is closed for peer A

umap/static/umap/js/modules/data/features.js

@@ -329,7 +329,7 @@ class Feature {
     }
     for (const key of keys) {
       const value = this.properties[key]
-      if (value) return value.trim()
+      if (value) return String(value).trim()
     }
     return this.datalayer.getName().trim()
   }

umap/static/umap/js/modules/data/layer.js

@@ -144,11 +144,10 @@ export class DataLayer extends ServerStored {
           if (fields.includes('options.type')) {
             this.resetLayer()
           }
-          this.hide()
           for (const field of fields) {
             this.layer.onEdit(field, builder)
           }
-          this.show()
+          this.redraw()
           break
         case 'remote-data':
           this.fetchRemoteData()
@@ -652,8 +651,7 @@ export class DataLayer extends ServerStored {
 
   redraw() {
     if (!this.isVisible()) return
-    this.hide()
-    this.show()
+    this.eachFeature((feature) => feature.redraw())
   }
 
   edit() {

umap/static/umap/js/modules/rendering/map.js

@@ -269,8 +269,12 @@ export const LeafletMap = BaseMap.extend({
     this.renderUI()
   },
 
-  renderUI: function () {
+  pullProperties() {
     setOptions(this, this._umap.properties)
+  },
+
+  renderUI: function () {
+    this.pullProperties()
     if (this.options.scrollWheelZoom) {
       this.scrollWheelZoom.enable()
       this.dragging.enable()

umap/static/umap/js/modules/sync/updaters.js

@@ -47,6 +47,7 @@ export class MapUpdater extends BaseUpdater {
       this.updateObjectValue(this._umap, key, value)
     }
 
+    this._umap.onPropertiesUpdated([key])
     this._umap.render([key])
   }
 }

umap/static/umap/js/modules/umap.js

@@ -1329,6 +1329,10 @@ export default class Umap extends ServerStored {
     }
   }
 
+  onPropertiesUpdated(fields = []) {
+    this._leafletMap.pullProperties()
+  }
+
   render(fields = []) {
     // Propagate will remove the fields it has already
     // processed

umap/static/umap/js/umap.controls.js

@@ -302,6 +302,10 @@ U.TileLayerChooser = L.Control.extend({
         if (options?.edit) {
           this.map._umap.properties.tilelayer = tilelayer.toJSON()
           this.map._umap.isDirty = true
+          this.map._umap.sync.update(
+            'properties.tilelayer',
+            this.map._umap.properties.tilelayer
+          )
         }
       },
       this