@dra2020/baseclient 1.0.55 → 1.0.59

package/dist/csv/all.d.ts

@@ -0,0 +1 @@
+export * from './csv';

package/dist/csv/csv.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/geo/all.d.ts

@@ -1,2 +1,3 @@
 export * from './geo';
 export * from './vfeature';
+export * from './flexname';

package/dist/geo/flexname.d.ts

@@ -0,0 +1 @@
+export declare function flexName(f: any): string;

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

@@ -93,12 +93,14 @@ export interface SessionProps {
         [prop: string]: string;
     };
     groups: any;
+    xid?: string;
 }
 export declare type LabelUpdate = {
     [name: string]: boolean | null;
 };
 export interface SessionUpdateProps {
     id?: string;
+    xid?: string;
     ids?: string[];
     deleted?: boolean;
     published?: boolean;

package/lib/all/all.ts

@@ -21,3 +21,5 @@ import * as G from '../geo/all';
 export { G };
 import * as Emit from '../emit/all';
 export { Emit };
+import * as CSV from '../csv/all';
+export { CSV };

package/lib/csv/all.ts

@@ -0,0 +1 @@
+export * from './csv';

package/lib/csv/csv.ts

@@ -0,0 +1,108 @@
+import * as Util from '../util/all';
+
+// Parse CSV. 
+//    Fields are separated by commas or pipe symbol (census uses pipe separators.
+//    Quoted fields may contain commas or pipes.
+//    Either single quotes or double quotes may be used to surround field value.
+//    Spaces at the beginning and end of fields are ignored.
+//    Quotes must be the first non-space character in the field (otherwise they are part of the field value).
+//
+
+const Space = 32;
+const Tab = 9;
+const Newline = 10;
+const CR = 13;
+const Comma = 44;
+const SingleQuote = 39;
+const DoubleQuote = 34;
+const BackSlash = 92;
+const Pipe = 124;
+
+function isWhite(c: number): boolean
+{
+  return c === Space || c === Newline || c === Tab || c == CR;
+}
+
+class ParseOne
+{
+  coder: Util.Coder;
+  fields: string[]; // output
+  buf: Uint8Array;
+  n: number;
+  tok: Uint8Array;
+  toklen: number;
+  infield: boolean;
+  quote: number;
+  nwhite: number;
+
+  constructor(coder: Util.Coder, line?: string)
+  {
+    this.coder = coder;
+    if (line)
+      this.set(line);
+  }
+
+  set(line: string): void
+  {
+    this.fields = [];
+    this.buf = Util.s2u8(this.coder, line);
+    this.tok = new Uint8Array(new ArrayBuffer(this.buf.length));
+    this.n = 0;
+    this.toklen = 0;
+    this.infield = false;
+    this.nwhite = 0;
+    this.quote = 0;
+    this.parse();
+  }
+
+  get length(): number { return this.fields.length }
+
+  pushtok(force: boolean): void
+  {
+    // Trim trailing whitespace
+    if (!force)
+      this.toklen -= this.nwhite;
+
+    if (this.toklen || force)
+    {
+      this.fields.push(Util.u82s(this.coder, this.tok, 0, this.toklen));
+      this.toklen = 0;
+    }
+    this.infield = false;
+    this.nwhite = 0;
+    this.quote = 0;
+  }
+
+  parse(): void
+  {
+    while (this.n < this.buf.length)
+    {
+      let c: number = this.buf[this.n++];
+      if (this.quote && c === this.quote)
+        this.pushtok(true);
+      else if (c === Comma || c === Pipe)
+        this.pushtok(true);
+      else if (this.infield)
+      {
+        this.tok[this.toklen++] = c;
+        if (isWhite(c))
+          this.nwhite++;
+        else
+          this.nwhite = 0;
+      }
+      else if (isWhite(c))
+        continue;
+      else if (c === SingleQuote || c === DoubleQuote)
+      {
+        this.quote = c;
+        this.infield = true;
+      }
+      else
+      {
+        this.infield = true;
+        this.tok[this.toklen++] = c;
+      }
+    }
+    this.pushtok(false);
+  }
+}

package/lib/geo/all.ts

@@ -1,2 +1,3 @@
 export * from './geo';
 export * from './vfeature';
+export * from './flexname';

package/lib/geo/flexname.ts

@@ -0,0 +1,27 @@
+export function flexName(f: any): string
+{
+  if (!f || !f.properties) return null;
+
+  let oneOf = [ 'name', 'entry_name', 'Name', 'NAME',
+                'NAMELSAD', 'namelsad',
+                'NAME10', 'name10',
+                'NAMELSAD10', 'namelsad10',
+                'NAME20', 'name20',
+                'NAMELSAD20', 'namelsad20',
+                'NAME30', 'name30',
+                'NAMELSAD30', 'namelsad30',
+                ];
+
+  for (let i = 0; i < oneOf.length; i++)
+    if (f.properties[oneOf[i]] !== undefined)
+    {
+      let name: string = f.properties[oneOf[i]];
+      if (name.startsWith('Block Group') && f.properties['GEOID10'] !== undefined)
+        return String(f.properties['GEOID10']).substr(2);
+      name = name.replace('Voting Districts', '');
+      name = name.replace('Precinct', '');
+      return name.replace('Voting District', '').trim();
+    }
+
+  return `${f.properties.id}`;
+}

package/lib/ot-js/otsession.ts

@@ -119,6 +119,7 @@ export interface SessionProps
   expungeDate?: string;
   xprops?: { [prop: string]: string };
   groups: any;  // DT.GroupsMapIndex
+  xid?: string; // external ID
 }
 
 // True to add, False to remove
@@ -127,6 +128,7 @@ export type LabelUpdate = { [name: string]: boolean|null }
 export interface SessionUpdateProps
 {
 	id?: string;
+  xid?: string;
   ids?: string[];
 	deleted?: boolean;
 	published?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dra2020/baseclient",
-  "version": "1.0.55",
+  "version": "1.0.59",
   "description": "Utility functions for Javascript projects.",
   "main": "dist/baseclient.js",
   "types": "./dist/all/all.d.ts",
@@ -40,9 +40,6 @@
     "webpack-cli": "^4.4.0"
   },
   "dependencies": {
-    "@dra2020/baseclient": "^1.0.36",
-    "@dra2020/baseserver": "^1.0.21",
-    "@dra2020/dra-types": "^1.8.26",
     "@dra2020/topojson-client": "^3.2.7",
     "@dra2020/topojson-server": "^3.0.103",
     "@dra2020/topojson-simplify": "^3.0.102",