diff --git a/web/gui/src/main/webapp/app/fw/util/prefs.js b/web/gui/src/main/webapp/app/fw/util/prefs.js index 0ebdb557dd..14bc5e2b10 100644 --- a/web/gui/src/main/webapp/app/fw/util/prefs.js +++ b/web/gui/src/main/webapp/app/fw/util/prefs.js @@ -66,7 +66,6 @@ } function updatePrefs(data) { - $log.info('User properties updated'); cache = data; listeners.forEach(function (lsnr) { lsnr(); }); } diff --git a/web/gui/src/main/webapp/app/view/topo2/.eslintrc.js b/web/gui/src/main/webapp/app/view/topo2/.eslintrc.js index 5934858ec2..8432f7a83e 100644 --- a/web/gui/src/main/webapp/app/view/topo2/.eslintrc.js +++ b/web/gui/src/main/webapp/app/view/topo2/.eslintrc.js @@ -3,7 +3,8 @@ module.exports = { "installedESLint": true, "globals": { "angular": true, - "d3": true + "d3": true, + "_": true }, "rules": { "brace-style": 0, diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2-theme.css b/web/gui/src/main/webapp/app/view/topo2/topo2-theme.css index 7d8be0bed0..a5b996a2f1 100644 --- a/web/gui/src/main/webapp/app/view/topo2/topo2-theme.css +++ b/web/gui/src/main/webapp/app/view/topo2/topo2-theme.css @@ -181,7 +181,7 @@ } -#ov-topo2 svg .node.device.selected rect { +#ov-topo2 svg .node.device.selected .node-container { stroke-width: 2.0; stroke: #009fdb; } diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2.css b/web/gui/src/main/webapp/app/view/topo2/topo2.css index 2851cbd454..cda26af7e7 100644 --- a/web/gui/src/main/webapp/app/view/topo2/topo2.css +++ b/web/gui/src/main/webapp/app/view/topo2/topo2.css @@ -99,3 +99,29 @@ cursor: pointer; fill-rule: evenodd; } + +/* --- Topo Summary Panel --- */ + +#topo2-p-summary { + padding: 16px; +} + + +/* --- Topo Detail Panel --- */ + +#topo2-p-detail { + padding: 16px; + top: 370px; +} +html[data-platform='iPad'] #topo2-p-detail { + top: 386px; +} + +#topo2-p-detail .actionBtns .actionBtn { + display: inline-block; +} +#topo2-p-detail .actionBtns .actionBtn svg { + width: 28px; + height: 28px; +} + diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2.js b/web/gui/src/main/webapp/app/view/topo2/topo2.js index 5c8332c44b..48f06d0915 100644 --- a/web/gui/src/main/webapp/app/view/topo2/topo2.js +++ b/web/gui/src/main/webapp/app/view/topo2/topo2.js @@ -24,7 +24,7 @@ 'use strict'; // references to injected services - var $scope, $log, fs, mast, ks, zs, + var $scope, $log, fs, mast, ks, gs, sus, ps, t2es, t2fs, t2is, t2bcs, t2kcs, t2ms, t2mcs, t2zs; // DOM elements @@ -81,19 +81,20 @@ angular.module('ovTopo2', ['onosUtil', 'onosSvg', 'onosRemote']) .controller('OvTopo2Ctrl', ['$scope', '$log', '$location', - 'FnService', 'MastService', 'KeyService', 'ZoomService', + 'FnService', 'MastService', 'KeyService', 'GlyphService', 'MapService', 'SvgUtilService', 'FlashService', 'WebSocketService', 'PrefsService', 'ThemeService', 'Topo2EventService', 'Topo2ForceService', 'Topo2InstanceService', 'Topo2BreadcrumbService', 'Topo2KeyCommandService', 'Topo2MapService', - 'Topo2MapConfigService', 'Topo2SummaryPanelService', 'Topo2ZoomService', + 'Topo2MapConfigService', 'Topo2ZoomService', + 'Topo2SummaryPanelService', 'Topo2DeviceDetailsPanel', function (_$scope_, _$log_, _$loc_, - _fs_, _mast_, _ks_, _zs_, + _fs_, _mast_, _ks_, _gs_, _ms_, _sus_, _flash_, _wss_, _ps_, _th_, _t2es_, _t2fs_, _t2is_, _t2bcs_, _t2kcs_, _t2ms_, _t2mcs_, - summaryPanel, _t2zs_ + _t2zs_, summaryPanel, detailsPanel ) { var params = _$loc_.search(), @@ -115,7 +116,6 @@ fs = _fs_; mast = _mast_; ks = _ks_; - zs = _zs_; gs = _gs_; sus = _sus_; @@ -156,6 +156,8 @@ ks.unbindKeys(); t2fs.destroy(); t2is.destroy(); + summaryPanel.destroy(); + detailsPanel.destroy(); }); // svg layer and initialization of components @@ -176,7 +178,7 @@ t2es.bindHandlers(); // Add the map SVG Group - t2ms.init(zoomLayer).then( + t2ms.init(zoomLayer, zoomer).then( function (proj) { var z = ps.getPrefs('topo_zoom', { tx: 0, ty: 0, sc: 1 }); zoomer.panZoom([z.tx, z.ty], z.sc); @@ -219,6 +221,7 @@ // $log.debug('registered overlays...', tov.list()); summaryPanel.init(); + detailsPanel.init(); $log.log('OvTopo2Ctrl has been created'); }]); diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Device.js b/web/gui/src/main/webapp/app/view/topo2/topo2Device.js index 12b0a13c86..0d0d6917d5 100644 --- a/web/gui/src/main/webapp/app/view/topo2/topo2Device.js +++ b/web/gui/src/main/webapp/app/view/topo2/topo2Device.js @@ -34,10 +34,10 @@ var DeviceCollection = Collection.extend({ model: Model, comparator: function (a, b) { - var order = region.get('layerOrder'), - aLayer = a.get('layer'), - bLayer = b.get('layer'); - return order.indexOf(aLayer - order.indexOf(bLayer)); + // var order = region.get('layerOrder'), + // aLayer = a.get('id'), + // bLayer = b.get('layer'); + // return order.indexOf(aLayer - order.indexOf(bLayer)); } }); @@ -54,11 +54,10 @@ return deviceCollection; } - angular.module('ovTopo2') .factory('Topo2DeviceService', - ['Topo2Collection', 'Topo2NodeModel', - function (_c_, _nm_) { + ['Topo2Collection', 'Topo2NodeModel', 'Topo2DeviceDetailsPanel', + function (_c_, _nm_, detailsPanel) { Collection = _c_; @@ -67,11 +66,27 @@ this.super = this.constructor.__super__; this.super.initialize.apply(this, arguments); }, + events: { + 'click': 'onClick' + }, nodeType: 'device', icon: function () { var type = this.get('type'); return remappedDeviceTypes[type] || type || 'unknown'; }, + onClick: function () { + + if (this.get('selected')) { + this.set('selected', false); + detailsPanel.hide(); + } else { + this.set('selected', true); + detailsPanel.updateDetails(this.get('id'), this.get('nodeType')); + detailsPanel.show(); + } + + this.el.attr('class', this.svgClassName()); + }, onExit: function () { var node = this.el; node.select('use') diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2DeviceDetailsPanel.js b/web/gui/src/main/webapp/app/view/topo2/topo2DeviceDetailsPanel.js new file mode 100644 index 0000000000..9673600d0b --- /dev/null +++ b/web/gui/src/main/webapp/app/view/topo2/topo2DeviceDetailsPanel.js @@ -0,0 +1,237 @@ +/* + * Copyright 2016-present Open Networking Laboratory + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + ONOS GUI -- Topology View Module. + Module that displays the details panel for selected nodes + */ + +(function () { + 'use strict'; + + // Injected Services + var Panel, gs, wss, flash, bs, fs, ns; + + // Internal State + var detailsPanel; + + // configuration + var id = 'topo2-p-detail', + className = 'topo-p', + panelOpts = { + width: 260 // summary and detail panel width + }, + handlerMap = { + 'showDetails': showDetails + }; + + var coreButtons = { + showDeviceView: { + gid: 'switch', + tt: 'Show Device View', + path: 'device' + }, + showFlowView: { + gid: 'flowTable', + tt: 'Show Flow View for this Device', + path: 'flow' + }, + showPortView: { + gid: 'portTable', + tt: 'Show Port View for this Device', + path: 'port' + }, + showGroupView: { + gid: 'groupTable', + tt: 'Show Group View for this Device', + path: 'group' + }, + showMeterView: { + gid: 'meterTable', + tt: 'Show Meter View for this Device', + path: 'meter' + } + }; + + function init() { + + bindHandlers(); + + var options = angular.extend({}, panelOpts, { + class: className + }); + + detailsPanel = new Panel(id, options); + detailsPanel.p.classed(className, true); + } + + function addProp(tbody, label, value) { + var tr = tbody.append('tr'), + lab; + if (typeof label === 'string') { + lab = label.replace(/_/g, ' '); + } else { + lab = label; + } + + function addCell(cls, txt) { + tr.append('td').attr('class', cls).html(txt); + } + addCell('label', lab + ' :'); + addCell('value', value); + } + + function addSep(tbody) { + tbody.append('tr').append('td').attr('colspan', 2).append('hr'); + } + + function listProps(tbody, data) { + data.propOrder.forEach(function (p) { + if (p === '-') { + addSep(tbody); + } else { + addProp(tbody, p, data.props[p]); + } + }); + } + + function addBtnFooter() { + detailsPanel.appendToFooter('hr'); + detailsPanel.appendToFooter('div').classed('actionBtns', true); + } + + function addAction(o) { + var btnDiv = d3.select('#' + id) + .select('.actionBtns') + .append('div') + .classed('actionBtn', true); + bs.button(btnDiv, id + '-' + o.id, o.gid, o.cb, o.tt); + } + + function installButtons(buttons, data, devId) { + buttons.forEach(function (id) { + var btn = coreButtons[id], + gid = btn && btn.gid, + tt = btn && btn.tt, + path = btn && btn.path; + + if (btn) { + addAction({ + id: 'core-' + id, + gid: gid, + tt: tt, + cb: function () { ns.navTo(path, { devId: devId }); } + }); + } + // else if (btn = _getButtonDef(id, data)) { + // addAction(btn); + // } + }); + } + + function renderSingle(data) { + + detailsPanel.emptyRegions(); + + var svg = detailsPanel.appendToHeader('div') + .classed('icon clickable', true) + .append('svg'), + title = detailsPanel.appendToHeader('h2') + .classed('clickable', true), + table = detailsPanel.appendToBody('table'), + tbody = table.append('tbody'), + navFn; + + gs.addGlyph(svg, (data.type || 'unknown'), 26); + title.text(data.title); + + // // only add navigation when displaying a device + // if (isDevice[data.type]) { + // navFn = function () { + // ns.navTo(devPath, { devId: data.id }); + // }; + // + // svg.on('click', navFn); + // title.on('click', navFn); + // } + + listProps(tbody, data); + addBtnFooter(); + } + + + function bindHandlers() { + wss.bindHandlers(handlerMap); + } + + function updateDetails(id, nodeType) { + wss.sendEvent('requestDetails', { + id: id, + class: nodeType + }); + } + + function showDetails(data) { + var buttons = fs.isA(data.buttons) || []; + renderSingle(data); + installButtons(buttons, data, data.id); + } + + function toggle() { + var on = detailsPanel.p.toggle(), + verb = on ? 'Show' : 'Hide'; + flash.flash(verb + ' Summary Panel'); + } + + function show() { + detailsPanel.p.show(); + } + + function hide() { + detailsPanel.p.hide(); + } + + function destroy() { + wss.unbindHandlers(handlerMap); + detailsPanel.destroy(); + } + + angular.module('ovTopo2') + .factory('Topo2DeviceDetailsPanel', + ['Topo2PanelService', 'GlyphService', 'WebSocketService', 'FlashService', + 'ButtonService', 'FnService', 'NavService', + function (_ps_, _gs_, _wss_, _flash_, _bs_, _fs_, _ns_) { + + Panel = _ps_; + gs = _gs_; + wss = _wss_; + flash = _flash_; + bs = _bs_; + fs = _fs_; + ns = _ns_; + + return { + init: init, + updateDetails: updateDetails, + + toggle: toggle, + show: show, + hide: hide, + destroy: destroy + }; + } + ]); +})(); diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Force.js b/web/gui/src/main/webapp/app/view/topo2/topo2Force.js index 33c4183ab2..89eb020a90 100644 --- a/web/gui/src/main/webapp/app/view/topo2/topo2Force.js +++ b/web/gui/src/main/webapp/app/view/topo2/topo2Force.js @@ -190,18 +190,49 @@ // ========================== Main Service Definition + function update(elements) { + angular.forEach(elements, function (el) { + el.update(); + }); + } + function updateNodes() { - var allNodes = t2rs.regionNodes(); - angular.forEach(allNodes, function (node) { - node.update(); + update(t2rs.regionNodes()); + } + + function updateLinks() { + update(t2rs.regionLinks()); + } + + function resetAllLocations() { + var nodes = t2rs.regionNodes(); + + angular.forEach(nodes, function (node) { + node.resetPosition(); + }); + + t2ls.update(); + t2ls.tick(); + } + + function unpin() { + var hovered = t2rs.filterRegionNodes(function (model) { + return model.get('hovered'); + }); + + angular.forEach(hovered, function (model) { + model.fixed = false; + model.el.classed('fixed', false); }); } angular.module('ovTopo2') .factory('Topo2ForceService', - ['$log', 'WebSocketService', 'Topo2InstanceService', 'Topo2RegionService', - 'Topo2LayoutService', 'Topo2ViewService', 'Topo2BreadcrumbService', 'Topo2ZoomService', - function (_$log_, _wss_, _t2is_, _t2rs_, _t2ls_, _t2vs_, _t2bcs_, zoomService) { + ['$log', 'WebSocketService', 'Topo2InstanceService', + 'Topo2RegionService', 'Topo2LayoutService', 'Topo2ViewService', + 'Topo2BreadcrumbService', 'Topo2ZoomService', + function (_$log_, _wss_, _t2is_, _t2rs_, _t2ls_, + _t2vs_, _t2bcs_, zoomService) { $log = _$log_; wss = _wss_; @@ -238,7 +269,10 @@ showMastership: showMastership, topo2PeerRegions: topo2PeerRegions, - updateNodes: updateNodes + updateNodes: updateNodes, + updateLinks: updateLinks, + resetAllLocations: resetAllLocations, + unpin: unpin }; }]); })(); diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2KeyCommands.js b/web/gui/src/main/webapp/app/view/topo2/topo2KeyCommands.js index 85715755d1..8885a89db5 100644 --- a/web/gui/src/main/webapp/app/view/topo2/topo2KeyCommands.js +++ b/web/gui/src/main/webapp/app/view/topo2/topo2KeyCommands.js @@ -17,9 +17,9 @@ (function () { // Injected Services - var ks, t2ps, t2ms, ps, t2is, t2sp; + var ks, flash, wss, t2ps, t2ms, ps, t2is, t2sp, t2vs; - var topo2ForceService; + var t2fs; // Commmands var actionMap = { @@ -27,11 +27,16 @@ G: [openMapSelection, 'Select background geo map'], B: [toggleMap, 'Toggle background geo map'], I: [toggleInstancePanel, 'Toggle ONOS Instance Panel'], - O: [toggleSummary, 'Toggle the Summary Panel'] + O: [toggleSummary, 'Toggle the Summary Panel'], + R: [resetZoom, 'Reset pan / zoom'], + P: [togglePorts, 'Toggle Port Highlighting'], + E: [equalizeMasters, 'Equalize mastership roles'], + X: [resetAllNodeLocations, 'Reset Node Location'], + U: [unpinNode, 'Unpin node (mouse over)'] }; - function init(t2fs) { - topo2ForceService = t2fs; + function init(_t2fs_) { + t2fs = _t2fs_; bindCommands(); } @@ -58,7 +63,7 @@ function cycleDeviceLabels() { var deviceLabelIndex = t2ps.get('dlbls') + 1; t2ps.set('dlbls', deviceLabelIndex % 3); - topo2ForceService.updateNodes(); + t2fs.updateNodes(); } function openMapSelection() { @@ -77,17 +82,47 @@ t2sp.toggle(); } + function resetZoom() { + t2ms.resetZoom(); + flash.flash('Pan and zoom reset'); + } + + function togglePorts(x) { + updatePrefsState('porthl', t2vs.togglePortHighlights(x)); + t2fs.updateLinks(); + } + + function equalizeMasters() { + wss.sendEvent('equalizeMasters'); + flash.flash('Equalizing master roles'); + } + + function resetAllNodeLocations() { + t2fs.resetAllLocations(); + flash.flash('Reset node locations'); + } + + function unpinNode() { + t2fs.unpin(); + flash.flash('Unpin node'); + } + angular.module('ovTopo2') .factory('Topo2KeyCommandService', - ['KeyService', 'Topo2PrefsService', 'Topo2MapService', 'PrefsService', - 'Topo2InstanceService', 'Topo2SummaryPanelService', - function (_ks_, _t2ps_, _t2ms_, _ps_, _t2is_, _t2sp_) { + ['KeyService', 'FlashService', 'WebSocketService', 'Topo2PrefsService', + 'Topo2MapService', 'PrefsService', 'Topo2InstanceService', + 'Topo2SummaryPanelService', 'Topo2ViewService', + function (_ks_, _flash_, _wss_, _t2ps_, _t2ms_, _ps_, _t2is_, _t2sp_, _t2vs_) { + + ks = _ks_; + flash = _flash_; + wss = _wss_; t2ps = _t2ps_; t2ms = _t2ms_; t2is = _t2is_; ps = _ps_; - ks = _ks_; t2sp = _t2sp_; + t2vs = _t2vs_; return { init: init, diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Layout.js b/web/gui/src/main/webapp/app/view/topo2/topo2Layout.js index a02a84478d..4cd86cc4cd 100644 --- a/web/gui/src/main/webapp/app/view/topo2/topo2Layout.js +++ b/web/gui/src/main/webapp/app/view/topo2/topo2Layout.js @@ -438,6 +438,7 @@ init: init, createForceLayout: createForceLayout, update: update, + tick: tick, start: start, setDimensions: setDimensions diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Link.js b/web/gui/src/main/webapp/app/view/topo2/topo2Link.js index c62a935dd7..415a21e435 100644 --- a/web/gui/src/main/webapp/app/view/topo2/topo2Link.js +++ b/web/gui/src/main/webapp/app/view/topo2/topo2Link.js @@ -22,8 +22,7 @@ (function () { 'use strict'; - var $log; - var Collection, Model, ts, sus, t2zs; + var $log, Collection, Model, ts, sus, t2zs, t2vs; var linkLabelOffset = '0.35em'; @@ -59,7 +58,6 @@ var attrs = angular.extend({}, linkPoints, { key: this.get('id'), class: 'link', - weight: 1, srcPort: this.get('srcPort'), tgtPort: this.get('dstPort'), position: { @@ -144,44 +142,47 @@ }); this.el.classed('enhanced', true); - point = this.locatePortLabel(); - angular.extend(point, { - id: 'topo-port-tgt', - num: this.get('portB') - }); - data.push(point); - if (this.get('portA')) { - point = this.locatePortLabel(1); + if (showPort()) { + point = this.locatePortLabel(); angular.extend(point, { - id: 'topo-port-src', - num: this.get('portA') + id: 'topo-port-tgt', + num: this.get('portB') }); data.push(point); + + if (this.get('portA')) { + point = this.locatePortLabel(1); + angular.extend(point, { + id: 'topo-port-src', + num: this.get('portA') + }); + data.push(point); + } + + var entering = d3.select('#topo-portLabels') + .selectAll('.portLabel') + .data(data).enter().append('g') + .classed('portLabel', true) + .attr('id', function (d) { return d.id; }); + + entering.each(function (d) { + var el = d3.select(this), + rect = el.append('rect'), + text = el.append('text').text(d.num); + + var rectSize = rectAroundText(el); + + rect.attr(rectSize) + .attr('rx', 2) + .attr('ry', 2); + + text.attr('dy', linkLabelOffset) + .attr('text-anchor', 'middle'); + + el.attr('transform', sus.translate(d.x, d.y)); + }); } - - var entering = d3.select('#topo-portLabels') - .selectAll('.portLabel') - .data(data).enter().append('g') - .classed('portLabel', true) - .attr('id', function (d) { return d.id; }); - - entering.each(function (d) { - var el = d3.select(this), - rect = el.append('rect'), - text = el.append('text').text(d.num); - - var rectSize = rectAroundText(el); - - rect.attr(rectSize) - .attr('rx', 2) - .attr('ry', 2); - - text.attr('dy', linkLabelOffset) - .attr('text-anchor', 'middle'); - - el.attr('transform', sus.translate(d.x, d.y)); - }); }, unenhance: function () { this.el.classed('enhanced', false); @@ -248,6 +249,11 @@ setScale: function () { var width = linkScale(widthRatio / t2zs.scale()); this.el.style('stroke-width', width + 'px'); + }, + update: function () { + if (this.el.classed('enhanced')) { + this.enhance(); + } } }); @@ -258,17 +264,23 @@ return new LinkCollection(data); } + function showPort() { + return t2vs.getPortHighlighting(); + } + angular.module('ovTopo2') .factory('Topo2LinkService', ['$log', 'Topo2Collection', 'Topo2Model', 'ThemeService', 'SvgUtilService', 'Topo2ZoomService', - - function (_$log_, _Collection_, _Model_, _ts_, _sus_, _t2zs_) { + 'Topo2ViewService', + function (_$log_, _Collection_, _Model_, _ts_, _sus_, + _t2zs_, _t2vs_) { $log = _$log_; ts = _ts_; sus = _sus_; t2zs = _t2zs_; + t2vs = _t2vs_; Collection = _Collection_; Model = _Model_; diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Map.js b/web/gui/src/main/webapp/app/view/topo2/topo2Map.js index 4ff21628f7..ce7e956c89 100644 --- a/web/gui/src/main/webapp/app/view/topo2/topo2Map.js +++ b/web/gui/src/main/webapp/app/view/topo2/topo2Map.js @@ -29,13 +29,15 @@ var MapSelectionDialog; // internal state - var mapG; + var mapG, zoomLayer, zoomer; - function init(zoomLayer) { - return setUpMap(zoomLayer); + function init(_zoomLayer_, _zoomer_) { + zoomLayer = _zoomLayer_; + zoomer = _zoomer_; + return setUpMap(); } - function setUpMap(zoomLayer) { + function setUpMap() { var prefs = currentMap(), mapId = prefs.mapid, mapFilePath = prefs.mapfilepath, @@ -124,6 +126,10 @@ }).open(); } + function resetZoom() { + zoomer.reset(); + } + angular.module('ovTopo2') .factory('Topo2MapService', ['$location', 'PrefsService', 'MapService', @@ -140,7 +146,9 @@ return { init: init, openMapSelection: openMapSelection, - toggle: toggle + toggle: toggle, + + resetZoom: resetZoom }; } ]); diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2NodeModel.js b/web/gui/src/main/webapp/app/view/topo2/topo2NodeModel.js index 109a694186..42275bf1a2 100644 --- a/web/gui/src/main/webapp/app/view/topo2/topo2NodeModel.js +++ b/web/gui/src/main/webapp/app/view/topo2/topo2NodeModel.js @@ -15,18 +15,14 @@ */ /* - ONOS GUI -- Topology Layout Module. - Module that contains the d3.force.layout logic + ONOS GUI -- Topology Node Module. + Module that contains model for nodes within the topology */ (function () { 'use strict'; - var randomService, ps, sus, is, ts, t2mcs; - var fn; - - // Internal state; - var nearDist = 15; + var ps, sus, is, ts, t2mcs, t2nps, fn; var devIconDim = 36, devIconDimMin = 20, @@ -56,133 +52,56 @@ dColTheme[ts.theme()][otag]; } - function positionNode(node, forUpdate) { - var meta = node.get('metaUi'), - x = meta && meta.x, - y = meta && meta.y, - dim = [800, 600], - xy; - - // If the device contains explicit LONG/LAT data, use that to position - if (setLongLat(node)) { - // Indicate we want to update cached meta data... - return true; - } - - // else if we have [x,y] cached in meta data, use that... - if (x !== undefined && y !== undefined) { - node.fixed = true; - node.px = node.x = x; - node.py = node.y = y; - return; - } - - // if this is a node update (not a node add).. skip randomizer - if (forUpdate) { - return; - } - - // Note: Placing incoming unpinned nodes at exactly the same point - // (center of the view) causes them to explode outwards when - // the force layout kicks in. So, we spread them out a bit - // initially, to provide a more serene layout convergence. - // Additionally, if the node is a host, we place it near - // the device it is connected to. - - function rand() { - return { - x: randomService.randDim(dim[0]), - y: randomService.randDim(dim[1]) - }; - } - - function near(node) { - return { - x: node.x + nearDist + randomService.spread(nearDist), - y: node.y + nearDist + randomService.spread(nearDist) - }; - } - - function getDevice(cp) { - return rand(); - } - - xy = (node.class === 'host') ? near(getDevice(node.cp)) : rand(); - - if (node.class === 'sub-region') { - xy = rand(); - node.x = node.px = xy.x; - node.y = node.py = xy.y; - } - angular.extend(node, xy); - } - - function setLongLat(el) { - var loc = el.get('location'), - coord; - - if (loc && loc.type === 'lnglat') { - - if (loc.lat === 0 && loc.lng === 0) { - return false; - } - - coord = coordFromLngLat(loc); - el.fixed = true; - el.x = el.px = coord[0]; - el.y = el.py = coord[1]; - - return true; - } - } - - function coordFromLngLat(loc) { - var p = t2mcs.projection(); - return p ? p([loc.lng, loc.lat]) : [0, 0]; - } - angular.module('ovTopo2') .factory('Topo2NodeModel', - ['Topo2Model', 'FnService', 'RandomService', 'Topo2PrefsService', + ['Topo2Model', 'FnService', 'Topo2PrefsService', 'SvgUtilService', 'IconService', 'ThemeService', - 'Topo2MapConfigService', 'Topo2ZoomService', - function (Model, _fn_, _RandomService_, _ps_, _sus_, _is_, _ts_, - _t2mcs_, zoomService) { + 'Topo2MapConfigService', 'Topo2ZoomService', 'Topo2NodePositionService', + function (Model, _fn_, _ps_, _sus_, _is_, _ts_, + _t2mcs_, zoomService, _t2nps_) { - randomService = _RandomService_; ts = _ts_; fn = _fn_; ps = _ps_; sus = _sus_; is = _is_; t2mcs = _t2mcs_; + t2nps = _t2nps_; return Model.extend({ initialize: function () { - this.set('class', this.nodeType); - this.set('svgClass', this.svgClassName()); this.node = this.createNode(); + this._events = { + 'mouseover': 'mouseoverHandler', + 'mouseout': 'mouseoutHandler' + }; }, createNode: function () { - this.set('class', this.nodeType); this.set('svgClass', this.svgClassName()); - positionNode(this); + t2nps.positionNode(this); return this; }, setUpEvents: function () { - var _this = this; - angular.forEach(this.events, function (handler, key) { + var _this = this, + events = angular.extend({}, this._events, this.events); + angular.forEach(events, function (handler, key) { _this.el.on(key, _this[handler].bind(_this)); }); }, + mouseoverHandler: function () { + this.set('hovered', true); + }, + mouseoutHandler: function () { + this.set('hovered', false); + }, icon: function () { return 'unknown'; }, label: function () { var props = this.get('props'), id = this.get('id'), - friendlyName = props ? props.name : id, - labels = ['', friendlyName, id], + friendlyName = props && props.name ? props.name : id, + labels = ['', friendlyName || id, id], nli = ps.get('dlbls'), idx = (nli < labels.length) ? nli : 0; @@ -197,7 +116,8 @@ return box.width + labelPad * 2; }, addLabelElements: function (label) { - var rect = this.el.append('rect'); + var rect = this.el.append('rect') + .attr('class', 'node-container'); var glythRect = this.el.append('rect') .attr('y', -halfDevIcon) .attr('x', -halfDevIcon) @@ -243,7 +163,8 @@ this.nodeType, this.get('type'), { - online: this.get('online') + online: this.get('online'), + selected: this.get('selected') } ); }, @@ -251,6 +172,9 @@ var p = t2mcs.projection(); return p ? p.invert(coord) : [0, 0]; }, + resetPosition: function () { + t2nps.setLongLat(this); + }, update: function () { this.updateLabel(); }, @@ -281,8 +205,8 @@ multipler = devIconDimMax / (dim * zoomService.scale()); } - - this.el.selectAll('*').style('transform', 'scale(' + multipler + ')'); + this.el.selectAll('*') + .style('transform', 'scale(' + multipler + ')'); }, render: function () { var node = this.el, @@ -293,7 +217,8 @@ // Label var labelElements = this.addLabelElements(label); labelWidth = label ? this.computeLabelWidth(node) : 0; - labelElements.rect.attr(this.labelBox(devIconDim, labelWidth)); + labelElements.rect + .attr(this.labelBox(devIconDim, labelWidth)); // Icon glyph = is.addDeviceIcon(node, glyphId, devIconDim); diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2NodePosition.js b/web/gui/src/main/webapp/app/view/topo2/topo2NodePosition.js new file mode 100644 index 0000000000..7381f6b7a6 --- /dev/null +++ b/web/gui/src/main/webapp/app/view/topo2/topo2NodePosition.js @@ -0,0 +1,130 @@ +/* + * Copyright 2016-present Open Networking Laboratory + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + ONOS GUI -- Topology Node Position Module. + Module that helps position nodes in the topology + */ + +(function () { + 'use strict'; + + // Injected vars + var rs, t2mcs; + + // Internal state; + var nearDist = 15; + + function positionNode(node, forUpdate) { + var meta = node.get('metaUi'), + x = meta && meta.x, + y = meta && meta.y, + dim = [800, 600], + xy; + + // If the device contains explicit LONG/LAT data, use that to position + if (setLongLat(node)) { + // Indicate we want to update cached meta data... + return true; + } + + // else if we have [x,y] cached in meta data, use that... + if (x !== undefined && y !== undefined) { + node.fixed = true; + node.px = node.x = x; + node.py = node.y = y; + return; + } + + // if this is a node update (not a node add).. skip randomizer + if (forUpdate) { + return; + } + + // Note: Placing incoming unpinned nodes at exactly the same point + // (center of the view) causes them to explode outwards when + // the force layout kicks in. So, we spread them out a bit + // initially, to provide a more serene layout convergence. + // Additionally, if the node is a host, we place it near + // the device it is connected to. + + function rand() { + return { + x: rs.randDim(dim[0]), + y: rs.randDim(dim[1]) + }; + } + + function near(node) { + return { + x: node.x + nearDist + rs.spread(nearDist), + y: node.y + nearDist + rs.spread(nearDist) + }; + } + + function getDevice(cp) { + return rand(); + } + + xy = (node.class === 'host') ? near(getDevice(node.cp)) : rand(); + + if (node.class === 'sub-region') { + xy = rand(); + node.x = node.px = xy.x; + node.y = node.py = xy.y; + } + angular.extend(node, xy); + } + + function setLongLat(el) { + var loc = el.get('location'), + coord; + + if (loc && loc.type === 'lnglat') { + + if (loc.lat === 0 && loc.lng === 0) { + return false; + } + + coord = coordFromLngLat(loc); + el.fixed = true; + el.x = el.px = coord[0]; + el.y = el.py = coord[1]; + + return true; + } + } + + function coordFromLngLat(loc) { + var p = t2mcs.projection(); + return p ? p([loc.lng, loc.lat]) : [0, 0]; + } + + angular.module('ovTopo2') + .factory('Topo2NodePositionService', + ['RandomService', + function (_rs_, _t2mcs_) { + + rs = _rs_; + t2mcs = _t2mcs_; + + return { + positionNode: positionNode, + setLongLat: setLongLat + }; + } + ]); +})(); diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Panel.js b/web/gui/src/main/webapp/app/view/topo2/topo2Panel.js index bfd2a3f1d9..5836382796 100644 --- a/web/gui/src/main/webapp/app/view/topo2/topo2Panel.js +++ b/web/gui/src/main/webapp/app/view/topo2/topo2Panel.js @@ -29,7 +29,9 @@ this.p = ps.createPanel(this.id, options); this.setup(); - this.p.show(); + if (options.show) { + this.p.show(); + } }; Panel.prototype = { @@ -59,8 +61,8 @@ this.body.selectAll("*").remove(); this.footer.selectAll("*").remove(); }, - destory: function () { - ps.destroy(this.id); + destroy: function () { + ps.destroyPanel(this.id); } }; diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Region.js b/web/gui/src/main/webapp/app/view/topo2/topo2Region.js index 3f6fa17e11..6becc4902d 100644 --- a/web/gui/src/main/webapp/app/view/topo2/topo2Region.js +++ b/web/gui/src/main/webapp/app/view/topo2/topo2Region.js @@ -80,6 +80,11 @@ return []; } + function filterRegionNodes(predicate) { + var nodes = regionNodes(); + return _.filter(nodes, predicate); + } + function regionLinks() { return (region) ? region.get('links').models : []; } @@ -105,6 +110,7 @@ addRegion: addRegion, regionNodes: regionNodes, regionLinks: regionLinks, + filterRegionNodes: filterRegionNodes, getSubRegions: t2sr.getSubRegions }; diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2SummaryPanel.js b/web/gui/src/main/webapp/app/view/topo2/topo2SummaryPanel.js index 149e7ccaff..ac12c2b8bd 100644 --- a/web/gui/src/main/webapp/app/view/topo2/topo2SummaryPanel.js +++ b/web/gui/src/main/webapp/app/view/topo2/topo2SummaryPanel.js @@ -29,8 +29,12 @@ var summaryPanel, summaryData; // configuration - var id = 'topo-p-summary', + var id = 'topo2-p-summary', className = 'topo-p', + panelOpts = { + show: true, + width: 260 // summary and detail panel width + }, handlerMap = { showSummary: handleSummaryData }; @@ -40,10 +44,12 @@ bindHandlers(); wss.sendEvent('requestSummary'); - summaryPanel = new Panel(id, { + var options = angular.extend({}, panelOpts, { class: className }); + summaryPanel = new Panel(id, options); + summaryPanel.p.classed(className, true); } @@ -107,6 +113,11 @@ flash.flash(verb + ' Summary Panel'); } + function destroy() { + wss.unbindHandlers(handlerMap); + summaryPanel.destroy(); + } + angular.module('ovTopo2') .factory('Topo2SummaryPanelService', ['Topo2PanelService', 'GlyphService', 'WebSocketService', 'FlashService', @@ -120,7 +131,8 @@ return { init: init, - toggle: toggle + toggle: toggle, + destroy: destroy }; } ]); diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2View.js b/web/gui/src/main/webapp/app/view/topo2/topo2View.js index 9178e1a8cd..ae29894130 100644 --- a/web/gui/src/main/webapp/app/view/topo2/topo2View.js +++ b/web/gui/src/main/webapp/app/view/topo2/topo2View.js @@ -15,14 +15,21 @@ */ /* - ONOS GUI -- Topology Layout Module. - Module that contains the d3.force.layout logic + ONOS GUI -- Topology View Module. + Module that contains the topology view variables */ (function () { 'use strict'; - var dimensions; + // Injected Services + var flash; + + // Internal State + var dimensions, + viewOptions = { + linkPortHighlighting: true + }; function newDim(_dimensions) { dimensions = _dimensions; @@ -32,13 +39,33 @@ return dimensions; } + function togglePortHighlights(x) { + var kev = (x === 'keyev'), + on = kev ? !viewOptions.linkPortHighlighting : Boolean(x), + what = on ? 'Enable' : 'Disable'; + + viewOptions.linkPortHighlighting = on; + flash.flash(what + ' port highlighting'); + return on; + } + + function getPortHighlighting() { + return viewOptions.linkPortHighlighting; + } + angular.module('ovTopo2') .factory('Topo2ViewService', - [ - function () { + ['FlashService', + function (_flash_) { + + flash = _flash_; + return { newDim: newDim, - getDimensions: getDimensions + getDimensions: getDimensions, + + togglePortHighlights: togglePortHighlights, + getPortHighlighting: getPortHighlighting }; } ] diff --git a/web/gui/src/main/webapp/index.html b/web/gui/src/main/webapp/index.html index f5fd009262..b848f3689a 100644 --- a/web/gui/src/main/webapp/index.html +++ b/web/gui/src/main/webapp/index.html @@ -40,6 +40,7 @@ + @@ -132,6 +133,7 @@ + @@ -145,6 +147,7 @@ + diff --git a/web/gui/src/main/webapp/tp/lodash.min.js b/web/gui/src/main/webapp/tp/lodash.min.js new file mode 100644 index 0000000000..4bf932bd97 --- /dev/null +++ b/web/gui/src/main/webapp/tp/lodash.min.js @@ -0,0 +1,134 @@ +/** + * @license + * lodash lodash.com/license | Underscore.js 1.8.3 underscorejs.org/LICENSE + */ +;(function(){function t(t,n){return t.set(n[0],n[1]),t}function n(t,n){return t.add(n),t}function r(t,n,r){switch(r.length){case 0:return t.call(n);case 1:return t.call(n,r[0]);case 2:return t.call(n,r[0],r[1]);case 3:return t.call(n,r[0],r[1],r[2])}return t.apply(n,r)}function e(t,n,r,e){for(var u=-1,i=t?t.length:0;++u"']/g,Y=RegExp(G.source),H=RegExp(J.source),Q=/<%-([\s\S]+?)%>/g,X=/<%([\s\S]+?)%>/g,tt=/<%=([\s\S]+?)%>/g,nt=/\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,rt=/^\w*$/,et=/^\./,ut=/[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g,it=/[\\^$.*+?()[\]{}|]/g,ot=RegExp(it.source),ft=/^\s+|\s+$/g,ct=/^\s+/,at=/\s+$/,lt=/\{(?:\n\/\* \[wrapped with .+\] \*\/)?\n?/,st=/\{\n\/\* \[wrapped with (.+)\] \*/,ht=/,? & /,pt=/[^\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]+/g,_t=/\\(\\)?/g,vt=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,gt=/\w*$/,dt=/^[-+]0x[0-9a-f]+$/i,yt=/^0b[01]+$/i,bt=/^\[object .+?Constructor\]$/,xt=/^0o[0-7]+$/i,jt=/^(?:0|[1-9]\d*)$/,wt=/[\xc0-\xd6\xd8-\xf6\xf8-\xff\u0100-\u017f]/g,mt=/($^)/,At=/['\n\r\u2028\u2029\\]/g,kt="[\\ufe0e\\ufe0f]?(?:[\\u0300-\\u036f\\ufe20-\\ufe23\\u20d0-\\u20f0]|\\ud83c[\\udffb-\\udfff])?(?:\\u200d(?:[^\\ud800-\\udfff]|(?:\\ud83c[\\udde6-\\uddff]){2}|[\\ud800-\\udbff][\\udc00-\\udfff])[\\ufe0e\\ufe0f]?(?:[\\u0300-\\u036f\\ufe20-\\ufe23\\u20d0-\\u20f0]|\\ud83c[\\udffb-\\udfff])?)*",Et="(?:[\\u2700-\\u27bf]|(?:\\ud83c[\\udde6-\\uddff]){2}|[\\ud800-\\udbff][\\udc00-\\udfff])"+kt,Ot="(?:[^\\ud800-\\udfff][\\u0300-\\u036f\\ufe20-\\ufe23\\u20d0-\\u20f0]?|[\\u0300-\\u036f\\ufe20-\\ufe23\\u20d0-\\u20f0]|(?:\\ud83c[\\udde6-\\uddff]){2}|[\\ud800-\\udbff][\\udc00-\\udfff]|[\\ud800-\\udfff])",St=RegExp("['\u2019]","g"),It=RegExp("[\\u0300-\\u036f\\ufe20-\\ufe23\\u20d0-\\u20f0]","g"),Rt=RegExp("\\ud83c[\\udffb-\\udfff](?=\\ud83c[\\udffb-\\udfff])|"+Ot+kt,"g"),zt=RegExp(["[A-Z\\xc0-\\xd6\\xd8-\\xde]?[a-z\\xdf-\\xf6\\xf8-\\xff]+(?:['\u2019](?:d|ll|m|re|s|t|ve))?(?=[\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2000-\\u206f \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000]|[A-Z\\xc0-\\xd6\\xd8-\\xde]|$)|(?:[A-Z\\xc0-\\xd6\\xd8-\\xde]|[^\\ud800-\\udfff\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2000-\\u206f \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000\\d+\\u2700-\\u27bfa-z\\xdf-\\xf6\\xf8-\\xffA-Z\\xc0-\\xd6\\xd8-\\xde])+(?:['\u2019](?:D|LL|M|RE|S|T|VE))?(?=[\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2000-\\u206f \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000]|[A-Z\\xc0-\\xd6\\xd8-\\xde](?:[a-z\\xdf-\\xf6\\xf8-\\xff]|[^\\ud800-\\udfff\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2000-\\u206f \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000\\d+\\u2700-\\u27bfa-z\\xdf-\\xf6\\xf8-\\xffA-Z\\xc0-\\xd6\\xd8-\\xde])|$)|[A-Z\\xc0-\\xd6\\xd8-\\xde]?(?:[a-z\\xdf-\\xf6\\xf8-\\xff]|[^\\ud800-\\udfff\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2000-\\u206f \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000\\d+\\u2700-\\u27bfa-z\\xdf-\\xf6\\xf8-\\xffA-Z\\xc0-\\xd6\\xd8-\\xde])+(?:['\u2019](?:d|ll|m|re|s|t|ve))?|[A-Z\\xc0-\\xd6\\xd8-\\xde]+(?:['\u2019](?:D|LL|M|RE|S|T|VE))?|\\d+",Et].join("|"),"g"),Wt=RegExp("[\\u200d\\ud800-\\udfff\\u0300-\\u036f\\ufe20-\\ufe23\\u20d0-\\u20f0\\ufe0e\\ufe0f]"),Bt=/[a-z][A-Z]|[A-Z]{2,}[a-z]|[0-9][a-zA-Z]|[a-zA-Z][0-9]|[^a-zA-Z0-9 ]/,Lt="Array Buffer DataView Date Error Float32Array Float64Array Function Int8Array Int16Array Int32Array Map Math Object Promise RegExp Set String Symbol TypeError Uint8Array Uint8ClampedArray Uint16Array Uint32Array WeakMap _ clearTimeout isFinite parseInt setTimeout".split(" "),Ut={}; +Ut["[object Float32Array]"]=Ut["[object Float64Array]"]=Ut["[object Int8Array]"]=Ut["[object Int16Array]"]=Ut["[object Int32Array]"]=Ut["[object Uint8Array]"]=Ut["[object Uint8ClampedArray]"]=Ut["[object Uint16Array]"]=Ut["[object Uint32Array]"]=true,Ut["[object Arguments]"]=Ut["[object Array]"]=Ut["[object ArrayBuffer]"]=Ut["[object Boolean]"]=Ut["[object DataView]"]=Ut["[object Date]"]=Ut["[object Error]"]=Ut["[object Function]"]=Ut["[object Map]"]=Ut["[object Number]"]=Ut["[object Object]"]=Ut["[object RegExp]"]=Ut["[object Set]"]=Ut["[object String]"]=Ut["[object WeakMap]"]=false; +var Ct={};Ct["[object Arguments]"]=Ct["[object Array]"]=Ct["[object ArrayBuffer]"]=Ct["[object DataView]"]=Ct["[object Boolean]"]=Ct["[object Date]"]=Ct["[object Float32Array]"]=Ct["[object Float64Array]"]=Ct["[object Int8Array]"]=Ct["[object Int16Array]"]=Ct["[object Int32Array]"]=Ct["[object Map]"]=Ct["[object Number]"]=Ct["[object Object]"]=Ct["[object RegExp]"]=Ct["[object Set]"]=Ct["[object String]"]=Ct["[object Symbol]"]=Ct["[object Uint8Array]"]=Ct["[object Uint8ClampedArray]"]=Ct["[object Uint16Array]"]=Ct["[object Uint32Array]"]=true, +Ct["[object Error]"]=Ct["[object Function]"]=Ct["[object WeakMap]"]=false;var Mt,Dt={"\\":"\\","'":"'","\n":"n","\r":"r","\u2028":"u2028","\u2029":"u2029"},Tt=parseFloat,$t=parseInt,Ft=typeof global=="object"&&global&&global.Object===Object&&global,Nt=typeof self=="object"&&self&&self.Object===Object&&self,Pt=Ft||Nt||Function("return this")(),Zt=typeof exports=="object"&&exports&&!exports.nodeType&&exports,qt=Zt&&typeof module=="object"&&module&&!module.nodeType&&module,Vt=qt&&qt.exports===Zt,Kt=Vt&&Ft.h; +t:{try{Mt=Kt&&Kt.g("util");break t}catch(t){}Mt=void 0}var Gt=Mt&&Mt.isArrayBuffer,Jt=Mt&&Mt.isDate,Yt=Mt&&Mt.isMap,Ht=Mt&&Mt.isRegExp,Qt=Mt&&Mt.isSet,Xt=Mt&&Mt.isTypedArray,tn=j("length"),nn=w({"\xc0":"A","\xc1":"A","\xc2":"A","\xc3":"A","\xc4":"A","\xc5":"A","\xe0":"a","\xe1":"a","\xe2":"a","\xe3":"a","\xe4":"a","\xe5":"a","\xc7":"C","\xe7":"c","\xd0":"D","\xf0":"d","\xc8":"E","\xc9":"E","\xca":"E","\xcb":"E","\xe8":"e","\xe9":"e","\xea":"e","\xeb":"e","\xcc":"I","\xcd":"I","\xce":"I","\xcf":"I", +"\xec":"i","\xed":"i","\xee":"i","\xef":"i","\xd1":"N","\xf1":"n","\xd2":"O","\xd3":"O","\xd4":"O","\xd5":"O","\xd6":"O","\xd8":"O","\xf2":"o","\xf3":"o","\xf4":"o","\xf5":"o","\xf6":"o","\xf8":"o","\xd9":"U","\xda":"U","\xdb":"U","\xdc":"U","\xf9":"u","\xfa":"u","\xfb":"u","\xfc":"u","\xdd":"Y","\xfd":"y","\xff":"y","\xc6":"Ae","\xe6":"ae","\xde":"Th","\xfe":"th","\xdf":"ss","\u0100":"A","\u0102":"A","\u0104":"A","\u0101":"a","\u0103":"a","\u0105":"a","\u0106":"C","\u0108":"C","\u010a":"C","\u010c":"C", +"\u0107":"c","\u0109":"c","\u010b":"c","\u010d":"c","\u010e":"D","\u0110":"D","\u010f":"d","\u0111":"d","\u0112":"E","\u0114":"E","\u0116":"E","\u0118":"E","\u011a":"E","\u0113":"e","\u0115":"e","\u0117":"e","\u0119":"e","\u011b":"e","\u011c":"G","\u011e":"G","\u0120":"G","\u0122":"G","\u011d":"g","\u011f":"g","\u0121":"g","\u0123":"g","\u0124":"H","\u0126":"H","\u0125":"h","\u0127":"h","\u0128":"I","\u012a":"I","\u012c":"I","\u012e":"I","\u0130":"I","\u0129":"i","\u012b":"i","\u012d":"i","\u012f":"i", +"\u0131":"i","\u0134":"J","\u0135":"j","\u0136":"K","\u0137":"k","\u0138":"k","\u0139":"L","\u013b":"L","\u013d":"L","\u013f":"L","\u0141":"L","\u013a":"l","\u013c":"l","\u013e":"l","\u0140":"l","\u0142":"l","\u0143":"N","\u0145":"N","\u0147":"N","\u014a":"N","\u0144":"n","\u0146":"n","\u0148":"n","\u014b":"n","\u014c":"O","\u014e":"O","\u0150":"O","\u014d":"o","\u014f":"o","\u0151":"o","\u0154":"R","\u0156":"R","\u0158":"R","\u0155":"r","\u0157":"r","\u0159":"r","\u015a":"S","\u015c":"S","\u015e":"S", +"\u0160":"S","\u015b":"s","\u015d":"s","\u015f":"s","\u0161":"s","\u0162":"T","\u0164":"T","\u0166":"T","\u0163":"t","\u0165":"t","\u0167":"t","\u0168":"U","\u016a":"U","\u016c":"U","\u016e":"U","\u0170":"U","\u0172":"U","\u0169":"u","\u016b":"u","\u016d":"u","\u016f":"u","\u0171":"u","\u0173":"u","\u0174":"W","\u0175":"w","\u0176":"Y","\u0177":"y","\u0178":"Y","\u0179":"Z","\u017b":"Z","\u017d":"Z","\u017a":"z","\u017c":"z","\u017e":"z","\u0132":"IJ","\u0133":"ij","\u0152":"Oe","\u0153":"oe","\u0149":"'n", +"\u017f":"s"}),rn=w({"&":"&","<":"<",">":">",'"':""","'":"'"}),en=w({"&":"&","<":"<",">":">",""":'"',"'":"'"}),un=function w(kt){function Et(t){return fi.call(t)}function Ot(t){if(vu(t)&&!nf(t)&&!(t instanceof Dt)){if(t instanceof Mt)return t;if(ui.call(t,"__wrapped__"))return De(t)}return new Mt(t)}function Rt(){}function Mt(t,n){this.__wrapped__=t,this.__actions__=[],this.__chain__=!!n,this.__index__=0,this.__values__=F}function Dt(t){this.__wrapped__=t,this.__actions__=[], +this.__dir__=1,this.__filtered__=false,this.__iteratees__=[],this.__takeCount__=4294967295,this.__views__=[]}function Ft(t){var n=-1,r=t?t.length:0;for(this.clear();++n=n?t:n)),t}function yn(t,n,r,e,i,o,f){var c;if(e&&(c=o?e(t,i,o,f):e(t)),c!==F)return c;if(!_u(t))return t;if(i=nf(t)){if(c=be(t),!n)return Cr(t,c)}else{var a=Et(t),l="[object Function]"==a||"[object GeneratorFunction]"==a;if(ef(t))return Rr(t,n);if("[object Object]"==a||"[object Arguments]"==a||l&&!o){if(c=xe(l?{}:t),!n)return Dr(t,_n(c,t))}else{if(!Ct[a])return o?t:{};c=je(t,a,yn,n)}}if(f||(f=new Kt),o=f.get(t))return o;f.set(t,c); +var s=i?F:(r?se:Iu)(t);return u(s||t,function(u,i){s&&(i=u,u=t[i]),sn(c,i,yn(u,n,r,e,i,t,f))}),c}function bn(t){var n=Iu(t);return function(r){return xn(r,t,n)}}function xn(t,n,r){var e=r.length;if(null==t)return!e;for(t=Ju(t);e--;){var u=r[e],i=n[u],o=t[u];if(o===F&&!(u in t)||!i(o))return false}return true}function jn(t,n,r){if(typeof t!="function")throw new Qu("Expected a function");return po(function(){t.apply(F,r)},n)}function wn(t,n,r,e){var u=-1,i=c,o=true,f=t.length,s=[],h=n.length;if(!f)return s;r&&(n=l(n,S(r))), +e?(i=a,o=false):200<=n.length&&(i=R,o=false,n=new qt(n));t:for(;++un}function Bn(t,n){return null!=t&&ui.call(t,n)}function Ln(t,n){ +return null!=t&&n in Ju(t)}function Un(t,n,r){for(var e=r?a:c,u=t[0].length,i=t.length,o=i,f=Zu(i),s=1/0,h=[];o--;){var p=t[o];o&&n&&(p=l(p,S(n))),s=Wi(p.length,s),f[o]=!r&&(n||120<=u&&120<=p.length)?new qt(o&&p):F}var p=t[0],_=-1,v=f[0];t:for(;++_n?r:0,me(n,r)?t[n]:F}function rr(t,n,r){var e=-1;return n=l(n.length?n:[Mu],S(_e())),t=Hn(t,function(t){return{a:l(n,function(n){return n(t)}),b:++e,c:t}}),A(t,function(t,n){var e;t:{e=-1;for(var u=t.a,i=n.a,o=u.length,f=r.length;++e=f?c:c*("desc"==r[e]?-1:1);break t}}e=t.b-n.b}return e})}function er(t,n){return t=Ju(t),ur(t,n,function(n,r){return r in t})}function ur(t,n,r){for(var e=-1,u=n.length,i={};++en||9007199254740991n&&(n=-n>u?0:u+n),r=r>u?u:r,0>r&&(r+=u),u=n>r?0:r-n>>>0,n>>>=0,r=Zu(u);++e=u){for(;e>>1,o=t[i];null!==o&&!bu(o)&&(r?o<=n:o=e?t:vr(t,n,r)}function Rr(t,n){if(n)return t.slice();var r=t.length,r=pi?pi(r):new t.constructor(r); +return t.copy(r),r}function zr(t){var n=new t.constructor(t.byteLength);return new hi(n).set(new hi(t)),n}function Wr(t,n){return new t.constructor(n?zr(t.buffer):t.buffer,t.byteOffset,t.length)}function Br(t,n){if(t!==n){var r=t!==F,e=null===t,u=t===t,i=bu(t),o=n!==F,f=null===n,c=n===n,a=bu(n);if(!f&&!a&&!i&&t>n||i&&o&&c&&!f&&!a||e&&o&&c||!r&&c||!u)return 1;if(!e&&!i&&!a&&tu?F:i,u=1),n=Ju(n);++eo&&f[0]!==a&&f[o-1]!==a?[]:C(f,a),o-=c.length,or?r?ar(n,t):n:(r=ar(n,Ai(t/T(n))),Wt.test(n)?Ir($(r),0,t).join(""):r.slice(0,t))}function ne(t,n,e,u){function i(){for(var n=-1,c=arguments.length,a=-1,l=u.length,s=Zu(l+c),h=this&&this!==Pt&&this instanceof i?f:t;++an||e)&&(1&t&&(i[2]=h[2],n|=1&r?0:4),(r=h[3])&&(e=i[3],i[3]=e?Lr(e,r,h[4]):r,i[4]=e?C(i[3],"__lodash_placeholder__"):h[4]),(r=h[5])&&(e=i[5],i[5]=e?Ur(e,r,h[6]):r,i[6]=e?C(i[5],"__lodash_placeholder__"):h[6]),(r=h[7])&&(i[7]=r),128&t&&(i[8]=null==i[8]?h[8]:Wi(i[8],h[8])), +null==i[9]&&(i[9]=h[9]),i[0]=h[0],i[1]=n),t=i[0],n=i[1],r=i[2],e=i[3],u=i[4],f=i[9]=null==i[9]?c?0:t.length:zi(i[9]-a,0),!f&&24&n&&(n&=-25),We((h?uo:ho)(n&&1!=n?8==n||16==n?Kr(t,n,f):32!=n&&33!=n||u.length?Yr.apply(F,i):ne(t,n,r,e):Pr(t,n,r),i),t,n)}function ce(t,n,r,e,u,i){var o=2&u,f=t.length,c=n.length;if(f!=c&&!(o&&c>f))return false;if((c=i.get(t))&&i.get(n))return c==n;var c=-1,a=true,l=1&u?new qt:F;for(i.set(t,n),i.set(n,t);++cr&&(r=zi(e+r,0)),g(t,_e(n,3),r)):-1}function $e(t,n,r){var e=t?t.length:0;if(!e)return-1;var u=e-1;return r!==F&&(u=wu(r),u=0>r?zi(e+u,0):Wi(u,e-1)),g(t,_e(n,3),u,true); +}function Fe(t){return t&&t.length?En(t,1):[]}function Ne(t){return t&&t.length?t[0]:F}function Pe(t){var n=t?t.length:0;return n?t[n-1]:F}function Ze(t,n){return t&&t.length&&n&&n.length?or(t,n):t}function qe(t){return t?Ci.call(t):t}function Ve(t){if(!t||!t.length)return[];var n=0;return t=f(t,function(t){if(au(t))return n=zi(t.length,n),true}),E(n,function(n){return l(t,j(n))})}function Ke(t,n){if(!t||!t.length)return[];var e=Ve(t);return null==n?e:l(e,function(t){return r(n,F,t)})}function Ge(t){ +return t=Ot(t),t.__chain__=true,t}function Je(t,n){return n(t)}function Ye(){return this}function He(t,n){return(nf(t)?u:to)(t,_e(n,3))}function Qe(t,n){return(nf(t)?i:no)(t,_e(n,3))}function Xe(t,n){return(nf(t)?l:Hn)(t,_e(n,3))}function tu(t,n,r){return n=r?F:n,n=t&&null==n?t.length:n,fe(t,128,F,F,F,F,n)}function nu(t,n){var r;if(typeof n!="function")throw new Qu("Expected a function");return t=wu(t),function(){return 0<--t&&(r=n.apply(this,arguments)),1>=t&&(n=F),r}}function ru(t,n,r){return n=r?F:n, +t=fe(t,8,F,F,F,F,F,n),t.placeholder=ru.placeholder,t}function eu(t,n,r){return n=r?F:n,t=fe(t,16,F,F,F,F,F,n),t.placeholder=eu.placeholder,t}function uu(t,n,r){function e(n){var r=c,e=a;return c=a=F,_=n,s=t.apply(e,r)}function u(t){var r=t-p;return t-=_,p===F||r>=n||0>r||g&&t>=l}function i(){var t=Po();if(u(t))return o(t);var r,e=po;r=t-_,t=n-(t-p),r=g?Wi(t,l-r):t,h=e(i,r)}function o(t){return h=F,d&&c?e(t):(c=a=F,s)}function f(){var t=Po(),r=u(t);if(c=arguments,a=this,p=t,r){if(h===F)return _=t=p, +h=po(i,n),v?e(t):s;if(g)return h=po(i,n),e(p)}return h===F&&(h=po(i,n)),s}var c,a,l,s,h,p,_=0,v=false,g=false,d=true;if(typeof t!="function")throw new Qu("Expected a function");return n=Au(n)||0,_u(r)&&(v=!!r.leading,l=(g="maxWait"in r)?zi(Au(r.maxWait)||0,n):l,d="trailing"in r?!!r.trailing:d),f.cancel=function(){h!==F&&oo(h),_=0,c=p=a=h=F},f.flush=function(){return h===F?s:o(Po())},f}function iu(t,n){function r(){var e=arguments,u=n?n.apply(this,e):e[0],i=r.cache;return i.has(u)?i.get(u):(e=t.apply(this,e), +r.cache=i.set(u,e)||i,e)}if(typeof t!="function"||n&&typeof n!="function")throw new Qu("Expected a function");return r.cache=new(iu.Cache||Zt),r}function ou(t){if(typeof t!="function")throw new Qu("Expected a function");return function(){var n=arguments;switch(n.length){case 0:return!t.call(this);case 1:return!t.call(this,n[0]);case 2:return!t.call(this,n[0],n[1]);case 3:return!t.call(this,n[0],n[1],n[2])}return!t.apply(this,n)}}function fu(t,n){return t===n||t!==t&&n!==n}function cu(t){return null!=t&&pu(t.length)&&!su(t); +}function au(t){return vu(t)&&cu(t)}function lu(t){return!!vu(t)&&("[object Error]"==fi.call(t)||typeof t.message=="string"&&typeof t.name=="string")}function su(t){return t=_u(t)?fi.call(t):"","[object Function]"==t||"[object GeneratorFunction]"==t||"[object Proxy]"==t}function hu(t){return typeof t=="number"&&t==wu(t)}function pu(t){return typeof t=="number"&&-1=t}function _u(t){var n=typeof t;return null!=t&&("object"==n||"function"==n)}function vu(t){return null!=t&&typeof t=="object"; +}function gu(t){return typeof t=="number"||vu(t)&&"[object Number]"==fi.call(t)}function du(t){return!(!vu(t)||"[object Object]"!=fi.call(t))&&(t=_i(t),null===t||(t=ui.call(t,"constructor")&&t.constructor,typeof t=="function"&&t instanceof t&&ei.call(t)==oi))}function yu(t){return typeof t=="string"||!nf(t)&&vu(t)&&"[object String]"==fi.call(t)}function bu(t){return typeof t=="symbol"||vu(t)&&"[object Symbol]"==fi.call(t)}function xu(t){if(!t)return[];if(cu(t))return yu(t)?$(t):Cr(t);if(vi&&t[vi]){t=t[vi](); +for(var n,r=[];!(n=t.next()).done;)r.push(n.value);return r}return n=Et(t),("[object Map]"==n?L:"[object Set]"==n?M:Wu)(t)}function ju(t){return t?(t=Au(t),t===N||t===-N?1.7976931348623157e308*(0>t?-1:1):t===t?t:0):0===t?t:0}function wu(t){t=ju(t);var n=t%1;return t===t?n?t-n:t:0}function mu(t){return t?dn(wu(t),0,4294967295):0}function Au(t){if(typeof t=="number")return t;if(bu(t))return P;if(_u(t)&&(t=typeof t.valueOf=="function"?t.valueOf():t,t=_u(t)?t+"":t),typeof t!="string")return 0===t?t:+t; +t=t.replace(ft,"");var n=yt.test(t);return n||xt.test(t)?$t(t.slice(2),n?2:8):dt.test(t)?P:+t}function ku(t){return Mr(t,Ru(t))}function Eu(t){return null==t?"":jr(t)}function Ou(t,n,r){return t=null==t?F:Rn(t,n),t===F?r:t}function Su(t,n){return null!=t&&ye(t,n,Ln)}function Iu(t){return cu(t)?tn(t):Jn(t)}function Ru(t){if(cu(t))t=tn(t,true);else if(_u(t)){var n,r=Oe(t),e=[];for(n in t)("constructor"!=n||!r&&ui.call(t,n))&&e.push(n);t=e}else{if(n=[],null!=t)for(r in Ju(t))n.push(r);t=n}return t}function zu(t,n){ +return null==t?{}:ur(t,zn(t,Ru,lo),_e(n))}function Wu(t){return t?I(t,Iu(t)):[]}function Bu(t){return Uf(Eu(t).toLowerCase())}function Lu(t){return(t=Eu(t))&&t.replace(wt,nn).replace(It,"")}function Uu(t,n,r){return t=Eu(t),n=r?F:n,n===F?Bt.test(t)?t.match(zt)||[]:t.match(pt)||[]:t.match(n)||[]}function Cu(t){return function(){return t}}function Mu(t){return t}function Du(t){return Gn(typeof t=="function"?t:yn(t,true))}function Tu(t,n,r){var e=Iu(n),i=In(n,e);null!=r||_u(n)&&(i.length||!e.length)||(r=n, +n=t,t=this,i=In(n,Iu(n)));var o=!(_u(r)&&"chain"in r&&!r.chain),f=su(t);return u(i,function(r){var e=n[r];t[r]=e,f&&(t.prototype[r]=function(){var n=this.__chain__;if(o||n){var r=t(this.__wrapped__);return(r.__actions__=Cr(this.__actions__)).push({func:e,args:arguments,thisArg:t}),r.__chain__=n,r}return e.apply(t,s([this.value()],arguments))})}),t}function $u(){}function Fu(t){return ke(t)?j(Ue(t)):ir(t)}function Nu(){return[]}function Pu(){return false}kt=kt?un.defaults(Pt.Object(),kt,un.pick(Pt,Lt)):Pt; +var Zu=kt.Array,qu=kt.Date,Vu=kt.Error,Ku=kt.Function,Gu=kt.Math,Ju=kt.Object,Yu=kt.RegExp,Hu=kt.String,Qu=kt.TypeError,Xu=Zu.prototype,ti=Ju.prototype,ni=kt["__core-js_shared__"],ri=function(){var t=/[^.]+$/.exec(ni&&ni.keys&&ni.keys.IE_PROTO||"");return t?"Symbol(src)_1."+t:""}(),ei=Ku.prototype.toString,ui=ti.hasOwnProperty,ii=0,oi=ei.call(Ju),fi=ti.toString,ci=Pt._,ai=Yu("^"+ei.call(ui).replace(it,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),li=Vt?kt.Buffer:F,si=kt.Symbol,hi=kt.Uint8Array,pi=li?li.f:F,_i=U(Ju.getPrototypeOf,Ju),vi=si?si.iterator:F,gi=Ju.create,di=ti.propertyIsEnumerable,yi=Xu.splice,bi=si?si.isConcatSpreadable:F,xi=function(){ +try{var t=de(Ju,"defineProperty");return t({},"",{}),t}catch(t){}}(),ji=kt.clearTimeout!==Pt.clearTimeout&&kt.clearTimeout,wi=qu&&qu.now!==Pt.Date.now&&qu.now,mi=kt.setTimeout!==Pt.setTimeout&&kt.setTimeout,Ai=Gu.ceil,ki=Gu.floor,Ei=Ju.getOwnPropertySymbols,Oi=li?li.isBuffer:F,Si=kt.isFinite,Ii=Xu.join,Ri=U(Ju.keys,Ju),zi=Gu.max,Wi=Gu.min,Bi=qu.now,Li=kt.parseInt,Ui=Gu.random,Ci=Xu.reverse,Mi=de(kt,"DataView"),Di=de(kt,"Map"),Ti=de(kt,"Promise"),$i=de(kt,"Set"),Fi=de(kt,"WeakMap"),Ni=de(Ju,"create"),Pi=Fi&&new Fi,Zi={},qi=Ce(Mi),Vi=Ce(Di),Ki=Ce(Ti),Gi=Ce($i),Ji=Ce(Fi),Yi=si?si.prototype:F,Hi=Yi?Yi.valueOf:F,Qi=Yi?Yi.toString:F,Xi=function(){ +function t(){}return function(n){return _u(n)?gi?gi(n):(t.prototype=n,n=new t,t.prototype=F,n):{}}}();Ot.templateSettings={escape:Q,evaluate:X,interpolate:tt,variable:"",imports:{_:Ot}},Ot.prototype=Rt.prototype,Ot.prototype.constructor=Ot,Mt.prototype=Xi(Rt.prototype),Mt.prototype.constructor=Mt,Dt.prototype=Xi(Rt.prototype),Dt.prototype.constructor=Dt,Ft.prototype.clear=function(){this.__data__=Ni?Ni(null):{},this.size=0},Ft.prototype.delete=function(t){return t=this.has(t)&&delete this.__data__[t], +this.size-=t?1:0,t},Ft.prototype.get=function(t){var n=this.__data__;return Ni?(t=n[t],"__lodash_hash_undefined__"===t?F:t):ui.call(n,t)?n[t]:F},Ft.prototype.has=function(t){var n=this.__data__;return Ni?n[t]!==F:ui.call(n,t)},Ft.prototype.set=function(t,n){var r=this.__data__;return this.size+=this.has(t)?0:1,r[t]=Ni&&n===F?"__lodash_hash_undefined__":n,this},Nt.prototype.clear=function(){this.__data__=[],this.size=0},Nt.prototype.delete=function(t){var n=this.__data__;return t=hn(n,t),!(0>t)&&(t==n.length-1?n.pop():yi.call(n,t,1), +--this.size,true)},Nt.prototype.get=function(t){var n=this.__data__;return t=hn(n,t),0>t?F:n[t][1]},Nt.prototype.has=function(t){return-1e?(++this.size,r.push([t,n])):r[e][1]=n,this},Zt.prototype.clear=function(){this.size=0,this.__data__={hash:new Ft,map:new(Di||Nt),string:new Ft}},Zt.prototype.delete=function(t){return t=ve(this,t).delete(t),this.size-=t?1:0,t},Zt.prototype.get=function(t){return ve(this,t).get(t); +},Zt.prototype.has=function(t){return ve(this,t).has(t)},Zt.prototype.set=function(t,n){var r=ve(this,t),e=r.size;return r.set(t,n),this.size+=r.size==e?0:1,this},qt.prototype.add=qt.prototype.push=function(t){return this.__data__.set(t,"__lodash_hash_undefined__"),this},qt.prototype.has=function(t){return this.__data__.has(t)},Kt.prototype.clear=function(){this.__data__=new Nt,this.size=0},Kt.prototype.delete=function(t){var n=this.__data__;return t=n.delete(t),this.size=n.size,t},Kt.prototype.get=function(t){ +return this.__data__.get(t)},Kt.prototype.has=function(t){return this.__data__.has(t)},Kt.prototype.set=function(t,n){var r=this.__data__;if(r instanceof Nt){var e=r.__data__;if(!Di||199>e.length)return e.push([t,n]),this.size=++r.size,this;r=this.__data__=new Zt(e)}return r.set(t,n),this.size=r.size,this};var to=Fr(On),no=Fr(Sn,true),ro=Nr(),eo=Nr(true),uo=Pi?function(t,n){return Pi.set(t,n),t}:Mu,io=xi?function(t,n){return xi(t,"toString",{configurable:true,enumerable:false,value:Cu(n),writable:true})}:Mu,oo=ji||function(t){ +return Pt.clearTimeout(t)},fo=$i&&1/M(new $i([,-0]))[1]==N?function(t){return new $i(t)}:$u,co=Pi?function(t){return Pi.get(t)}:$u,ao=Ei?U(Ei,Ju):Nu,lo=Ei?function(t){for(var n=[];t;)s(n,ao(t)),t=_i(t);return n}:Nu;(Mi&&"[object DataView]"!=Et(new Mi(new ArrayBuffer(1)))||Di&&"[object Map]"!=Et(new Di)||Ti&&"[object Promise]"!=Et(Ti.resolve())||$i&&"[object Set]"!=Et(new $i)||Fi&&"[object WeakMap]"!=Et(new Fi))&&(Et=function(t){var n=fi.call(t);if(t=(t="[object Object]"==n?t.constructor:F)?Ce(t):F)switch(t){ +case qi:return"[object DataView]";case Vi:return"[object Map]";case Ki:return"[object Promise]";case Gi:return"[object Set]";case Ji:return"[object WeakMap]"}return n});var so=ni?su:Pu,ho=Be(uo),po=mi||function(t,n){return Pt.setTimeout(t,n)},_o=Be(io),vo=function(t){t=iu(t,function(t){return 500===n.size&&n.clear(),t});var n=t.cache;return t}(function(t){t=Eu(t);var n=[];return et.test(t)&&n.push(""),t.replace(ut,function(t,r,e,u){n.push(e?u.replace(_t,"$1"):r||t)}),n}),go=lr(function(t,n){return au(t)?wn(t,En(n,1,au,true)):[]; +}),yo=lr(function(t,n){var r=Pe(n);return au(r)&&(r=F),au(t)?wn(t,En(n,1,au,true),_e(r,2)):[]}),bo=lr(function(t,n){var r=Pe(n);return au(r)&&(r=F),au(t)?wn(t,En(n,1,au,true),F,r):[]}),xo=lr(function(t){var n=l(t,Or);return n.length&&n[0]===t[0]?Un(n):[]}),jo=lr(function(t){var n=Pe(t),r=l(t,Or);return n===Pe(r)?n=F:r.pop(),r.length&&r[0]===t[0]?Un(r,_e(n,2)):[]}),wo=lr(function(t){var n=Pe(t),r=l(t,Or);return n===Pe(r)?n=F:r.pop(),r.length&&r[0]===t[0]?Un(r,F,n):[]}),mo=lr(Ze),Ao=le(function(t,n){var r=t?t.length:0,e=gn(t,n); +return fr(t,l(n,function(t){return me(t,r)?+t:t}).sort(Br)),e}),ko=lr(function(t){return wr(En(t,1,au,true))}),Eo=lr(function(t){var n=Pe(t);return au(n)&&(n=F),wr(En(t,1,au,true),_e(n,2))}),Oo=lr(function(t){var n=Pe(t);return au(n)&&(n=F),wr(En(t,1,au,true),F,n)}),So=lr(function(t,n){return au(t)?wn(t,n):[]}),Io=lr(function(t){return kr(f(t,au))}),Ro=lr(function(t){var n=Pe(t);return au(n)&&(n=F),kr(f(t,au),_e(n,2))}),zo=lr(function(t){var n=Pe(t);return au(n)&&(n=F),kr(f(t,au),F,n)}),Wo=lr(Ve),Bo=lr(function(t){ +var n=t.length,n=1=n}),tf=Dn(function(){return arguments}())?Dn:function(t){return vu(t)&&ui.call(t,"callee")&&!di.call(t,"callee")},nf=Zu.isArray,rf=Gt?S(Gt):Tn,ef=Oi||Pu,uf=Jt?S(Jt):$n,of=Yt?S(Yt):Nn,ff=Ht?S(Ht):qn,cf=Qt?S(Qt):Vn,af=Xt?S(Xt):Kn,lf=ee(Yn),sf=ee(function(t,n){return t<=n}),hf=$r(function(t,n){if(Oe(n)||cu(n))Mr(n,Iu(n),t);else for(var r in n)ui.call(n,r)&&sn(t,r,n[r]); +}),pf=$r(function(t,n){Mr(n,Ru(n),t)}),_f=$r(function(t,n,r,e){Mr(n,Ru(n),t,e)}),vf=$r(function(t,n,r,e){Mr(n,Iu(n),t,e)}),gf=le(gn),df=lr(function(t){return t.push(F,an),r(_f,F,t)}),yf=lr(function(t){return t.push(F,Ie),r(mf,F,t)}),bf=Hr(function(t,n,r){t[n]=r},Cu(Mu)),xf=Hr(function(t,n,r){ui.call(t,n)?t[n].push(r):t[n]=[r]},_e),jf=lr(Mn),wf=$r(function(t,n,r){tr(t,n,r)}),mf=$r(function(t,n,r,e){tr(t,n,r,e)}),Af=le(function(t,n){return null==t?{}:(n=l(n,Ue),er(t,wn(zn(t,Ru,lo),n)))}),kf=le(function(t,n){ +return null==t?{}:er(t,l(n,Ue))}),Ef=oe(Iu),Of=oe(Ru),Sf=qr(function(t,n,r){return n=n.toLowerCase(),t+(r?Bu(n):n)}),If=qr(function(t,n,r){return t+(r?"-":"")+n.toLowerCase()}),Rf=qr(function(t,n,r){return t+(r?" ":"")+n.toLowerCase()}),zf=Zr("toLowerCase"),Wf=qr(function(t,n,r){return t+(r?"_":"")+n.toLowerCase()}),Bf=qr(function(t,n,r){return t+(r?" ":"")+Uf(n)}),Lf=qr(function(t,n,r){return t+(r?" ":"")+n.toUpperCase()}),Uf=Zr("toUpperCase"),Cf=lr(function(t,n){try{return r(t,F,n)}catch(t){return lu(t)?t:new Vu(t); +}}),Mf=le(function(t,n){return u(n,function(n){n=Ue(n),vn(t,n,Zo(t[n],t))}),t}),Df=Jr(),Tf=Jr(true),$f=lr(function(t,n){return function(r){return Mn(r,t,n)}}),Ff=lr(function(t,n){return function(r){return Mn(t,r,n)}}),Nf=Xr(l),Pf=Xr(o),Zf=Xr(_),qf=re(),Vf=re(true),Kf=Qr(function(t,n){return t+n},0),Gf=ie("ceil"),Jf=Qr(function(t,n){return t/n},1),Yf=ie("floor"),Hf=Qr(function(t,n){return t*n},1),Qf=ie("round"),Xf=Qr(function(t,n){return t-n},0);return Ot.after=function(t,n){if(typeof n!="function")throw new Qu("Expected a function"); +return t=wu(t),function(){if(1>--t)return n.apply(this,arguments)}},Ot.ary=tu,Ot.assign=hf,Ot.assignIn=pf,Ot.assignInWith=_f,Ot.assignWith=vf,Ot.at=gf,Ot.before=nu,Ot.bind=Zo,Ot.bindAll=Mf,Ot.bindKey=qo,Ot.castArray=function(){if(!arguments.length)return[];var t=arguments[0];return nf(t)?t:[t]},Ot.chain=Ge,Ot.chunk=function(t,n,r){if(n=(r?Ae(t,n,r):n===F)?1:zi(wu(n),0),r=t?t.length:0,!r||1>n)return[];for(var e=0,u=0,i=Zu(Ai(r/n));en?0:n,e)):[]},Ot.dropRight=function(t,n,r){var e=t?t.length:0;return e?(n=r||n===F?1:wu(n),n=e-n,vr(t,0,0>n?0:n)):[]},Ot.dropRightWhile=function(t,n){return t&&t.length?mr(t,_e(n,3),true,true):[]},Ot.dropWhile=function(t,n){ +return t&&t.length?mr(t,_e(n,3),true):[]},Ot.fill=function(t,n,r,e){var u=t?t.length:0;if(!u)return[];for(r&&typeof r!="number"&&Ae(t,n,r)&&(r=0,e=u),u=t.length,r=wu(r),0>r&&(r=-r>u?0:u+r),e=e===F||e>u?u:wu(e),0>e&&(e+=u),e=r>e?0:mu(e);r>>0,r?(t=Eu(t))&&(typeof n=="string"||null!=n&&!ff(n))&&(n=jr(n),!n&&Wt.test(t))?Ir($(t),0,r):t.split(n,r):[]},Ot.spread=function(t,n){if(typeof t!="function")throw new Qu("Expected a function");return n=n===F?0:zi(wu(n),0),lr(function(e){var u=e[n];return e=Ir(e,0,n),u&&s(e,u),r(t,this,e)})},Ot.tail=function(t){ +var n=t?t.length:0;return n?vr(t,1,n):[]},Ot.take=function(t,n,r){return t&&t.length?(n=r||n===F?1:wu(n),vr(t,0,0>n?0:n)):[]},Ot.takeRight=function(t,n,r){var e=t?t.length:0;return e?(n=r||n===F?1:wu(n),n=e-n,vr(t,0>n?0:n,e)):[]},Ot.takeRightWhile=function(t,n){return t&&t.length?mr(t,_e(n,3),false,true):[]},Ot.takeWhile=function(t,n){return t&&t.length?mr(t,_e(n,3)):[]},Ot.tap=function(t,n){return n(t),t},Ot.throttle=function(t,n,r){var e=true,u=true;if(typeof t!="function")throw new Qu("Expected a function"); +return _u(r)&&(e="leading"in r?!!r.leading:e,u="trailing"in r?!!r.trailing:u),uu(t,n,{leading:e,maxWait:n,trailing:u})},Ot.thru=Je,Ot.toArray=xu,Ot.toPairs=Ef,Ot.toPairsIn=Of,Ot.toPath=function(t){return nf(t)?l(t,Ue):bu(t)?[t]:Cr(vo(t))},Ot.toPlainObject=ku,Ot.transform=function(t,n,r){var e=nf(t),i=e||ef(t)||af(t);if(n=_e(n,4),null==r){var o=t&&t.constructor;r=i?e?new o:[]:_u(t)&&su(o)?Xi(_i(t)):{}}return(i?u:On)(t,function(t,e,u){return n(r,t,e,u)}),r},Ot.unary=function(t){return tu(t,1)},Ot.union=ko, +Ot.unionBy=Eo,Ot.unionWith=Oo,Ot.uniq=function(t){return t&&t.length?wr(t):[]},Ot.uniqBy=function(t,n){return t&&t.length?wr(t,_e(n,2)):[]},Ot.uniqWith=function(t,n){return t&&t.length?wr(t,F,n):[]},Ot.unset=function(t,n){var r;if(null==t)r=true;else{r=t;var e=n,e=ke(e,r)?[e]:Sr(e);r=ze(r,e),e=Ue(Pe(e)),r=!(null!=r&&ui.call(r,e))||delete r[e]}return r},Ot.unzip=Ve,Ot.unzipWith=Ke,Ot.update=function(t,n,r){return null==t?t:pr(t,n,(typeof r=="function"?r:Mu)(Rn(t,n)),void 0)},Ot.updateWith=function(t,n,r,e){ +return e=typeof e=="function"?e:F,null!=t&&(t=pr(t,n,(typeof r=="function"?r:Mu)(Rn(t,n)),e)),t},Ot.values=Wu,Ot.valuesIn=function(t){return null==t?[]:I(t,Ru(t))},Ot.without=So,Ot.words=Uu,Ot.wrap=function(t,n){return n=null==n?Mu:n,Jo(n,t)},Ot.xor=Io,Ot.xorBy=Ro,Ot.xorWith=zo,Ot.zip=Wo,Ot.zipObject=function(t,n){return Er(t||[],n||[],sn)},Ot.zipObjectDeep=function(t,n){return Er(t||[],n||[],pr)},Ot.zipWith=Bo,Ot.entries=Ef,Ot.entriesIn=Of,Ot.extend=pf,Ot.extendWith=_f,Tu(Ot,Ot),Ot.add=Kf,Ot.attempt=Cf, +Ot.camelCase=Sf,Ot.capitalize=Bu,Ot.ceil=Gf,Ot.clamp=function(t,n,r){return r===F&&(r=n,n=F),r!==F&&(r=Au(r),r=r===r?r:0),n!==F&&(n=Au(n),n=n===n?n:0),dn(Au(t),n,r)},Ot.clone=function(t){return yn(t,false,true)},Ot.cloneDeep=function(t){return yn(t,true,true)},Ot.cloneDeepWith=function(t,n){return yn(t,true,true,n)},Ot.cloneWith=function(t,n){return yn(t,false,true,n)},Ot.conformsTo=function(t,n){return null==n||xn(t,n,Iu(n))},Ot.deburr=Lu,Ot.defaultTo=function(t,n){return null==t||t!==t?n:t},Ot.divide=Jf,Ot.endsWith=function(t,n,r){ +t=Eu(t),n=jr(n);var e=t.length,e=r=r===F?e:dn(wu(r),0,e);return r-=n.length,0<=r&&t.slice(r,e)==n},Ot.eq=fu,Ot.escape=function(t){return(t=Eu(t))&&H.test(t)?t.replace(J,rn):t},Ot.escapeRegExp=function(t){return(t=Eu(t))&&ot.test(t)?t.replace(it,"\\$&"):t},Ot.every=function(t,n,r){var e=nf(t)?o:mn;return r&&Ae(t,n,r)&&(n=F),e(t,_e(n,3))},Ot.find=Co,Ot.findIndex=Te,Ot.findKey=function(t,n){return v(t,_e(n,3),On)},Ot.findLast=Mo,Ot.findLastIndex=$e,Ot.findLastKey=function(t,n){return v(t,_e(n,3),Sn); +},Ot.floor=Yf,Ot.forEach=He,Ot.forEachRight=Qe,Ot.forIn=function(t,n){return null==t?t:ro(t,_e(n,3),Ru)},Ot.forInRight=function(t,n){return null==t?t:eo(t,_e(n,3),Ru)},Ot.forOwn=function(t,n){return t&&On(t,_e(n,3))},Ot.forOwnRight=function(t,n){return t&&Sn(t,_e(n,3))},Ot.get=Ou,Ot.gt=Qo,Ot.gte=Xo,Ot.has=function(t,n){return null!=t&&ye(t,n,Bn)},Ot.hasIn=Su,Ot.head=Ne,Ot.identity=Mu,Ot.includes=function(t,n,r,e){return t=cu(t)?t:Wu(t),r=r&&!e?wu(r):0,e=t.length,0>r&&(r=zi(e+r,0)),yu(t)?r<=e&&-1r&&(r=zi(e+r,0)),d(t,n,r)):-1},Ot.inRange=function(t,n,r){return n=ju(n),r===F?(r=n,n=0):r=ju(r),t=Au(t),t>=Wi(n,r)&&t=t; +},Ot.isSet=cf,Ot.isString=yu,Ot.isSymbol=bu,Ot.isTypedArray=af,Ot.isUndefined=function(t){return t===F},Ot.isWeakMap=function(t){return vu(t)&&"[object WeakMap]"==Et(t)},Ot.isWeakSet=function(t){return vu(t)&&"[object WeakSet]"==fi.call(t)},Ot.join=function(t,n){return t?Ii.call(t,n):""},Ot.kebabCase=If,Ot.last=Pe,Ot.lastIndexOf=function(t,n,r){var e=t?t.length:0;if(!e)return-1;var u=e;if(r!==F&&(u=wu(r),u=0>u?zi(e+u,0):Wi(u,e-1)),n===n){for(r=u+1;r--&&t[r]!==n;);t=r}else t=g(t,b,u,true);return t}, +Ot.lowerCase=Rf,Ot.lowerFirst=zf,Ot.lt=lf,Ot.lte=sf,Ot.max=function(t){return t&&t.length?An(t,Mu,Wn):F},Ot.maxBy=function(t,n){return t&&t.length?An(t,_e(n,2),Wn):F},Ot.mean=function(t){return x(t,Mu)},Ot.meanBy=function(t,n){return x(t,_e(n,2))},Ot.min=function(t){return t&&t.length?An(t,Mu,Yn):F},Ot.minBy=function(t,n){return t&&t.length?An(t,_e(n,2),Yn):F},Ot.stubArray=Nu,Ot.stubFalse=Pu,Ot.stubObject=function(){return{}},Ot.stubString=function(){return""},Ot.stubTrue=function(){return true},Ot.multiply=Hf, +Ot.nth=function(t,n){return t&&t.length?nr(t,wu(n)):F},Ot.noConflict=function(){return Pt._===this&&(Pt._=ci),this},Ot.noop=$u,Ot.now=Po,Ot.pad=function(t,n,r){t=Eu(t);var e=(n=wu(n))?T(t):0;return!n||e>=n?t:(n=(n-e)/2,te(ki(n),r)+t+te(Ai(n),r))},Ot.padEnd=function(t,n,r){t=Eu(t);var e=(n=wu(n))?T(t):0;return n&&en){var e=t;t=n,n=e}return r||t%1||n%1?(r=Ui(),Wi(t+r*(n-t+Tt("1e-"+((r+"").length-1))),n)):cr(t,n)},Ot.reduce=function(t,n,r){var e=nf(t)?h:m,u=3>arguments.length;return e(t,_e(n,4),r,u,to)},Ot.reduceRight=function(t,n,r){var e=nf(t)?p:m,u=3>arguments.length;return e(t,_e(n,4),r,u,no)},Ot.repeat=function(t,n,r){ +return n=(r?Ae(t,n,r):n===F)?1:wu(n),ar(Eu(t),n)},Ot.replace=function(){var t=arguments,n=Eu(t[0]);return 3>t.length?n:n.replace(t[1],t[2])},Ot.result=function(t,n,r){n=ke(n,t)?[n]:Sr(n);var e=-1,u=n.length;for(u||(t=F,u=1);++et||9007199254740991=i)return t;if(i=r-T(e),1>i)return e;if(r=o?Ir(o,0,i).join(""):t.slice(0,i),u===F)return r+e;if(o&&(i+=r.length-i),ff(u)){if(t.slice(i).search(u)){var f=r;for(u.global||(u=Yu(u.source,Eu(gt.exec(u))+"g")),u.lastIndex=0;o=u.exec(f);)var c=o.index;r=r.slice(0,c===F?i:c)}}else t.indexOf(jr(u),i)!=i&&(u=r.lastIndexOf(u),-1u.__dir__?"Right":"")}),u},Dt.prototype[t+"Right"]=function(n){return this.reverse()[t](n).reverse()}}),u(["filter","map","takeWhile"],function(t,n){var r=n+1,e=1==r||3==r;Dt.prototype[t]=function(t){var n=this.clone();return n.__iteratees__.push({iteratee:_e(t,3),type:r}),n.__filtered__=n.__filtered__||e,n}}),u(["head","last"],function(t,n){var r="take"+(n?"Right":"");Dt.prototype[t]=function(){return this[r](1).value()[0]}}),u(["initial","tail"],function(t,n){var r="drop"+(n?"":"Right"); +Dt.prototype[t]=function(){return this.__filtered__?new Dt(this):this[r](1)}}),Dt.prototype.compact=function(){return this.filter(Mu)},Dt.prototype.find=function(t){return this.filter(t).head()},Dt.prototype.findLast=function(t){return this.reverse().find(t)},Dt.prototype.invokeMap=lr(function(t,n){return typeof t=="function"?new Dt(this):this.map(function(r){return Mn(r,t,n)})}),Dt.prototype.reject=function(t){return this.filter(ou(_e(t)))},Dt.prototype.slice=function(t,n){t=wu(t);var r=this;return r.__filtered__&&(0n)?new Dt(r):(0>t?r=r.takeRight(-t):t&&(r=r.drop(t)), +n!==F&&(n=wu(n),r=0>n?r.dropRight(-n):r.take(n-t)),r)},Dt.prototype.takeRightWhile=function(t){return this.reverse().takeWhile(t).reverse()},Dt.prototype.toArray=function(){return this.take(4294967295)},On(Dt.prototype,function(t,n){var r=/^(?:filter|find|map|reject)|While$/.test(n),e=/^(?:head|last)$/.test(n),u=Ot[e?"take"+("last"==n?"Right":""):n],i=e||/^find/.test(n);u&&(Ot.prototype[n]=function(){function n(t){return t=u.apply(Ot,s([t],f)),e&&h?t[0]:t}var o=this.__wrapped__,f=e?[1]:arguments,c=o instanceof Dt,a=f[0],l=c||nf(o); +l&&r&&typeof a=="function"&&1!=a.length&&(c=l=false);var h=this.__chain__,p=!!this.__actions__.length,a=i&&!h,c=c&&!p;return!i&&l?(o=c?o:new Dt(this),o=t.apply(o,f),o.__actions__.push({func:Je,args:[n],thisArg:F}),new Mt(o,h)):a&&c?t.apply(this,f):(o=this.thru(n),a?e?o.value()[0]:o.value():o)})}),u("pop push shift sort splice unshift".split(" "),function(t){var n=Xu[t],r=/^(?:push|sort|unshift)$/.test(t)?"tap":"thru",e=/^(?:pop|shift)$/.test(t);Ot.prototype[t]=function(){var t=arguments;if(e&&!this.__chain__){ +var u=this.value();return n.apply(nf(u)?u:[],t)}return this[r](function(r){return n.apply(nf(r)?r:[],t)})}}),On(Dt.prototype,function(t,n){var r=Ot[n];if(r){var e=r.name+"";(Zi[e]||(Zi[e]=[])).push({name:n,func:r})}}),Zi[Yr(F,2).name]=[{name:"wrapper",func:F}],Dt.prototype.clone=function(){var t=new Dt(this.__wrapped__);return t.__actions__=Cr(this.__actions__),t.__dir__=this.__dir__,t.__filtered__=this.__filtered__,t.__iteratees__=Cr(this.__iteratees__),t.__takeCount__=this.__takeCount__,t.__views__=Cr(this.__views__), +t},Dt.prototype.reverse=function(){if(this.__filtered__){var t=new Dt(this);t.__dir__=-1,t.__filtered__=true}else t=this.clone(),t.__dir__*=-1;return t},Dt.prototype.value=function(){var t,n=this.__wrapped__.value(),r=this.__dir__,e=nf(n),u=0>r,i=e?n.length:0;t=i;for(var o=this.__views__,f=0,c=-1,a=o.length;++ci||i==t&&a==t)return Ar(n,this.__actions__);e=[];t:for(;t--&&c=this.__values__.length;return{done:t,value:t?F:this.__values__[this.__index__++]}},Ot.prototype.plant=function(t){for(var n,r=this;r instanceof Rt;){var e=De(r);e.__index__=0,e.__values__=F,n?u.__wrapped__=e:n=e;var u=e,r=r.__wrapped__}return u.__wrapped__=t,n},Ot.prototype.reverse=function(){var t=this.__wrapped__;return t instanceof Dt?(this.__actions__.length&&(t=new Dt(this)),t=t.reverse(),t.__actions__.push({func:Je,args:[qe],thisArg:F}),new Mt(t,this.__chain__)):this.thru(qe); +},Ot.prototype.toJSON=Ot.prototype.valueOf=Ot.prototype.value=function(){return Ar(this.__wrapped__,this.__actions__)},Ot.prototype.first=Ot.prototype.head,vi&&(Ot.prototype[vi]=Ye),Ot}();typeof define=="function"&&typeof define.amd=="object"&&define.amd?(Pt._=un, define(function(){return un})):qt?((qt.exports=un)._=un,Zt._=un):Pt._=un}).call(this); \ No newline at end of file