@twinfinity/printing 6.0.1-ci.28952-beta → 6.0.2-beta

package/src/layout/labelsRender.ts

@@ -1,170 +1,170 @@
-import { LabelsElement, LayoutData } from './types';
-import { matchesV2Filter } from './filters';
-import { pointInPolygon } from './clipUtils';
-import { getPathValue, resolvePath, escapeAttr, escapeText } from './renderUtils';
-
-import { isRecord, getProp } from './typeGuards';
-
-export interface ViewportRenderInfo {
-    mmPerModel: number;
-    contentWidthMm: number;
-    contentHeightMm: number;
-    offsetX: number;
-    offsetY: number;
-    rotationDeg: number;
-    transform: {
-        viewMinX: number;
-        viewMaxX: number;
-        viewMinZ: number;
-        viewMaxZ: number;
-        viewWidth: number;
-        viewHeight: number;
-    };
-    centerX: number;
-    centerY: number;
-    centerModelX: number;
-    centerModelY: number;
-}
-
-export const renderLabels = (
-    labelElements: LabelsElement[],
-    data: LayoutData,
-    viewportRenderInfo: Record<string, ViewportRenderInfo>,
-    viewportClipLabels: Record<string, boolean>,
-    viewportClipPolygonsLocal: Record<string, Array<Array<{ x: number; y: number }>>>,
-    viewportClipPolygonsWorld: Record<string, Array<Array<{ x: number; z: number }>>>,
-    styles: Record<string, unknown>,
-    dataWithViewport: unknown,
-    warnings: string[]
-): string[] => {
-    const parts: string[] = [];
-
-    for (const dl of labelElements) {
-        const vpInfo = viewportRenderInfo[dl.viewport];
-        if (!vpInfo) {
-            warnings.push(`Labels '${dl.id}' missing viewport '${dl.viewport}'.`);
-            continue;
-        }
-        if (vpInfo.rotationDeg !== 0) {
-            warnings.push(`Labels '${dl.id}' skipped because rotation is not supported.`);
-            continue;
-        }
-        if (!vpInfo.transform) {
-            warnings.push(`Labels '${dl.id}' skipped because model transform is missing.`);
-            continue;
-        }
-        // Items come from the bound viewport's data
-        const items = getPathValue(data, `viewports.${dl.viewport}.items`);
-        if (!Array.isArray(items) || !items.length) {
-            continue;
-        }
-        // Filter by class + where
-        let filteredItems =
-            dl.class || dl.where ? items.filter((item) => matchesV2Filter(item, dl.class, dl.where)) : items;
-
-        console.log(`[Labels ${dl.id}] Total items:`, items.length, 'After class+where filter:', filteredItems.length);
-
-        // If matchClipFilter is true, filter by spatial position inside clip polygon
-        if (dl.matchClipFilter && viewportClipPolygonsWorld[dl.viewport]?.length) {
-            const clipPolygons = viewportClipPolygonsWorld[dl.viewport];
-            console.log(`[Labels ${dl.id}] Applying matchClipFilter (spatial) with ${clipPolygons.length} polygons`);
-            const beforeClipFilter = filteredItems.length;
-            filteredItems = filteredItems.filter((item) => {
-                const ix = getProp(item, 'x');
-                const iz = getProp(item, 'z');
-                if (!Number.isFinite(ix) || !Number.isFinite(iz)) return false;
-                return clipPolygons.some((poly) => {
-                    // pointInPolygon expects y coordinate, but we use z for world space
-                    const polyWith2D = poly.map((p) => ({ x: p.x, y: p.z }));
-                    return pointInPolygon(polyWith2D, ix as number, iz as number);
-                });
-            });
-            console.log(
-                `[Labels ${dl.id}] After matchClipFilter (spatial):`,
-                filteredItems.length,
-                '(was:',
-                beforeClipFilter,
-                ')'
-            );
-
-            // Debug: log first few items to see their properties
-            if (filteredItems.length === 0 && beforeClipFilter > 0) {
-                console.log('[Labels] Sample item that was filtered out:', items[0]);
-            }
-        }
-
-        if (!filteredItems.length) {
-            console.log(`[Labels ${dl.id}] No items left after filtering, skipping.`);
-            continue;
-        }
-        const styleName = dl.textStyle;
-        const style = styleName && isRecord(styles) ? getProp(styles, styleName) : undefined;
-        if (!isRecord(style)) {
-            warnings.push(`Labels '${dl.id}' missing textStyle '${styleName ?? '(none)'}'.`);
-            continue;
-        }
-        const anchor = dl.align === 'center' ? 'middle' : dl.align === 'right' ? 'end' : 'start';
-        const t = vpInfo.transform;
-
-        let renderedCount = 0;
-        let spatiallyFilteredCount = 0;
-
-        filteredItems.forEach((item) => {
-            // Hardcoded x/z for BIM floor plane convention
-            const xVal = getProp(item, 'x');
-            const yVal = getProp(item, 'z');
-            if (!Number.isFinite(xVal as number) || !Number.isFinite(yVal as number)) {
-                return;
-            }
-            const viewX = (xVal as number) - t.viewMinX;
-            const viewY = t.viewMaxZ - (yVal as number);
-            const centerModelX = vpInfo.centerModelX;
-            const centerModelY = vpInfo.centerModelY;
-            const xMm = vpInfo.centerX + (viewX - centerModelX) * vpInfo.mmPerModel;
-            const yMm = vpInfo.centerY + (viewY - centerModelY) * vpInfo.mmPerModel;
-
-            if (viewportClipLabels[dl.viewport] && viewportClipPolygonsLocal[dl.viewport]?.length) {
-                const inside = viewportClipPolygonsLocal[dl.viewport].some((poly) =>
-                    pointInPolygon(poly, viewX, viewY)
-                );
-                if (!inside) {
-                    spatiallyFilteredCount++;
-                    return;
-                }
-            }
-
-            renderedCount++;
-
-            const text = escapeText(
-                dl.text && typeof dl.text === 'string'
-                    ? dl.text.replace(/\{\{\s*([^}]+?)\s*\}\}/g, (_m, path) => {
-                          const val = resolvePath(item, path) ?? getPathValue(dataWithViewport, path);
-                          return val === undefined || val === null || typeof val === 'object' ? '' : String(val);
-                      })
-                    : ''
-            );
-
-            const fontFamily = getProp(style, 'fontFamily');
-            const fontSizeMm = getProp(style, 'fontSizeMm');
-            const fontWeight = getProp(style, 'fontWeight');
-            const color = getProp(style, 'color');
-            const letterSpacingMm = getProp(style, 'letterSpacingMm');
-            const lineHeightMm = getProp(style, 'lineHeightMm');
-
-            parts.push(
-                `<text x="${xMm}" y="${yMm}" font-family="${escapeAttr(String(fontFamily))}" font-size="${fontSizeMm}"` +
-                    (fontWeight ? ` font-weight="${escapeAttr(String(fontWeight))}"` : '') +
-                    (color ? ` fill="${escapeAttr(String(color))}"` : '') +
-                    (letterSpacingMm !== undefined ? ` letter-spacing="${letterSpacingMm}"` : '') +
-                    (lineHeightMm !== undefined ? ` line-height="${lineHeightMm}"` : '') +
-                    ` text-anchor="${anchor}">${text}</text>`
-            );
-        });
-
-        console.log(
-            `[Labels ${dl.id}] Rendered ${renderedCount} labels. Spatially filtered out: ${spatiallyFilteredCount}`
-        );
-    }
-
-    return parts;
-};
+import { LabelsElement, LayoutData } from './types';
+import { matchesV2Filter } from './filters';
+import { pointInPolygon } from './clipUtils';
+import { getPathValue, resolvePath, escapeAttr, escapeText } from './renderUtils';
+
+import { isRecord, getProp } from './typeGuards';
+
+export interface ViewportRenderInfo {
+    mmPerModel: number;
+    contentWidthMm: number;
+    contentHeightMm: number;
+    offsetX: number;
+    offsetY: number;
+    rotationDeg: number;
+    transform: {
+        viewMinX: number;
+        viewMaxX: number;
+        viewMinZ: number;
+        viewMaxZ: number;
+        viewWidth: number;
+        viewHeight: number;
+    };
+    centerX: number;
+    centerY: number;
+    centerModelX: number;
+    centerModelY: number;
+}
+
+export const renderLabels = (
+    labelElements: LabelsElement[],
+    data: LayoutData,
+    viewportRenderInfo: Record<string, ViewportRenderInfo>,
+    viewportClipLabels: Record<string, boolean>,
+    viewportClipPolygonsLocal: Record<string, Array<Array<{ x: number; y: number }>>>,
+    viewportClipPolygonsWorld: Record<string, Array<Array<{ x: number; z: number }>>>,
+    styles: Record<string, unknown>,
+    dataWithViewport: unknown,
+    warnings: string[]
+): string[] => {
+    const parts: string[] = [];
+
+    for (const dl of labelElements) {
+        const vpInfo = viewportRenderInfo[dl.viewport];
+        if (!vpInfo) {
+            warnings.push(`Labels '${dl.id}' missing viewport '${dl.viewport}'.`);
+            continue;
+        }
+        if (vpInfo.rotationDeg !== 0) {
+            warnings.push(`Labels '${dl.id}' skipped because rotation is not supported.`);
+            continue;
+        }
+        if (!vpInfo.transform) {
+            warnings.push(`Labels '${dl.id}' skipped because model transform is missing.`);
+            continue;
+        }
+        // Items come from the bound viewport's data
+        const items = getPathValue(data, `viewports.${dl.viewport}.items`);
+        if (!Array.isArray(items) || !items.length) {
+            continue;
+        }
+        // Filter by class + where
+        let filteredItems =
+            dl.class || dl.where ? items.filter((item) => matchesV2Filter(item, dl.class, dl.where)) : items;
+
+        console.log(`[Labels ${dl.id}] Total items:`, items.length, 'After class+where filter:', filteredItems.length);
+
+        // If matchClipFilter is true, filter by spatial position inside clip polygon
+        if (dl.matchClipFilter && viewportClipPolygonsWorld[dl.viewport]?.length) {
+            const clipPolygons = viewportClipPolygonsWorld[dl.viewport];
+            console.log(`[Labels ${dl.id}] Applying matchClipFilter (spatial) with ${clipPolygons.length} polygons`);
+            const beforeClipFilter = filteredItems.length;
+            filteredItems = filteredItems.filter((item) => {
+                const ix = getProp(item, 'x');
+                const iz = getProp(item, 'z');
+                if (!Number.isFinite(ix) || !Number.isFinite(iz)) return false;
+                return clipPolygons.some((poly) => {
+                    // pointInPolygon expects y coordinate, but we use z for world space
+                    const polyWith2D = poly.map((p) => ({ x: p.x, y: p.z }));
+                    return pointInPolygon(polyWith2D, ix as number, iz as number);
+                });
+            });
+            console.log(
+                `[Labels ${dl.id}] After matchClipFilter (spatial):`,
+                filteredItems.length,
+                '(was:',
+                beforeClipFilter,
+                ')'
+            );
+
+            // Debug: log first few items to see their properties
+            if (filteredItems.length === 0 && beforeClipFilter > 0) {
+                console.log('[Labels] Sample item that was filtered out:', items[0]);
+            }
+        }
+
+        if (!filteredItems.length) {
+            console.log(`[Labels ${dl.id}] No items left after filtering, skipping.`);
+            continue;
+        }
+        const styleName = dl.textStyle;
+        const style = styleName && isRecord(styles) ? getProp(styles, styleName) : undefined;
+        if (!isRecord(style)) {
+            warnings.push(`Labels '${dl.id}' missing textStyle '${styleName ?? '(none)'}'.`);
+            continue;
+        }
+        const anchor = dl.align === 'center' ? 'middle' : dl.align === 'right' ? 'end' : 'start';
+        const t = vpInfo.transform;
+
+        let renderedCount = 0;
+        let spatiallyFilteredCount = 0;
+
+        filteredItems.forEach((item) => {
+            // Hardcoded x/z for BIM floor plane convention
+            const xVal = getProp(item, 'x');
+            const yVal = getProp(item, 'z');
+            if (!Number.isFinite(xVal as number) || !Number.isFinite(yVal as number)) {
+                return;
+            }
+            const viewX = (xVal as number) - t.viewMinX;
+            const viewY = t.viewMaxZ - (yVal as number);
+            const centerModelX = vpInfo.centerModelX;
+            const centerModelY = vpInfo.centerModelY;
+            const xMm = vpInfo.centerX + (viewX - centerModelX) * vpInfo.mmPerModel;
+            const yMm = vpInfo.centerY + (viewY - centerModelY) * vpInfo.mmPerModel;
+
+            if (viewportClipLabels[dl.viewport] && viewportClipPolygonsLocal[dl.viewport]?.length) {
+                const inside = viewportClipPolygonsLocal[dl.viewport].some((poly) =>
+                    pointInPolygon(poly, viewX, viewY)
+                );
+                if (!inside) {
+                    spatiallyFilteredCount++;
+                    return;
+                }
+            }
+
+            renderedCount++;
+
+            const text = escapeText(
+                dl.text && typeof dl.text === 'string'
+                    ? dl.text.replace(/\{\{\s*([^}]+?)\s*\}\}/g, (_m, path) => {
+                          const val = resolvePath(item, path) ?? getPathValue(dataWithViewport, path);
+                          return val === undefined || val === null || typeof val === 'object' ? '' : String(val);
+                      })
+                    : ''
+            );
+
+            const fontFamily = getProp(style, 'fontFamily');
+            const fontSizeMm = getProp(style, 'fontSizeMm');
+            const fontWeight = getProp(style, 'fontWeight');
+            const color = getProp(style, 'color');
+            const letterSpacingMm = getProp(style, 'letterSpacingMm');
+            const lineHeightMm = getProp(style, 'lineHeightMm');
+
+            parts.push(
+                `<text x="${xMm}" y="${yMm}" font-family="${escapeAttr(String(fontFamily))}" font-size="${fontSizeMm}"` +
+                    (fontWeight ? ` font-weight="${escapeAttr(String(fontWeight))}"` : '') +
+                    (color ? ` fill="${escapeAttr(String(color))}"` : '') +
+                    (letterSpacingMm !== undefined ? ` letter-spacing="${letterSpacingMm}"` : '') +
+                    (lineHeightMm !== undefined ? ` line-height="${lineHeightMm}"` : '') +
+                    ` text-anchor="${anchor}">${text}</text>`
+            );
+        });
+
+        console.log(
+            `[Labels ${dl.id}] Rendered ${renderedCount} labels. Spatially filtered out: ${spatiallyFilteredCount}`
+        );
+    }
+
+    return parts;
+};

