@dra2020/dra-types 1.0.14 → 1.0.17

package/dist/dra-types.d.ts

@@ -34,12 +34,16 @@ export declare type DistrictToSplitBlock = {
 };
 export declare function vgeoidToGeoid(vgeoid: string): string;
 export declare function vgeoidToChunk(vgeoid: string): string;
+export declare function vgeoidToHash(vgeoid: string): string;
 export declare function isVfeature(geoid: string): boolean;
 export declare function splitToCacheKey(s: SplitBlock): string;
 export declare function splitToChunkKey(s: SplitBlock): string;
 export declare function splitToPrefix(s: SplitBlock): string;
 export declare function cacheKeysToChunkHash(keys: string[]): string;
 export declare function canonicalDistrictID(districtID: string): string;
+export declare function canonicalSortingDistrictID(districtID: string): string;
+export declare function canonicalNumericFromDistrictID(districtID: string): number;
+export declare function canonicalDistrictIDFromNumber(districtID: string, n: number): string;
 export declare type DistrictOrder = {
     [districtID: string]: number;
 };

package/dist/dra-types.js

@@ -156,6 +156,17 @@ function vgeoidToChunk(vgeoid) {
     return vgeoid;
 }
 exports.vgeoidToChunk = vgeoidToChunk;
+function vgeoidToHash(vgeoid) {
+    // vgeoid is string of form: "vfeature_[geoid]_[chunkid]_[hash]"
+    let re = /vfeature_([^_]*)_([^_*])_(.*)/;
+    let a = re.exec(vgeoid);
+    if (a && a.length == 4)
+        vgeoid = a[3];
+    else
+        vgeoid = null;
+    return vgeoid;
+}
+exports.vgeoidToHash = vgeoidToHash;
 function isVfeature(geoid) {
     return geoid.indexOf('vfeature') === 0;
 }
@@ -189,38 +200,93 @@ function cacheKeysToChunkHash(keys) {
     return hash(keys);
 }
 exports.cacheKeysToChunkHash = cacheKeysToChunkHash;
+let reNumeric = /^(\D*)(\d*)(\D*)$/;
 let reDistrictNumber = /^\d+$/;
 let reDistrictNumeric = /^\d/;
+let reLeadingZero = /^0+(.*)/;
+// Normalize any numeric part to have no padded leading zeros
 function canonicalDistrictID(districtID) {
-    // Normalize purely numeric values (e.g. 001)
-    if (reDistrictNumber.test(districtID))
-        return String(Number(districtID));
+    let a = reNumeric.exec(districtID);
+    if (a && a.length == 4) {
+        if (a[2].length > 0)
+            a[2] = String(Number(a[2]));
+        districtID = `${a[1]}${a[2]}${a[3]}`;
+    }
     return districtID;
 }
 exports.canonicalDistrictID = canonicalDistrictID;
