@dra2020/baseclient 1.0.147 → 1.0.149

package/dist/geo/geo.d.ts

@@ -20,6 +20,8 @@ export interface NormalizeOptions {
     checkRewind?: boolean;
     ensureID?: boolean;
 }
+export declare function applyCanonicalID(col: GeoFeatureCollection): void;
+export declare function isValidId(col: GeoFeatureCollection): boolean;
 export declare function geoEnsureID(col: GeoFeatureCollection, options?: NormalizeOptions): void;
 export declare function geoNormalizeFeature(f: any, options?: NormalizeOptions): GeoFeature;
 export declare function geoNormalizeCollection(col: GeoFeatureCollection, options?: NormalizeOptions): GeoFeatureCollection;

package/dist/util/util.d.ts

@@ -29,6 +29,7 @@ export declare class Deadline {
     done(): boolean;
 }
 export declare function createGuid(): string;
+export declare function isGuid(s: string): boolean;
 export declare function createKeyedGuid(key: string): string;
 export declare function guidKey(guid: string): string;
 export declare function sizeof(a: any): number;

package/lib/geo/geo.ts

@@ -44,6 +44,27 @@ export interface NormalizeOptions
 }
 const NormalizeAll: NormalizeOptions = { joinPolygons: true, checkRewind: true, ensureID: true };
 
+export function applyCanonicalID(col: GeoFeatureCollection): void
+{
+  if (col && Array.isArray(col.features))
+    col.features.forEach((f: GeoFeature, n: number) => { f.properties.id = String(n+1) });
+}
+
+export function isValidId(col: GeoFeatureCollection): boolean
+{
+  if (! col || ! Array.isArray(col.features)) return true;
+
+  let set = new Set<string>();
+  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;
+}
+
 // set the canonical 'id' property from the best property value.
 // if joinPolygons is true, we do not enforce uniqueness.
 //
@@ -58,7 +79,6 @@ export function geoEnsureID(col: GeoFeatureCollection, options?: NormalizeOption
   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)
@@ -71,12 +91,13 @@ export function geoEnsureID(col: GeoFeatureCollection, options?: NormalizeOption
           }
       });
     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++) });
+      col.features.forEach(f => { f.properties.id = f.properties[prop] });
+      if (! isValidId(col))
+        applyCanonicalID(col);
     }
+    else
+      applyCanonicalID(col);
   }
 }
 

package/lib/util/util.ts

@@ -132,6 +132,13 @@ export function createGuid(): string
   });
 }
 
+const reGuid = /.*-.*-.*-.*-/;
+
+export function isGuid(s: string): boolean
+{
+  return reGuid.test(s) && s.length >= 36
+}
+
 export function createKeyedGuid(key: string): string
 {
     return `xxxxxxxx-xxxx-${key}xxx-yxxx-xxxxxxxxxxxx`.replace(/[xy]/g, function(c) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dra2020/baseclient",
-  "version": "1.0.147",
+  "version": "1.0.149",
   "description": "Utility functions for Javascript projects.",
   "main": "dist/baseclient.js",
   "types": "./dist/all/all.d.ts",