ofs-object 0.1.7 → 0.1.8

package/dist/ofs-object.js

@@ -33345,7 +33345,7 @@ class uf {
         y: (b.y + S.y) / 2
       });
       const T = ((r.x - b.x) * P + (r.y - b.y) * N) / C, I = Math.max(0, Math.min(1, T));
-      if (Math.hypot(r.x - (b.x + I * P), r.y - (b.y + I * N)) <= o && h.push({ a: E, b: L }), this.modes.edge && T >= 0.08 && T <= 0.92 && l(
+      if (Math.hypot(r.x - (b.x + I * P), r.y - (b.y + I * N)) <= o && h.push({ a: E, b: L }), this.modes.edge && T > 0 && T < 1 && l(
         "edge",
         [E[0] + T * (L[0] - E[0]), E[1] + T * (L[1] - E[1])],
         { x: b.x + T * P, y: b.y + T * N },
@@ -33421,7 +33421,7 @@ class uf {
       }
       n("center", o.toGeographic(l.center)), n("midpoint", o.toGeographic(hx(l)));
       const h = um(l, o.toPlanar(e));
-      if (h.t > 0.08 && h.t < 0.92 && n("edge", o.toGeographic(h.point)), r) {
+      if (h.t > 0 && h.t < 1 && n("edge", o.toGeographic(h.point)), r) {
         const f = um(l, o.toPlanar(r));
         f.t > 0 && f.t < 1 && n("perpendicular", o.toGeographic(f.point));
       }
@@ -33589,6 +33589,7 @@ class V4 extends zo {
     q(this, "currentSnapResult", null);
     q(this, "sourceId", "_ofs_grips_temp");
     q(this, "activeFeatureId", null);
+    q(this, "editFilter", null);
     q(this, "activeLayerId", null);
     q(this, "activeGrip", null);
     q(this, "isDragging", !1);
@@ -33635,23 +33636,37 @@ class V4 extends zo {
   /**
    * Start editing a feature's geometry with grips
    */
+  /**
+   * Which features may be edited (null = any). Checked here, in the one method every way into
+   * editing goes through - clicking, double-clicking, startEdit, the `grips` command, a box selection
+   * that lands on one feature - so a new way in cannot forget it.
+   */
+  setEditFilter(e) {
+    this.editFilter = e;
+  }
+  /**
+   * Start editing a feature. Returns false when it cannot be edited: it does not exist, its geometry
+   * type has no grips, or the edit filter rejects it.
+   */
   editFeature(e, n) {
+    if (this.editFilter && !this.editFilter(e, n)) return !1;
     if (this.isEnabled && this.activeLayerId === e && this.activeFeatureId === n)
-      return;
+      return !0;
     const s = this.dataSource.getFeature(e, n);
-    !s || !["Point", "MultiPoint", "LineString", "MultiLineString", "Polygon", "MultiPolygon"].includes(s.geometry.type) || (this.activeLayerId = e, this.activeFeatureId = n, this.isEnabled = !0, this.activeGrip = null, this.isDragging = !1, this.dragHasMoved = !1, this.initialFeatureSnapshot = null, this.activationTimestamp = Date.now(), this.setupLayers(), this.renderGrips(), this.bindEvents());
+    return !s || !["Point", "MultiPoint", "LineString", "MultiLineString", "Polygon", "MultiPolygon"].includes(s.geometry.type) ? !1 : (this.isEnabled && this.activeLayerId !== null && this.activeFeatureId !== null && this.emit("edit:end", { layerId: this.activeLayerId, featureId: this.activeFeatureId }), this.activeLayerId = e, this.activeFeatureId = n, this.isEnabled = !0, this.activeGrip = null, this.isDragging = !1, this.dragHasMoved = !1, this.initialFeatureSnapshot = null, this.activationTimestamp = Date.now(), this.setupLayers(), this.renderGrips(), this.bindEvents(), this.emit("edit:start", { layerId: e, featureId: n }), !0);
   }
   /**
    * Stop editing and clear grips
    */
   clear() {
+    const e = this.isEnabled && this.activeLayerId !== null && this.activeFeatureId !== null ? { layerId: this.activeLayerId, featureId: this.activeFeatureId } : null;
     try {
-      const e = xe(this.mapAdapter);
-      e && e.dragPan && e.dragPan.enable(), e && e.getCanvas() && (e.getCanvas().style.cursor = "default");
-    } catch (e) {
-      Wt("OFSGripsEditor.clear", e);
+      const n = xe(this.mapAdapter);
+      n && n.dragPan && n.dragPan.enable(), n && n.getCanvas() && (n.getCanvas().style.cursor = "default");
+    } catch (n) {
+      Wt("OFSGripsEditor.clear", n);
     }
-    this.isEnabled = !1, this.activeFeatureId = null, this.activeLayerId = null, this.activeGrip = null, this.isDragging = !1, this.dragHasMoved = !1, this.initialFeatureSnapshot = null, this.currentSnapResult = null, this.unsubClick && (this.unsubClick(), this.unsubClick = null), this.unsubMouseDown && (this.unsubMouseDown(), this.unsubMouseDown = null), this.unsubMouseUp && (this.unsubMouseUp(), this.unsubMouseUp = null), this.unsubMove && (this.unsubMove(), this.unsubMove = null), this.unsubContextMenu && (this.unsubContextMenu(), this.unsubContextMenu = null), this.clearSource(), this.emit("grip:clear", void 0);
+    this.isEnabled = !1, this.activeFeatureId = null, this.activeLayerId = null, this.activeGrip = null, this.isDragging = !1, this.dragHasMoved = !1, this.initialFeatureSnapshot = null, this.currentSnapResult = null, this.unsubClick && (this.unsubClick(), this.unsubClick = null), this.unsubMouseDown && (this.unsubMouseDown(), this.unsubMouseDown = null), this.unsubMouseUp && (this.unsubMouseUp(), this.unsubMouseUp = null), this.unsubMove && (this.unsubMove(), this.unsubMove = null), this.unsubContextMenu && (this.unsubContextMenu(), this.unsubContextMenu = null), this.clearSource(), this.emit("grip:clear", void 0), e && this.emit("edit:end", e);
   }
   getActiveFeature() {
     return !this.activeLayerId || this.activeFeatureId === null ? null : this.dataSource.getFeature(this.activeLayerId, this.activeFeatureId) || null;
@@ -35305,6 +35320,8 @@ class c3 extends zo {
     /** How far stored geometry may sag from the curves it samples */
     q(this, "sagToleranceMeters", jr);
     q(this, "targetLayerId", null);
+    /** Which features Grips may edit (null = any) - see setEditFilter */
+    q(this, "editFilter", null);
     q(this, "tempSourceId", "_ofs_draw_temp");
     q(this, "unsubClick", null);
     q(this, "unsubDblClick", null);
@@ -35351,7 +35368,16 @@ class c3 extends zo {
         }
       }
     });
-    this.dataSource = e, this.mapAdapter = n, this.snapping = new uf(e, n), this.grips = new V4(e, n, this.snapping), this.selectionOverlay = new r3(e, n), this.preview = new W4(n), this.bindMapEvents();
+    q(this, "dataUnsubscribers", []);
+    this.dataSource = e, this.mapAdapter = n, this.snapping = new uf(e, n), this.grips = new V4(e, n, this.snapping), this.selectionOverlay = new r3(e, n), this.preview = new W4(n), this.bindMapEvents(), this.dataUnsubscribers.push(
+      this.grips.on("edit:start", (s) => this.emit("edit:start", s)),
+      this.grips.on("edit:end", (s) => this.emit("edit:end", s)),
+      // An edit filter usually depends on the selection and the active layer ("only the selected
+      // features of the active layer"); when either changes, an edit it no longer allows ends here,
+      // rather than every application wiring that up itself
+      e.on("selection:changed", () => this.enforceEditFilter()),
+      e.on("active-layer:changed", () => this.enforceEditFilter())
+    );
   }
   setOrtho(e) {
     this.orthoEnabled = e, this.emit("draw:ortho-change", { enabled: e });
@@ -36065,11 +36091,13 @@ class c3 extends zo {
     if (this.currentMode === "modify") {
       if (this.grips.getIsEditing() && this.grips.hasHandleAt(e.coordinate, 18))
         return;
-      const h = !!((a = e.originalEvent) != null && a.shiftKey);
-      if (e.features && e.features.length > 0) {
-        const f = e.features[0];
-        if (f.id !== void 0 && f.layerId) {
-          this.dataSource.selectFeature(f.layerId, f.id, !1), this.grips.editFeature(f.layerId, f.id);
+      const h = !!((a = e.originalEvent) != null && a.shiftKey), f = this.pickable(e.features).filter(
+        (d) => d.id !== void 0 && !!d.layerId && this.canEdit(d.layerId, d.id)
+      );
+      if (f.length > 0) {
+        const d = f[0];
+        if (d.id !== void 0 && d.layerId) {
+          this.isSelected(d.layerId, d.id) || this.dataSource.selectFeature(d.layerId, d.id, !1), this.grips.editFeature(d.layerId, d.id);
           return;
         }
       } else {
@@ -36151,19 +36179,17 @@ class c3 extends zo {
    * Handle double click on map (finishes LineString or Polygon)
    */
   handleMapDblClick(e) {
+    var r;
     if (!this.currentMode) return;
-    const n = this.currentMode === "select" ? this.pickable(e.features) : [];
-    if (n.length > 0) {
-      const s = n[0];
-      if (s.id !== void 0 && s.layerId) {
-        this.startEdit(s.layerId, s.id);
-        return;
-      }
+    const s = (this.currentMode === "select" ? this.pickable(e.features) : []).find((o) => o.id !== void 0 && !!o.layerId && this.canEdit(o.layerId, o.id));
+    if (s && this.startEdit(s.layerId, s.id)) {
+      (r = e.preventDefault) == null || r.call(e);
+      return;
     }
     if (this.isDrawing && (this.currentMode === "line" || this.currentMode === "polygon" || this.currentMode === "select-polygon")) {
       if (this.activeCoordinates.length > 1) {
-        const s = this.activeCoordinates[this.activeCoordinates.length - 1], r = this.activeCoordinates[this.activeCoordinates.length - 2];
-        s[0] === r[0] && s[1] === r[1] && this.activeCoordinates.pop();
+        const o = this.activeCoordinates[this.activeCoordinates.length - 1], a = this.activeCoordinates[this.activeCoordinates.length - 2];
+        o[0] === a[0] && o[1] === a[1] && this.activeCoordinates.pop();
       }
       this.finishDrawing();
     }
@@ -36207,12 +36233,12 @@ class c3 extends zo {
       return;
     }
     if (this.currentMode === "select" || this.currentMode === "modify") {
-      const a = this.pickable(e.features)[0] ?? null, l = xe(this.mapAdapter), h = l && typeof l.getCanvas == "function" ? l.getCanvas() : null;
-      if (a && a.id !== void 0 && a.layerId) {
-        const f = this.dataSource.getLayer(a.layerId), d = f == null ? void 0 : f.getFeature(a.id);
-        this.selectionOverlay.setHoverFeature(d || a), h && (h.style.cursor = "pointer");
+      const a = this.pickable(e.features), l = (this.currentMode === "modify" ? a.find((d) => d.id !== void 0 && !!d.layerId && this.canEdit(d.layerId, d.id)) : a[0]) ?? null, h = xe(this.mapAdapter), f = h && typeof h.getCanvas == "function" ? h.getCanvas() : null;
+      if (l && l.id !== void 0 && l.layerId) {
+        const d = this.dataSource.getLayer(l.layerId), p = d == null ? void 0 : d.getFeature(l.id);
+        this.selectionOverlay.setHoverFeature(p || l), f && (f.style.cursor = "pointer");
       } else
-        this.selectionOverlay.setHoverFeature(null), h && (h.style.cursor = "default");
+        this.selectionOverlay.setHoverFeature(null), f && (f.style.cursor = "default");
       return;
     }
     if (!this.currentMode) return;
@@ -36559,7 +36585,7 @@ class c3 extends zo {
    * Start interactive Grips editing on a feature
    */
   startEdit(e, n) {
-    return this.dataSource.getFeature(e, n) ? (this.dataSource.selectFeature(e, n), this.grips.editFeature(e, n), this.currentMode !== "modify" && (this.currentMode = "modify", this.emit("draw:mode-change", { mode: "modify" })), !0) : !1;
+    return !this.dataSource.getFeature(e, n) || !this.canEdit(e, n) || (this.isSelected(e, n) || this.dataSource.selectFeature(e, n), !this.grips.editFeature(e, n)) ? !1 : (this.currentMode !== "modify" && (this.currentMode = "modify", this.emit("draw:mode-change", { mode: "modify" })), !0);
   }
   /**
    * Stop interactive Grips editing
@@ -36567,6 +36593,38 @@ class c3 extends zo {
   stopEdit() {
     this.grips.clear(), this.currentMode === "modify" && (this.currentMode = "select", this.emit("draw:mode-change", { mode: "select" }));
   }
+  /**
+   * Limit which features Grips may edit, e.g. only the selected features of the active layer:
+   *
+   * ```ts
+   * draw.setEditFilter((layerId, id) =>
+   *   layerId === ds.getActiveLayerId() && ds.getSelectedFeatureIds(layerId).includes(id));
+   * ```
+   * Applies to every way into Grips: startEdit, clicking in modify mode (a rejected feature counts as
+   * empty space), double-click to edit, the hover cursor, the `grips` command and a box selection
+   * that lands on one feature. It limits Grips only - move, rotate, offset and the other commands
+   * are not affected.
+   *
+   * An edit in progress is ended when the filter stops allowing it: when a new filter is set, and
+   * when the selection or the active layer changes. If the filter depends on other application state,
+   * call `stopEdit()` (or set the filter again) when that changes. `null` = any feature.
+   */
+  setEditFilter(e) {
+    this.editFilter = e, this.grips.setEditFilter(e), this.enforceEditFilter();
+  }
+  /** End the current edit when the edit filter no longer allows it */
+  enforceEditFilter() {
+    if (!this.editFilter || !this.isEditing()) return;
+    const e = this.getActiveEditingLayerId(), n = this.getActiveEditingFeatureId();
+    e !== null && n !== null && !this.canEdit(e, n) && this.stopEdit();
+  }
+  isSelected(e, n) {
+    return this.dataSource.getSelectedFeatureIds(e).some((s) => String(s) === String(n));
+  }
+  /** Whether Grips may edit this feature under the current edit filter */
+  canEdit(e, n) {
+    return !this.editFilter || this.editFilter(e, n);
+  }
   /**
    * Check if geometry editing is currently active
    */
@@ -37316,7 +37374,7 @@ class c3 extends zo {
       }
   }
   destroy() {
-    this.unsubClick && this.unsubClick(), this.unsubDblClick && this.unsubDblClick(), this.unsubContextMenu && this.unsubContextMenu(), this.unsubMove && this.unsubMove(), this.unsubMouseDown && this.unsubMouseDown(), this.unsubMouseUp && this.unsubMouseUp(), typeof window < "u" && window.removeEventListener("keydown", this.handleKeyDown), this.cancel(), this.grips.clear(), this.preview.destroy(), this.selectionOverlay.destroy(), this.removeAllListeners();
+    this.unsubClick && this.unsubClick(), this.unsubDblClick && this.unsubDblClick(), this.unsubContextMenu && this.unsubContextMenu(), this.unsubMove && this.unsubMove(), this.unsubMouseDown && this.unsubMouseDown(), this.unsubMouseUp && this.unsubMouseUp(), typeof window < "u" && window.removeEventListener("keydown", this.handleKeyDown), this.cancel(), this.grips.clear(), this.preview.destroy(), this.selectionOverlay.destroy(), this.dataUnsubscribers.forEach((e) => e()), this.dataUnsubscribers = [], this.removeAllListeners();
   }
 }
 const E_ = {
@@ -40984,50 +41042,57 @@ class Gx {
       }, "BaseGLAdapter.off");
     });
   }
+  /**
+   * Data features under a map event: rendered features within 6 px, falling back to a spatial point
+   * query when nothing rendered matched. Click and double-click both use it.
+   */
+  featuresAtEvent(t, e) {
+    const n = [
+      [t.point.x - 6, t.point.y - 6],
+      [t.point.x + 6, t.point.y + 6]
+    ], r = (this.map.queryRenderedFeatures(n) || []).filter((o) => o.layer && !o.layer.id.startsWith("_ofs_")).map((o) => {
+      var h;
+      const a = this.dataLayerIdFor(o.layer.id);
+      let l = ((h = o.properties) == null ? void 0 : h._ofs_id) ?? o.id;
+      if (l == null && this.dataSource) {
+        const f = this.dataSource.getLayer(a), d = f ? el.queryPoint(f, e) : [];
+        d.length > 0 && (l = d[0].id);
+      }
+      return {
+        id: l,
+        layerId: a,
+        properties: o.properties || {},
+        geometry: o.geometry
+      };
+    }).filter((o) => this.dataSource ? this.dataSource.hasLayer(o.layerId) : !0);
+    if (r.length === 0 && this.dataSource) {
+      const o = this.dataSource.getAllLayers().filter((a) => a.visible);
+      for (let a = o.length - 1; a >= 0; a--) {
+        const l = o[a], h = el.queryPoint(l, e);
+        if (h.length > 0) {
+          r.push({
+            id: h[0].id,
+            layerId: l.id,
+            properties: h[0].properties || {},
+            geometry: h[0].geometry
+          });
+          break;
+        }
+      }
+    }
+    return r;
+  }
   setupMapEventListeners() {
     this.map && (this.listen("style.load", () => {
       this.styleFontCache = void 0;
     }), this.listen("click", (t) => {
-      const e = [t.lngLat.lng, t.lngLat.lat], n = [
-        [t.point.x - 6, t.point.y - 6],
-        [t.point.x + 6, t.point.y + 6]
-      ], r = (this.map.queryRenderedFeatures(n) || []).filter((a) => a.layer && !a.layer.id.startsWith("_ofs_")).map((a) => {
-        var f;
-        const l = this.dataLayerIdFor(a.layer.id);
-        let h = ((f = a.properties) == null ? void 0 : f._ofs_id) ?? a.id;
-        if (h == null && this.dataSource) {
-          const d = this.dataSource.getLayer(l), p = d ? el.queryPoint(d, e) : [];
-          p.length > 0 && (h = p[0].id);
-        }
-        return {
-          id: h,
-          layerId: l,
-          properties: a.properties || {},
-          geometry: a.geometry
-        };
-      }).filter((a) => this.dataSource ? this.dataSource.hasLayer(a.layerId) : !0);
-      if (r.length === 0 && this.dataSource) {
-        const a = this.dataSource.getAllLayers().filter((l) => l.visible);
-        for (let l = a.length - 1; l >= 0; l--) {
-          const h = a[l], f = el.queryPoint(h, e);
-          if (f.length > 0) {
-            r.push({
-              id: f[0].id,
-              layerId: h.id,
-              properties: f[0].properties || {},
-              geometry: f[0].geometry
-            });
-            break;
-          }
-        }
-      }
-      const o = {
+      const e = [t.lngLat.lng, t.lngLat.lat], n = this.featuresAtEvent(t, e), s = {
         coordinate: e,
         point: { x: t.point.x, y: t.point.y },
-        features: r,
+        features: n,
         originalEvent: t.originalEvent
       };
-      [...this.clickHandlers].forEach((a) => a(o));
+      [...this.clickHandlers].forEach((r) => r(s));
     }), this.listen("mousedown", (t) => {
       const n = {
         coordinate: [t.lngLat.lng, t.lngLat.lat],
@@ -41045,11 +41110,16 @@ class Gx {
       };
       [...this.mouseUpHandlers].forEach((s) => s(n));
     }), this.listen("dblclick", (t) => {
-      const n = {
-        coordinate: [t.lngLat.lng, t.lngLat.lat],
+      const e = [t.lngLat.lng, t.lngLat.lat], n = {
+        coordinate: e,
         point: { x: t.point.x, y: t.point.y },
-        features: [],
-        originalEvent: t.originalEvent
+        // Features too, or "double-click a feature to edit its vertices" never finds one
+        features: this.featuresAtEvent(t, e),
+        originalEvent: t.originalEvent,
+        // MapLibre / Mapbox: stops DoubleClickZoomHandler for this one double-click
+        preventDefault: () => {
+          typeof t.preventDefault == "function" && t.preventDefault();
+        }
       };
       [...this.dblClickHandlers].forEach((s) => s(n));
     }), this.listen("contextmenu", (t) => {
@@ -42280,7 +42350,9 @@ function VO(i, t) {
       if (!H)
         return i.grips.clear(), it.print("Grips cleared. Please select a feature to edit.", "output"), K;
       const { layerId: J, featureId: nt } = H;
-      return hn(it, J, t.getActiveLayerId()), i.grips.editFeature(J, nt), it.print(`Grips editing active for feature [${nt}]. Drag blue vertices or midpoint handles to reshape.`, "success"), K;
+      if (hn(it, J, t.getActiveLayerId()), !i.grips.editFeature(J, nt))
+        throw new Error(`Feature [${nt}] in "${J}" cannot be edited here.`);
+      return it.print(`Grips editing active for feature [${nt}]. Drag blue vertices or midpoint handles to reshape.`, "success"), K;
     }
   }, _ = {
     name: "move",

package/docs/API.md

@@ -141,6 +141,21 @@ ofs.drawTools.startEdit('parcels', 'plot-1');
 // - กดปุ่ม Delete / Backspace: ลบจุดมุมที่กำลังเลือก
 // - หมายเหตุรอยต่อแปลง: เมื่อวาดหรือลาก Snap ชนกัน จุดพิกัดจะแนบสนิท 100% 
 //   เส้นสีขาวที่เห็นระหว่างแปลงคือขอบเส้น Outline Stroke (${layerId}_stroke) ที่ระบบสร้างขึ้นอัตโนมัติ
+
+// จำกัดว่า Grips แก้ feature ไหนได้ (0.1.8) — เช่น เฉพาะตัวที่เลือกอยู่ใน active layer
+ofs.drawTools.setEditFilter((layerId, id) =>
+  layerId === ofs.dataSource.getActiveLayerId() &&
+  ofs.dataSource.getSelectedFeatureIds(layerId).some((s) => String(s) === String(id)));
+ofs.drawTools.canEdit('parcels', 'plot-1');   // ตรวจก่อนเปิดปุ่ม "แก้รูปทรง"
+ofs.drawTools.setEditFilter(null);            // แก้ได้ทุกตัว (ค่าเริ่มต้น)
+// - ครอบทุกทางเข้า Grips: startEdit (คืน false), คลิกในโหมด modify (ตัวที่ห้าม = คลิกที่ว่าง),
+//   ดับเบิลคลิก, cursor ตอน hover, คำสั่ง `grips` และลากกรอบเลือกแล้วได้ตัวเดียว
+// - จำกัดเฉพาะ Grips — move / rotate / offset และคำสั่งอื่นไม่เกี่ยว
+// - จบการแก้ให้เองเมื่อ filter ไม่ยอมแล้ว: ตอนตั้ง filter ใหม่ และเมื่อ selection / active layer เปลี่ยน
+// - เริ่มแก้ตัวที่เลือกอยู่แล้ว selection เดิมไม่ถูกล้าง (สลับไปแก้ตัวอื่นที่เลือกไว้ได้)
+ofs.drawTools.on('edit:start', ({ layerId, featureId }) => { /* ... */ });
+ofs.drawTools.on('edit:end', ({ layerId, featureId }) => { /* ... */ });  // สลับตัว = end แล้ว start
+// ดับเบิลคลิก feature ในโหมด select = เข้า Grips โดยแผนที่ไม่ซูม · ดับเบิลคลิกที่ว่างยังซูมตามเดิม
 ```
 
 #### การใช้ฟังก์ชัน CAD ขั้นสูง (`CADOperations`)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ofs-object",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "Framework-agnostic TypeScript Library for GIS Map Tools (Data Adapter, Draw Tools, Legend & Thematic Symbology, Map Adapters, Web CLI & AI Bridge)",
   "license": "MIT",
   "author": "On-Farm Solution Co.,Ltd.",