@theseam/ui-common 2.0.1-beta.115 → 2.0.1-beta.119

package/fesm2022/theseam-ui-common-utils.mjs

@@ -711,32 +711,17 @@ function openBlob(blob, target, filename) {
     // }
 }
 
-/** Returns object without property */
-function withoutProperty(obj, propName) {
-    const { [propName]: _, ...without } = obj;
-    return without;
-}
-/** Returns object without properties */
-function withoutProperties(obj, propNames) {
-    let without = obj;
-    for (const propName of propNames) {
-        without = withoutProperty(without, propName);
-    }
-    return without;
-}
-/** Delete property of object */
-function deleteProperty(obj, propName) {
-    if (Object.prototype.hasOwnProperty.call(obj, propName)) {
-        delete obj[propName];
-    }
-}
-/** Delete properties of object */
-function deleteProperties(obj, propNames) {
-    for (const propName of propNames) {
-        deleteProperty(obj, propName);
-    }
-}
-
+/**
+ * Property key under which `readGeoFile` records the archive member a feature
+ * came from, for shapefile archives only.
+ *
+ * A zip can hold one shapefile per field, and once their features are
+ * concatenated the member name is the only thing distinguishing them — for
+ * some producer exports it is the only usable name at all, because the `.dbf`
+ * carries nothing but numbers. The value is the member's basename, without its
+ * directory or extension.
+ */
+const GEO_FILE_SOURCE_NAME_PROPERTY = 'seamSourceFileName';
 /**
  * Reads a File, or buffer of file content, in GeoJSON or ESRI Shapefile format
  * and returns a GeoJSON `FeatureCollection`.
@@ -775,17 +760,73 @@ async function parseShpFile(buffer) {
     return featCollection;
 }
 async function parseShpZip(buffer) {
-    let featCollection = await parseZip(buffer);
-    if (Array.isArray(featCollection)) {
-        if (featCollection.length === 0) {
-            throw Error(`Shape data not found.`);
+    const parsed = await parseZipLayers(buffer);
+    const features = [];
+    let coercedAny = false;
+    for (const layer of parsed) {
+        const collection = coerceFeatureCollection(layer);
+        if (collection === null) {
+            // `parseZip` also reports `.json` members as layers, and one can hold
+            // something that is not a FeatureCollection. Skip it rather than fail an
+            // archive whose shapefiles are perfectly good.
+            continue;
         }
-        else if (featCollection.length > 1) {
-            throw Error(`Multiple shape files not supported.`);
+        coercedAny = true;
+        const sourceName = basename(layer.fileName);
+        for (const feature of collection.features) {
+            features.push(sourceName === undefined
+                ? feature
+                : {
+                    ...feature,
+                    properties: {
+                        ...feature.properties,
+                        [GEO_FILE_SOURCE_NAME_PROPERTY]: sourceName,
+                    },
+                });
         }
-        featCollection = featCollection[0];
     }
-    return withoutProperty(featCollection, 'fileName');
+    // Not "features.length === 0": a member that coerced fine but held zero
+    // records (an empty selection, legally exported) is a successful empty
+    // import, not a failure. Only "every member failed to coerce" means the
+    // archive held no usable shape data.
+    if (!coercedAny) {
+        throw Error(`Shape data not found.`);
+    }
+    // Built fresh, so the `fileName` shpjs sets on each layer is not carried out
+    // of here on the collection itself.
+    return { type: 'FeatureCollection', features };
+}
+/**
+ * Normalizes `parseZip`'s return to an array. It hands back the collection
+ * itself for a single-shapefile archive and an array for a multi-shapefile
+ * one, and throws its own `no layers founds` for an archive holding neither a
+ * `.shp` nor a `.json`.
+ */
+async function parseZipLayers(buffer) {
+    let parsed;
+    try {
+        parsed = await parseZip(buffer);
+    }
+    catch (err) {
+        if (err instanceof Error && err.message === 'no layers founds') {
+            throw Error(`Shape data not found.`);
+        }
+        throw err;
+    }
+    return Array.isArray(parsed) ? parsed : [parsed];
+}
+/**
+ * Member name without its directory, as a feature can use it. Strips only the
+ * directory: shpjs has already stripped the extension from `layer.fileName`
+ * by the time it reaches here, so there is none left to remove.
+ */
+function basename(fileName) {
+    if (fileName === undefined || fileName.length === 0) {
+        return undefined;
+    }
+    const lastSlash = Math.max(fileName.lastIndexOf('/'), fileName.lastIndexOf('\\'));
+    const name = lastSlash === -1 ? fileName : fileName.slice(lastSlash + 1);
+    return name.length === 0 ? undefined : name;
 }
 function parseGeoJson(buffer) {
     const json = JSON.parse(new TextDecoder().decode(buffer));
@@ -1103,6 +1144,32 @@ function loadStyleSheet(path) {
     });
 }
 
