ropegeo-common 1.9.2 → 1.9.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/classes/filters/searchFilter.d.ts.map +1 -1
  2. package/dist/classes/filters/searchFilter.js +6 -0
  3. package/dist/components/RopeGeoPaginationHttpRequest.d.ts.map +1 -1
  4. package/dist/components/RopeGeoPaginationHttpRequest.js +7 -9
  5. package/package.json +1 -1
package/dist/classes/filters/searchFilter.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"searchFilter.d.ts","sourceRoot":"","sources":["../../../src/classes/filters/searchFilter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EACH,YAAY,EACZ,KAAK,WAAW,EAChB,KAAK,oBAAoB,EAC5B,MAAM,+BAA+B,CAAC;AACvC,OAAO,0CAA0C,CAAC;AAClD,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAEpE;;;;;GAKG;AACH,qBAAa,YAAY;IACrB,KAAK,EAAE,WAAW,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;IACtB,cAAc,EAAE,OAAO,CAAC;IACxB,UAAU,EAAE,OAAO,CAAC;IACpB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,kCAAkC;IAClC,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;IAChC,iBAAiB,EAAE,uBAAuB,GAAG,IAAI,CAAC;gBAG9C,YAAY,GAAE,oBAAoB,GAAG,IAAI,GAAG,SAAgB,EAC5D,IAAI,GAAE,MAAM,GAAG,IAAI,GAAG,SAAgB;IAmC1C,QAAQ,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI;IAIlC,eAAe,CAAC,CAAC,EAAE,OAAO,GAAG,IAAI;IASjC,iBAAiB,CAAC,CAAC,EAAE,OAAO,GAAG,IAAI;IAInC,aAAa,CAAC,CAAC,EAAE,OAAO,GAAG,IAAI;IAI/B,sBAAsB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI;IAOvC,SAAS,CAAC,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,GAAG,IAAI;IAKhD,oBAAoB,CAAC,IAAI,EAAE,uBAAuB,GAAG,IAAI,GAAG,IAAI;IAOhE,cAAc,CAAC,OAAO,EAAE;QACpB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,4GAA4G;QAC5G,eAAe,CAAC,EAAE,oBAAoB,GAAG,IAAI,CAAC;KACjD,GAAG,YAAY;IAqBhB,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAejC,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY;IAYjD,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,GAAG,YAAY;IA0B9C,OAAO,CAAC,MAAM,CAAC,UAAU;IAOzB,OAAO,CAAC,MAAM,CAAC,WAAW;CAmB7B"}
1
+ {"version":3,"file":"searchFilter.d.ts","sourceRoot":"","sources":["../../../src/classes/filters/searchFilter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EACH,YAAY,EACZ,KAAK,WAAW,EAChB,KAAK,oBAAoB,EAC5B,MAAM,+BAA+B,CAAC;AACvC,OAAO,0CAA0C,CAAC;AAClD,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAEpE;;;;;GAKG;AACH,qBAAa,YAAY;IACrB,KAAK,EAAE,WAAW,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;IACtB,cAAc,EAAE,OAAO,CAAC;IACxB,UAAU,EAAE,OAAO,CAAC;IACpB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,kCAAkC;IAClC,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;IAChC,iBAAiB,EAAE,uBAAuB,GAAG,IAAI,CAAC;gBAG9C,YAAY,GAAE,oBAAoB,GAAG,IAAI,GAAG,SAAgB,EAC5D,IAAI,GAAE,MAAM,GAAG,IAAI,GAAG,SAAgB;IAmC1C,QAAQ,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI;IAIlC,eAAe,CAAC,CAAC,EAAE,OAAO,GAAG,IAAI;IAYjC,iBAAiB,CAAC,CAAC,EAAE,OAAO,GAAG,IAAI;IAInC,aAAa,CAAC,CAAC,EAAE,OAAO,GAAG,IAAI;IAI/B,sBAAsB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI;IAOvC,SAAS,CAAC,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,GAAG,IAAI;IAKhD,oBAAoB,CAAC,IAAI,EAAE,uBAAuB,GAAG,IAAI,GAAG,IAAI;IAOhE,cAAc,CAAC,OAAO,EAAE;QACpB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,4GAA4G;QAC5G,eAAe,CAAC,EAAE,oBAAoB,GAAG,IAAI,CAAC;KACjD,GAAG,YAAY;IAqBhB,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAejC,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY;IAYjD,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,GAAG,YAAY;IA6B9C,OAAO,CAAC,MAAM,CAAC,UAAU;IAOzB,OAAO,CAAC,MAAM,CAAC,WAAW;CAmB7B"}
package/dist/classes/filters/searchFilter.js CHANGED
@@ -51,6 +51,9 @@ class SearchFilter {
51
51
  throw new Error('Cannot set include-pages false while difficulty filter is set; clear difficulty first');
52
52
  }
53
53
  this.includePages = v;
54
+ if (!v) {
55
+ this.includeAka = false;
56
+ }
54
57
  }
