[FE-16355] Safety optional chaining, validate without throwing error (#630)

* Add some optional chaining for safety in weird states, move assert validation to something that won't throw an error but warn on the console and wait for a good state
* Formatting, update warning message
This commit is contained in:
Joe O'Hallaron 2023-01-26 11:30:12 -07:00 committed by GitHub
parent 93eb2c2b0d
commit d812586229
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 163 additions and 112 deletions

232
dist/charting.js vendored
View File

@ -7596,7 +7596,7 @@ var objectKeys = Object.keys || function (obj) {
return keys;
};
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(49)))
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(50)))
/***/ }),
/* 6 */
@ -8245,7 +8245,7 @@ function serializeProduction(node) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__core_errors__ = __webpack_require__(51);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__mixins_filter_mixin__ = __webpack_require__(291);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__mixins_label_mixin__ = __webpack_require__(292);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__utils_logger__ = __webpack_require__(50);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__utils_logger__ = __webpack_require__(40);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__utils_multiple_key_accessors__ = __webpack_require__(209);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__mixins_multiple_key_label_mixin__ = __webpack_require__(210);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__mixins_spinner_mixin__ = __webpack_require__(211);
@ -10547,7 +10547,7 @@ _defineProperty(ScaleType, "kInternalPassthru_", new ScaleType("internal-passthr
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__grammar_follow__ = __webpack_require__(400);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__scan_tokens_public__ = __webpack_require__(23);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__cst_cst__ = __webpack_require__(66);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__errors_public__ = __webpack_require__(45);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__errors_public__ = __webpack_require__(46);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__grammar_gast_gast_resolver_public__ = __webpack_require__(256);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__traits_recoverable__ = __webpack_require__(257);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__traits_looksahead__ = __webpack_require__(403);
@ -14261,7 +14261,7 @@ _defineProperty(ContinuousScale, "max_subdivisions", 25);
/* harmony export (immutable) */ __webpack_exports__["c"] = createTokenInstance;
/* harmony export (immutable) */ __webpack_exports__["f"] = tokenMatcher;
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__utils_utils__ = __webpack_require__(2);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__lexer_public__ = __webpack_require__(44);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__lexer_public__ = __webpack_require__(45);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__tokens__ = __webpack_require__(35);
@ -31949,7 +31949,7 @@ var getFirstNonNullDatumForAxis = function getFirstNonNullDatumForAxis(data, axi
}
}.call(this));
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(49), __webpack_require__(71)(module)))
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(50), __webpack_require__(71)(module)))
/***/ }),
/* 29 */
@ -33279,6 +33279,53 @@ var TIME_LABEL_TO_SECONDS = {
/* 40 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return logger; });
var logger = {};
logger.enableDebugLog = false;
/* istanbul ignore next */
logger.warn = function (msg) {
if (console) {
if (console.warn) {
console.warn(msg);
} else if (console.log) {
console.log(msg);
}
}
return logger;
};
/* istanbul ignore next */
logger.debug = function (msg) {
if (logger.enableDebugLog && console) {
if (console.debug) {
console.debug(msg);
} else if (console.log) {
console.log(msg);
}
}
return logger;
};
/* istanbul ignore next */
logger.deprecate = function (fn, msg) {
// Allow logging of deprecation
var warned = false;
function deprecated() {
if (!warned) {
logger.warn(msg);
warned = true;
}
return fn.apply(this, arguments);
}
return deprecated;
};
/***/ }),
/* 41 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
/* harmony export (immutable) */ __webpack_exports__["g"] = distance_in_meters;
/* harmony export (immutable) */ __webpack_exports__["e"] = conv900913To4326X;
@ -33369,11 +33416,11 @@ function conv4326To900913(out, coord) {
}
/***/ }),
/* 41 */
/* 42 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__formatDecimal_js__ = __webpack_require__(42);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__formatDecimal_js__ = __webpack_require__(43);
/* harmony default export */ __webpack_exports__["a"] = (function(x) {
@ -33382,7 +33429,7 @@ function conv4326To900913(out, coord) {
/***/ }),
/* 42 */
/* 43 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@ -33410,7 +33457,7 @@ function formatDecimalParts(x, p) {
/***/ }),
/* 43 */
/* 44 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@ -34107,7 +34154,7 @@ function rasterLayerPointMixin(_layer) {
}
/***/ }),
/* 44 */
/* 45 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@ -34792,7 +34839,7 @@ var Lexer = /** @class */ (function () {
//# sourceMappingURL=lexer_public.js.map
/***/ }),
/* 45 */
/* 46 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@ -34803,7 +34850,7 @@ var Lexer = /** @class */ (function () {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__utils_utils__ = __webpack_require__(2);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__grammar_gast_gast_public__ = __webpack_require__(7);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__grammar_gast_gast__ = __webpack_require__(36);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__grammar_checks__ = __webpack_require__(46);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__grammar_checks__ = __webpack_require__(47);
@ -35009,7 +35056,7 @@ var defaultGrammarValidatorErrorProvider = {
//# sourceMappingURL=errors_public.js.map
/***/ }),
/* 46 */
/* 47 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@ -35034,9 +35081,9 @@ var defaultGrammarValidatorErrorProvider = {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__utils_utils__ = __webpack_require__(2);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__parser_parser__ = __webpack_require__(13);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__gast_gast__ = __webpack_require__(36);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__lookahead__ = __webpack_require__(47);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__lookahead__ = __webpack_require__(48);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__cst_cst__ = __webpack_require__(66);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__interpreter__ = __webpack_require__(48);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__interpreter__ = __webpack_require__(49);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__gast_gast_public__ = __webpack_require__(7);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__gast_gast_visitor_public__ = __webpack_require__(25);
var __extends = (this && this.__extends) || (function () {
@ -35615,7 +35662,7 @@ function validateDuplicateNestedRules(topLevelRules, errMsgProvider) {
//# sourceMappingURL=checks.js.map
/***/ }),
/* 47 */
/* 48 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@ -35632,7 +35679,7 @@ function validateDuplicateNestedRules(topLevelRules, errMsgProvider) {
/* harmony export (immutable) */ __webpack_exports__["j"] = isStrictPrefixOfPath;
/* unused harmony export areTokenCategoriesNotUsed */
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__utils_utils__ = __webpack_require__(2);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__interpreter__ = __webpack_require__(48);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__interpreter__ = __webpack_require__(49);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__rest__ = __webpack_require__(63);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__scan_tokens__ = __webpack_require__(35);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__gast_gast_public__ = __webpack_require__(7);
@ -36128,7 +36175,7 @@ function areTokenCategoriesNotUsed(lookAheadPaths) {
//# sourceMappingURL=lookahead.js.map
/***/ }),
/* 48 */
/* 49 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@ -36691,7 +36738,7 @@ function expandTopLevelRule(topRule, currIdx, currRuleStack, currOccurrenceStack
//# sourceMappingURL=interpreter.js.map
/***/ }),
/* 49 */
/* 50 */
/***/ (function(module, exports) {
var g;
@ -36717,53 +36764,6 @@ try {
module.exports = g;
/***/ }),
/* 50 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return logger; });
var logger = {};
logger.enableDebugLog = false;
/* istanbul ignore next */
logger.warn = function (msg) {
if (console) {
if (console.warn) {
console.warn(msg);
} else if (console.log) {
console.log(msg);
}
}
return logger;
};
/* istanbul ignore next */
logger.debug = function (msg) {
if (logger.enableDebugLog && console) {
if (console.debug) {
console.debug(msg);
} else if (console.log) {
console.log(msg);
}
}
return logger;
};
/* istanbul ignore next */
logger.deprecate = function (fn, msg) {
// Allow logging of deprecation
var warned = false;
function deprecated() {
if (!warned) {
logger.warn(msg);
warned = true;
}
return fn.apply(this, arguments);
}
return deprecated;
};
/***/ }),
/* 51 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
@ -38620,7 +38620,7 @@ function mapMixin(_chart, chartDivId, _mapboxgl) {
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__utils_utils_latlon__ = __webpack_require__(40);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__utils_utils_latlon__ = __webpack_require__(41);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__heavyai_draw_dist_draw__ = __webpack_require__(12);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__heavyai_draw_dist_draw___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_1__heavyai_draw_dist_draw__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_assert__ = __webpack_require__(5);
@ -58466,7 +58466,7 @@ function multiSeriesMixin(chart) {
"use strict";
/* harmony export (immutable) */ __webpack_exports__["a"] = rasterDrawMixin;
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__utils_utils_latlon__ = __webpack_require__(40);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__utils_utils_latlon__ = __webpack_require__(41);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__ui_lasso_tool_ui__ = __webpack_require__(303);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_lodash__ = __webpack_require__(28);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_lodash___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_2_lodash__);
@ -59022,7 +59022,7 @@ function rasterDrawMixin(chart) {
"use strict";
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return LatLonCircle; });
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__utils_utils_latlon__ = __webpack_require__(40);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__utils_utils_latlon__ = __webpack_require__(41);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__heavyai_draw_dist_draw__ = __webpack_require__(12);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__heavyai_draw_dist_draw___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_1__heavyai_draw_dist_draw__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__LatLonViewIntersectUtils__ = __webpack_require__(56);
@ -60408,7 +60408,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__exponent_js__ = __webpack_require__(41);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__exponent_js__ = __webpack_require__(42);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__formatGroup_js__ = __webpack_require__(322);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__formatNumerals_js__ = __webpack_require__(323);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__formatSpecifier_js__ = __webpack_require__(222);
@ -60628,7 +60628,7 @@ FormatSpecifier.prototype.toString = function() {
"use strict";
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return prefixExponent; });
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__formatDecimal_js__ = __webpack_require__(42);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__formatDecimal_js__ = __webpack_require__(43);
var prefixExponent;
@ -62973,7 +62973,7 @@ function rasterLayerHeatmapMixin(_layer) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__core_core_async__ = __webpack_require__(6);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__utils_utils_vega__ = __webpack_require__(15);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__utils_utils__ = __webpack_require__(4);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__raster_layer_point_mixin__ = __webpack_require__(43);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__raster_layer_point_mixin__ = __webpack_require__(44);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__heavyai_draw_dist_draw__ = __webpack_require__(12);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__heavyai_draw_dist_draw___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_4__heavyai_draw_dist_draw__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__render_vega_lite_PropDescriptor_CommonChannelDescriptors__ = __webpack_require__(29);
@ -63262,16 +63262,18 @@ function rasterLayerWindBarbMixin(_layer) {
return _vega;
};
_layer.getPrimaryColorScaleAndLegend = function () {
var _vega_property_output2, _vega_property_output4;
var prop_descriptor = prop_descriptors.get("stroke");
var scale_obj = _vega_property_output_state.getScaleForProp(prop_descriptor);
var scale_obj = (_vega_property_output2 = _vega_property_output_state) === null || _vega_property_output2 === void 0 ? void 0 : _vega_property_output2.getScaleForProp(prop_descriptor);
if (!scale_obj) {
var _vega_property_output3;
prop_descriptor = prop_descriptors.get("fill");
scale_obj = _vega_property_output_state.getScaleForProp(prop_descriptor);
scale_obj = (_vega_property_output3 = _vega_property_output_state) === null || _vega_property_output3 === void 0 ? void 0 : _vega_property_output3.getScaleForProp(prop_descriptor);
if (!scale_obj) {
prop_descriptor = null;
}
}
var legend_obj = prop_descriptor ? _vega_property_output_state.getLegendForProperty(prop_descriptor) : null;
var legend_obj = prop_descriptor ? (_vega_property_output4 = _vega_property_output_state) === null || _vega_property_output4 === void 0 ? void 0 : _vega_property_output4.getLegendForProperty(prop_descriptor) : null;
return [scale_obj, legend_obj];
};
_layer._addRenderAttrsToPopupColumnSet = function (chart, popupColumnsSet) {
@ -64089,7 +64091,7 @@ var DiscreteScale = /*#__PURE__*/function (_ScaleDefinitionObjec) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__heavyai_draw_dist_draw___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_2__heavyai_draw_dist_draw__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__core_core_async__ = __webpack_require__(6);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__utils_utils_vega__ = __webpack_require__(15);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__raster_layer_point_mixin__ = __webpack_require__(43);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__raster_layer_point_mixin__ = __webpack_require__(44);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__render_vega_lite_RasterLayerContext__ = __webpack_require__(31);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__render_vega_lite_PropDescriptor_CommonChannelDescriptors__ = __webpack_require__(29);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__render_vega_lite_Definitions_Mark_Mesh2dConfigDefinitionObject__ = __webpack_require__(245);
@ -66427,7 +66429,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "EmbeddedActionsParser", function() { return __WEBPACK_IMPORTED_MODULE_1__parse_parser_parser__["f"]; });
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "ParserDefinitionErrorType", function() { return __WEBPACK_IMPORTED_MODULE_1__parse_parser_parser__["h"]; });
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "EMPTY_ALT", function() { return __WEBPACK_IMPORTED_MODULE_1__parse_parser_parser__["d"]; });
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__scan_lexer_public__ = __webpack_require__(44);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__scan_lexer_public__ = __webpack_require__(45);
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "Lexer", function() { return __WEBPACK_IMPORTED_MODULE_2__scan_lexer_public__["a"]; });
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "LexerDefinitionErrorType", function() { return __WEBPACK_IMPORTED_MODULE_2__scan_lexer_public__["b"]; });
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__scan_tokens_public__ = __webpack_require__(23);
@ -66437,7 +66439,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "tokenLabel", function() { return __WEBPACK_IMPORTED_MODULE_3__scan_tokens_public__["e"]; });
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "tokenMatcher", function() { return __WEBPACK_IMPORTED_MODULE_3__scan_tokens_public__["f"]; });
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "tokenName", function() { return __WEBPACK_IMPORTED_MODULE_3__scan_tokens_public__["g"]; });
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__parse_errors_public__ = __webpack_require__(45);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__parse_errors_public__ = __webpack_require__(46);
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "defaultGrammarResolverErrorProvider", function() { return __WEBPACK_IMPORTED_MODULE_4__parse_errors_public__["a"]; });
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "defaultGrammarValidatorErrorProvider", function() { return __WEBPACK_IMPORTED_MODULE_4__parse_errors_public__["b"]; });
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "defaultParserErrorProvider", function() { return __WEBPACK_IMPORTED_MODULE_4__parse_errors_public__["c"]; });
@ -66546,7 +66548,7 @@ var VERSION = "6.5.0";
/* harmony export (immutable) */ __webpack_exports__["e"] = charCodeToOptimizedIndex;
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_regexp_to_ast__ = __webpack_require__(64);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_regexp_to_ast___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0_regexp_to_ast__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__lexer_public__ = __webpack_require__(44);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__lexer_public__ = __webpack_require__(45);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__utils_utils__ = __webpack_require__(2);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__reg_exp__ = __webpack_require__(401);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__reg_exp_parser__ = __webpack_require__(65);
@ -67542,8 +67544,8 @@ var IN = "_~IN~_";
/* harmony export (immutable) */ __webpack_exports__["a"] = assignOccurrenceIndices;
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__utils_utils__ = __webpack_require__(2);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__resolver__ = __webpack_require__(402);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__checks__ = __webpack_require__(46);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__errors_public__ = __webpack_require__(45);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__checks__ = __webpack_require__(47);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__errors_public__ = __webpack_require__(46);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__gast__ = __webpack_require__(36);
@ -68215,7 +68217,7 @@ __webpack_require__(261);
/***/ (function(module, exports, __webpack_require__) {
/* WEBPACK VAR INJECTION */(function(global) {module.exports = global["dc"] = __webpack_require__(262);
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(49)))
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(50)))
/***/ }),
/* 262 */
@ -68292,7 +68294,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
/* harmony namespace reexport (by provided) */ __webpack_require__.d(__webpack_exports__, "maxVal", function() { return __WEBPACK_IMPORTED_MODULE_5__utils_utils__["g"]; });
/* harmony namespace reexport (by provided) */ __webpack_require__.d(__webpack_exports__, "pluck", function() { return __WEBPACK_IMPORTED_MODULE_5__utils_utils__["j"]; });
/* harmony namespace reexport (by provided) */ __webpack_require__.d(__webpack_exports__, "utils", function() { return __WEBPACK_IMPORTED_MODULE_5__utils_utils__["l"]; });
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__utils_logger__ = __webpack_require__(50);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__utils_logger__ = __webpack_require__(40);
/* harmony namespace reexport (by provided) */ __webpack_require__.d(__webpack_exports__, "logger", function() { return __WEBPACK_IMPORTED_MODULE_6__utils_logger__["a"]; });
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__core_errors__ = __webpack_require__(51);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__charts_bubble_overlay__ = __webpack_require__(289);
@ -68353,7 +68355,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "mapMixin", function() { return __WEBPACK_IMPORTED_MODULE_35__mixins_map_mixin__["a"]; });
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_36__mixins_raster_layer_heatmap_mixin__ = __webpack_require__(237);
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "rasterLayerHeatmapMixin", function() { return __WEBPACK_IMPORTED_MODULE_36__mixins_raster_layer_heatmap_mixin__["a"]; });
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_37__mixins_raster_layer_point_mixin__ = __webpack_require__(43);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_37__mixins_raster_layer_point_mixin__ = __webpack_require__(44);
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "rasterLayerPointMixin", function() { return __WEBPACK_IMPORTED_MODULE_37__mixins_raster_layer_point_mixin__["b"]; });
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_38__mixins_raster_layer_windbarb_mixin__ = __webpack_require__(238);
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "rasterLayerWindBarbMixin", function() { return __WEBPACK_IMPORTED_MODULE_38__mixins_raster_layer_windbarb_mixin__["a"]; });
@ -82231,12 +82233,12 @@ function geoChoroplethChart(parent, useMap, chartGroup, mapbox) {
"use strict";
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return LassoButtonGroupController; });
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__utils_utils_latlon__ = __webpack_require__(40);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__utils_utils_latlon__ = __webpack_require__(41);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__heavyai_draw_dist_draw__ = __webpack_require__(12);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__heavyai_draw_dist_draw___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_1__heavyai_draw_dist_draw__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_simplify_js__ = __webpack_require__(304);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_simplify_js___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_2_simplify_js__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__utils_logger__ = __webpack_require__(50);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__utils_logger__ = __webpack_require__(40);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__lasso_shapes_LatLonCircle__ = __webpack_require__(216);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__lasso_shapes_LatLonPoly__ = __webpack_require__(218);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__lasso_shapes_LatLonPolyLine__ = __webpack_require__(219);
@ -88906,6 +88908,7 @@ function genLayeredVega(chart) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_assert__ = __webpack_require__(5);
/* 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__(220);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__utils_logger__ = __webpack_require__(40);
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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@ -88926,6 +88929,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
var hasLegendOpenProp = function hasLegendOpenProp(color) {
return _typeof(color.legend) === "object" && color.legend.hasOwnProperty("open");
};
@ -89302,10 +89306,12 @@ function legendState_v2(state, useMap) {
range: state.range
};
} else if (state_type === "quantize") {
__WEBPACK_IMPORTED_MODULE_2_assert___default()(Array.isArray(state.range));
__WEBPACK_IMPORTED_MODULE_2_assert___default()(Array.isArray(state.domain));
__WEBPACK_IMPORTED_MODULE_2_assert___default()(state.domain.length === 2);
__WEBPACK_IMPORTED_MODULE_2_assert___default()(typeof state.domain[0] === "number");
var errors = validateQuantizeDomain(state);
// Failing domain validation, warn about problems and don't crash
if (errors.length > 0) {
errors.forEach(__WEBPACK_IMPORTED_MODULE_4__utils_logger__["a" /* logger */].warn);
return {};
}
return {
type: "gradient",
title: title,
@ -89348,6 +89354,22 @@ function legendState_v2(state, useMap) {
return {};
}
}
function validateQuantizeDomain(state) {
var errors = [];
if (!Array.isArray(state.range)) {
errors.push("Range must be an array, but was ".concat(JSON.stringify(state.range)));
}
if (!Array.isArray(state.domain)) {
errors.push("Domain must be an Array, but was ".concat(JSON.stringify(state.domain)));
}
if (state.domain.length !== 2) {
errors.push("Domain must have length of exactly 2, but was ".concat(state.domain.length));
}
if (typeof state.domain[0] !== "number") {
errors.push("Domain must be array of numbers but was ".concat(JSON.stringify(state.domain)));
}
return errors;
}
function legendState(state) {
var useMap = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
var _state$version = state.version,
@ -89752,7 +89774,7 @@ function defaultLocale(definition) {
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__formatDecimal_js__ = __webpack_require__(42);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__formatDecimal_js__ = __webpack_require__(43);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__formatPrefixAuto_js__ = __webpack_require__(223);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__formatRounded_js__ = __webpack_require__(326);
@ -89781,7 +89803,7 @@ function defaultLocale(definition) {
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__formatDecimal_js__ = __webpack_require__(42);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__formatDecimal_js__ = __webpack_require__(43);
/* harmony default export */ __webpack_exports__["a"] = (function(x, p) {
@ -89810,7 +89832,7 @@ function defaultLocale(definition) {
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__exponent_js__ = __webpack_require__(41);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__exponent_js__ = __webpack_require__(42);
/* harmony default export */ __webpack_exports__["a"] = (function(step) {
@ -89823,7 +89845,7 @@ function defaultLocale(definition) {
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__exponent_js__ = __webpack_require__(41);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__exponent_js__ = __webpack_require__(42);
/* harmony default export */ __webpack_exports__["a"] = (function(step, value) {
@ -89836,7 +89858,7 @@ function defaultLocale(definition) {
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__exponent_js__ = __webpack_require__(41);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__exponent_js__ = __webpack_require__(42);
/* harmony default export */ __webpack_exports__["a"] = (function(step, max) {
@ -97328,7 +97350,7 @@ var GastRefResolverVisitor = /** @class */ (function (_super) {
"use strict";
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return LooksAhead; });
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__grammar_lookahead__ = __webpack_require__(47);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__grammar_lookahead__ = __webpack_require__(48);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__utils_utils__ = __webpack_require__(2);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__parser__ = __webpack_require__(13);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__grammar_keys__ = __webpack_require__(37);
@ -97754,7 +97776,7 @@ var TreeBuilder = /** @class */ (function () {
/* unused harmony export validateRedundantMethods */
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__utils_utils__ = __webpack_require__(2);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__lang_lang_extensions__ = __webpack_require__(258);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__grammar_checks__ = __webpack_require__(46);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__grammar_checks__ = __webpack_require__(47);
@ -97968,8 +97990,8 @@ var LexerAdapter = /** @class */ (function () {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__utils_utils__ = __webpack_require__(2);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__exceptions_public__ = __webpack_require__(38);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__parser__ = __webpack_require__(13);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__errors_public__ = __webpack_require__(45);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__grammar_checks__ = __webpack_require__(46);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__errors_public__ = __webpack_require__(46);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__grammar_checks__ = __webpack_require__(47);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__grammar_gast_gast_public__ = __webpack_require__(7);
@ -98322,8 +98344,8 @@ var RecognizerApi = /** @class */ (function () {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__utils_utils__ = __webpack_require__(2);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__grammar_keys__ = __webpack_require__(37);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__exceptions_public__ = __webpack_require__(38);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__grammar_lookahead__ = __webpack_require__(47);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__grammar_interpreter__ = __webpack_require__(48);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__grammar_lookahead__ = __webpack_require__(48);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__grammar_interpreter__ = __webpack_require__(49);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__parser__ = __webpack_require__(13);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__recoverable__ = __webpack_require__(257);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__scan_tokens_public__ = __webpack_require__(23);
@ -98981,7 +99003,7 @@ var RecognizerEngine = /** @class */ (function () {
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ErrorHandler; });
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__exceptions_public__ = __webpack_require__(38);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__utils_utils__ = __webpack_require__(2);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__grammar_lookahead__ = __webpack_require__(47);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__grammar_lookahead__ = __webpack_require__(48);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__parser__ = __webpack_require__(13);
@ -99071,7 +99093,7 @@ var ErrorHandler = /** @class */ (function () {
"use strict";
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ContentAssist; });
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__grammar_interpreter__ = __webpack_require__(48);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__grammar_interpreter__ = __webpack_require__(49);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__utils_utils__ = __webpack_require__(2);
@ -99108,7 +99130,7 @@ var ContentAssist = /** @class */ (function () {
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return GastRecorder; });
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__utils_utils__ = __webpack_require__(2);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__grammar_gast_gast_public__ = __webpack_require__(7);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__scan_lexer_public__ = __webpack_require__(44);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__scan_lexer_public__ = __webpack_require__(45);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__scan_tokens__ = __webpack_require__(35);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__scan_tokens_public__ = __webpack_require__(23);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__parser__ = __webpack_require__(13);
@ -99691,7 +99713,7 @@ function indent(howMuch, text) {
"use strict";
/* harmony export (immutable) */ __webpack_exports__["a"] = rasterLayer;
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__cap_mixin__ = __webpack_require__(20);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__raster_layer_point_mixin__ = __webpack_require__(43);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__raster_layer_point_mixin__ = __webpack_require__(44);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__raster_layer_poly_mixin__ = __webpack_require__(248);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__raster_layer_heatmap_mixin__ = __webpack_require__(237);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__raster_layer_line_mixin__ = __webpack_require__(417);

View File

@ -2,6 +2,7 @@ import * as _ from "lodash"
import { getRealLayers } from "../utils/utils-vega"
import assert from "assert"
import { format } from "d3-format"
import { logger } from "../utils/logger"
const hasLegendOpenProp = color =>
typeof color.legend === "object" && color.legend.hasOwnProperty("open")
@ -458,10 +459,12 @@ function legendState_v2(state, useMap) {
range: state.range
}
} else if (state_type === "quantize") {
assert(Array.isArray(state.range))
assert(Array.isArray(state.domain))
assert(state.domain.length === 2)
assert(typeof state.domain[0] === "number")
const errors = validateQuantizeDomain(state)
// Failing domain validation, warn about problems and don't crash
if (errors.length > 0) {
errors.forEach(logger.warn)
return {}
}
return {
type: "gradient",
title,
@ -504,6 +507,30 @@ function legendState_v2(state, useMap) {
}
}
function validateQuantizeDomain(state) {
const errors = []
if (!Array.isArray(state.range)) {
errors.push(
`Range must be an array, but was ${JSON.stringify(state.range)}`
)
}
if (!Array.isArray(state.domain)) {
errors.push(
`Domain must be an Array, but was ${JSON.stringify(state.domain)}`
)
}
if (state.domain.length !== 2) {
errors.push(
`Domain must have length of exactly 2, but was ${state.domain.length}`
)
}
if (typeof state.domain[0] !== "number") {
errors.push(
`Domain must be array of numbers but was ${JSON.stringify(state.domain)}`
)
}
return errors
}
function legendState(state, useMap = true) {
const { version = 1.0 } = state
return version >= 2.0

View File

@ -359,16 +359,18 @@ export default function rasterLayerWindBarbMixin(_layer) {
_layer.getPrimaryColorScaleAndLegend = function() {
let prop_descriptor = prop_descriptors.get("stroke")
let scale_obj = _vega_property_output_state.getScaleForProp(prop_descriptor)
let scale_obj = _vega_property_output_state?.getScaleForProp(
prop_descriptor
)
if (!scale_obj) {
prop_descriptor = prop_descriptors.get("fill")
scale_obj = _vega_property_output_state.getScaleForProp(prop_descriptor)
scale_obj = _vega_property_output_state?.getScaleForProp(prop_descriptor)
if (!scale_obj) {
prop_descriptor = null
}
}
const legend_obj = prop_descriptor
? _vega_property_output_state.getLegendForProperty(prop_descriptor)
? _vega_property_output_state?.getLegendForProperty(prop_descriptor)
: null
return [scale_obj, legend_obj]
}