@devgateway/dvz-ui-react 1.9.12 → 1.9.14

package/dist/esm/embeddable/d3Map/FlowLayer.js

@@ -1,170 +1,176 @@
 import { jsx as b } from "react/jsx-runtime";
 import "react";
-import Y from "./BaseLayer.js";
-import q from "../data/DataProvider.js";
-import G from "../data/DataConsumer.js";
-import * as T from "d3";
-import { injectIntl as H } from "react-intl";
-import X from "papaparse";
-import K from "./BreaksStyles.js";
-class Q extends Y {
+import G from "./BaseLayer.js";
+import H from "../data/DataProvider.js";
+import X from "../data/DataConsumer.js";
+import * as z from "d3";
+import { injectIntl as K } from "react-intl";
+import Q from "papaparse";
+import Z from "./BreaksStyles.js";
+import { extractVariablesDeep as B } from "./Utils.js";
+class $ extends G {
   constructor() {
     super(), this.createDataLayer = this.createDataLayer.bind(this);
   }
-  createDataLayer(t) {
+  createDataLayer(e) {
     const {
       format: i,
       path: s,
-      tooltip: u,
+      tooltip: c,
       markFillColor: n,
       markBorderColor: m,
-      markSizeScale: g,
+      markSizeScale: k,
       //circle size
-      featureJoinAttribute: e,
-      apiJoinAttribute: v,
+      featureJoinAttribute: r,
+      apiJoinAttribute: x,
       projection: o,
-      breaks: l,
-      markSizeScale2: p,
+      breaks: a,
+      markSizeScale2: f,
       //arrow size
-      measures: f,
-      zoom: k,
-      offsetPixels: x = 10,
-      waitForFilters: $
-    } = this.props, _ = f[0], D = new K({
-      breaks: l,
+      measures: y,
+      zoom: D,
+      offsetPixels: l = 10,
+      waitForFilters: g
+    } = this.props, E = y[0], A = new Z({
+      breaks: a,
       defaultFillColor: n,
       defaultBorderColor: m,
-      defaultSize: p
+      defaultSize: f
     });
     i.style === "compacted" || i.style, i.style, i.currency, parseInt(i.minimumFractionDigits), parseInt(i.maximumFractionDigits);
-    const I = t.features.filter((r) => r.properties._value != null);
-    this.g = T.select(this.gRef.current), this.g.attr("class", "base-layer zoomable flow"), this.props.transform && this.g.attr("transform", this.props.transform), this.g.selectAll(".flow-line").remove(), this.g.selectAll(".start-point").remove(), this.g.selectAll(".end-point").remove(), this.g.select("defs").selectAll("*").remove();
-    const B = this.props.transform ? this.props.transform.k : 1, z = [];
-    I.forEach((r) => {
-      z.push(r), r.properties.destinations.sort((h, y) => h[_] - y[_]).forEach((h) => {
-        const y = h[_];
-        t.features.filter((a) => a.properties[e] == h.value).forEach((a) => {
-          a.properties.meta = h;
-          const M = r.properties[e], w = r.properties[e] + "--" + a.properties[e], E = s.centroid(r), A = s.centroid(a), F = A[0] - E[0], j = A[1] - E[1], O = Math.sqrt(F * F + j * j), V = F / O, J = j / O, N = [
-            A[0] - V * x,
-            A[1] - J * x
-          ], R = o.invert(N), U = {
+    const V = e.features.filter((t) => t.properties._value != null);
+    this.g = z.select(this.gRef.current), this.g.attr("class", "base-layer zoomable flow"), this.props.transform && this.g.attr("transform", this.props.transform), this.g.selectAll(".flow-line").remove(), this.g.selectAll(".start-point").remove(), this.g.selectAll(".end-point").remove(), this.g.select("defs").selectAll("*").remove();
+    const M = this.props.transform ? this.props.transform.k : 1, O = [];
+    V.forEach((t) => {
+      O.push(t), t.properties.destinations.sort((d, v) => d[E] - v[E]).forEach((d) => {
+        const v = d[E];
+        e.features.filter((p) => p.properties[r] == d.value).forEach((p) => {
+          p.properties.meta = { ...d, ...B(d) };
+          const J = t.properties[r], w = t.properties[r] + "--" + p.properties[r], _ = s.centroid(t), S = s.centroid(p), j = S[0] - _[0], F = S[1] - _[1], P = Math.sqrt(j * j + F * F), N = j / P, R = F / P, U = [
+            S[0] - N * l,
+            S[1] - R * l
+          ], W = o.invert(U), Y = {
             type: "LineString",
             coordinates: [
-              o.invert(E),
+              o.invert(_),
               // Start in geo coords
-              R
+              W
               // New endpoint before d2
             ]
-          }, c = this.g;
-          this.g.select("defs").append("marker").attr("id", "arrow" + w).attr("markerUnits", "strokeWidth").attr("markerWidth", "6").attr("markerHeight", "6").attr("viewBox", "0 0 24 24").attr("refX", "6").attr("refY", "6").attr("orient", "auto").append("path").attr("d", "M2,2 L10,6 L2,10 L6,6 L2,2").attr("d", "M2,2 L10,6 L2,10 L6,6 L2,2").attr("style", (L) => "fill: " + D.getColor(y) + ";"), c.append("path").attr("d", s(U)).attr("id", w).attr("class", "flow-line").style("fill", "none").style("cursor", "pointer").style("stroke-dasharray", "0").style("stroke", (L) => D.getColor(y)).style("stroke-width", (L) => D.getSize(y)).attr("marker-end", "url(#arrow" + w + ")").on("mouseenter", (L, tt) => {
-            if (c.selectAll("marker").transition().duration("200").style("opacity", 0), c.selectAll(".start-point").transition().duration("200").style("opacity", 0), c.selectAll(".flow-line").transition().duration("200").style("opacity", 0), T.select(L.target).transition().duration("200").style("opacity", 1), c.selectAll("#arrow" + w).transition().duration("200").style("opacity", 1), c.selectAll(".start-point.circle_" + M).transition().duration("200").style("opacity", 1), y) {
-              const P = {}, C = {};
-              Object.keys(r.properties).forEach((d) => {
-                P["origin_" + d] = r.properties[d];
-              }), Object.keys(a.properties).forEach((d) => {
-                C["target_" + d] = a.properties[d];
-              }), Object.keys(a.properties.meta).forEach((d) => {
-                C["target_" + d] = a.properties.meta[d];
+          }, u = this.g;
+          this.g.select("defs").append("marker").attr("id", "arrow" + w).attr("markerUnits", "strokeWidth").attr("markerWidth", "6").attr("markerHeight", "6").attr("viewBox", "0 0 24 24").attr("refX", "6").attr("refY", "6").attr("orient", "auto").append("path").attr("d", "M2,2 L10,6 L2,10 L6,6 L2,2").attr("d", "M2,2 L10,6 L2,10 L6,6 L2,2").attr("style", (L) => "fill: " + A.getColor(v) + ";"), u.append("path").attr("d", s(Y)).attr("id", w).attr("class", "flow-line").style("fill", "none").style("cursor", "pointer").style("stroke-dasharray", "0").style("stroke", (L) => A.getColor(v)).style("stroke-width", (L) => A.getSize(v)).attr("marker-end", "url(#arrow" + w + ")").on("mouseenter", (L, et) => {
+            if (u.selectAll("marker").transition().duration("200").style("opacity", 0), u.selectAll(".start-point").transition().duration("200").style("opacity", 0), u.selectAll(".flow-line").transition().duration("200").style("opacity", 0), z.select(L.target).transition().duration("200").style("opacity", 1), u.selectAll("#arrow" + w).transition().duration("200").style("opacity", 1), u.selectAll(".start-point.circle_" + J).transition().duration("200").style("opacity", 1), v) {
+              const I = {}, T = {};
+              Object.keys(t.properties).forEach((h) => {
+                I["origin_" + h] = t.properties[h];
+              }), Object.keys(p.properties).forEach((h) => {
+                T["target_" + h] = p.properties[h];
+              }), Object.keys(p.properties.meta).forEach((h) => {
+                T["target_" + h] = p.properties.meta[h];
               });
-              const W = {
-                ...P,
-                ...C,
+              const q = {
+                ...I,
+                ...T,
                 meta: {
-                  [v]: r.properties.meta ? r.properties.meta.value : "",
-                  ...r.properties.meta,
-                  value: y
+                  [x]: t.properties.meta ? t.properties.meta.value : "",
+                  ...t.properties.meta,
+                  value: v
                 }
               };
-              this.showToolTip(u, W, D.getColor(a.properties._value));
+              this.showToolTip(c, q, A.getColor(p.properties._value));
             }
           }).on("mouseout", (L) => {
-            this.hiddenToolTip(), T.selectAll(".flow-line").transition().duration("100").style("opacity", 1), c.selectAll(".start-point").transition().duration("100").style("opacity", 1), c.selectAll("marker").transition().duration("100").style("opacity", 1);
-          }), c.append("text").append("textPath").attr("xlink:href", w).style("text-anchor", "middle").attr("startOffset", "50%").attr("fill", "#fff").text("Yay, my text is on a wavy path");
+            this.hiddenToolTip(), z.selectAll(".flow-line").transition().duration("100").style("opacity", 1), u.selectAll(".start-point").transition().duration("100").style("opacity", 1), u.selectAll("marker").transition().duration("100").style("opacity", 1);
+          }), u.append("text").append("textPath").attr("xlink:href", w).style("text-anchor", "middle").attr("startOffset", "50%").attr("fill", "#fff").text("Yay, my text is on a wavy path");
         });
       });
-    }), z.forEach((r) => {
-      this.g.append("circle").attr("fill", n).attr("stroke", m).attr("class", "start-point circle_" + r.properties[e]).attr("stroke-width", 2).style("vector-effect", "non-scaling-stroke").attr("cx", s.centroid(r)[0]).attr("cy", s.centroid(r)[1]).attr("r", () => g * 1 / B).on("mouseenter", (h) => {
-        this.showToolTip("{name_en}", r.properties, "");
-      }).on("mouseout", (h) => {
+    }), O.forEach((t) => {
+      this.g.append("circle").attr("fill", n).attr("stroke", m).attr("class", "start-point circle_" + t.properties[r]).attr("stroke-width", 2).style("vector-effect", "non-scaling-stroke").attr("cx", s.centroid(t)[0]).attr("cy", s.centroid(t)[1]).attr("r", () => k * 1 / M).on("mouseenter", (d) => {
+        this.showToolTip(c, { ...t.properties, ...t.properties.meta }, n);
+      }).on("mouseout", (d) => {
         this.hiddenToolTip();
       });
     });
   }
-  _buildLayer(t) {
+  _buildLayer(e) {
     const {
       featureJoinAttribute: i,
       app: s,
-      data: u,
+      data: c,
       measures: n,
       csv: m
-    } = this.props, g = t.features.map((e) => {
-      const v = e.properties[i];
-      if (s != "csv" && u && u.children) {
-        const o = u.children.filter((l) => l.value.indexOf(v) > -1);
+    } = this.props, k = e.features.map((r) => {
+      const x = r.properties[i];
+      if (s != "csv" && c && c.children) {
+        const o = c.children.filter((a) => a.value.indexOf(x) > -1);
         if (o.length > 0) {
-          const l = o[0][n[0]];
-          e.properties.meta = o[0], e.properties._value = l, e.properties.destinations = o[0].children;
+          const a = o[0][n[0]];
+          r.properties.meta = { ...o[0], ...B(o[0]) }, r.properties._value = a, r.properties.destinations = o[0].children;
         }
       } else if (s == "csv") {
-        const o = X.parse(m, { header: !0, dynamicTyping: !0 }), l = e.properties[i], p = o.data.filter((f) => f.origin == l)[0];
-        p != null && (alert("CSV Not implemented Yet, please do it if you have time"), e.properties.meta = p, e.properties._value = p.value, e.properties.destinations = p.destination);
+        const o = Q.parse(m, { header: !0, dynamicTyping: !0 }), a = r.properties[i], f = o.data.filter((y) => y.origin == a)[0];
+        f != null && (alert("CSV Not implemented Yet, please do it if you have time"), r.properties.meta = f, r.properties._value = f.value, r.properties.destinations = f.destination);
       }
-      return e;
+      return r;
     });
-    this.createDataLayer({ ...t, features: g });
+    this.createDataLayer({ ...e, features: k });
   }
   create() {
-    const { file: t } = this.props;
-    t != "none" && (this.state.json ? this._buildLayer(this.state.json) : this.loadJSON(t).then((i) => {
+    const { file: e } = this.props;
+    e != "none" && (this.state.json ? this._buildLayer(this.state.json) : this.loadJSON(e).then((i) => {
       this.setState({ json: i }), this._buildLayer(i);
     }));
   }
-  componentDidUpdate(t, i, s) {
-    const { projection: u, editing: n, data: m } = this.props;
-    (n || t.data !== m || t.path !== this.props.path) && this.create(), t.visible != this.props.visible && this.g.style("display", this.props.visible ? "" : "none");
+  componentDidUpdate(e, i, s) {
+    const { projection: c, editing: n, data: m } = this.props;
+    (n || e.data !== m || e.path !== this.props.path) && this.create(), e.visible != this.props.visible && this.g.style("display", this.props.visible ? "" : "none");
   }
   componentDidMount() {
     this.create(), this.props.zoom.current.fullView();
   }
   render() {
-    const { id: t } = this.props;
-    return /* @__PURE__ */ b("g", { id: "data-" + t, className: "data " + t, ref: this.gRef, children: /* @__PURE__ */ b("defs", {}) });
+    const { id: e } = this.props;
+    return /* @__PURE__ */ b("g", { id: "data-" + e, className: "data " + e, ref: this.gRef, children: /* @__PURE__ */ b("defs", {}) });
   }
 }
-const Z = (S) => {
+const tt = (C) => {
   const {
-    id: t,
+    id: e,
     unique: i,
     filters: s,
-    csv: u,
+    csv: c,
     app: n,
     group: m = "default",
-    flowOrigin: g,
-    editing: e,
-    flowDestination: v,
+    flowOrigin: k,
+    editing: r,
+    flowDestination: x,
     dvzProxyDatasetId: o,
-    waitForFilters: l
-  } = S, p = { dvzProxyDatasetId: o }, f = s || {};
-  return f && f.forEach && f.forEach((k) => {
-    k.value != null && k.value.filter((x) => x != null && x.toString().trim() != "").length > 0 && (p[k.param] = k.value);
-  }), /* @__PURE__ */ b(
-    q,
+    extraTooltipColumns: a,
+    waitForFilters: f
+  } = C, y = { dvzProxyDatasetId: o }, D = s || {};
+  if (D && D.forEach && D.forEach((l) => {
+    l.value != null && l.value.filter((g) => g != null && g.toString().trim() != "").length > 0 && (y[l.param] = l.value);
+  }), a && a.length > 0) {
+    const l = a.filter((g) => g && g !== k && g !== x);
+    l.length > 0 && (y.includeColumns = l.join(","));
+  }
+  return /* @__PURE__ */ b(
+    H,
     {
-      editing: e,
-      params: p,
-      waitForFilters: l,
+      editing: r,
+      params: y,
+      waitForFilters: f,
       app: n,
-      csv: decodeURIComponent(u),
+      csv: decodeURIComponent(c),
       group: m,
       ignoreErrors: !0,
       isSvg: !0,
-      store: [n, i, t],
-      source: g + "/" + v,
-      children: /* @__PURE__ */ b(G, { children: /* @__PURE__ */ b(Q, { ...S }) })
+      store: [n, i, e],
+      source: k + "/" + x,
+      children: /* @__PURE__ */ b(X, { children: /* @__PURE__ */ b($, { ...C }) })
     }
   );
-}, pt = H(Z);
+}, ut = K(tt);
 export {
-  pt as default
+  ut as default
 };

package/dist/esm/embeddable/d3Map/LatLongLayer.js

@@ -1,128 +1,129 @@
-import { jsx as v } from "react/jsx-runtime";
-import I from "react";
-import j from "../data/DataProvider.js";
-import N from "../data/DataConsumer.js";
-import * as p from "d3";
-import { injectIntl as O } from "react-intl";
-import * as U from "react-dom";
-import V from "./Tooltip.js";
-class X extends I.Component {
+import { jsx as S } from "react/jsx-runtime";
+import C from "react";
+import _ from "../data/DataProvider.js";
+import V from "../data/DataConsumer.js";
+import * as c from "d3";
+import { injectIntl as N } from "react-intl";
+import * as O from "react-dom";
+import U from "./Tooltip.js";
+import { extractVariablesDeep as X } from "./Utils.js";
+class Y extends C.Component {
   constructor() {
-    super(), this.create = this.create.bind(this), this.showToolTip = this.showToolTip.bind(this), this.moveToolTip = this.moveToolTip.bind(this), this.resize = this.resize.bind(this), this.gRef = I.createRef();
+    super(), this.create = this.create.bind(this), this.showToolTip = this.showToolTip.bind(this), this.moveToolTip = this.moveToolTip.bind(this), this.resize = this.resize.bind(this), this.gRef = C.createRef();
   }
-  showToolTip(e, n, s, r) {
-    const a = p.select("body").append("div").attr("class", "d3MapTooltip").style("position", "absolute").html("").style("left", r.pageX + 15 + "px").style("top", r.pageY - 50 + "px");
-    U.render(/* @__PURE__ */ v(
-      V,
+  showToolTip(e, n, r, s) {
+    const l = c.select("body").append("div").attr("class", "d3MapTooltip").style("position", "absolute").html("").style("left", s.pageX + 15 + "px").style("top", s.pageY - 50 + "px");
+    O.render(/* @__PURE__ */ S(
+      U,
       {
         intl: this.props.intl,
         tooltip: e,
         data: n,
         tooltipEnableMarkdown: !1
       }
-    ), a._groups[0][0]);
+    ), l._groups[0][0]);
   }
   moveToolTip(e) {
-    p.select(".d3MapTooltip").style("left", e.pageX + 15 + "px").style("top", e.pageY - 50 + "px");
+    c.select(".d3MapTooltip").style("left", e.pageX + 15 + "px").style("top", e.pageY - 50 + "px");
   }
   hiddenToolTip(e) {
-    p.selectAll(".d3MapTooltip").remove();
+    c.selectAll(".d3MapTooltip").remove();
   }
   create() {
     const {
       app: e,
       tooltip: n,
-      data: s,
-      markFillColor: r,
-      markBorderColor: a,
+      data: r,
+      markFillColor: s,
+      markBorderColor: l,
       markSizeScale: m,
-      markerLabelSize: g,
-      measures: y,
-      projection: c,
-      id: T,
-      format: l,
-      intl: x,
-      useBreaks: L,
+      markerLabelSize: T,
+      measures: b,
+      projection: p,
+      id: v,
+      format: a,
+      intl: g,
+      useBreaks: I,
       breaks: d,
-      pointDimensionStyles: u = [],
-      pointStyleBy: f,
-      dimension2: b,
-      visible: D = !0,
-      showDim2OnLegends: A,
-      dim2LegendLabel: q
-    } = this.props, E = {
-      style: l.style === "compacted" ? "decimal" : l.style,
-      notation: l.style === "compacted" ? "compact" : "standard",
-      currency: l.currency,
-      minimumFractionDigits: parseInt(l.minimumFractionDigits),
-      maximumFractionDigits: parseInt(l.maximumFractionDigits)
-    }, B = p.scaleThreshold().domain(d.map((t) => t.end)).range(d.map((t) => m + t.size)), C = p.scaleThreshold().domain(d.map((t) => t.end)).range(d.map((t) => t.color)), M = p.scaleThreshold().domain(d.map((t) => t.end)).range(d.map((t) => t.borderColor));
-    let S = [];
-    const z = p.select(this.gRef.current);
-    if (e != "csv" && s && s.children)
-      S = s.children.map((t) => {
+      pointDimensionStyles: x = [],
+      pointStyleBy: y,
+      dimension2: z,
+      visible: u = !0,
+      showDim2OnLegends: h,
+      dim2LegendLabel: G
+    } = this.props, A = {
+      style: a.style === "compacted" ? "decimal" : a.style,
+      notation: a.style === "compacted" ? "compact" : "standard",
+      currency: a.currency,
+      minimumFractionDigits: parseInt(a.minimumFractionDigits),
+      maximumFractionDigits: parseInt(a.maximumFractionDigits)
+    }, E = c.scaleThreshold().domain(d.map((t) => t.end)).range(d.map((t) => m + t.size)), B = c.scaleThreshold().domain(d.map((t) => t.end)).range(d.map((t) => t.color)), M = c.scaleThreshold().domain(d.map((t) => t.end)).range(d.map((t) => t.borderColor));
+    let D = [];
+    const k = c.select(this.gRef.current);
+    if (e != "csv" && r && r.children)
+      D = r.children.map((t) => {
         const o = t.value.split(",");
-        let h = { color: r, size: m, border: a }, i = 1;
-        return f === "measure" ? (i = t[y[0]], h = { color: C(i), size: B(i), border: M(i) }) : f === "dimension" && t.children && A && (i = t.children[0].value, h = {
-          color: u[i + "_color"] || r,
-          size: u[i + "_size"] || m,
-          border: u[i + "_border"] || a
+        let f = { color: s, size: m, border: l }, i = 1;
+        return y === "measure" ? (i = t[b[0]], f = { color: B(i), size: E(i), border: M(i) }) : y === "dimension" && t.children && h && (i = t.children[0].value, f = {
+          color: x[i + "_color"] || s,
+          size: x[i + "_size"] || m,
+          border: x[i + "_border"] || l
         }), {
           x: o[0],
           y: o[1],
           value: i,
-          metadata: t,
-          pointStyle: h
+          metadata: { ...t, ...X(t) },
+          pointStyle: f
         };
-      }), S.sort((t, o) => t.pointStyle.size - o.pointStyle.size);
+      }), D.sort((t, o) => t.pointStyle.size - o.pointStyle.size);
     else if (e == "csv") {
-      const t = s.meta.fields[0], o = s.meta.fields[1], h = s.meta.fields[2];
-      S = s.data.map((i) => {
-        let _ = { color: r, size: m, border: a };
+      const t = r.meta.fields[0], o = r.meta.fields[1], f = r.meta.fields[2];
+      D = r.data.map((i) => {
+        let j = { color: s, size: m, border: l };
         return {
           x: i[t],
           y: i[o],
-          value: i[h],
-          meta: i,
-          pointStyle: _
+          value: i[f],
+          metadata: i,
+          pointStyle: j
         };
       });
     }
     const F = (t) => {
-      const { pointStyleBy: o, dimension2: h } = this.props, i = {};
-      return h != "none" && (i[h] = t.metadata.children[0].value), { ...i, ...t, ...t.metadata };
+      const { pointStyleBy: o, dimension2: f } = this.props, i = {};
+      return f != "none" && (i[f] = t.metadata.children[0].value), { ...i, ...t, ...t.metadata };
     }, R = this.props.transform ? this.props.transform.k : 1;
-    z.attr("class", "zoomable lat-long " + T), z.selectAll(".point-group").remove();
-    const w = z.selectAll(".point-group").data(S).enter().append("g").attr("class", "point-group");
+    k.attr("class", "zoomable lat-long " + v), k.selectAll(".point-group").remove();
+    const w = k.selectAll(".point-group").data(D).enter().append("g").attr("class", "point-group");
     w.append("circle").attr("cx", function(t) {
-      return c([t.y, t.x])[0];
+      return p([t.y, t.x])[0];
     }).attr("cy", function(t) {
-      return c([t.y, t.x])[1];
+      return p([t.y, t.x])[1];
     }).attr("class", "latLong").attr("r", (t) => t.pointStyle.size * 1 / R).attr("stroke-width", 2).style("vector-effect", "non-scaling-stroke").attr("stroke", (t) => t.pointStyle.border).attr("fill", (t) => t.pointStyle.color).on("mouseenter", (t, o) => {
       this.showToolTip(n, F(o), o.pointStyle.color, t);
     }).on("mousemove", (t, o) => {
       this.moveToolTip(t);
     }).on("mouseleave", (t, o) => {
       this.hiddenToolTip(t);
-    }), w.append("text").attr("class", "point-label").attr("text-anchor", "middle").attr("dominant-baseline", "middle").attr("x", (t) => c([t.y, t.x])[0]).attr("y", (t) => c([t.y, t.x])[1]).attr("font-size", (t) => g * (10 / R) + "px").attr("fill", "#EEE").text((t) => x.formatNumber(t.value, E)).on("mouseenter", (t, o) => {
+    }), w.append("text").attr("class", "point-label").attr("text-anchor", "middle").attr("dominant-baseline", "middle").attr("x", (t) => p([t.y, t.x])[0]).attr("y", (t) => p([t.y, t.x])[1]).attr("font-size", (t) => T * (10 / R) + "px").attr("fill", "#EEE").text((t) => g.formatNumber(t.value, A)).on("mouseenter", (t, o) => {
       this.showToolTip(n, F(o), o.pointStyle.color, t);
     }).on("mousemove", (t, o) => {
       this.moveToolTip(t);
     }).on("mouseleave", (t, o) => {
       this.hiddenToolTip(t);
-    }), this.props.transform && z.attr("transform", this.props.transform);
+    }), this.props.transform && k.attr("transform", this.props.transform);
   }
-  componentDidUpdate(e, n, s) {
-    const { editing: r, selectedItem: a, onZoomToPoint: m, data: g } = this.props, y = p.select(this.gRef.current);
-    if ((r || e.data !== g || e.path !== this.props.path) && this.create(), e.visible != this.props.visible && p.select(this.gRef.current).style("display", this.props.visible ? "block" : "none"), a != null && this.props.selectedItem != e.selectedItem) {
-      const T = y.selectAll(".point-group circle").filter((l) => l.metadata.children.find((x) => x.value == a) != null);
-      m({ x: T.datum().x, y: T.datum().y });
+  componentDidUpdate(e, n, r) {
+    const { editing: s, selectedItem: l, onZoomToPoint: m, data: T } = this.props, b = c.select(this.gRef.current);
+    if ((s || e.data !== T || e.path !== this.props.path) && this.create(), e.visible != this.props.visible && c.select(this.gRef.current).style("display", this.props.visible ? "block" : "none"), l != null && this.props.selectedItem != e.selectedItem) {
+      const v = b.selectAll(".point-group circle").filter((a) => a.metadata.children.find((g) => g.value == l) != null);
+      m({ x: v.datum().x, y: v.datum().y });
     }
     this.resize();
   }
   resize() {
-    const { markerLabelSize: e } = this.props, n = p.select(this.gRef.current), s = this.props.transform ? this.props.transform.k : 1;
-    n && (n.selectAll(".point-group circle").attr("r", (r) => r.pointStyle.size * 1 / s), n.selectAll(".point-group text.point-label").attr("font-size", (r) => e * (10 / s) + "px"));
+    const { markerLabelSize: e } = this.props, n = c.select(this.gRef.current), r = this.props.transform ? this.props.transform.k : 1;
+    n && (n.selectAll(".point-group circle").attr("r", (s) => s.pointStyle.size * 1 / r), n.selectAll(".point-group text.point-label").attr("font-size", (s) => e * (10 / r) + "px"));
   }
   componentDidMount() {
     this.create();
@@ -131,44 +132,49 @@ class X extends I.Component {
     const {
       id: e
     } = this.props;
-    return /* @__PURE__ */ v("g", { className: "latLong " + e, ref: this.gRef });
+    return /* @__PURE__ */ S("g", { className: "latLong " + e, ref: this.gRef });
   }
 }
-const Y = (k) => {
+const q = (L) => {
   const {
     id: e,
     unique: n,
-    filters: s,
-    csv: r,
-    app: a,
+    filters: r,
+    csv: s,
+    app: l,
     group: m = "default",
-    apiJoinAttribute: g,
-    editing: y,
-    dimension2: c,
-    pointStyleBy: T,
-    dvzProxyDatasetId: l,
-    settings: x,
-    waitForFilters: L
-  } = k, d = c != "none" ? "/" + c : "", u = {}, f = s || {};
-  return f && f.forEach && f.forEach((b) => {
-    b.value != null && b.value.filter((D) => D != null && D.toString().trim() != "").length > 0 && (u[b.param] = b.value);
-  }), l && (u.dvzProxyDatasetId = l), /* @__PURE__ */ v(
-    j,
+    apiJoinAttribute: T,
+    editing: b,
+    dimension2: p,
+    pointStyleBy: v,
+    dvzProxyDatasetId: a,
+    extraTooltipColumns: g,
+    settings: I,
+    waitForFilters: d
+  } = L, x = p != "none" ? "/" + p : "", y = {}, z = r || {};
+  if (z && z.forEach && z.forEach((u) => {
+    u.value != null && u.value.filter((h) => h != null && h.toString().trim() != "").length > 0 && (y[u.param] = u.value);
+  }), a && (y.dvzProxyDatasetId = a), g && g.length > 0) {
+    const u = g.filter((h) => h && h !== T && h !== p);
+    u.length > 0 && (y.includeColumns = u.join(","));
+  }
+  return /* @__PURE__ */ S(
+    _,
     {
-      editing: y,
-      params: u,
-      waitForFilters: L,
-      app: a,
-      csv: decodeURIComponent(r),
+      editing: b,
+      params: y,
+      waitForFilters: d,
+      app: l,
+      csv: decodeURIComponent(s),
       group: m,
       ignoreErrors: !0,
       isSvg: !0,
-      store: [a, n, e],
-      source: [g + d],
-      children: /* @__PURE__ */ v(N, { children: /* @__PURE__ */ v(X, { ...k }) })
+      store: [l, n, e],
+      source: [T + x],
+      children: /* @__PURE__ */ S(V, { children: /* @__PURE__ */ S(Y, { ...L }) })
     }
   );
-}, K = O(Y);
+}, $ = N(q);
 export {
-  K as default
+  $ as default
 };