xlucene-parser 2.3.1 → 2.3.3
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"polygon.d.ts","sourceRoot":"","sources":["../../../../src/functions/geo/polygon.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"polygon.d.ts","sourceRoot":"","sources":["../../../../src/functions/geo/polygon.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,CAAC,MAAM,qBAAqB,CAAC;AA4EzC,QAAA,MAAM,UAAU,EAAE,CAAC,CAAC,kBAmKnB,CAAC;AAEF,eAAe,UAAU,CAAC"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { toString, isWildCardString, matchWildcard, uniq, TSError, isKey } from '@terascope/core-utils';
|
|
2
2
|
import { GeoShapeType, ESGeoShapeType, GeoShapeRelation, xLuceneFieldType } from '@terascope/types';
|
|
3
|
-
import { geoRelationFP, validateListCoords, isGeoShapeMultiPolygon, polyHasHoles, isGeoShapePolygon, parseGeoPoint } from '@terascope/geo-utils';
|
|
3
|
+
import { geoRelationFP, validateListCoords, isGeoShapeMultiPolygon, polyHasHoles, isGeoShapePolygon, parseGeoPoint, isGeoShapePoint } from '@terascope/geo-utils';
|
|
4
4
|
import { getFieldValue, logger } from '../../utils.js';
|
|
5
5
|
const compatMapping = {
|
|
6
6
|
[GeoShapeType.Polygon]: ESGeoShapeType.Polygon,
|
|
7
7
|
[GeoShapeType.MultiPolygon]: ESGeoShapeType.MultiPolygon,
|
|
8
|
+
[GeoShapeType.Point]: ESGeoShapeType.Point
|
|
8
9
|
};
|
|
9
10
|
const relations = new Set(Object.values(GeoShapeRelation));
|
|
10
11
|
function validate(params, variables) {
|
|
@@ -29,7 +30,9 @@ function validate(params, variables) {
|
|
|
29
30
|
coordinates: []
|
|
30
31
|
};
|
|
31
32
|
const geoPointsValue = getFieldValue(geoPointsParam.value, variables);
|
|
32
|
-
if (isGeoShapePolygon(geoPointsValue)
|
|
33
|
+
if (isGeoShapePolygon(geoPointsValue)
|
|
34
|
+
|| isGeoShapeMultiPolygon(geoPointsValue)
|
|
35
|
+
|| isGeoShapePoint(geoPointsValue)) {
|
|
33
36
|
polygonShape = geoPointsValue;
|
|
34
37
|
}
|
|
35
38
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"polygon.js","sourceRoot":"","sources":["../../../../src/functions/geo/polygon.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,QAAQ,EAAE,gBAAgB,EAAE,aAAa,EACzC,IAAI,EAAE,OAAO,EAAE,KAAK,EACvB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACO,YAAY,EAAE,cAAc,EACV,gBAAgB,EACjB,gBAAgB,EAC9C,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACH,aAAa,EAAE,kBAAkB,EAAE,sBAAsB,EACzD,YAAY,EAAE,iBAAiB,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"polygon.js","sourceRoot":"","sources":["../../../../src/functions/geo/polygon.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,QAAQ,EAAE,gBAAgB,EAAE,aAAa,EACzC,IAAI,EAAE,OAAO,EAAE,KAAK,EACvB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACO,YAAY,EAAE,cAAc,EACV,gBAAgB,EACjB,gBAAgB,EAC9C,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACH,aAAa,EAAE,kBAAkB,EAAE,sBAAsB,EACzD,YAAY,EAAE,iBAAiB,EAAE,aAAa,EAC9C,eAAe,EAClB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAEvD,MAAM,aAAa,GAAG;IAClB,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,cAAc,CAAC,OAAO;IAC9C,CAAC,YAAY,CAAC,YAAY,CAAC,EAAE,cAAc,CAAC,YAAY;IACxD,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,cAAc,CAAC,KAAK;CACpC,CAAC;AAaX,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC;AAE3D,SAAS,QAAQ,CACb,MAAgB,EAChB,SAA2B;IAE3B,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC;IACtE,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,UAAU,CAAC,CAAC;IAC1E,IAAI,QAA0B,CAAC;IAE/B,IAAI,gBAAgB,EAAE,CAAC;QACnB,MAAM,gBAAgB,GAAG,aAAa,CAClC,gBAAgB,CAAC,KAAK,EAAE,SAAS,CACpC,CAAC;QACF,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,CAAC;YACnC,MAAM,IAAI,SAAS,CAAC,2BAA2B,gBAAgB,GAAG,CAAC,CAAC;QACxE,CAAC;QACD,QAAQ,GAAG,gBAAgB,CAAC;IAChC,CAAC;SAAM,CAAC;QACJ,QAAQ,GAAG,gBAAgB,CAAC,MAAM,CAAC;IACvC,CAAC;IAED,IAAI,cAAc,IAAI,IAAI,EAAE,CAAC;QACzB,MAAM,IAAI,SAAS,CAAC,gEAAgE,CAAC,CAAC;IAC1F,CAAC;IAED,IAAI,YAAY,GAAa;QACzB,IAAI,EAAE,YAAY,CAAC,OAAO;QAC1B,WAAW,EAAE,EAAE;KAClB,CAAC;IAEF,MAAM,cAAc,GAAG,aAAa,CAAC,cAAc,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAEtE,IACI,iBAAiB,CAAC,cAAc,CAAC;WAC9B,sBAAsB,CAAC,cAAc,CAAC;WACtC,eAAe,CAAC,cAAc,CAAC,EACpC,CAAC;QACC,YAAY,GAAG,cAAc,CAAC;IAClC,CAAC;SAAM,CAAC;QACJ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;YACjC,MAAM,IAAI,SAAS,CAAC,qFAAqF,CAAC,CAAC;QAC/G,CAAC;QAED,MAAM,MAAM,GAAsB,cAAc,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YAC1D,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC;YACjC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;YAC1C,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAC1C,YAAY,CAAC,WAAW,GAAG,MAAM,CAAC;IACtC,CAAC;IAED,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,GAAyB;IACrC,IAAI,EAAE,YAAY;IAClB,OAAO,EAAE,GAAG;IACZ,MAAM,CAAC,EACH,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,GAC3C;QACG,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,KAAK,GAAG,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;QACnE,CAAC;QAED,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,QAAQ,CACvC,IAAI,CAAC,MAAkB,EAAE,SAAS,CACrC,CAAC;QACF,IAAI,IAAY,CAAC;QAEjB,IAAI,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/B,MAAM,OAAO,GAAa,EAAE,CAAC;YAC7B,sDAAsD;YACtD,KAAK,MAAM,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC7C,IAAI,aAAa,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC;oBAAE,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;YACtE,CAAC;YACD,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;YAC5B,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACnB,MAAM,IAAI,OAAO,CAAC,2DAA2D,QAAQ,CAAC,KAAK,CAAC,EAAE,EAAE;oBAC5F,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;oBACvB,UAAU,EAAE,GAAG;iBAClB,CAAC,CAAC;YACP,CAAC;YACD,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;QACnB,CAAC;aAAM,CAAC;YACJ,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC9B,6DAA6D;QACjE,CAAC;QAED,MAAM,gBAAgB,GAAG,IAAI,KAAK,gBAAgB,CAAC,QAAQ;eACpD,IAAI,KAAK,gBAAgB,CAAC,GAAG;eAC7B,IAAI,KAAK,SAAS,CAAC;QAE1B,MAAM,UAAU,GAAG,QAAQ,KAAK,gBAAgB,CAAC,QAAQ,CAAC;QAE1D,IAAI,gBAAgB,IAAI,YAAY,CAAC,YAAY,CAAC,IAAI,UAAU,EAAE,CAAC;YAC/D,MAAM,IAAI,KAAK,CAAC,0IAA0I,CAAC,CAAC;QAChK,CAAC;QAED,SAAS,eAAe,CAAC,KAAa,EAAE,MAAyB;YAC7D,OAAO;gBACH,WAAW,EAAE;oBACT,CAAC,KAAK,CAAC,EAAE;wBACL,MAAM;qBACT;iBACJ;aACJ,CAAC;QACN,CAAC;QAED,SAAS,gBAAgB,CACrB,KAAa,EACb,WAAgC;YAEhC,MAAM,KAAK,GAAG;gBACV,IAAI,EAAE;oBACF,MAAM,EAAE,EAAS;iBACpB;aACJ,CAAC;YAEF,MAAM,MAAM,GAAG;gBACX,IAAI,EAAE;oBACF,MAAM,EAAE,EAAS;iBACpB;aACJ,CAAC;YAEF,MAAM,KAAK,GAAU;gBACjB,IAAI,EAAE;oBACF,QAAQ,EAAE,EAAE;iBACf;aACJ,CAAC;YAEF,IAAI,QAAQ,KAAK,gBAAgB,CAAC,QAAQ,EAAE,CAAC;gBACzC,uDAAuD;gBACvD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;gBAC/C,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACrE,CAAC;iBAAM,CAAC;gBACJ,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;oBAClC,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;wBACd,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;oBAC5D,CAAC;yBAAM,CAAC;wBACJ,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;oBAC7D,CAAC;gBACL,CAAC,CAAC,CAAC;YACP,CAAC;YAED,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC/B,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC/B,OAAO,KAAuB,CAAC;QACnC,CAAC;QAED,SAAS,kBAAkB,CAAC,KAAa;YACrC,IAAI,iBAAiB,CAAC,YAAY,CAAC,EAAE,CAAC;gBAClC,MAAM,KAAK,GAAG,gBAAgB,CAAC,KAAK,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC;gBAChE,IAAI,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE;oBAAE,MAAM,CAAC,KAAK,CAAC,kCAAkC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;gBAEvF,OAAO,EAAE,KAAK,EAAE,CAAC;YACrB,CAAC;YAED,IAAI,sBAAsB,CAAC,YAAY,CAAC,EAAE,CAAC;gBACvC,MAAM,GAAG,GAAG,YAAY,CAAC,WAAW,CAAC,GAAG,CACpC,CAAC,UAAU,EAAE,EAAE,CAAC,gBAAgB,CAAC,KAAK,EAAE,UAAU,CAAC,CACtD,CAAC;gBAEF,MAAM,KAAK,GAAQ;oBACf,IAAI,EAAE,EAAE;iBACX,CAAC;gBAEF,IAAI,QAAQ,KAAK,gBAAgB,CAAC,QAAQ,EAAE,CAAC;oBACzC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;gBAC1B,CAAC;qBAAM,CAAC;oBACJ,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC;gBAC5B,CAAC;gBAED,IAAI,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE;oBAAE,MAAM,CAAC,KAAK,CAAC,kCAAkC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;gBAEvF,OAAO,EAAE,KAAK,EAAE,CAAC;YACrB,CAAC;YAED,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;QACzB,CAAC;QAED,SAAS,iBAAiB,CAAC,KAAa;YACpC,MAAM,MAAM,GAAG,KAAK,CAAC,aAAa,EAAE,YAAY,CAAC,IAAI,CAAC;gBAClD,CAAC,CAAC,aAAa,CAAC,YAAY,CAAC,IAAI,CAAC;gBAClC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC;YAE7B,MAAM,KAAK,GAAG;gBACV,SAAS,EAAE;oBACP,CAAC,KAAK,CAAC,EAAE;wBACL,KAAK,EAAE;4BACH,IAAI,EAAE,MAAM;4BACZ,WAAW,EAAE,YAAY,CAAC,WAAW;yBACxC;wBACD,QAAQ;qBACX;iBACJ;aACQ,CAAC;YAEd,IAAI,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE;gBAAE,MAAM,CAAC,KAAK,CAAC,oCAAoC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;YAEzF,OAAO,EAAE,KAAK,EAAE,CAAC;QACrB,CAAC;QAED,IAAI,gBAAgB,EAAE,CAAC;YACnB,IAAI,QAAQ,KAAK,gBAAgB,CAAC,QAAQ,EAAE,CAAC;gBACzC,MAAM,IAAI,KAAK,CAAC,yDAAyD,gBAAgB,CAAC,QAAQ,GAAG,CAAC,CAAC;YAC3G,CAAC;YACD,OAAO;gBACH,KAAK,EAAE,aAAa,CAAC,YAAY,EAAE,QAAQ,CAAC;gBAC5C,oBAAoB,EAAE,kBAAkB;aAC3C,CAAC;QACN,CAAC;QAED,OAAO;YACH,KAAK,EAAE,aAAa,CAAC,YAAY,EAAE,QAAQ,CAAC;YAC5C,oBAAoB,EAAE,iBAAiB;SAC1C,CAAC;IACN,CAAC;CACJ,CAAC;AAEF,eAAe,UAAU,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "xlucene-parser",
|
|
3
3
|
"displayName": "xLucene Parser",
|
|
4
|
-
"version": "2.3.
|
|
4
|
+
"version": "2.3.3",
|
|
5
5
|
"description": "Flexible Lucene-like evaluator and language parser",
|
|
6
6
|
"homepage": "https://github.com/terascope/teraslice/tree/master/packages/xlucene-parser#readme",
|
|
7
7
|
"repository": {
|
|
@@ -23,10 +23,10 @@
|
|
|
23
23
|
],
|
|
24
24
|
"dependencies": {
|
|
25
25
|
"peggy": "~5.1.0",
|
|
26
|
-
"@terascope/
|
|
27
|
-
"@terascope/
|
|
28
|
-
"@terascope/
|
|
29
|
-
"@terascope/types": "~2.3.
|
|
26
|
+
"@terascope/geo-utils": "~2.3.2",
|
|
27
|
+
"@terascope/core-utils": "~2.3.2",
|
|
28
|
+
"@terascope/ip-utils": "~2.3.2",
|
|
29
|
+
"@terascope/types": "~2.3.1"
|
|
30
30
|
},
|
|
31
31
|
"devDependencies": {
|
|
32
32
|
"@turf/invariant": "~7.3.4",
|