+/** Returns object without property */
+function withoutProperty(obj, propName) {
+    const { [propName]: _, ...without } = obj;
+    return without;
+}
+/** Returns object without properties */
+function withoutProperties(obj, propNames) {
+    let without = obj;
+    for (const propName of propNames) {
+        without = withoutProperty(without, propName);
+    }
+    return without;
+}
+/** Delete property of object */
+function deleteProperty(obj, propName) {
+    if (Object.prototype.hasOwnProperty.call(obj, propName)) {
+        delete obj[propName];
+    }
+}
+/** Delete properties of object */
+function deleteProperties(obj, propNames) {
+    for (const propName of propNames) {
+        deleteProperty(obj, propName);
+    }
+}
+
 function notNullOrUndefinedOrEmpty(value, trim = true) {
     return (value !== null &&
         value !== undefined &&
@@ -1494,5 +1561,5 @@ function sanitizeFilename(filename, options) {
  * Generated bundle index. Do not edit.
  */
 
-export { IS_FEATURE_COLLECTION_VALIDATOR_NAME, IS_ONLY_GEOMETRY_TYPES_VALIDATOR_NAME, MIN_MAX_POINTS_VALIDATOR_NAME, NO_EMPTY_FEATURE_COLLECTION_VALIDATOR_NAME, NO_INNER_RINGS_VALIDATOR_NAME, NO_KINKS_VALIDATOR_NAME, PollingTickerOptions, Refreshable, activatedRoutesWithDataProperty, addHoleToPolygon, arrayMoveImmutable, arrayMoveMutable, calcPercentage, closePolygons, coerceFeatureCollection, createPadding, deleteProperties, deleteProperty, fileBufferToBlob, fileBufferToObjectUrl, fileDataFromBuffer, fractionalDigitsCount, geoJsonToArea, getAttribute, getClosestWidgetCdkDrag, getControlName, getControlPath, hasAttribute, hasProperty, hasRequiredControl, isAbsoluteUrl, isEmptyInputValue, isEmptyUrlRoute, isFeatureCollectionValidator, isNullOrUndefined, isNullOrUndefinedOrEmpty, isNumeric, isOnlyGeometryTypes, isOnlyGeometryTypesValidator, leafChildRoute, loadStyle, loadStyleSheet, mapEach, mergePolygons, minMaxPointsValidator, noEmptyFeatureCollectionValidator, noInnerRingsValidator, noKinksValidator, notNullOrUndefined, notNullOrUndefinedOrEmpty, observeControlIsDifferent, observeControlStatus, observeControlValid, observeControlValue, observeControlValueChange, observeQueryList, openBlob, padEnd, padStart, phoneNumberMask, pollingTicker, polygonContains, polygonHasMinDistinctVertices, polygonViolatesMinMax, readFileAsDataUrlAsync, readFileAsync, readGeoFile, ringIsClockwise, routeSnapshotPathFull, routeSnapshotPathRelative, sanitizeFilename, splitMultiPolygons, stripOuter, subscriberCount, tapFirst, toggleAttribute, trimRepeated, waitOnConditionAsync, waitOnNonPendingStatus, willHaveDataProp, withoutProperties, withoutProperty, wrapIntoObservable };
+export { GEO_FILE_SOURCE_NAME_PROPERTY, IS_FEATURE_COLLECTION_VALIDATOR_NAME, IS_ONLY_GEOMETRY_TYPES_VALIDATOR_NAME, MIN_MAX_POINTS_VALIDATOR_NAME, NO_EMPTY_FEATURE_COLLECTION_VALIDATOR_NAME, NO_INNER_RINGS_VALIDATOR_NAME, NO_KINKS_VALIDATOR_NAME, PollingTickerOptions, Refreshable, activatedRoutesWithDataProperty, addHoleToPolygon, arrayMoveImmutable, arrayMoveMutable, calcPercentage, closePolygons, coerceFeatureCollection, createPadding, deleteProperties, deleteProperty, fileBufferToBlob, fileBufferToObjectUrl, fileDataFromBuffer, fractionalDigitsCount, geoJsonToArea, getAttribute, getClosestWidgetCdkDrag, getControlName, getControlPath, hasAttribute, hasProperty, hasRequiredControl, isAbsoluteUrl, isEmptyInputValue, isEmptyUrlRoute, isFeatureCollectionValidator, isNullOrUndefined, isNullOrUndefinedOrEmpty, isNumeric, isOnlyGeometryTypes, isOnlyGeometryTypesValidator, leafChildRoute, loadStyle, loadStyleSheet, mapEach, mergePolygons, minMaxPointsValidator, noEmptyFeatureCollectionValidator, noInnerRingsValidator, noKinksValidator, notNullOrUndefined, notNullOrUndefinedOrEmpty, observeControlIsDifferent, observeControlStatus, observeControlValid, observeControlValue, observeControlValueChange, observeQueryList, openBlob, padEnd, padStart, phoneNumberMask, pollingTicker, polygonContains, polygonHasMinDistinctVertices, polygonViolatesMinMax, readFileAsDataUrlAsync, readFileAsync, readGeoFile, ringIsClockwise, routeSnapshotPathFull, routeSnapshotPathRelative, sanitizeFilename, splitMultiPolygons, stripOuter, subscriberCount, tapFirst, toggleAttribute, trimRepeated, waitOnConditionAsync, waitOnNonPendingStatus, willHaveDataProp, withoutProperties, withoutProperty, wrapIntoObservable };
 //# sourceMappingURL=theseam-ui-common-utils.mjs.map