@annotorious/annotorious 3.4.2 → 3.4.3

package/dist/model/core/multipolygon/multiPolygonUtils.d.ts

@@ -1,4 +1,5 @@
-import { MultiPolygonElement, MultiPolygonGeometry } from './MultiPolygon';
+import { MultiPolygon, MultiPolygonElement, MultiPolygonGeometry } from './MultiPolygon';
 export declare const boundsFromMultiPolygonElements: (elements: MultiPolygonElement[]) => import('../Shape').Bounds;
 export declare const multipolygonElementToPath: (element: MultiPolygonElement) => string;
 export declare const getAllCorners: (geom: MultiPolygonGeometry) => [number, number][];
+export declare const simplifyMultiPolygon: (multi: MultiPolygon, tolerance?: number) => MultiPolygon;

package/dist/model/core/polygon/polygonUtils.d.ts

@@ -1 +1,2 @@
-export {};
+import { Polygon } from './Polygon';
+export declare const simplifyPolygon: (polygon: Polygon, tolerance?: number) => Polygon;

package/dist/model/core/shapeUtils.d.ts

@@ -32,3 +32,4 @@ export declare const boundsFromPoints: (points: Array<[number, number]>) => Boun
 export declare const computePolygonArea: (points: [number, number][]) => number;
 export declare const isPointInPolygon: (points: [number, number][], x: number, y: number) => boolean;
 export declare const pointsToPath: (points: [number, number][], close?: boolean) => string;
+export declare const simplifyPoints: (points: number[][], tolerance?: number) => [number, number][];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@annotorious/annotorious",
-  "version": "3.4.2",
+  "version": "3.4.3",
   "description": "Add image annotation functionality to any web page with a few lines of JavaScript",
   "author": "Rainer Simon",
   "license": "BSD-3-Clause",
@@ -49,9 +49,10 @@
     "vitest": "^3.1.4"
   },
   "dependencies": {
-    "@annotorious/core": "3.4.2",
+    "@annotorious/core": "3.4.3",
     "dequal": "^2.0.3",
     "rbush": "^4.0.1",
+    "simplify-js": "^1.2.4",
     "svg-pathdata": "^7.2.0",
     "uuid": "^11.1.0"
   }

package/src/annotation/editors/multipolygon/MultiPolygonEditor.svelte

@@ -50,7 +50,7 @@
 
   /** Determine visible midpoint, if any **/
   const onPointerMove = (evt: PointerEvent) => {
-    if (selectedCorners.length > 0) {
+    if (selectedCorners.length > 0 || !midpoints.some(m => m.visible)) {
       visibleMidpoint = undefined;
       return;
     }

package/src/annotation/editors/polygon/PolygonEditor.svelte

@@ -59,7 +59,7 @@
 
   /** Determine visible midpoint, if any **/
   const onPointerMove = (evt: PointerEvent) => {
-    if (selectedCorners.length > 0) {
+    if (selectedCorners.length > 0 || !midpoints.some(m => m.visible)) {
       visibleMidpoint = undefined;
       return;
     }

package/src/model/core/multipolygon/multiPolygonUtils.ts

@@ -1,7 +1,7 @@
 import { ShapeType } from '../Shape';
 import type { ShapeUtil } from '../shapeUtils';
-import { boundsFromPoints, computePolygonArea, isPointInPolygon, pointsToPath, registerShapeUtil } from '../shapeUtils';
-import type { MultiPolygon, MultiPolygonElement, MultiPolygonGeometry } from './MultiPolygon';
+import { boundsFromPoints, computePolygonArea, isPointInPolygon, pointsToPath, registerShapeUtil, simplifyPoints } from '../shapeUtils';
+import type { MultiPolygon, MultiPolygonElement, MultiPolygonGeometry, MultiPolygonRing } from './MultiPolygon';
 
 const MultiPolygonUtil: ShapeUtil<MultiPolygon> = {
 
@@ -70,4 +70,35 @@ export const getAllCorners = (geom: MultiPolygonGeometry) =>
     ]
   ), []);
 
+export const simplifyMultiPolygon = (multi: MultiPolygon, tolerance = 1): MultiPolygon => {
+  const polygons = multi.geometry.polygons.map(polygon => {
+    const rings: MultiPolygonRing[] = polygon.rings.map(ring => {
+      const points = simplifyPoints(ring.points, tolerance);
+      return {
+        ...ring,
+        points
+      }
+    });
+
+    const bounds = boundsFromPoints(rings[0].points);
+
+    return {
+      ...polygon,
+      rings,
+      bounds
+    }
+  });
+
+  const bounds = boundsFromMultiPolygonElements(polygons);
+
+  return {
+    ...multi,
+    geometry: {
+      ...multi.geometry,
+      polygons,
+      bounds
+    }
+  }
+}
+
 registerShapeUtil(ShapeType.MULTIPOLYGLON, MultiPolygonUtil);

package/src/model/core/polygon/polygonUtils.ts

@@ -1,6 +1,6 @@
 import { ShapeType } from '../Shape';
 import type { ShapeUtil } from '../shapeUtils';
-import { computePolygonArea, isPointInPolygon, registerShapeUtil } from '../shapeUtils';
+import { boundsFromPoints, computePolygonArea, isPointInPolygon, registerShapeUtil, simplifyPoints } from '../shapeUtils';
 import type { Polygon } from './Polygon';
 
 const PolygonUtil: ShapeUtil<Polygon> = {
@@ -17,4 +17,18 @@ const PolygonUtil: ShapeUtil<Polygon> = {
   
 };
 
+export const simplifyPolygon = (polygon: Polygon, tolerance = 1): Polygon => {
+  const points = simplifyPoints(polygon.geometry.points, tolerance);
+  const bounds = boundsFromPoints(points);
+
+  return {
+    ...polygon,
+    geometry: {
+      ...polygon.geometry,
+      bounds,
+      points
+    }
+  }
+}
+
 registerShapeUtil(ShapeType.POLYGON, PolygonUtil);

package/src/model/core/shapeUtils.ts

@@ -1,3 +1,4 @@
+import simplify from 'simplify-js';
 import type { Bounds, Shape, ShapeType } from './Shape';
 
 export interface ShapeUtil<T extends Shape> {
@@ -103,3 +104,8 @@ export const pointsToPath = (points: [number, number][], close: boolean = true):
 
   return d;
 }
+
+export const simplifyPoints = (points: number[][], tolerance = 1): [number, number][] => {
+  const mapped = points.map(([x, y]) => ({ x, y }));
+  return simplify(mapped, tolerance, true).map(pt => [pt.x, pt.y]);
+}