55
58
  setIncludeRegions(v) {
56
59
  this.includeRegions = v;
@@ -117,6 +120,9 @@ class SearchFilter {
117
120
  f.includePages = Boolean(o.includePages);
118
121
  f.includeRegions = Boolean(o.includeRegions);
119
122
  f.includeAka = Boolean(o.includeAka);
123
+ if (!f.includePages) {
124
+ f.includeAka = false;
125
+ }
120
126
  f.similarityThreshold = Number(o.similarityThreshold);
121
127
  if (typeof f.similarityThreshold !== 'number' ||
122
128
  Number.isNaN(f.similarityThreshold)) {
package/dist/components/RopeGeoPaginationHttpRequest.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"RopeGeoPaginationHttpRequest.d.ts","sourceRoot":"","sources":["../../src/components/RopeGeoPaginationHttpRequest.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvC,OAAO,EACL,KAAK,gBAAgB,EAEtB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,MAAM,EAAE,OAAO,EAAoB,MAAM,sBAAsB,CAAC;AAoEzE,MAAM,MAAM,iCAAiC,CAAC,CAAC,GAAG,OAAO,IAAI;IAC3D,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,CAAC,OAAO,MAAM,CAAC,CAAC,MAAM,OAAO,MAAM,CAAC,CAAC;IAC9C,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,WAAW,EAAE,gBAAgB,CAAC;IAC9B;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,CAAC,IAAI,EAAE;QACf,OAAO,EAAE,OAAO,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;QACrB;;;WAGG;QACH,IAAI,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC;QACjB,+FAA+F;QAC/F,MAAM,EAAE,KAAK,GAAG,IAAI,CAAC;KACtB,KAAK,SAAS,CAAC;CACjB,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,CAAC,GAAG,OAAO,EAAE,EACxD,OAAO,EACP,MAAmB,EACnB,IAAI,EACJ,UAAU,EACV,WAAW,EACX,SAAc,EACd,QAAQ,GACT,EAAE,iCAAiC,CAAC,CAAC,CAAC,2CA4KtC"}
1
+ {"version":3,"file":"RopeGeoPaginationHttpRequest.d.ts","sourceRoot":"","sources":["../../src/components/RopeGeoPaginationHttpRequest.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvC,OAAO,EACL,KAAK,gBAAgB,EAEtB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,MAAM,EAAE,OAAO,EAAoB,MAAM,sBAAsB,CAAC;AAoEzE,MAAM,MAAM,iCAAiC,CAAC,CAAC,GAAG,OAAO,IAAI;IAC3D,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,CAAC,OAAO,MAAM,CAAC,CAAC,MAAM,OAAO,MAAM,CAAC,CAAC;IAC9C,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,WAAW,EAAE,gBAAgB,CAAC;IAC9B;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,CAAC,IAAI,EAAE;QACf,OAAO,EAAE,OAAO,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;QACrB;;;WAGG;QACH,IAAI,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC;QACjB,+FAA+F;QAC/F,MAAM,EAAE,KAAK,GAAG,IAAI,CAAC;KACtB,KAAK,SAAS,CAAC;CACjB,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,CAAC,GAAG,OAAO,EAAE,EACxD,OAAO,EACP,MAAmB,EACnB,IAAI,EACJ,UAAU,EACV,WAAW,EACX,SAAc,EACd,QAAQ,GACT,EAAE,iCAAiC,CAAC,CAAC,CAAC,2CAwKtC"}
package/dist/components/RopeGeoPaginationHttpRequest.js CHANGED
@@ -162,19 +162,17 @@ function RopeGeoPaginationHttpRequest({ service, method = RopeGeoHttpRequest_1.M
162
162
  if (sumReceived(pagesByNum) >= totalCount)
163
163
  break;
164
164
  const chunk = toFetch.slice(i, i + effectiveBatch);
165
- const batchResults = await Promise.all(chunk.map(async (pageNum) => {
165
+ await Promise.all(chunk.map(async (pageNum) => {
166
166
  const parsed = await fetchPage(pageNum);
167
- return { pageNum, parsed };
167
+ if (cancelled)
168
+ return;
169
+ pagesByNum.set(pageNum, parsed);
170
+ setReceived(sumReceived(pagesByNum));
171
+ setTotal(totalCount);
168
172
  }));
169
173
  if (cancelled)
170
174
  return;
171
- for (const { pageNum, parsed } of batchResults) {
172
- pagesByNum.set(pageNum, parsed);
173
- }
174
- receivedCount = sumReceived(pagesByNum);
175
- setReceived(receivedCount);
176
- setTotal(totalCount);
177
- if (receivedCount >= totalCount)
175
+ if (sumReceived(pagesByNum) >= totalCount)
178
176
  break;
179
177
  }
180
178
  if (cancelled)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ropegeo-common",
3
- "version": "1.9.2",
3
+ "version": "1.9.4",
4
4
  "description": "Shared domain classes and helpers for RopeGeo and WebScraper",
5
5
  "license": "ISC",
6
6
  "repository": {