@yuneta/gobj-ui 1.0.1 → 1.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@yuneta/gobj-ui",
-    "version": "1.0.1",
+    "version": "1.0.3",
     "type": "module",
     "main": "dist/gobj-ui.cjs.js",
     "module": "dist/gobj-ui.es.js",

package/src/c_yui_map.js

@@ -305,7 +305,7 @@ function get_coordinates(gobj, device)
      *  Coordinates can be set in device.settings or in device
      *  If devices.settings are null then get it from device
      */
-    let coordinates = decod_coordinates(gobj, device.settings.coordinates);
+    let coordinates = decod_coordinates(gobj, device.settings?.coordinates);
     if(coordinates.lng === 0 && coordinates.lat === 0) {
         coordinates = decod_coordinates(gobj, device.coordinates);
     }
@@ -381,7 +381,18 @@ function devices2geojson(gobj, devices)
                 id: device.id,
                 name: device.name,
                 image: device.image,
-                connected: device.connected,
+                /*
+                 *  A REAL boolean. Four style expressions test this with
+                 *  ['case', ...], and maplibre asserts a STRICT boolean
+                 *  there, so null, absent, or the 1/0 a backend may send all
+                 *  fail the assertion. The consequences are not cosmetic:
+                 *  the point paints with the property default instead of
+                 *  green/red, and the cluster accumulator turns NULL, which
+                 *  the cluster colour compares against point_count -- never
+                 *  equal, so the whole cluster stays red as if something were
+                 *  disconnected.
+                 */
+                connected: !!device.connected,
                 gobj_service_name: device.gobj_service_name,
             }
         };
@@ -776,10 +787,24 @@ function ac_refresh(gobj, event, kw, src)
     let devices = gobj_read_attr(gobj, "devices");
 
     let map = priv.xmap;
-    if (map.isStyleLoaded()) {
-        const geojson_data = devices2geojson(gobj, devices);
-        map.getSource('devices').setData(geojson_data);
+
+    /*
+     *  Ask for the source, do not infer it from the style. 'devices' is added
+     *  by load_devices() on the map 'load' event, which is a LATER milestone:
+     *  isStyleLoaded() is already true one render frame before 'load' fires,
+     *  and getSource() is undefined in that frame. Nothing is lost by
+     *  skipping, load_devices() reads the same attr.
+     *
+     *  Testing the style was also wrong the other way: it goes back to false
+     *  while new tiles load, so every refresh during a pan or a zoom was
+     *  silently dropped and the devices stopped moving.
+     */
+    const source = map.getSource('devices');
+    if(!source) {
+        return 0;
     }
+
+    source.setData(devices2geojson(gobj, devices));
     return 0;
 }