@dra2020/baseclient 1.0.29 → 1.0.32

package/dist/geo/geo.d.ts

@@ -4,6 +4,12 @@ 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 declare function geoEnsureID(col: GeoFeatureCollection): void;
 export declare function geoCollectionToMap(col: GeoFeatureCollection): GeoFeatureMap;
 export declare function geoMapToCollection(map: GeoFeatureMap): GeoFeatureCollection;

package/dist/poly/mapto.d.ts

@@ -1,2 +1,3 @@
 import * as G from '../geo/all';
+export declare function polyMapToByCentroid(districts: G.GeoFeatureCollection, centroids: G.GeoCentroidMap): any;
 export declare function polyMapTo(districts: G.GeoFeatureCollection, blocks: G.GeoFeatureCollection): any;

package/lib/geo/geo.ts

@@ -6,6 +6,7 @@ export type GeoProperties = geojson.GeoJsonProperties;
 export type GeoFeature = geojson.Feature;
 export type GeoFeatureArray = GeoFeature[];
 export type GeoFeatureCollection = geojson.FeatureCollection;
+export type GeoCentroidMap = { [geoid: string]: { x: number, y: number } };
 
 export function geoEnsureID(col: GeoFeatureCollection): void
 {
@@ -19,6 +20,11 @@ export function geoEnsureID(col: GeoFeatureCollection): void
     props.forEach(p => { if (prop === undefined && f.properties[p] !== undefined) prop = p; });
     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++) });
+    }
   }
 }
 

package/lib/poly/mapto.ts

@@ -33,21 +33,17 @@ function setLabels(c: G.GeoFeatureCollection): void
 //
 //  The return value is an object that maps the block feature ids to the district feature id.
 //
-
-export function polyMapTo(districts: G.GeoFeatureCollection, blocks: G.GeoFeatureCollection): any
+export function polyMapToByCentroid(districts: G.GeoFeatureCollection, centroids: G.GeoCentroidMap): any
 {
   let map: any = {};
 
-  // Cache labelx, labely if necessary
-  setLabels(blocks);
-
   // Cache district boundboxes for quick containment exclusion
   let bbDistricts: BB.BoundBox[] = districts.features.map(f => BB.boundbox(f));
 
   // Walk over blocks, mapping centroid to district
-  blocks.features.forEach(fBlock => {
-      let x = fBlock.properties.labelx;
-      let y = fBlock.properties.labely;
+  Object.keys(centroids).forEach(blockid => {
+      let x = centroids[blockid].x;
+      let y = centroids[blockid].y;
 
       let fIn: G.GeoFeature[] = [];
       districts.features.forEach((fDistrict: G.GeoFeature, i: number) => {
@@ -57,8 +53,21 @@ export function polyMapTo(districts: G.GeoFeatureCollection, blocks: G.GeoFeatur
         });
 
       if (fIn.length == 1)
-        map[fBlock.properties.id] = fIn[0].properties.id;
+        map[blockid] = fIn[0].properties.id;
     });
 
   return map;
 }
+
+export function polyMapTo(districts: G.GeoFeatureCollection, blocks: G.GeoFeatureCollection): any
+{
+  // Cache labelx, labely if necessary
+  setLabels(blocks);
+
+  let centroids: G.GeoCentroidMap = {};
+  blocks.features.forEach(f => {
+    centroids[f.properties.id] = { x: f.properties.labelx, y: f.properties.labely }
+    });
+
+  return polyMapToByCentroid(districts, centroids);
+}

package/lib/poly/pointinpoly.ts

@@ -6,9 +6,21 @@ export function polyContainsPoint(poly: any, x: number, y: number): boolean
   if (pp == null) return false;
   let bFound = false;
   let bInside = false;
+  let iCurPoly = -1;
+  let bCurInside = false;
 
   PP.polyPackEachRing(pp, (b: Float64Array, iPoly: number, iRing: number, iOffset: number, nPoints: number) => {
       if (bFound) return;
+      if (iRing == 0)
+      {
+        if (iCurPoly >= 0 && bCurInside)
+        {
+          bInside = true;
+          bFound = true;
+        }
+        iCurPoly = iPoly;
+        bCurInside = false;
+      }
       let inside = false;
       let iEnd = iOffset + (nPoints - 1) * 2;
       for (let i = iOffset, j = iEnd; i <= iEnd; j = i, i += 2)
@@ -20,10 +32,9 @@ export function polyContainsPoint(poly: any, x: number, y: number): boolean
         if (intersect) inside = !inside;
       }
       if (inside)
-      {
-        bFound = iRing > 0;   // if inside a hole, don't need to process further
-        bInside = iRing == 0; // not inside if inside a hole
-      }
+        bCurInside = iRing == 0; // not inside if inside a hole
     });
+  if (iCurPoly >= 0 && bCurInside)
+    bInside = true;
   return bInside;
 }

package/package.json

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