vega-functions 5.12.1 → 5.13.0

package/build/vega-functions.module.js

@@ -142,9 +142,9 @@ function internalScaleFunctions(codegen, fnctx, visitors) {
 
 
   return {
-    _bandwidth: args => `this.__bandwidth(${ref(args[0])})`,
-    _range: args => `${ref(args[0])}.range()`,
-    _scale: args => `${ref(args[0])}(${codegen(args[1])})`
+    _bandwidth: args => "this.__bandwidth(".concat(ref(args[0]), ")"),
+    _range: args => "".concat(ref(args[0]), ".range()"),
+    _scale: args => "".concat(ref(args[0]), "(").concat(codegen(args[1]), ")")
   };
 }
 
@@ -331,16 +331,32 @@ function sequence(seq) {
   return array(seq) || (isString(seq) ? seq : null);
 }
 
-function join(seq, ...args) {
+function join(seq) {
+  for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+    args[_key - 1] = arguments[_key];
+  }
+
   return array(seq).join(...args);
 }
-function indexof(seq, ...args) {
+function indexof(seq) {
+  for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
+    args[_key2 - 1] = arguments[_key2];
+  }
+
   return sequence(seq).indexOf(...args);
 }
-function lastindexof(seq, ...args) {
+function lastindexof(seq) {
+  for (var _len3 = arguments.length, args = new Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {
+    args[_key3 - 1] = arguments[_key3];
+  }
+
   return sequence(seq).lastIndexOf(...args);
 }
-function slice(seq, ...args) {
+function slice(seq) {
+  for (var _len4 = arguments.length, args = new Array(_len4 > 1 ? _len4 - 1 : 0), _key4 = 1; _key4 < _len4; _key4++) {
+    args[_key4 - 1] = arguments[_key4];
+  }
+
   return sequence(seq).slice(...args);
 }
 function replace(str, pattern, repl) {
@@ -474,6 +490,98 @@ function filter(opt) {
   return p;
 }
 
+/**
+ * Appends a new point to the lasso
+ * 
+ * @param {*} lasso the lasso in pixel space
+ * @param {*} x the x coordinate in pixel space
+ * @param {*} y the y coordinate in pixel space
+ * @param {*} minDist the minimum distance, in pixels, that thenew point needs to be apart from the last point
+ * @returns a new array containing the lasso with the new point
+ */
+
+function lassoAppend(lasso, x, y) {
+  let minDist = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 5;
+  const last = lasso[lasso.length - 1]; // Add point to lasso if distance to last point exceed minDist or its the first point
+
+  if (last === undefined || Math.sqrt((last[0] - x) ** 2 + (last[1] - y) ** 2) > minDist) {
+    lasso.push([x, y]);
+    return [...lasso];
+  }
+
+  return lasso;
+}
+/**
+ * Generates a svg path command which draws a lasso
+ * 
+ * @param {*} lasso the lasso in pixel space in the form [[x,y], [x,y], ...]
+ * @returns the svg path command that draws the lasso
+ */
+
+function lassoPath(lasso) {
+  return (lasso !== null && lasso !== void 0 ? lasso : []).reduce((svg, _ref, i) => {
+    let [x, y] = _ref;
+    return svg += i == 0 ? "M ".concat(x, ",").concat(y, " ") : i === lasso.length - 1 ? ' Z' : "L ".concat(x, ",").concat(y, " ");
+  }, '');
+}
+/**
+ * Inverts the lasso from pixel space to an array of vega scenegraph tuples
+ * 
+ * @param {*} data the dataset
+ * @param {*} pixelLasso the lasso in pixel space, [[x,y], [x,y], ...]
+ * @param {*} unit the unit where the lasso is defined
+ * 
+ * @returns an array of vega scenegraph tuples
+ */
+
+function intersectLasso(markname, pixelLasso, unit) {
+  const {
+    x,
+    y,
+    mark
+  } = unit;
+  const bb = new Bounds().set(Number.MAX_SAFE_INTEGER, Number.MAX_SAFE_INTEGER, Number.MIN_SAFE_INTEGER, Number.MIN_SAFE_INTEGER); // Get bounding box around lasso
+
+  for (const [px, py] of pixelLasso) {
+    if (px < bb.x1) bb.x1 = px;
+    if (px > bb.x2) bb.x2 = px;
+    if (py < bb.y1) bb.y1 = py;
+    if (py > bb.y2) bb.y2 = py;
+  } // Translate bb against unit coordinates
+
+
+  bb.translate(x, y);
+  const intersection = intersect([[bb.x1, bb.y1], [bb.x2, bb.y2]], markname, mark); // Check every point against the lasso
+
+  return intersection.filter(tuple => pointInPolygon(tuple.x, tuple.y, pixelLasso));
+}
+/**
+ * Performs a test if a point is inside a polygon based on the idea from
+ * https://wrf.ecse.rpi.edu/Research/Short_Notes/pnpoly.html
+ * 
+ * This method will not need the same start/end point since it wraps around the edges of the array
+ * 
+ * @param {*} test a point to test against
+ * @param {*} polygon a polygon in the form [[x,y], [x,y], ...]
+ * @returns true if the point lies inside the polygon, false otherwise
+ */
+
+function pointInPolygon(testx, testy, polygon) {
+  let intersections = 0;
+
+  for (let i = 0, j = polygon.length - 1; i < polygon.length; j = i++) {
+    const [prevX, prevY] = polygon[j];
+    const [x, y] = polygon[i]; // count intersections
+
+    if (y > testy != prevY > testy && testx < (prevX - x) * (testy - y) / (prevY - y) + x) {
+      intersections++;
+    }
+  } // point is in polygon if intersection count is odd
+
+
+  return intersections & 1;
+}
+
 const functionContext = {
   random() {
     return random();
@@ -511,7 +619,12 @@ const functionContext = {
   },
 
   toBoolean,
-  toDate,
+
+  toDate(_) {
+    return toDate(_);
+  },
+
+  // suppress extra arguments
   toNumber,
   toString,
   indexof,
@@ -559,7 +672,12 @@ const functionContext = {
   warn,
   info,
   debug,
-  extent,
+
+  extent(_) {
+    return extent(_);
+  },
+
+  // suppress extra arguments
   inScope,
   intersect,
   clampRange,
@@ -580,7 +698,10 @@ const functionContext = {
   zoomPow,
   zoomSymlog,
   encode,
-  modify
+  modify,
+  lassoAppend,
+  lassoPath,
+  intersectLasso
 };
 const eventFunctions = ['view', 'item', 'group', 'xy', 'x', 'y'],
       // event functions
@@ -595,7 +716,7 @@ const codegenParams = {
   forbidden: ['_'],
   allowed: ['datum', 'event', 'item'],
   fieldvar: 'datum',
-  globalvar: id => `_[${stringValue(SignalPrefix + id)}]`,
+  globalvar: id => "_[".concat(stringValue(SignalPrefix + id), "]"),
   functions: buildFunctions,
   constants: constants,
   visitors: astVisitors

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vega-functions",
-  "version": "5.12.1",
+  "version": "5.13.0",
   "description": "Custom functions for the Vega expression language.",
   "keywords": [
     "vega",
@@ -21,20 +21,20 @@
     "prepublishOnly": "yarn test && yarn build"
   },
   "dependencies": {
-    "d3-array": "^2.7.1",
-    "d3-color": "^2.0.0",
-    "d3-geo": "^2.0.1",
+    "d3-array": "^3.1.1",
+    "d3-color": "^3.0.1",
+    "d3-geo": "^3.0.1",
     "vega-dataflow": "^5.7.3",
     "vega-expression": "^5.0.0",
-    "vega-scale": "^7.1.1",
+    "vega-scale": "^7.2.0",
     "vega-scenegraph": "^4.9.3",
     "vega-selections": "^5.3.1",
     "vega-statistics": "^1.7.9",
-    "vega-time": "^2.0.4",
+    "vega-time": "^2.1.0",
     "vega-util": "^1.16.0"
   },
   "devDependencies": {
-    "vega-format": "^1.0.4"
+    "vega-format": "^1.1.0"
   },
-  "gitHead": "774165e29850b66ec8b79ba52a7955f1ab936ea6"
+  "gitHead": "9a3faca4395cade9ecdfde90af98f1c53e9916b2"
 }

package/src/codegen.js

@@ -151,6 +151,12 @@ import {
   slice
 } from './functions/sequence';
 
+import {
+  intersectLasso,
+  lassoAppend,
+  lassoPath
+} from './functions/lasso';
+
 import {
   bandspace,
   bandwidth,
@@ -219,7 +225,7 @@ export const functionContext = {
   isTuple,
   isValid(_) { return _ != null && _ === _; },
   toBoolean,
-  toDate,
+  toDate(_) { return toDate(_); }, // suppress extra arguments
   toNumber,
   toString,
   indexof,
@@ -267,7 +273,7 @@ export const functionContext = {
   warn,
   info,
   debug,
-  extent,
+  extent(_) { return extent(_); }, // suppress extra arguments
   inScope,
   intersect,
   clampRange,
@@ -288,7 +294,10 @@ export const functionContext = {
   zoomPow,
   zoomSymlog,
   encode,
-  modify
+  modify,
+  lassoAppend,
+  lassoPath,
+  intersectLasso
 };
 
 const eventFunctions = ['view', 'item', 'group', 'xy', 'x', 'y'], // event functions

package/src/functions/lasso.js

@@ -0,0 +1,110 @@
+import intersect from './intersect';
+import { Bounds } from 'vega-scenegraph';
+
+/**
+ * Appends a new point to the lasso
+ * 
+ * @param {*} lasso the lasso in pixel space
+ * @param {*} x the x coordinate in pixel space
+ * @param {*} y the y coordinate in pixel space
+ * @param {*} minDist the minimum distance, in pixels, that thenew point needs to be apart from the last point
+ * @returns a new array containing the lasso with the new point
+ */
+export function lassoAppend(lasso, x, y, minDist = 5) {
+    const last = lasso[lasso.length - 1];
+
+    // Add point to lasso if distance to last point exceed minDist or its the first point
+    if (last === undefined || Math.sqrt(((last[0] - x) ** 2) + ((last[1] - y) ** 2)) > minDist) {
+        lasso.push([x, y]);
+
+        return [...lasso];
+    }
+
+    return lasso;
+}
+
+
+/**
+ * Generates a svg path command which draws a lasso
+ * 
+ * @param {*} lasso the lasso in pixel space in the form [[x,y], [x,y], ...]
+ * @returns the svg path command that draws the lasso
+ */
+export function lassoPath(lasso) {
+    return (lasso ?? []).reduce((svg, [x, y], i) => {
+        return svg += i == 0
+            ? `M ${x},${y} `
+            : i === lasso.length - 1
+                ? ' Z'
+                : `L ${x},${y} `;
+    }, '');
+}
+
+
+
+/**
+ * Inverts the lasso from pixel space to an array of vega scenegraph tuples
+ * 
+ * @param {*} data the dataset
+ * @param {*} pixelLasso the lasso in pixel space, [[x,y], [x,y], ...]
+ * @param {*} unit the unit where the lasso is defined
+ * 
+ * @returns an array of vega scenegraph tuples
+ */
+export function intersectLasso(markname, pixelLasso, unit) {
+    const { x, y, mark } = unit;
+
+    const bb = new Bounds().set(
+        Number.MAX_SAFE_INTEGER,
+        Number.MAX_SAFE_INTEGER,
+        Number.MIN_SAFE_INTEGER,
+        Number.MIN_SAFE_INTEGER
+    );
+
+    // Get bounding box around lasso
+    for (const [px, py] of pixelLasso) {
+        if (px < bb.x1) bb.x1 = px;
+        if (px > bb.x2) bb.x2 = px;
+        if (py < bb.y1) bb.y1 = py;
+        if (py > bb.y2) bb.y2 = py;
+    }
+
+    // Translate bb against unit coordinates
+    bb.translate(x, y);
+
+    const intersection = intersect([[bb.x1, bb.y1], [bb.x2, bb.y2]],
+        markname,
+        mark);
+
+    // Check every point against the lasso
+    return intersection.filter(tuple => pointInPolygon(tuple.x, tuple.y, pixelLasso));
+}
+
+
+
+/**
+ * Performs a test if a point is inside a polygon based on the idea from
+ * https://wrf.ecse.rpi.edu/Research/Short_Notes/pnpoly.html
+ * 
+ * This method will not need the same start/end point since it wraps around the edges of the array
+ * 
+ * @param {*} test a point to test against
+ * @param {*} polygon a polygon in the form [[x,y], [x,y], ...]
+ * @returns true if the point lies inside the polygon, false otherwise
+ */
+function pointInPolygon(testx, testy, polygon) {
+    let intersections = 0;
+
+    for (let i = 0, j = polygon.length - 1; i < polygon.length; j = i++) {
+        const [prevX, prevY] = polygon[j];
+        const [x, y] = polygon[i];
+
+        // count intersections
+        if (((y > testy) != (prevY > testy)) && (testx < (prevX - x) * (testy - y) / (prevY - y) + x)) {
+            intersections++;
+        }
+    }
+
+    // point is in polygon if intersection count is odd
+    return intersections & 1;
+}