-function canonicalDistrictIDOrdering(order) {
-    let keys = Object.keys(order);
-    let i;
-    for (i = 0; i < keys.length; i++) {
-        let s = keys[i];
-        if (reDistrictNumeric.test(s)) {
+// Normalize any numeric part to have four digits with padded leading zeros
+function canonicalSortingDistrictID(districtID) {
+    let a = reNumeric.exec(districtID);
+    if (a && a.length == 4) {
+        let s = a[2];
+        if (s.length > 0) {
             switch (s.length) {
                 case 1:
-                    keys[i] = `000${s}`;
+                    s = `000${s}`;
                     break;
                 case 2:
-                    keys[i] = `00${s}`;
+                    s = `00${s}`;
                     break;
                 case 3:
-                    keys[i] = `0${s}`;
+                    s = `0${s}`;
                     break;
             }
+            a[2] = s;
+        }
+        districtID = `${a[1]}${a[2]}${a[3]}`;
+    }
+    return districtID;
+}
+exports.canonicalSortingDistrictID = canonicalSortingDistrictID;
+// Return numeric part of districtID (or -1 if there is none)
+function canonicalNumericFromDistrictID(districtID) {
+    let a = reNumeric.exec(districtID);
+    if (a && a.length == 4) {
+        let s = a[2];
+        if (s.length > 0)
+            return Number(s);
+    }
+    return -1;
+}
+exports.canonicalNumericFromDistrictID = canonicalNumericFromDistrictID;
+function canonicalDistrictIDFromNumber(districtID, n) {
+    let a = reNumeric.exec(districtID);
+    if (a && a.length == 4) {
+        a[2] = String(n);
+        districtID = `${a[1]}${a[2]}${a[3]}`;
+    }
+    else
+        districtID = String(n);
+    return districtID;
+}
+exports.canonicalDistrictIDFromNumber = canonicalDistrictIDFromNumber;
+function canonicalDistrictIDOrdering(order) {
+    let keys = Object.keys(order);
+    let i;
+    let a = [];
+    let template = undefined;
+    for (i = 0; i < keys.length; i++) {
+        let s = keys[i];
+        keys[i] = canonicalSortingDistrictID(s);
+        let n = canonicalNumericFromDistrictID(s);
+        if (n > 0) {
+            if (template === undefined)
+                template = s;
+            a[n] = true;
         }
     }
+    if (template !== undefined) {
+        for (i = 1; i < a.length; i++)
+            if (a[i] === undefined)
+                keys.push(canonicalDistrictIDFromNumber(template, i));
+    }
     keys.sort();
     order = {};
     for (i = 0; i < keys.length; i++)
         order[canonicalDistrictID(keys[i])] = i + 1;
+    if (order['ZZZ'])
+        delete order['ZZZ'];
     return order;
 }
 exports.canonicalDistrictIDOrdering = canonicalDistrictIDOrdering;

package/dist/dra-types.js.map

@@ -1 +1 @@
-{"version":3,"sources":["webpack://dra-types/webpack/universalModuleDefinition","webpack://dra-types/webpack/bootstrap","webpack://dra-types/./lib/all.ts","webpack://dra-types/./lib/dra-types.ts","webpack://dra-types/external \"object-hash\""],"names":[],"mappings":"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","file":"dra-types.js","sourcesContent":["(function webpackUniversalModuleDefinition(root, factory) {\n\tif(typeof exports === 'object' && typeof module === 'object')\n\t\tmodule.exports = factory();\n\telse if(typeof define === 'function' && define.amd)\n\t\tdefine([], factory);\n\telse if(typeof exports === 'object')\n\t\texports[\"dra-types\"] = factory();\n\telse\n\t\troot[\"dra-types\"] = factory();\n})(global, function() {\nreturn "," \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, { enumerable: true, get: getter });\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n \t\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n \t\t}\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// create a fake namespace object\n \t// mode & 1: value is a module id, require it\n \t// mode & 2: merge all properties of value into the ns\n \t// mode & 4: return value when already ns object\n \t// mode & 8|1: behave like require\n \t__webpack_require__.t = function(value, mode) {\n \t\tif(mode & 1) value = __webpack_require__(value);\n \t\tif(mode & 8) return value;\n \t\tif((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;\n \t\tvar ns = Object.create(null);\n \t\t__webpack_require__.r(ns);\n \t\tObject.defineProperty(ns, 'default', { enumerable: true, value: value });\n \t\tif(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));\n \t\treturn ns;\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = \"./lib/all.ts\");\n","export * from './dra-types';\n","// Public libraries\nimport * as Hash from 'object-hash';\n\n// Type for single comment\nexport interface Comment\n{\n  userid: string;\n  text: string;\n  date: string;\n  recommend: number;\n}\n\n// Comment record associated with a map\nexport interface CommentList\n{\n  id?: string;\n  [commentid: string]: Comment | string;  // Really just Comment but make TypeScript happy\n}\n\n// Supported like kinds\nexport type LikeKind = 'like' | 'love' | 'wow' | 'angry' | 'funny';\n\n// Like record for an individual like\nexport interface Like\n{\n  date: string;\n  kind: LikeKind;\n}\n\n// Record for likes associated with a map\nexport interface LikeList\n{\n  id?: string;\n  [userid: string]: Like | string;  // Really just Like but make TypeScript happy\n}\n\n// Record for likes an individual user has performed\nexport interface UserLikes\n{\n  id?: string;\n  [aid: string]: Like | string;     // Really just Like but make TypeScript happy\n}\n\nexport interface SplitBlock\n{\n  id?: string;\n  chunk?: string;\n  state: string;\n  datasource: string;\n  geoid: string;\n  blocks: string[];\n}\n\nexport type DistrictToSplitBlock = { [districtID: string]: SplitBlock[] };\n\n// Canonical hashing of splitblock data\nfunction hash(o: any): string\n{\n  return Hash(o,\n    { respectType: false,\n      unorderedArrays: true,\n      unorderedObjects: true,\n      excludeKeys: (k: string) => (k === 'id' || k === 'chunk')\n    });\n}\n\nexport function vgeoidToGeoid(vgeoid: string): string\n{\n  let re = /vfeature_([^_]*)_.*/;\n  let a = re.exec(vgeoid);\n  if (a == null || a.length != 2)\n    return '';\n  else\n    return a[1];\n}\n\nexport function vgeoidToChunk(vgeoid: string): string\n{\n  // vgeoid is string of form: \"vfeature_[geoid]_[chunkid]_[hash]\"\n  // the contents are chunked into a file of form \"vfeature_chunk_[chunkid]\"\n  // So extract the chunk ID and download that.\n  let re = /vfeature_([^_]*)_([^_*])_(.*)/;\n  let a = re.exec(vgeoid);\n  if (a && a.length == 4)\n    vgeoid = `vfeature_chunk_${a[2]}`;\n  else\n    vgeoid = null;\n\n  return vgeoid;\n}\n\nexport function isVfeature(geoid: string): boolean\n{\n  return geoid.indexOf('vfeature') === 0;\n}\n\nexport function splitToCacheKey(s: SplitBlock): string\n{\n  if (s.id === undefined)\n    s.id = hash(s);\n  if (s.chunk === undefined)\n    s.chunk = \"0\";\n\n  return `_${s.state}_${s.datasource}_vfeature_${s.geoid}_${s.chunk}_${s.id}.geojson`;\n}\n\nexport function splitToChunkKey(s: SplitBlock): string\n{\n  if (s.chunk === undefined)\n    s.chunk = \"0\";\n\n  return `_${s.state}_${s.datasource}_vfeature_chunk_${s.chunk}.geojson`;\n}\n\nexport function splitToPrefix(s: SplitBlock): string\n{\n  if (s.blocks === undefined)\n  {\n    let re = /_([^_]*)_(.*)_vfeature.*\\.geojson$/;\n    let a = re.exec(s.id);\n    if (a && a.length == 3)\n      return `_${a[1]}_${a[2]}`;\n    return s.id;\n  }\n  return `_${s.state}_${s.datasource}`;\n}\n\nexport function cacheKeysToChunkHash(keys: string[]): string\n{\n  return hash(keys);\n}\n\nlet reDistrictNumber = /^\\d+$/;\nlet reDistrictNumeric = /^\\d/;\n\nexport function canonicalDistrictID(districtID: string): string\n{\n  // Normalize purely numeric values (e.g. 001)\n  if (reDistrictNumber.test(districtID))\n    return String(Number(districtID));\n  return districtID;\n}\n\n// Numbers start at 1\nexport type DistrictOrder = { [districtID: string]: number };\n\nexport function canonicalDistrictIDOrdering(order: DistrictOrder): DistrictOrder\n{\n  let keys = Object.keys(order);\n  let i: number;\n\n  for (i = 0; i < keys.length; i++)\n  {\n    let s = keys[i];\n    if (reDistrictNumeric.test(s))\n    {\n      switch (s.length)\n      {\n        case 1: keys[i] = `000${s}`;  break;\n        case 2: keys[i] = `00${s}`;  break;\n        case 3: keys[i] = `0${s}`;  break;\n      }\n    }\n  }\n  keys.sort();\n  order = {};\n  for (i = 0; i < keys.length; i++)\n    order[canonicalDistrictID(keys[i])] = i+1;\n  return order;\n}\n","module.exports = require(\"object-hash\");"],"sourceRoot":""}
+{"version":3,"sources":["webpack://dra-types/webpack/universalModuleDefinition","webpack://dra-types/webpack/bootstrap","webpack://dra-types/./lib/all.ts","webpack://dra-types/./lib/dra-types.ts","webpack://dra-types/external \"object-hash\""],"names":[],"mappings":"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","file":"dra-types.js","sourcesContent":["(function webpackUniversalModuleDefinition(root, factory) {\n\tif(typeof exports === 'object' && typeof module === 'object')\n\t\tmodule.exports = factory();\n\telse if(typeof define === 'function' && define.amd)\n\t\tdefine([], factory);\n\telse if(typeof exports === 'object')\n\t\texports[\"dra-types\"] = factory();\n\telse\n\t\troot[\"dra-types\"] = factory();\n})(global, function() {\nreturn "," \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, { enumerable: true, get: getter });\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n \t\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n \t\t}\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// create a fake namespace object\n \t// mode & 1: value is a module id, require it\n \t// mode & 2: merge all properties of value into the ns\n \t// mode & 4: return value when already ns object\n \t// mode & 8|1: behave like require\n \t__webpack_require__.t = function(value, mode) {\n \t\tif(mode & 1) value = __webpack_require__(value);\n \t\tif(mode & 8) return value;\n \t\tif((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;\n \t\tvar ns = Object.create(null);\n \t\t__webpack_require__.r(ns);\n \t\tObject.defineProperty(ns, 'default', { enumerable: true, value: value });\n \t\tif(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));\n \t\treturn ns;\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = \"./lib/all.ts\");\n","export * from './dra-types';\n","// Public libraries\nimport * as Hash from 'object-hash';\n\n// Type for single comment\nexport interface Comment\n{\n  userid: string;\n  text: string;\n  date: string;\n  recommend: number;\n}\n\n// Comment record associated with a map\nexport interface CommentList\n{\n  id?: string;\n  [commentid: string]: Comment | string;  // Really just Comment but make TypeScript happy\n}\n\n// Supported like kinds\nexport type LikeKind = 'like' | 'love' | 'wow' | 'angry' | 'funny';\n\n// Like record for an individual like\nexport interface Like\n{\n  date: string;\n  kind: LikeKind;\n}\n\n// Record for likes associated with a map\nexport interface LikeList\n{\n  id?: string;\n  [userid: string]: Like | string;  // Really just Like but make TypeScript happy\n}\n\n// Record for likes an individual user has performed\nexport interface UserLikes\n{\n  id?: string;\n  [aid: string]: Like | string;     // Really just Like but make TypeScript happy\n}\n\nexport interface SplitBlock\n{\n  id?: string;\n  chunk?: string;\n  state: string;\n  datasource: string;\n  geoid: string;\n  blocks: string[];\n}\n\nexport type DistrictToSplitBlock = { [districtID: string]: SplitBlock[] };\n\n// Canonical hashing of splitblock data\nfunction hash(o: any): string\n{\n  return Hash(o,\n    { respectType: false,\n      unorderedArrays: true,\n      unorderedObjects: true,\n      excludeKeys: (k: string) => (k === 'id' || k === 'chunk')\n    });\n}\n\nexport function vgeoidToGeoid(vgeoid: string): string\n{\n  let re = /vfeature_([^_]*)_.*/;\n  let a = re.exec(vgeoid);\n  if (a == null || a.length != 2)\n    return '';\n  else\n    return a[1];\n}\n\nexport function vgeoidToChunk(vgeoid: string): string\n{\n  // vgeoid is string of form: \"vfeature_[geoid]_[chunkid]_[hash]\"\n  // the contents are chunked into a file of form \"vfeature_chunk_[chunkid]\"\n  // So extract the chunk ID and download that.\n  let re = /vfeature_([^_]*)_([^_*])_(.*)/;\n  let a = re.exec(vgeoid);\n  if (a && a.length == 4)\n    vgeoid = `vfeature_chunk_${a[2]}`;\n  else\n    vgeoid = null;\n\n  return vgeoid;\n}\n\nexport function vgeoidToHash(vgeoid: string): string\n{\n  // vgeoid is string of form: \"vfeature_[geoid]_[chunkid]_[hash]\"\n  let re = /vfeature_([^_]*)_([^_*])_(.*)/;\n  let a = re.exec(vgeoid);\n  if (a && a.length == 4)\n    vgeoid = a[3];\n  else\n    vgeoid = null;\n\n  return vgeoid;\n}\n\nexport function isVfeature(geoid: string): boolean\n{\n  return geoid.indexOf('vfeature') === 0;\n}\n\nexport function splitToCacheKey(s: SplitBlock): string\n{\n  if (s.id === undefined)\n    s.id = hash(s);\n  if (s.chunk === undefined)\n    s.chunk = \"0\";\n\n  return `_${s.state}_${s.datasource}_vfeature_${s.geoid}_${s.chunk}_${s.id}.geojson`;\n}\n\nexport function splitToChunkKey(s: SplitBlock): string\n{\n  if (s.chunk === undefined)\n    s.chunk = \"0\";\n\n  return `_${s.state}_${s.datasource}_vfeature_chunk_${s.chunk}.geojson`;\n}\n\nexport function splitToPrefix(s: SplitBlock): string\n{\n  if (s.blocks === undefined)\n  {\n    let re = /_([^_]*)_(.*)_vfeature.*\\.geojson$/;\n    let a = re.exec(s.id);\n    if (a && a.length == 3)\n      return `_${a[1]}_${a[2]}`;\n    return s.id;\n  }\n  return `_${s.state}_${s.datasource}`;\n}\n\nexport function cacheKeysToChunkHash(keys: string[]): string\n{\n  return hash(keys);\n}\n\nlet reNumeric = /^(\\D*)(\\d*)(\\D*)$/;\nlet reDistrictNumber = /^\\d+$/;\nlet reDistrictNumeric = /^\\d/;\nlet reLeadingZero = /^0+(.*)/;\n\n// Normalize any numeric part to have no padded leading zeros\nexport function canonicalDistrictID(districtID: string): string\n{\n  let a = reNumeric.exec(districtID);\n  if (a && a.length == 4)\n  {\n    if (a[2].length > 0)\n      a[2] = String(Number(a[2]));\n    districtID = `${a[1]}${a[2]}${a[3]}`;\n  }\n  return districtID;\n}\n\n// Normalize any numeric part to have four digits with padded leading zeros\nexport function canonicalSortingDistrictID(districtID: string): string\n{\n  let a = reNumeric.exec(districtID);\n  if (a && a.length == 4)\n  {\n    let s = a[2];\n    if (s.length > 0)\n    {\n      switch (s.length)\n      {\n        case 1: s = `000${s}`;  break;\n        case 2: s = `00${s}`;  break;\n        case 3: s = `0${s}`;  break;\n      }\n      a[2] = s;\n    }\n    districtID = `${a[1]}${a[2]}${a[3]}`;\n  }\n  return districtID;\n}\n\n// Return numeric part of districtID (or -1 if there is none)\nexport function canonicalNumericFromDistrictID(districtID: string): number\n{\n  let a = reNumeric.exec(districtID);\n  if (a && a.length == 4)\n  {\n    let s = a[2];\n    if (s.length > 0)\n      return Number(s);\n  }\n  return -1;\n}\n\nexport function canonicalDistrictIDFromNumber(districtID: string, n: number): string\n{\n  let a = reNumeric.exec(districtID);\n  if (a && a.length == 4)\n  {\n    a[2] = String(n);\n    districtID = `${a[1]}${a[2]}${a[3]}`;\n  }\n  else\n    districtID = String(n);\n  return districtID;\n}\n\n// Numbers start at 1\nexport type DistrictOrder = { [districtID: string]: number };\n\nexport function canonicalDistrictIDOrdering(order: DistrictOrder): DistrictOrder\n{\n  let keys = Object.keys(order);\n  let i: number;\n  let a: any = [];\n  let template: string = undefined;\n\n  for (i = 0; i < keys.length; i++)\n  {\n    let s = keys[i];\n    keys[i] = canonicalSortingDistrictID(s);\n    let n = canonicalNumericFromDistrictID(s);\n    if (n > 0)\n    {\n      if (template === undefined)\n        template = s;\n      a[n] = true;\n    }\n  }\n  if (template !== undefined)\n  {\n    for (i = 1; i < a.length; i++)\n      if (a[i] === undefined)\n        keys.push(canonicalDistrictIDFromNumber(template, i));\n  }\n  keys.sort();\n  order = {};\n  for (i = 0; i < keys.length; i++)\n    order[canonicalDistrictID(keys[i])] = i+1;\n  if (order['ZZZ'])\n    delete order['ZZZ'];\n  return order;\n}\n","module.exports = require(\"object-hash\");"],"sourceRoot":""}

package/lib/dra-types.ts

@@ -89,6 +89,19 @@ export function vgeoidToChunk(vgeoid: string): string
   return vgeoid;
 }
 
+export function vgeoidToHash(vgeoid: string): string
+{
+  // vgeoid is string of form: "vfeature_[geoid]_[chunkid]_[hash]"
+  let re = /vfeature_([^_]*)_([^_*])_(.*)/;
+  let a = re.exec(vgeoid);
+  if (a && a.length == 4)
+    vgeoid = a[3];
+  else
+    vgeoid = null;
+
+  return vgeoid;
+}
+
 export function isVfeature(geoid: string): boolean
 {
   return geoid.indexOf('vfeature') === 0;
@@ -130,14 +143,69 @@ export function cacheKeysToChunkHash(keys: string[]): string
   return hash(keys);
 }
 
+let reNumeric = /^(\D*)(\d*)(\D*)$/;
 let reDistrictNumber = /^\d+$/;
 let reDistrictNumeric = /^\d/;
+let reLeadingZero = /^0+(.*)/;
 
+// Normalize any numeric part to have no padded leading zeros
 export function canonicalDistrictID(districtID: string): string
 {
-  // Normalize purely numeric values (e.g. 001)
-  if (reDistrictNumber.test(districtID))
-    return String(Number(districtID));
+  let a = reNumeric.exec(districtID);
+  if (a && a.length == 4)
+  {
+    if (a[2].length > 0)
+      a[2] = String(Number(a[2]));
+    districtID = `${a[1]}${a[2]}${a[3]}`;
+  }
+  return districtID;
+}
+
+// Normalize any numeric part to have four digits with padded leading zeros
+export function canonicalSortingDistrictID(districtID: string): string
+{
+  let a = reNumeric.exec(districtID);
+  if (a && a.length == 4)
+  {
+    let s = a[2];
+    if (s.length > 0)
+    {
+      switch (s.length)
+      {
+        case 1: s = `000${s}`;  break;
+        case 2: s = `00${s}`;  break;
+        case 3: s = `0${s}`;  break;
+      }
+      a[2] = s;
+    }
+    districtID = `${a[1]}${a[2]}${a[3]}`;
+  }
+  return districtID;
+}
+
+// Return numeric part of districtID (or -1 if there is none)
+export function canonicalNumericFromDistrictID(districtID: string): number
+{
+  let a = reNumeric.exec(districtID);
+  if (a && a.length == 4)
+  {
+    let s = a[2];
+    if (s.length > 0)
+      return Number(s);
+  }
+  return -1;
+}
+
+export function canonicalDistrictIDFromNumber(districtID: string, n: number): string
+{
+  let a = reNumeric.exec(districtID);
+  if (a && a.length == 4)
+  {
+    a[2] = String(n);
+    districtID = `${a[1]}${a[2]}${a[3]}`;
+  }
+  else
+    districtID = String(n);
   return districtID;
 }
 
@@ -148,23 +216,32 @@ export function canonicalDistrictIDOrdering(order: DistrictOrder): DistrictOrder
 {
   let keys = Object.keys(order);
   let i: number;
+  let a: any = [];
+  let template: string = undefined;
 
   for (i = 0; i < keys.length; i++)
   {
     let s = keys[i];
-    if (reDistrictNumeric.test(s))
+    keys[i] = canonicalSortingDistrictID(s);
+    let n = canonicalNumericFromDistrictID(s);
+    if (n > 0)
     {
-      switch (s.length)
-      {
-        case 1: keys[i] = `000${s}`;  break;
-        case 2: keys[i] = `00${s}`;  break;
-        case 3: keys[i] = `0${s}`;  break;
-      }
+      if (template === undefined)
+        template = s;
+      a[n] = true;
     }
   }
+  if (template !== undefined)
+  {
+    for (i = 1; i < a.length; i++)
+      if (a[i] === undefined)
+        keys.push(canonicalDistrictIDFromNumber(template, i));
+  }
   keys.sort();
   order = {};
   for (i = 0; i < keys.length; i++)
     order[canonicalDistrictID(keys[i])] = i+1;
+  if (order['ZZZ'])
+    delete order['ZZZ'];
   return order;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dra2020/dra-types",
-  "version": "1.0.14",
+  "version": "1.0.17",
   "description": "Shared types used between client and server.",
   "main": "dist/dra-types.js",
   "types": "./dist/all.d.ts",