@dra2020/baseclient 1.0.147 → 1.0.149

package/dist/baseclient.js

@@ -2602,7 +2602,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.geoIntersect = exports.geoIntersectOptions = exports.GeoMultiCollection = exports.geoMapEqual = exports.geoEqual = exports.geoTopoToCollectionNonNull = exports.geoTopoToCollection = exports.geoCollectionToTopoNonNull = exports.geoCollectionToTopo = exports.geoMapToCollectionNonNull = exports.geoMapToCollection = exports.geoCollectionToMap = exports.geoNormalizeCollection = exports.geoNormalizeFeature = exports.geoEnsureID = exports.hidemapConcat = exports.dumpMetrics = void 0;
+exports.geoIntersect = exports.geoIntersectOptions = exports.GeoMultiCollection = exports.geoMapEqual = exports.geoEqual = exports.geoTopoToCollectionNonNull = exports.geoTopoToCollection = exports.geoCollectionToTopoNonNull = exports.geoCollectionToTopo = exports.geoMapToCollectionNonNull = exports.geoMapToCollection = exports.geoCollectionToMap = exports.geoNormalizeCollection = exports.geoNormalizeFeature = exports.geoEnsureID = exports.isValidId = exports.applyCanonicalID = exports.hidemapConcat = exports.dumpMetrics = void 0;
 const Util = __importStar(__webpack_require__(/*! ../util/all */ "./lib/util/all.ts"));
 const Poly = __importStar(__webpack_require__(/*! ../poly/all */ "./lib/poly/all.ts"));
 // Tracing/debugging aid
@@ -2628,6 +2628,26 @@ function hidemapConcat(...args) {
 }
 exports.hidemapConcat = hidemapConcat;
 const NormalizeAll = { joinPolygons: true, checkRewind: true, ensureID: true };
+function applyCanonicalID(col) {
+    if (col && Array.isArray(col.features))
+        col.features.forEach((f, n) => { f.properties.id = String(n + 1); });
+}
+exports.applyCanonicalID = applyCanonicalID;
+function isValidId(col) {
+    if (!col || !Array.isArray(col.features))
+        return true;
+    let set = new Set();
+    for (let i = 0; i < col.features.length; i++) {
+        let f = col.features[i];
+        if (typeof f.properties.id !== 'string')
+            return false; // id must be string
+        if (set.has(f.properties.id))
+            return false; // id must be unique
+        set.add(f.properties.id);
+    }
+    return true;
+}
+exports.isValidId = isValidId;
 // set the canonical 'id' property from the best property value.
 // if joinPolygons is true, we do not enforce uniqueness.
 //
@@ -2637,8 +2657,6 @@ function geoEnsureID(col, options) {
     const props = ['id', 'GEOID', 'GEOID10', 'GEOID20', 'GEOID30', 'DISTRICT', 'DISTRICTNO', 'DISTRICTNAME'];
     if (col && col.features && col.features.length > 0) {
         let f = col.features[0];
-        if (f.properties.id !== undefined)
-            return; // short-cut - assume if 'id' is set, we're all good.
         props.forEach(p => {
             if (prop === undefined)
                 if (f.properties[p] !== undefined)
@@ -2649,12 +2667,13 @@ function geoEnsureID(col, options) {
                         prop = p;
                 }
         });
-        if (prop)
+        if (prop) {
             col.features.forEach(f => { f.properties.id = f.properties[prop]; });
-        else {
-            let n = 1;
-            col.features.forEach(f => { f.properties.id = String(n++); });
+            if (!isValidId(col))
+                applyCanonicalID(col);
         }
+        else
+            applyCanonicalID(col);
     }
 }
 exports.geoEnsureID = geoEnsureID;
@@ -11778,7 +11797,7 @@ exports.IndexedArray = IndexedArray;
 
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.toSafeNumber = exports.toNumber = exports.isNumber = exports.wrapLon = exports.rad2deg = exports.deg2rad = exports.distance = exports.toRGBAIntensity = exports.toRGBA = exports.toHex = exports.hashObject = exports.hash = exports.percentString = exports.precisionRound = exports.deepAccum = exports.deepCopy = exports.shallowEqual = exports.shallowAssignImmutable = exports.shallowDelete = exports.shallowAssign = exports.shallowCopy = exports.textToHtml = exports.recentDate = exports.relativeDate = exports.prettyDate = exports.deepEqual = exports.partialEqual = exports.nthKey = exports.nthProperty = exports.countKeys = exports.isEmpty = exports.depthof = exports.sizeof = exports.guidKey = exports.createKeyedGuid = exports.createGuid = exports.Deadline = exports.MultiTimer = exports.Elapsed = exports.Now = void 0;
+exports.toSafeNumber = exports.toNumber = exports.isNumber = exports.wrapLon = exports.rad2deg = exports.deg2rad = exports.distance = exports.toRGBAIntensity = exports.toRGBA = exports.toHex = exports.hashObject = exports.hash = exports.percentString = exports.precisionRound = exports.deepAccum = exports.deepCopy = exports.shallowEqual = exports.shallowAssignImmutable = exports.shallowDelete = exports.shallowAssign = exports.shallowCopy = exports.textToHtml = exports.recentDate = exports.relativeDate = exports.prettyDate = exports.deepEqual = exports.partialEqual = exports.nthKey = exports.nthProperty = exports.countKeys = exports.isEmpty = exports.depthof = exports.sizeof = exports.guidKey = exports.createKeyedGuid = exports.isGuid = exports.createGuid = exports.Deadline = exports.MultiTimer = exports.Elapsed = exports.Now = void 0;
 function Now() { return (new Date()).toJSON(); }
 exports.Now = Now;
 // polyfill
@@ -11877,6 +11896,11 @@ function createGuid() {
     });
 }
 exports.createGuid = createGuid;
+const reGuid = /.*-.*-.*-.*-/;
+function isGuid(s) {
+    return reGuid.test(s) && s.length >= 36;
+}
+exports.isGuid = isGuid;
 function createKeyedGuid(key) {
     return `xxxxxxxx-xxxx-${key}xxx-yxxx-xxxxxxxxxxxx`.replace(/[xy]/g, function (c) {
         var r = Math.random() * 16 | 0, v = c === 'x' ? r : (r & 0x3 | 0x8);