From fbe95e8d424a75c0fa3542b3d21623eb834dc379 Mon Sep 17 00:00:00 2001 From: Chris Matzenbach Date: Fri, 3 May 2024 12:46:17 -0500 Subject: [PATCH] Update build file for FE-17705 (#667) Co-authored-by: Chris Matzenbach --- dist/charting.js | 345 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 247 insertions(+), 98 deletions(-) diff --git a/dist/charting.js b/dist/charting.js index 87b44da9..5f231eb6 100644 --- a/dist/charting.js +++ b/dist/charting.js @@ -60719,16 +60719,19 @@ var LatLonPolyLine = /*#__PURE__*/function (_Draw$PolyLine) { /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_assert___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_2_assert__); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_d3_format__ = __webpack_require__(224); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__utils_logger__ = __webpack_require__(41); +function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); } +function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } +function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0) { ; } } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } } +function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; } +function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; } function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); } function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } +function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); } function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); } function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); } -function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); } -function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } -function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); } function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; } -function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0) { ; } } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } } -function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; } +function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } } +function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; } function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } @@ -60816,71 +60819,204 @@ function setColorScaleDomain_v1(domain) { }); }; } -function getLegendStateFromChart(chart, useMap, selectedLayer) { - // the getLegendStateFromChart in _doRender gets called from few different options - // and some of them are calling with all layers in chart. - // As a result, a legend for each layer is rendered. - // Thus, we need to remove extra legends here - var legends = chart.root().selectAll(".legend"); - var layers = chart.getLayerNames(); - if (legends.size() > layers.length && selectedLayer && selectedLayer.currentLayer !== "master") { - chart.root().selectAll(".legend").filter(function (d, i) { - return i !== selectedLayer.currentLayer; - }).remove(); - } - return toLegendState(Object(__WEBPACK_IMPORTED_MODULE_1__utils_utils_vega__["f" /* getRealLayers */])(chart.getLayerNames()).map(function (layer_name) { - var layer = chart.getLayer(layer_name); - if (typeof layer.getPrimaryColorScaleAndLegend === "function") { - var vega = chart.getMaterializedVegaSpec(); - var _layer$getPrimaryColo = layer.getPrimaryColorScaleAndLegend(), - _layer$getPrimaryColo2 = _slicedToArray(_layer$getPrimaryColo, 3), - color_scale = _layer$getPrimaryColo2[0], - color_legend = _layer$getPrimaryColo2[1], - legend_position = _layer$getPrimaryColo2[2]; - if (color_scale === null) { - return {}; - } - var color_scale_name = color_scale.name || ""; - var materialized_color_scale = vega.scales.find(function (scale) { - return scale.name === color_scale_name; - }); - if (!materialized_color_scale) { - return {}; +function getTopValues(_x, _x2, _x3) { + return _getTopValues.apply(this, arguments); +} +function _getTopValues() { + _getTopValues = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(layer, layerName, size) { + var _layer$crossfilter, _layer$getState3, _layer$getState3$enco, _layer$getState3$enco2, _layer$crossfilter2; + var OFFSET, chartId, dimension, newCf; + return _regeneratorRuntime().wrap(function _callee$(_context) { + while (1) { + switch (_context.prev = _context.next) { + case 0: + OFFSET = 0; + chartId = layer === null || layer === void 0 ? void 0 : (_layer$crossfilter = layer.crossfilter()) === null || _layer$crossfilter === void 0 ? void 0 : _layer$crossfilter.chartId; + dimension = layer === null || layer === void 0 ? void 0 : (_layer$getState3 = layer.getState()) === null || _layer$getState3 === void 0 ? void 0 : (_layer$getState3$enco = _layer$getState3.encoding) === null || _layer$getState3$enco === void 0 ? void 0 : (_layer$getState3$enco2 = _layer$getState3$enco.color) === null || _layer$getState3$enco2 === void 0 ? void 0 : _layer$getState3$enco2.field; + newCf = layer === null || layer === void 0 ? void 0 : (_layer$crossfilter2 = layer.crossfilter()) === null || _layer$crossfilter2 === void 0 ? void 0 : _layer$crossfilter2.cloneWithChartId(chartId, layerName); + if (!(chartId && dimension && newCf)) { + _context.next = 8; + break; + } + return _context.abrupt("return", newCf.dimension(dimension).group().topAsync(size, OFFSET).then(function (results) { + var _results$map; + return (_results$map = results === null || results === void 0 ? void 0 : results.map(function (result) { + return result.key0; + })) !== null && _results$map !== void 0 ? _results$map : null; + })["catch"](function (error) { + return null; + })); + case 8: + return _context.abrupt("return", null); + case 9: + case "end": + return _context.stop(); + } } - return _objectSpread(_objectSpread({}, materialized_color_scale), {}, { - legend: color_legend, - legend_position: legend_position, - version: 2.0 - }); - } else { - // TODO(croot): this can be removed once all raster layer types are - // transitioned to the getPrimaryColorScaleName/getLegendDefinitionForProperty - // form above - var layerState = layer.getState(); - var color = layer.getState().encoding.color; - var color_legend_descriptor = null; - if ((layers.length > 1 || __WEBPACK_IMPORTED_MODULE_0_lodash__["isEqual"](selectedLayer, layerState)) && typeof color !== "undefined") { - if (_typeof(color.scale) === "object" && color.scale.domain === "auto") { - color_legend_descriptor = _objectSpread(_objectSpread({}, color), {}, { - scale: _objectSpread(_objectSpread({}, color.scale), {}, { - domain: layer.colorDomain() - }) - }); - } else if (typeof color.scale === "undefined" && color.domain === "auto") { - color_legend_descriptor = _objectSpread(_objectSpread({}, color), {}, { - domain: layer.colorDomain() - }); - } else { - color_legend_descriptor = _objectSpread({}, color); + }, _callee); + })); + return _getTopValues.apply(this, arguments); +} +function getUpdatedDomainRange(newDomain, oldDomain, range, defaultColor) { + var oldDomainRange = new Map(_toConsumableArray(oldDomain).map(function (key, index) { + return [key, range[index]]; + })); + var newDomainRange = new Map(_toConsumableArray(newDomain).map(function (key) { + var _oldDomainRange$get; + return [key, (_oldDomainRange$get = oldDomainRange.get(key)) !== null && _oldDomainRange$get !== void 0 ? _oldDomainRange$get : defaultColor]; + })); + return { + newDomain: _toConsumableArray(newDomainRange.keys()), + newRange: _toConsumableArray(newDomainRange.values()) + }; +} +function getLegendStateFromChart(_x4, _x5, _x6) { + return _getLegendStateFromChart.apply(this, arguments); +} +function _getLegendStateFromChart() { + _getLegendStateFromChart = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(chart, useMap, selectedLayer) { + var legends, layers; + return _regeneratorRuntime().wrap(function _callee3$(_context3) { + while (1) { + switch (_context3.prev = _context3.next) { + case 0: + // the getLegendStateFromChart in _doRender gets called from few different options + // and some of them are calling with all layers in chart. + // As a result, a legend for each layer is rendered. + // Thus, we need to remove extra legends here + legends = chart.root().selectAll(".legend"); + layers = chart.getLayerNames(); + if (legends.size() > layers.length && selectedLayer && selectedLayer.currentLayer !== "master") { + chart.root().selectAll(".legend").filter(function (d, i) { + return i !== selectedLayer.currentLayer; + }).remove(); + } + _context3.t0 = toLegendState; + _context3.next = 6; + return Promise.all(Object(__WEBPACK_IMPORTED_MODULE_1__utils_utils_vega__["f" /* getRealLayers */])(chart.getLayerNames()).map( /*#__PURE__*/function () { + var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(layer_name) { + var layer, vega, _layer$getPrimaryColo, _layer$getPrimaryColo2, color_scale, color_legend, legend_position, color_scale_name, materialized_color_scale, layerState, color, color_legend_descriptor, colValues, _ref4, newDomain, newRange; + return _regeneratorRuntime().wrap(function _callee2$(_context2) { + while (1) { + switch (_context2.prev = _context2.next) { + case 0: + layer = chart.getLayer(layer_name); + if (!(typeof layer.getPrimaryColorScaleAndLegend === "function")) { + _context2.next = 13; + break; + } + vega = chart.getMaterializedVegaSpec(); + _layer$getPrimaryColo = layer.getPrimaryColorScaleAndLegend(), _layer$getPrimaryColo2 = _slicedToArray(_layer$getPrimaryColo, 3), color_scale = _layer$getPrimaryColo2[0], color_legend = _layer$getPrimaryColo2[1], legend_position = _layer$getPrimaryColo2[2]; + if (!(color_scale === null)) { + _context2.next = 6; + break; + } + return _context2.abrupt("return", {}); + case 6: + color_scale_name = color_scale.name || ""; + materialized_color_scale = vega.scales.find(function (scale) { + return scale.name === color_scale_name; + }); + if (materialized_color_scale) { + _context2.next = 10; + break; + } + return _context2.abrupt("return", {}); + case 10: + return _context2.abrupt("return", _objectSpread(_objectSpread({}, materialized_color_scale), {}, { + legend: color_legend, + legend_position: legend_position, + version: 2.0 + })); + case 13: + // TODO(croot): this can be removed once all raster layer types are + // transitioned to the getPrimaryColorScaleName/getLegendDefinitionForProperty + // form above + layerState = layer.getState(); + color = layer.getState().encoding.color; + color_legend_descriptor = null; + if (!((layers.length > 1 || __WEBPACK_IMPORTED_MODULE_0_lodash__["isEqual"](selectedLayer, layerState)) && typeof color !== "undefined")) { + _context2.next = 38; + break; + } + if (!(_typeof(color.scale) === "object" && color.scale.domain === "auto")) { + _context2.next = 21; + break; + } + color_legend_descriptor = _objectSpread(_objectSpread({}, color), {}, { + scale: _objectSpread(_objectSpread({}, color.scale), {}, { + domain: layer.colorDomain() + }) + }); + _context2.next = 36; + break; + case 21: + if (!(typeof color.scale === "undefined" && color.domain === "auto")) { + _context2.next = 25; + break; + } + color_legend_descriptor = _objectSpread(_objectSpread({}, color), {}, { + domain: layer.colorDomain() + }); + _context2.next = 36; + break; + case 25: + if (!(color.type === "ordinal")) { + _context2.next = 35; + break; + } + _context2.next = 28; + return getTopValues(layer, layer_name, color.domain.length); + case 28: + colValues = _context2.sent; + _ref4 = colValues ? getUpdatedDomainRange(colValues, color.domain, color.range, color.defaultOtherRange) : {}, newDomain = _ref4.newDomain, newRange = _ref4.newRange; // don't show the other category when new domain is smaller than original max + color.otherActive = false; + if (!color.hideOther && newDomain.length < color.domain.length) { + color.otherActive = false; + } else if (!color.hideOther) { + color.otherActive = true; + } + color_legend_descriptor = newDomain && newRange ? _objectSpread(_objectSpread({}, color), {}, { + domain: newDomain, + range: newRange + }) : _objectSpread({}, color); + _context2.next = 36; + break; + case 35: + color_legend_descriptor = _objectSpread({}, color); + case 36: + _context2.next = 39; + break; + case 38: + color_legend_descriptor = _objectSpread({}, color); + case 39: + return _context2.abrupt("return", _objectSpread(_objectSpread({}, color_legend_descriptor), {}, { + version: 1.0 + })); + case 40: + case "end": + return _context2.stop(); + } + } + }, _callee2); + })); + return function (_x7) { + return _ref3.apply(this, arguments); + }; + }())); + case 6: + _context3.t1 = _context3.sent; + _context3.t2 = chart; + _context3.t3 = useMap; + return _context3.abrupt("return", (0, _context3.t0)(_context3.t1, _context3.t2, _context3.t3)); + case 10: + case "end": + return _context3.stop(); } - } else { - color_legend_descriptor = _objectSpread({}, color); } - return _objectSpread(_objectSpread({}, color_legend_descriptor), {}, { - version: 1.0 - }); - } - }), chart, useMap); + }, _callee3); + })); + return _getLegendStateFromChart.apply(this, arguments); } function handleLegendToggle() { var _this = this; @@ -60909,16 +61045,21 @@ function handleLegendDoneRender() { }); } function handleLegendOpen() { + var _this3 = this; var index = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0; this.getLayers()[index].setState(setLegendState(function (color) { return { open: hasLegendOpenProp(color) ? !handleColorLegendOpenUndefined(color) : false }; })); - this.legend().setState(getLegendStateFromChart(this)); + getLegendStateFromChart(this).then(function (state) { + _this3.legend().setState(state); + }); } function handleLegendLock(_ref) { - var _layer$getState, _layer$getState$encod; + var _layer$getState, + _layer$getState$encod, + _this4 = this; var locked = _ref.locked, _ref$index = _ref.index, index = _ref$index === void 0 ? 0 : _ref$index; @@ -60953,11 +61094,14 @@ function handleLegendLock(_ref) { if (redraw) { this.renderAsync(); // not setting the state for the legend here because it'll happen on the redraw } else { - this.legend().setState(getLegendStateFromChart(this)); + getLegendStateFromChart(this).then(function (state) { + _this4.legend().setState(state); + }); } } } function handleLegendInput(_ref2) { + var _this5 = this; var domain = _ref2.domain, _ref2$index = _ref2.index, index = _ref2$index === void 0 ? 0 : _ref2$index; @@ -60981,8 +61125,10 @@ function handleLegendInput(_ref2) { }; })); } - this.legend().setState(getLegendStateFromChart(this)); - this.renderAsync(); + getLegendStateFromChart(this).then(function (state) { + _this5.legend().setState(state); + _this5.renderAsync(); + }); } function isQuantitativeType(type_string) { return type_string === "quantitative" || type_string === "linear" || type_string === "pow" || type_string === "sqrt" || type_string === "log" || type_string === "quantize"; @@ -61011,9 +61157,9 @@ function legendState_v1(state, useMap) { // For it's color swatch, we have two options: // 1. When the Other toggle is enabled, we show color swatch (color defined from color palette in chart editor) for the Other category range, // 2. If the Other toggle is disabled, we don't include color swatch for the Other domain - range: !state.hideOther && state.hasOwnProperty("showOther") && state.showOther === true ? state.range.concat([state.defaultOtherRange]) // When Other is toggled OFF, don't show color swatch in legend + range: !state.hideOther && state.hasOwnProperty("showOther") && state.showOther && state.otherActive ? state.range.concat([state.defaultOtherRange]) // When Other is toggled OFF, don't show color swatch in legend : state.range, - domain: state.hideOther ? state.domain : state.domain.concat(["Other"]), + domain: state.hideOther || !state.otherActive ? state.domain : state.domain.concat(["Other"]), position: position }; } else if (state.type === "quantitative" && state.domain && isNullLegend(state.domain)) { @@ -89763,32 +89909,33 @@ function rasterChart(parent, useMap, chartGroup, _mapboxgl) { }); } } - var state = Object(__WEBPACK_IMPORTED_MODULE_1__chart_addons_stacked_legend__["b" /* getLegendStateFromChart */])(_chart, useMap, selectedLayer); - _legend.setState(state); - if (_chart.isLoaded()) { - if (Object.keys(data).length) { - _chart._setOverlay({ - data: data.image, - bounds: _renderBoundsMap[data.nonce], - nonce: data.nonce, - browser: browser, - redraw: Boolean(redraw) - }); - _hasBeenRendered = true; + Object(__WEBPACK_IMPORTED_MODULE_1__chart_addons_stacked_legend__["b" /* getLegendStateFromChart */])(_chart, useMap, selectedLayer).then(function (state) { + _legend.setState(state); + if (_chart.isLoaded()) { + if (Object.keys(data).length) { + _chart._setOverlay({ + data: data.image, + bounds: _renderBoundsMap[data.nonce], + nonce: data.nonce, + browser: browser, + redraw: Boolean(redraw) + }); + _hasBeenRendered = true; + } else { + _chart._setOverlay({ + data: null, + bounds: null, + nonce: null, + browser: browser, + redraw: Boolean(redraw) + }); + } } else { - _chart._setOverlay({ - data: null, - bounds: null, - nonce: null, - browser: browser, - redraw: Boolean(redraw) + _chart.map().once("style.load", function () { + _chart._doRender(data, redraw, doNotForceData); }); } - } else { - _chart.map().once("style.load", function () { - _chart._doRender(data, redraw, doNotForceData); - }); - } + }); }; _chart._doRedraw = function (data) { _chart._doRender(data || null, true); @@ -100681,6 +100828,7 @@ var validLayerTypes = ["points", "polys", "heat", "lines", "windbarbs", "mesh2d" var getImageSize = __WEBPACK_IMPORTED_MODULE_12__utils_utils__["l" /* utils */].getImageSize, replaceAsync = __WEBPACK_IMPORTED_MODULE_12__utils_utils__["l" /* utils */].replaceAsync, parseUrlParts = __WEBPACK_IMPORTED_MODULE_12__utils_utils__["l" /* utils */].parseUrlParts; +var MISSING_HIT_TEST_COLUMN_ERROR = "$HEAVYAI_ERROR_COLUMN_NOT_FOUND_IN_HIT_TEST_CACHE$"; function rasterLayer(layerType) { var _layerType = layerType; var _dimension = null; @@ -100953,7 +101101,8 @@ function rasterLayer(layerType) { var columnSet = new Set(popupColumns); for (var key in data) { if (columnSet.has(key)) { - newData[key] = data[key]; + // check for missing hit test cache columns and substitute readable message + newData[key] = data[key] === MISSING_HIT_TEST_COLUMN_ERROR ? "Column Not Found" : data[key]; data[key] instanceof Date ? __WEBPACK_IMPORTED_MODULE_10_moment___default()(data[key]).utc() : data[key]; if (typeof chart.useLonLat === "function" && chart.useLonLat()) { if (key === "x") {