package/src/layout/legendConstants.ts

@@ -1,11 +1,11 @@
-export const PX_PER_MM = 96 / 25.4;
-export const DEFAULT_LEGEND_SWATCH_WIDTH_MM = 8;
-export const DEFAULT_LEGEND_CELL_PADDING_MM = 2;
-export const DEFAULT_LEGEND_BORDER_WIDTH_MM = 0.25;
-export const DEFAULT_LEGEND_GRID_WIDTH_MM = 0.25;
-export const DEFAULT_LEGEND_HEADER_WIDTH_MM = 0.65;
-export const DEFAULT_LEGEND_OFFSET_MM = 5;
-export const LEGEND_TEXT_WIDTH_FACTOR = 0.7;
-export const LEGEND_MIN_CONTENT_WIDTH_EM = 4;
-export const LEGEND_TEXT_Y_OFFSET_FACTOR = 0.3;
-export const MAX_LEGEND_ROWS = 200;
+export const PX_PER_MM = 96 / 25.4;
+export const DEFAULT_LEGEND_SWATCH_WIDTH_MM = 8;
+export const DEFAULT_LEGEND_CELL_PADDING_MM = 2;
+export const DEFAULT_LEGEND_BORDER_WIDTH_MM = 0.25;
+export const DEFAULT_LEGEND_GRID_WIDTH_MM = 0.25;
+export const DEFAULT_LEGEND_HEADER_WIDTH_MM = 0.65;
+export const DEFAULT_LEGEND_OFFSET_MM = 5;
+export const LEGEND_TEXT_WIDTH_FACTOR = 0.7;
+export const LEGEND_MIN_CONTENT_WIDTH_EM = 4;
+export const LEGEND_TEXT_Y_OFFSET_FACTOR = 0.3;
+export const MAX_LEGEND_ROWS = 200;