@dra2020/baseclient 1.0.125 → 1.0.126

package/dist/colors/jscolormapsdata.d.ts

@@ -1,4 +1,4 @@
-export type DataTable = {
+export declare type DataTable = {
     [key: string]: {
         interpolate: boolean;
         colors: any[];

package/dist/context/context.d.ts

@@ -1,4 +1,4 @@
-export type ContextValues = {
+export declare type ContextValues = {
     [key: string]: any;
 };
 export interface IContext {

package/dist/fsm/fsm.d.ts

@@ -14,7 +14,7 @@ export declare const FSM_CUSTOM6: number;
 export declare const FSM_CUSTOM7: number;
 export declare const FSM_CUSTOM8: number;
 export declare const FSM_CUSTOM9: number;
-export type FsmIndex = Set<Fsm>;
+export declare type FsmIndex = Set<Fsm>;
 export declare class FsmManager {
     theId: number;
     theEpoch: number;
@@ -68,7 +68,7 @@ export declare class FsmSleep extends Fsm {
     constructor(env: FsmEnvironment, delay: number);
     tick(): void;
 }
-export type SerializerIndex = {
+export declare type SerializerIndex = {
     [key: string]: Fsm;
 };
 export declare class FsmSerializer extends Fsm {
@@ -77,7 +77,7 @@ export declare class FsmSerializer extends Fsm {
     serialize(id: string, fsm?: Fsm): Fsm;
     tick(): void;
 }
-type FsmArrayMap = {
+declare type FsmArrayMap = {
     [key: string]: Fsm[];
 };
 export declare class FsmTracker {

package/dist/geo/geo.d.ts

@@ -1,16 +1,16 @@
 import * as geojson from 'geojson';
 import * as Poly from '../poly/all';
-export type GeoProperties = geojson.GeoJsonProperties;
-export type GeoFeature = geojson.Feature;
-export type GeoFeatureArray = GeoFeature[];
-export type GeoFeatureCollection = geojson.FeatureCollection;
-export type GeoCentroidMap = {
+export declare type GeoProperties = geojson.GeoJsonProperties;
+export declare type GeoFeature = geojson.Feature;
+export declare type GeoFeatureArray = GeoFeature[];
+export declare type GeoFeatureCollection = geojson.FeatureCollection;
+export declare type GeoCentroidMap = {
     [geoid: string]: {
         x: number;
         y: number;
     };
 };
-export type HideMap = {
+export declare type HideMap = {
     [id: string]: boolean;
 };
 export declare function dumpMetrics(): void;
@@ -33,14 +33,14 @@ export declare function geoTopoToCollectionNonNull(topo: Poly.Topo): GeoFeatureC
 export interface GeoFeatureMap {
     [id: string]: GeoFeature;
 }
-export type FeatureFunc = (f: GeoFeature) => void;
+export declare type FeatureFunc = (f: GeoFeature) => void;
 interface GeoEntry {
     tag: string;
     col?: GeoFeatureCollection;
     map?: GeoFeatureMap;
     topo?: Poly.Topo;
 }
-type GeoEntryMap = {
+declare type GeoEntryMap = {
     [tag: string]: GeoEntry;
 };
 export declare function geoEqual(m1: GeoMultiCollection, m2: GeoMultiCollection): boolean;

package/dist/geo/multiblockmapping.d.ts

@@ -1,7 +1,7 @@
-export type BlockMapping = {
+export declare type BlockMapping = {
     [blockid: string]: string;
 };
-export type ReverseBlockMapping = {
+export declare type ReverseBlockMapping = {
     [geoid: string]: string[];
 };
 interface Entry {

package/dist/ot-js/otarray.d.ts

@@ -5,8 +5,8 @@ export declare const OpRetain: number;
 export declare const OpCursor: number;
 export declare const OpSet: number;
 export declare const OpTmpRetain: number;
-export type OTSingleArrayEdit = [number, number, any];
-export type OTEdits = OTSingleArrayEdit[];
+export declare type OTSingleArrayEdit = [number, number, any];
+export declare type OTEdits = OTSingleArrayEdit[];
 declare enum OTalignEdgesType {
     AlignForCompose = 0,
     AlignForTransform = 1

package/dist/ot-js/otcounter.d.ts

@@ -1,7 +1,7 @@
 import * as OT from "./ottypes";
 export declare const OpCounterAdd = 1;
 export declare const OpCounterDel = 2;
-export type CounterEdit = [number, string, any];
+export declare type CounterEdit = [number, string, any];
 export declare class OTCounterResource extends OT.OTResourceBase {
     constructor(rid: string);
     static factory(rid: string): OTCounterResource;

package/dist/ot-js/otmap.d.ts

@@ -1,7 +1,7 @@
 import * as OT from './ottypes';
 export declare const OpMapSet = 1;
 export declare const OpMapDel = 2;
-export type MapEdit = [number, string, any];
+export declare type MapEdit = [number, string, any];
 export declare class OTMapResource extends OT.OTResourceBase {
     constructor(rid: string);
     static factory(rid: string): OTMapResource;

package/dist/ot-js/otsession.d.ts

@@ -23,7 +23,7 @@ export declare const FilterOfficial: number;
 export declare const FilterCOI: number;
 export declare const FilterMyGroups: number;
 export declare const FilterCount: number;
-export type Filter = number;
+export declare type Filter = number;
 export declare const PermNone: number;
 export declare const PermRead: number;
 export declare const PermWrite: number;
@@ -32,10 +32,10 @@ export declare const PermAdmin: number;
 export declare const PermVersion: number;
 export declare const PermEdit: number;
 export declare const PermAll: number;
-export type Permission = number;
+export declare type Permission = number;
 export declare const ServerStateRunning: number;
 export declare const ServerStateMaintenance: number;
-export type ServerState = number;
+export declare type ServerState = number;
 export interface AccessSessionMap {
     [key: string]: string;
 }
@@ -52,7 +52,7 @@ export interface Revision {
     label?: string;
     editcache?: string;
 }
-export type RevisionList = Revision[];
+export declare type RevisionList = Revision[];
 export interface SessionUser {
     id: string;
     name: string;
@@ -101,7 +101,7 @@ export interface SessionProps {
     xid?: string;
     colors?: string;
 }
-export type LabelUpdate = {
+export declare type LabelUpdate = {
     [name: string]: boolean | null;
 };
 export interface SessionUpdateProps {

package/dist/poly/matrix.d.ts

@@ -1,8 +1,8 @@
-export type Matrix = number[][];
-export type Vector = number[];
-export type Range = number[];
-export type Index = number[][];
-export type applyCB = (v: Vector) => number;
+export declare type Matrix = number[][];
+export declare type Vector = number[];
+export declare type Range = number[];
+export declare type Index = number[][];
+export declare type applyCB = (v: Vector) => number;
 export declare const enum Dim {
     Rows = 0,
     Columns = 1

package/dist/poly/polypack.d.ts

@@ -4,8 +4,8 @@ export interface PolyPack {
     buffer: any;
 }
 export declare function polyPackSize(coords: any): number;
-type EachRingCB = (buffer: Float64Array, iPoly: number, iRing: number, iOffset: number, nPoints: number) => void;
-type EachPointCB = (buffer: Float64Array, iPoly: number, iRing: number, iOffset: number) => void;
+declare type EachRingCB = (buffer: Float64Array, iPoly: number, iRing: number, iOffset: number, nPoints: number) => void;
+declare type EachPointCB = (buffer: Float64Array, iPoly: number, iRing: number, iOffset: number) => void;
 export declare function polyPackEachRing(pack: PolyPack, cb: EachRingCB): void;
 export declare function polyPackEachPoint(pack: PolyPack, cb: EachPointCB): void;
 export declare function polyPackCountPoints(pack: PolyPack): number;
@@ -22,7 +22,7 @@ export declare function polyUnpack(prepack: any): any;
 export declare function featurePackSize(f: any): number;
 export declare function featurePack(f: any, prepack?: PolyPack): any;
 export declare function featureUnpack(f: any): any;
-export type SavePack = WeakMap<any, any>;
+export declare type SavePack = WeakMap<any, any>;
 export declare function featureUnpackTemporarily(f: any, save?: SavePack): SavePack;
 export declare function featureRepack(f: any, save: SavePack): any;
 export declare function featurePackString(f: any): string;

package/dist/poly/simplify.d.ts

@@ -1,2 +1,2 @@
-export type Point = [number, number];
+export declare type Point = [number, number];
 export declare function simplify(points: Point[], tolerance?: number, highestQuality?: boolean): Point[];

package/dist/poly/topo.d.ts

@@ -2,11 +2,11 @@ import * as FSM from '../fsm/all';
 import * as G from '../geo/all';
 import * as P from './poly';
 import * as Q from './quad';
-export type Topo = any;
+export declare type Topo = any;
 export declare function topoFromCollection(col: any): Topo;
 export declare function topoContiguity(topo: Topo): any;
 export declare function topoToFeature(topo: Topo, geoid: string): any;
-export type TopoSpliceEntry = {
+export declare type TopoSpliceEntry = {
     topology: Topo;
     filterout?: any;
 };

package/dist/util/bintrie.d.ts

@@ -15,10 +15,10 @@ interface Fragment {
     s: string;
     u8?: Uint8Array;
 }
-type FragmentTable = {
+declare type FragmentTable = {
     [frag: string]: Fragment;
 };
-type FragmentPair = {
+declare type FragmentPair = {
     f1: Fragment;
     f2: Fragment;
     offset?: number;
@@ -51,7 +51,7 @@ declare class ValueTableBuilder {
     toOffset(s: string): number;
     toBinary(): void;
 }
-export type StringMap = {
+export declare type StringMap = {
     [key: string]: string;
 };
 interface UnpackedNode {

package/dist/util/gradient.d.ts

@@ -8,7 +8,7 @@ export interface Stop {
     stop: number;
     rgb?: RGB;
 }
-export type GradientStops = Stop[];
+export declare type GradientStops = Stop[];
 export declare function execGradient(stops: GradientStops, value: number): string;
 export declare function parseGradient(sStops: string): GradientStops;
 export declare function asCSSGradient(stops: GradientStops): string;

package/dist/util/util.d.ts

@@ -1,4 +1,4 @@
-export type DateString = string;
+export declare type DateString = string;
 export declare function Now(): DateString;
 export declare class Elapsed {
     tStart: any;

package/lib/poly/featurecleanholes.ts

@@ -1,5 +1,5 @@
 import { polyIntersects } from './union';
-import { polyArea } from './poly';
+import { polyArea, polyDescribe } from './poly';
 
 function flattenMultiPoly(polys: any): any
 {
@@ -24,6 +24,14 @@ export function featureCleanHoles(f: any): any
       || !Array.isArray(f.geometry.coordinates))
     return f;
 
+  // Bail out if excessive computation cost (and complex poly likely already correct, heuristically)
+  let d = polyDescribe(f);
+  if (d.npoly + d.nhole > 10)
+  {
+    //console.log(`featureCleanHoles: bailing out on polygon with ${d.npoly} polygons and ${d.nhole} holes`);
+    return f;
+  }
+
   // Normalize to flattened polygon
   f.geometry.coordinates = flattenMultiPoly(f.geometry.coordinates);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dra2020/baseclient",
-  "version": "1.0.125",
+  "version": "1.0.126",
   "description": "Utility functions for Javascript projects.",
   "main": "dist/baseclient.js",
   "types": "./dist/all/all.d.ts",
@@ -30,14 +30,14 @@
   "devDependencies": {
     "@types/diff-match-patch": "^1.0.32",
     "@types/geojson": "^7946.0.8",
-    "@types/node": "20.11.30",
-    "@types/object-hash": "^3.0.6",
-    "source-map-loader": "^5.0.0",
-    "ts-loader": "^9.5.1",
+    "@types/node": "12.7.2",
+    "@types/object-hash": "^2.2.1",
+    "source-map-loader": "^3.0.0",
+    "ts-loader": "^9.2.6",
     "tsify": "^5.0.4",
-    "typescript": "^5.4.3",
-    "webpack": "^5.91.0",
-    "webpack-cli": "^5.1.4"
+    "typescript": "^4.5.2",
+    "webpack": "^5.65.0",
+    "webpack-cli": "^4.9.1"
   },
   "dependencies": {
     "@dra2020/topojson-client": "^3.2.12",
@@ -45,7 +45,7 @@
     "@dra2020/topojson-simplify": "^3.0.102",
     "diff-match-patch": "^1.0.5",
     "geojson": "^0.5.0",
-    "object-hash": "^3.0.0",
+    "object-hash": "^2.2.0",
     "polygon-clipping": "^0.15.3",
     "tinyqueue": "^2.0.3"
   }