@dra2020/baseclient 1.0.149 → 1.0.151

package/dist/baseclient.js

@@ -2639,6 +2639,8 @@ function isValidId(col) {
     let set = new Set();
     for (let i = 0; i < col.features.length; i++) {
         let f = col.features[i];
+        if (typeof f.properties.id === 'number')
+            f.properties.id = String(f.properties.id); // Fix old 2016_BG collections
         if (typeof f.properties.id !== 'string')
             return false; // id must be string
         if (set.has(f.properties.id))
@@ -3297,7 +3299,7 @@ class MultiBlockMapping {
         return this.entries.length ? this.entries[0].bm[blockid] : undefined;
     }
     rev(geoid) {
-        for (let i = 0; i < this.entries.length; i++) {
+        for (let i = this.entries.length - 1; i >= 0; i--) {
             let e = this.entries[i];
             if (!e.rbm)
                 e.rbm = reverseBlockMapping(e.bm);
@@ -3311,13 +3313,19 @@ class MultiBlockMapping {
         if (this.entries.length)
             Object.keys(this.entries[0].bm).forEach(blockid => cb(blockid));
     }
-    // Just walks first map
+    // Walk maps in reverse order, careful to not invoke on same geoid
     forEachRev(cb) {
-        for (let i = 0; i < this.entries.length; i++) {
+        let seen = new Set();
+        for (let i = this.entries.length - 1; i >= 0; i--) {
             let e = this.entries[i];
             if (!e.rbm)
                 e.rbm = reverseBlockMapping(e.bm);
-            Object.keys(e.rbm).forEach(geoid => cb(geoid, e.rbm[geoid]));
+            Object.keys(e.rbm).forEach(geoid => {
+                if (!seen.has(geoid)) {
+                    seen.add(geoid);
+                    cb(geoid, e.rbm[geoid]);
+                }
+            });
         }
     }
 }