@smartnet360/svelte-components 0.0.144 → 0.0.145

package/dist/apps/antenna-tools/components/AntennaTools.svelte

@@ -110,11 +110,14 @@
       if (externalAntenna1) {
         const found = findAntennaBySpec(antennas, externalAntenna1);
         if (found) {
+          // Compute available tilts INLINE to avoid stale state issue
+          const tiltsForAntenna1 = getAvailableTiltsForAntenna(found);
+          
           // Use untrack to prevent infinite loop from state updates
           untrack(() => {
             selectedAntenna = found;
-            updateAvailableTilts(found);
-            ant1ElectricalTilt = findTiltIndex(availableElectricalTilts, externalAntenna1.electricalTilt ?? 0);
+            availableElectricalTilts = tiltsForAntenna1;
+            ant1ElectricalTilt = findTiltIndex(tiltsForAntenna1, externalAntenna1.electricalTilt ?? 0);
             ant1MechanicalTilt = externalAntenna1.mechanicalTilt ?? 0;
           });
         } else {
@@ -126,9 +129,10 @@
       if (externalAntenna2) {
         const found2 = findAntennaBySpec(antennas, externalAntenna2);
         if (found2) {
+          const tiltsForAntenna2 = getAvailableTiltsForAntenna(found2);
           untrack(() => {
             selectedAntenna2 = found2;
-            ant2ElectricalTilt = findTiltIndex(getAvailableTiltsForAntenna(found2), externalAntenna2.electricalTilt ?? 0);
+            ant2ElectricalTilt = findTiltIndex(tiltsForAntenna2, externalAntenna2.electricalTilt ?? 0);
             ant2MechanicalTilt = externalAntenna2.mechanicalTilt ?? 0;
             if (viewMode === 'single') {
               viewMode = 'compare';

package/dist/map-v3/features/custom/components/CustomCellSetManager.svelte

@@ -71,6 +71,8 @@
 	let csvHeaders = $state<string[]>([]);
 	let columnMapping = $state<ColumnMapping>({});
 	let importMode = $state<ImportMode>('cell');
+	let includeAllExtras = $state(true);
+	let selectedExtras = $state<number[]>([]);
 	
 	// Quick Add state
 	let showQuickAdd = $state(false);
@@ -203,7 +205,11 @@
 		if (!pendingCsvContent) return;
 		
 		try {
-			importResult = setsStore.importFromCsv(pendingCsvContent, importFileName, columnMapping);
+			importResult = setsStore.importFromCsv(pendingCsvContent, importFileName, {
+				columnMapping,
+				includeAllExtras,
+				selectedExtraIndices: selectedExtras
+			});
 			showMappingModal = false;
 			showImportModal = true;
 		} catch (err) {
@@ -219,6 +225,8 @@
 		csvHeaders = [];
 		columnMapping = {};
 		importMode = 'cell';
+		includeAllExtras = true;
+		selectedExtras = [];
 	}
 
 	function confirmImport() {
@@ -596,8 +604,14 @@
 						headers={csvHeaders}
 						mode={importMode}
 						mapping={columnMapping}
+						{includeAllExtras}
+						{selectedExtras}
 						onmodechange={(m) => importMode = m}
 						onchange={(m) => columnMapping = m}
+						onextraschange={(all, selected) => {
+							includeAllExtras = all;
+							selectedExtras = selected;
+						}}
 					/>
 				</div>
 				<div class="modal-footer py-2">

package/dist/map-v3/features/custom/layers/CustomCellsLayer.svelte

@@ -203,9 +203,7 @@
 						customGroup: item.customGroup,
 						sizeFactor: item.sizeFactor,
 						setName: set.name,
-						...Object.fromEntries(
-							Object.entries(item.extraFields).map(([k, v]) => [`extra_${k}`, v])
-						)
+						popupInfo: { ...item.extraFields }
 					}
 				});
 			} else if (item.geometry === 'cell' && item.resolvedCell) {
@@ -226,11 +224,7 @@
 					feature.properties.customGroup = item.customGroup;
 					feature.properties.sizeFactor = item.sizeFactor;
 					feature.properties.setName = set.name;
-					
-					// Add extra fields
-					for (const [key, value] of Object.entries(item.extraFields)) {
-						feature.properties[`extra_${key}`] = value;
-					}
+					feature.properties.popupInfo = { ...item.extraFields };
 				}
 
 				cellFeatures.push(feature);

package/dist/map-v3/features/custom/logic/csv-parser.d.ts

@@ -26,15 +26,27 @@ export type CsvDelimiter = ',' | ';' | 'auto';
  * @returns Array of header strings
  */
 export declare function extractCsvHeaders(csvContent: string, delimiter?: CsvDelimiter): string[];
+/**
+ * Options for CSV parsing
+ */
+export interface CsvParseOptions {
+    /** Delimiter to use: ',' (comma), ';' (semicolon), or 'auto' (detect) */
+    delimiter?: CsvDelimiter;
+    /** User-defined column mapping (overrides auto-detection) */
+    columnMapping?: ColumnMapping;
+    /** Whether to include all extra columns (default: true) */
+    includeAllExtras?: boolean;
+    /** Specific extra column indices to include (when includeAllExtras is false) */
+    selectedExtraIndices?: number[];
+}
 /**
  * Parse a CSV string into custom items (cells or points)
  * @param csvContent Raw CSV content
  * @param cellLookup Map of cellName -> Cell for resolving cell data
- * @param delimiter Delimiter to use: ',' (comma), ';' (semicolon), or 'auto' (detect)
- * @param columnMapping Optional user-defined column mapping (overrides auto-detection)
+ * @param options Parsing options
  * @returns Import result with items, unmatched IDs, groups, and extra columns
  */
-export declare function parseCustomCellsCsv(csvContent: string, cellLookup: Map<string, Cell>, delimiter?: CsvDelimiter, columnMapping?: ColumnMapping): CustomCellImportResult;
+export declare function parseCustomCellsCsv(csvContent: string, cellLookup: Map<string, Cell>, options?: CsvParseOptions): CustomCellImportResult;
 /**
  * Build a cell lookup map from an array of cells
  * Creates lookups for both cellName and txId for flexible matching

package/dist/map-v3/features/custom/logic/csv-parser.js

@@ -49,11 +49,11 @@ export function extractCsvHeaders(csvContent, delimiter = 'auto') {
  * Parse a CSV string into custom items (cells or points)
  * @param csvContent Raw CSV content
  * @param cellLookup Map of cellName -> Cell for resolving cell data
- * @param delimiter Delimiter to use: ',' (comma), ';' (semicolon), or 'auto' (detect)
- * @param columnMapping Optional user-defined column mapping (overrides auto-detection)
+ * @param options Parsing options
  * @returns Import result with items, unmatched IDs, groups, and extra columns
  */
-export function parseCustomCellsCsv(csvContent, cellLookup, delimiter = 'auto', columnMapping) {
+export function parseCustomCellsCsv(csvContent, cellLookup, options = {}) {
+    const { delimiter = 'auto', columnMapping, includeAllExtras = true, selectedExtraIndices = [] } = options;
     const lines = csvContent.trim().split('\n');
     if (lines.length < 2) {
         return {
@@ -106,16 +106,32 @@ export function parseCustomCellsCsv(csvContent, cellLookup, delimiter = 'auto',
         throw new Error('CSV must contain an "id", "cellName", or "txId" column');
     }
     const hasLatLon = latIndex !== -1 && lonIndex !== -1;
-    // Find extra columns (not reserved)
+    // Find extra columns based on user selection
     const extraColumns = [];
     const extraIndices = [];
-    headers.forEach((header, idx) => {
-        const normalized = normalizeColumnName(header);
-        if (!RESERVED_COLUMNS.includes(normalized)) {
-            extraColumns.push(header.trim());
-            extraIndices.push(idx);
+    // Get indices that are already mapped to known fields
+    const mappedIndices = new Set([idIndex, groupIndex, sizeFactorIndex, latIndex, lonIndex].filter(i => i >= 0));
+    if (includeAllExtras) {
+        // Include all non-reserved, non-mapped columns
+        headers.forEach((header, idx) => {
+            if (mappedIndices.has(idx))
+                return;
+            const normalized = normalizeColumnName(header);
+            if (!RESERVED_COLUMNS.includes(normalized)) {
+                extraColumns.push(header.trim());
+                extraIndices.push(idx);
+            }
+        });
+    }
+    else {
+        // Include only specifically selected columns
+        for (const idx of selectedExtraIndices) {
+            if (idx >= 0 && idx < headers.length && !mappedIndices.has(idx)) {
+                extraColumns.push(headers[idx].trim());
+                extraIndices.push(idx);
+            }
         }
-    });
+    }
     // Parse data rows
     const cells = [];
     const unmatchedTxIds = [];

package/dist/map-v3/features/custom/stores/custom-cell-sets.svelte.d.ts

@@ -7,7 +7,7 @@
 import type { Cell } from '../../../../shared/demo';
 import type { CellDataStore } from '../../cells/stores/cell.data.svelte';
 import type { CustomCellSet, CustomCellImportResult } from '../types';
-import type { ColumnMapping } from '../../../../shared/csv-import';
+import { type CsvParseOptions } from '../logic/csv-parser';
 /** Function that returns the current cells array */
 type CellsGetter = () => Cell[];
 /**
@@ -32,9 +32,9 @@ export declare class CustomCellSetsStore {
      * Import a CSV file and create a new custom cell set
      * @param csvContent Raw CSV content
      * @param fileName Name of the file being imported
-     * @param columnMapping Optional user-defined column mapping
+     * @param options Parsing options (column mapping, extra fields selection)
      */
-    importFromCsv(csvContent: string, fileName: string, columnMapping?: ColumnMapping): CustomCellImportResult;
+    importFromCsv(csvContent: string, fileName: string, options?: CsvParseOptions): CustomCellImportResult;
     /**
      * Create a new set from import result
      */

package/dist/map-v3/features/custom/stores/custom-cell-sets.svelte.js

@@ -69,13 +69,13 @@ export class CustomCellSetsStore {
      * Import a CSV file and create a new custom cell set
      * @param csvContent Raw CSV content
      * @param fileName Name of the file being imported
-     * @param columnMapping Optional user-defined column mapping
+     * @param options Parsing options (column mapping, extra fields selection)
      */
-    importFromCsv(csvContent, fileName, columnMapping) {
+    importFromCsv(csvContent, fileName, options) {
         // Build lookup from all cells
         const cellLookup = buildCellLookup(this.getCells());
-        // Parse CSV with optional user-defined column mapping
-        const result = parseCustomCellsCsv(csvContent, cellLookup, 'auto', columnMapping);
+        // Parse CSV with options
+        const result = parseCustomCellsCsv(csvContent, cellLookup, options || {});
         return result;
     }
     /**

package/dist/shared/csv-import/ColumnMapper.svelte

@@ -4,6 +4,7 @@
 	 * 
 	 * Compact UI for mapping CSV columns to expected fields.
 	 * Includes import mode selection (Cell/Point/Site) with auto-detection.
+	 * Supports extra field selection for tooltips.
 	 */
 	import type { ColumnMapping, ImportFieldsConfig, ImportMode } from './types';
 	import { getFieldsForMode } from './types';
@@ -16,18 +17,27 @@
 		mode: ImportMode;
 		/** Current mapping (can be auto-detected or user-modified) */
 		mapping: ColumnMapping;
+		/** Whether to include all extra columns */
+		includeAllExtras?: boolean;
+		/** Selected extra column indices (when not including all) */
+		selectedExtras?: number[];
 		/** Called when mode changes */
 		onmodechange?: (mode: ImportMode) => void;
 		/** Called when mapping changes */
 		onchange?: (mapping: ColumnMapping) => void;
+		/** Called when extra fields settings change */
+		onextraschange?: (includeAll: boolean, selected: number[]) => void;
 	}
 	
 	let { 
 		headers,
 		mode,
 		mapping,
+		includeAllExtras = true,
+		selectedExtras = [],
 		onmodechange,
-		onchange
+		onchange,
+		onextraschange
 	}: Props = $props();
 	
 	// Get fields config based on current mode
@@ -36,6 +46,18 @@
 	// All fields to display
 	let allFields = $derived([...fieldsConfig.required, ...fieldsConfig.optional]);
 	
+	// Get mapped column indices (to exclude from extra fields options)
+	let mappedIndices = $derived(new Set(
+		Object.values(mapping).filter((v): v is number => v !== null && v !== undefined)
+	));
+	
+	// Available columns for extra fields (not already mapped)
+	let availableExtras = $derived(
+		headers
+			.map((header, idx) => ({ header, idx }))
+			.filter(({ idx }) => !mappedIndices.has(idx))
+	);
+	
 	// Validation state
 	let missingRequired = $derived(
 		fieldsConfig.required.filter(f => 
@@ -78,6 +100,35 @@
 		const idx = mapping[fieldType];
 		return idx !== null && idx !== undefined ? headers[idx] : null;
 	}
+	
+	// Extra fields handlers
+	function handleIncludeAllChange(event: Event) {
+		const checked = (event.target as HTMLInputElement).checked;
+		onextraschange?.(checked, selectedExtras);
+	}
+	
+	function handleExtraFieldChange(slotIndex: number, event: Event) {
+		const select = event.target as HTMLSelectElement;
+		const value = select.value;
+		
+		const newSelected = [...selectedExtras];
+		
+		if (value === '') {
+			// Remove this slot
+			newSelected[slotIndex] = -1;
+		} else {
+			newSelected[slotIndex] = parseInt(value, 10);
+		}
+		
+		// Filter out -1 values and duplicates
+		const filtered = newSelected.filter((v, i) => v >= 0 && newSelected.indexOf(v) === i);
+		onextraschange?.(includeAllExtras, filtered);
+	}
+	
+	function getExtraSlotValue(slotIndex: number): string {
+		const value = selectedExtras[slotIndex];
+		return value === undefined || value < 0 ? '' : String(value);
+	}
 </script>
 
 <div class="column-mapper">
@@ -150,13 +201,56 @@
 				>
 					<option value="">{field.description || '-- Select --'}</option>
 					{#each headers as header, idx}
-						<option value={idx}>{header}</option>
+						<option value={String(idx)}>{header}</option>
 					{/each}
 				</select>
 			</div>
 		{/each}
 	</div>
 	
+	<!-- Extra Fields Section -->
+	{#if availableExtras.length > 0}
+		<div class="extra-fields mt-3 pt-2 border-top">
+			<div class="d-flex align-items-center justify-content-between mb-2">
+				<span class="small fw-medium">Extra columns for popups</span>
+				<div class="form-check form-check-inline mb-0">
+					<input 
+						class="form-check-input" 
+						type="checkbox" 
+						id="include-all-extras"
+						checked={includeAllExtras}
+						onchange={handleIncludeAllChange}
+					/>
+					<label class="form-check-label small" for="include-all-extras">
+						Include all ({availableExtras.length})
+					</label>
+				</div>
+			</div>
+			
+			{#if !includeAllExtras}
+				<div class="extra-slots">
+					{#each [0, 1, 2] as slotIndex}
+						{@const slotId = `extra-slot-${slotIndex}`}
+						<div class="d-flex align-items-center gap-2 mb-1">
+							<select
+								id={slotId}
+								class="form-select form-select-sm"
+								value={getExtraSlotValue(slotIndex)}
+								onchange={(e) => handleExtraFieldChange(slotIndex, e)}
+								aria-label={`Extra field ${slotIndex + 1}`}
+							>
+								<option value="">-- Extra {slotIndex + 1} --</option>
+								{#each availableExtras as { header, idx }}
+									<option value={String(idx)}>{header}</option>
+								{/each}
+							</select>
+						</div>
+					{/each}
+				</div>
+			{/if}
+		</div>
+	{/if}
+	
 	<!-- Validation Warning -->
 	{#if missingRequired.length > 0}
 		<div class="alert alert-warning py-1 px-2 mt-2 mb-0 small">

package/dist/shared/csv-import/ColumnMapper.svelte.d.ts

@@ -3,6 +3,7 @@
      *
      * Compact UI for mapping CSV columns to expected fields.
      * Includes import mode selection (Cell/Point/Site) with auto-detection.
+     * Supports extra field selection for tooltips.
      */
 import type { ColumnMapping, ImportMode } from './types';
 interface Props {
@@ -12,10 +13,16 @@ interface Props {
     mode: ImportMode;
     /** Current mapping (can be auto-detected or user-modified) */
     mapping: ColumnMapping;
+    /** Whether to include all extra columns */
+    includeAllExtras?: boolean;
+    /** Selected extra column indices (when not including all) */
+    selectedExtras?: number[];
     /** Called when mode changes */
     onmodechange?: (mode: ImportMode) => void;
     /** Called when mapping changes */
     onchange?: (mapping: ColumnMapping) => void;
+    /** Called when extra fields settings change */
+    onextraschange?: (includeAll: boolean, selected: number[]) => void;
 }
 declare const ColumnMapper: import("svelte").Component<Props, {}, "">;
 type ColumnMapper = ReturnType<typeof ColumnMapper>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@smartnet360/svelte-components",
-	"version": "0.0.144",
+	"version": "0.0.145",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build && npm run prepack",