From f5a996a64ee38230f786c30f562483f2e2368691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Sun, 9 Feb 2020 16:07:14 +0100 Subject: [PATCH 01/72] Highlight current anchor with css instead of js. The `:target` selector is supported by all browsers. --- .../jsdoc/api/template/static/scripts/main.js | 18 ------------------ .../api/template/static/styles/jaguar.css | 3 ++- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/config/jsdoc/api/template/static/scripts/main.js b/config/jsdoc/api/template/static/scripts/main.js index 97dfd0facf..6e609f9d01 100644 --- a/config/jsdoc/api/template/static/scripts/main.js +++ b/config/jsdoc/api/template/static/scripts/main.js @@ -137,22 +137,4 @@ $(function () { '' + textParts[1] + ''; }); - - // Highlighting current anchor - - var anchors = $('.anchor'); - var _onHashChange = function () { - var activeHash = window.document.location.hash - .replace(/\./g, '\\.') // Escape dot in element id - .replace(/\~/g, '\\~'); // Escape tilde in element id - - anchors.removeClass('highlighted'); - - if (activeHash.length > 0) { - anchors.filter(activeHash).addClass('highlighted'); - } - }; - - $(window).on('hashchange', _onHashChange); - _onHashChange(); }); diff --git a/config/jsdoc/api/template/static/styles/jaguar.css b/config/jsdoc/api/template/static/styles/jaguar.css index 1a677bfa93..88433f363f 100644 --- a/config/jsdoc/api/template/static/styles/jaguar.css +++ b/config/jsdoc/api/template/static/styles/jaguar.css @@ -51,7 +51,8 @@ body { width: 0px; height: 0px; } -.nameContainer .anchor.highlighted + h4 { +/* Highlighting current anchor */ +.nameContainer .anchor:target + h4 { background-color: #faebcc; } a { From 6187118166b485adb64d43dfbbff5d694b09f60b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Sun, 16 Feb 2020 14:47:01 +0100 Subject: [PATCH 02/72] Hide member-lists, show current item when clearing input --- .../jsdoc/api/template/static/scripts/main.js | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/config/jsdoc/api/template/static/scripts/main.js b/config/jsdoc/api/template/static/scripts/main.js index 6e609f9d01..a3a623c934 100644 --- a/config/jsdoc/api/template/static/scripts/main.js +++ b/config/jsdoc/api/template/static/scripts/main.js @@ -26,6 +26,22 @@ $(function () { return bW - aW; }; + // Show an item related a current documentation automatically + const longname = $('.page-title').data('filename') + .replace(/\.[a-z]+$/, '') + .replace('module-', 'module:') + .replace(/_/g, '/') + .replace(/-/g, '~'); + var $currentItem = $('.navigation .item[data-name*="' + longname + '"]:eq(0)'); + + if ($currentItem.length) { + $currentItem + .prependTo('.navigation .list') + .show() + .find('.member-list') + .show(); + } + // Search Items $('#search').on('keyup', function (e) { var value = $(this).val(); @@ -60,7 +76,9 @@ $(function () { .appendTo(".navigation ul.list"); // append again to the list } else { - $el.find('.item, .member-list').show(); + $currentItem.prependTo('.navigation .list'); + $currentItem.find('.member-list, li').show(); + $el.find('.item').show(); } $el.find('.list').scrollTop(0); @@ -71,23 +89,6 @@ $(function () { $(this).parent().parent().find('.member-list').toggle(); }); - // Show an item related a current documentation automatically - var filename = $('.page-title').data('filename') - .replace(/\.[a-z]+$/, '') - .replace('module-', 'module:') - .replace(/_/g, '/') - .replace(/-/g, '~'); - var $currentItem = $('.navigation .item[data-name*="' + filename + '"]:eq(0)'); - - if ($currentItem.length) { - $currentItem - .remove() - .prependTo('.navigation .list') - .show() - .find('.member-list') - .show(); - } - // Auto resizing on navigation var _onResize = function () { var height = $(window).height(); From b919074aa3b9c85096672444c1d1897d9c4a1fec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Thu, 13 Feb 2020 23:06:17 +0100 Subject: [PATCH 03/72] Skip searches when typing fast / slow cpu. --- .../jsdoc/api/template/static/scripts/main.js | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/config/jsdoc/api/template/static/scripts/main.js b/config/jsdoc/api/template/static/scripts/main.js index a3a623c934..4a212b3d98 100644 --- a/config/jsdoc/api/template/static/scripts/main.js +++ b/config/jsdoc/api/template/static/scripts/main.js @@ -42,8 +42,7 @@ $(function () { .show(); } - // Search Items - $('#search').on('keyup', function (e) { + function doSearch() { var value = $(this).val(); var $el = $('.navigation'); @@ -82,7 +81,22 @@ $(function () { } $el.find('.list').scrollTop(0); - }); + } + + const searchInput = $('#search').get(0); + // Skip searches when typing fast. + let key; + function queueSearch() { + if (!key) { + key = setTimeout(function () { + doSearch.call(searchInput); + key = undefined; + }, 0); + } + } + + // Search Items + searchInput.addEventListener('input', queueSearch); // Toggle when click an item element $('.navigation').on('click', '.toggle', function (e) { From 99ecce2a87d56a13efe683b6b1ec2c90644c63e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Sun, 16 Feb 2020 21:14:55 +0100 Subject: [PATCH 04/72] Provide the searchTerm as argument to doSearch function --- config/jsdoc/api/template/static/scripts/main.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/config/jsdoc/api/template/static/scripts/main.js b/config/jsdoc/api/template/static/scripts/main.js index 4a212b3d98..d91411db42 100644 --- a/config/jsdoc/api/template/static/scripts/main.js +++ b/config/jsdoc/api/template/static/scripts/main.js @@ -42,12 +42,11 @@ $(function () { .show(); } - function doSearch() { - var value = $(this).val(); + function doSearch(searchTerm) { var $el = $('.navigation'); - if (value && value.length > 1) { - var regexp = new RegExp(value, 'i'); + if (searchTerm.length > 1) { + var regexp = new RegExp(searchTerm, 'i'); $el.find('li, .member-list').hide(); $el.find('li').each(function (i, v) { @@ -61,7 +60,7 @@ $(function () { // Do the weight thing $classEntry.removeData('weight'); $classEntry.show(); - const weight = getSearchWeight(value, $classEntry); + const weight = getSearchWeight(searchTerm, $classEntry); $classEntry.data('weight', weight); $members.show(); @@ -89,7 +88,7 @@ $(function () { function queueSearch() { if (!key) { key = setTimeout(function () { - doSearch.call(searchInput); + doSearch(searchInput.value); key = undefined; }, 0); } From d56513b72237abaeea6e024ff939fa6b2aac8e46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Sun, 16 Feb 2020 21:19:01 +0100 Subject: [PATCH 05/72] Add code to measure search function speed --- config/jsdoc/api/template/static/scripts/main.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/config/jsdoc/api/template/static/scripts/main.js b/config/jsdoc/api/template/static/scripts/main.js index d91411db42..1df350cafa 100644 --- a/config/jsdoc/api/template/static/scripts/main.js +++ b/config/jsdoc/api/template/static/scripts/main.js @@ -85,11 +85,21 @@ $(function () { const searchInput = $('#search').get(0); // Skip searches when typing fast. let key; + let start; + const brandNode = document.querySelector('.brand'); function queueSearch() { if (!key) { + start = Date.now(); key = setTimeout(function () { - doSearch(searchInput.value); key = undefined; + + const searchTerm = searchInput.value; + doSearch(searchTerm); + + const time = Date.now() - start + brandNode.innerHTML = time + ' ms'; + console.log(searchTerm + ':', time, 'ms'); + start = undefined; }, 0); } } From 2b8582fcad9cfa874b6d5f2b6e67bf769939943d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Sun, 9 Feb 2020 17:53:22 +0100 Subject: [PATCH 06/72] Catch errors when search term is an invalid regular expression On error search escape special characters, with only '.' matching any characters. --- .../jsdoc/api/template/static/scripts/main.js | 31 ++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/config/jsdoc/api/template/static/scripts/main.js b/config/jsdoc/api/template/static/scripts/main.js index 1df350cafa..22943132ab 100644 --- a/config/jsdoc/api/template/static/scripts/main.js +++ b/config/jsdoc/api/template/static/scripts/main.js @@ -1,4 +1,8 @@ $(function () { + + // Allow user configuration? + const allowRegex = true; + // Search Items $('#include_modules').change(function (e) { console.log('change'); @@ -9,6 +13,29 @@ $(function () { } }); + const reNotCache = {}; + function escapeRegexp(s, not) { + if (not) { + let re = reNotCache[not]; + if (!re) { + const characters = '-\/\\^$*+?.()|[\]{}'.replace(new RegExp('[' + escapeRegexp(not) + ']', 'g'), ''); + re = reNotCache[not] = new RegExp('[' + escapeRegexp(characters) + ']', 'g'); + } + return s.replace(re, '\\$&'); + } + return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') + } + + function constructRegex(searchTerm, makeRe, allowRegex) { + try { + if (allowRegex) { + return makeRe(searchTerm); + } + } catch (e) { + } + return makeRe(escapeRegexp(searchTerm, '.')); + } + var getSearchWeight = function (searchTerm, $matchedItem) { let weight = 0; // We could get smarter on the weight here @@ -46,7 +73,9 @@ $(function () { var $el = $('.navigation'); if (searchTerm.length > 1) { - var regexp = new RegExp(searchTerm, 'i'); + const regexp = constructRegex(searchTerm, function (searchTerm) { + return new RegExp(searchTerm, 'i'); + }, allowRegex); $el.find('li, .member-list').hide(); $el.find('li').each(function (i, v) { From b9455bfad9c3db43ef50624cc1c3f93e7d0bc2df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Sun, 9 Feb 2020 17:56:40 +0100 Subject: [PATCH 07/72] Remove unnecessary / duplicate code. --- .../jsdoc/api/template/static/scripts/main.js | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/config/jsdoc/api/template/static/scripts/main.js b/config/jsdoc/api/template/static/scripts/main.js index 22943132ab..d6c755b948 100644 --- a/config/jsdoc/api/template/static/scripts/main.js +++ b/config/jsdoc/api/template/static/scripts/main.js @@ -3,16 +3,6 @@ $(function () { // Allow user configuration? const allowRegex = true; - // Search Items - $('#include_modules').change(function (e) { - console.log('change'); - if ($(this).is(':checked')) { - - } else { - - } - }); - const reNotCache = {}; function escapeRegexp(s, not) { if (not) { @@ -39,8 +29,7 @@ $(function () { var getSearchWeight = function (searchTerm, $matchedItem) { let weight = 0; // We could get smarter on the weight here - if ($matchedItem.data('shortname') - && $matchedItem.data('shortname').toLowerCase() === searchTerm.toLowerCase()) { + if ($matchedItem.data('shortname').toLowerCase() === searchTerm.toLowerCase()) { weight++; } return weight; @@ -82,19 +71,17 @@ $(function () { const $item = $(v); const name = $item.data('name'); - if (name && regexp.test(name)) { + if (regexp.test(name)) { const $classEntry = $item.closest('.item'); const $members = $item.closest('.member-list'); // Do the weight thing - $classEntry.removeData('weight'); - $classEntry.show(); const weight = getSearchWeight(searchTerm, $classEntry); $classEntry.data('weight', weight); + $item.show(); $members.show(); $classEntry.show(); - $item.show(); } }); From f7871d61036c7f50185008820c67c147ce0ebc88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Thu, 13 Feb 2020 23:53:14 +0100 Subject: [PATCH 08/72] Store search data in lowercase and compare in lowercase This way we can do the search case-sensitive after only converting the search term to lowercase. --- config/jsdoc/api/template/static/scripts/main.js | 7 ++++--- config/jsdoc/api/template/tmpl/navigation.tmpl | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/config/jsdoc/api/template/static/scripts/main.js b/config/jsdoc/api/template/static/scripts/main.js index d6c755b948..ca2ddb64b4 100644 --- a/config/jsdoc/api/template/static/scripts/main.js +++ b/config/jsdoc/api/template/static/scripts/main.js @@ -29,7 +29,7 @@ $(function () { var getSearchWeight = function (searchTerm, $matchedItem) { let weight = 0; // We could get smarter on the weight here - if ($matchedItem.data('shortname').toLowerCase() === searchTerm.toLowerCase()) { + if ($matchedItem.data('shortname') === searchTerm) { weight++; } return weight; @@ -48,7 +48,7 @@ $(function () { .replace('module-', 'module:') .replace(/_/g, '/') .replace(/-/g, '~'); - var $currentItem = $('.navigation .item[data-name*="' + longname + '"]:eq(0)'); + var $currentItem = $('.navigation .item[data-name*="' + longname.toLowerCase() + '"]:eq(0)'); if ($currentItem.length) { $currentItem @@ -62,8 +62,9 @@ $(function () { var $el = $('.navigation'); if (searchTerm.length > 1) { + searchTerm = searchTerm.toLowerCase(); const regexp = constructRegex(searchTerm, function (searchTerm) { - return new RegExp(searchTerm, 'i'); + return new RegExp(searchTerm); }, allowRegex); $el.find('li, .member-list').hide(); diff --git a/config/jsdoc/api/template/tmpl/navigation.tmpl b/config/jsdoc/api/template/tmpl/navigation.tmpl index 074e99672f..90e7e854e2 100644 --- a/config/jsdoc/api/template/tmpl/navigation.tmpl +++ b/config/jsdoc/api/template/tmpl/navigation.tmpl @@ -15,11 +15,11 @@ function getItemCssClass(type) { } const printList = v => { ?> -
  • "> { const cls = v.stability && v.stability !== 'stable' ? ' class="unstable"' : ''; ?> -
  • >">
      -
    • +
    • From d3b9b254292bc4f024e32b91c740255f740af482 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Sun, 16 Feb 2020 23:15:25 +0100 Subject: [PATCH 09/72] Search if the search input is not empty after page loads Firefox remembers input on the same page if a normal reload is performed. In this case the results for the search term should be shown automatically. --- config/jsdoc/api/template/static/scripts/main.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/jsdoc/api/template/static/scripts/main.js b/config/jsdoc/api/template/static/scripts/main.js index ca2ddb64b4..e9d7e604b5 100644 --- a/config/jsdoc/api/template/static/scripts/main.js +++ b/config/jsdoc/api/template/static/scripts/main.js @@ -123,6 +123,9 @@ $(function () { // Search Items searchInput.addEventListener('input', queueSearch); + if (searchInput.value) { + doSearch(searchInput.value); + } // Toggle when click an item element $('.navigation').on('click', '.toggle', function (e) { From 7640bcd163f436f37f1f1c0df63d3fb663bf11de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Sun, 9 Feb 2020 17:13:26 +0100 Subject: [PATCH 10/72] Only match the displayed name of items when searching Currently the search term is matched against the longname of members. Because of this most members are matched when searching for a class / module and also searching for 'mod' matches everything as all longnames start with 'module:' --- config/jsdoc/api/template/static/scripts/main.js | 4 ++-- config/jsdoc/api/template/tmpl/navigation.tmpl | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/jsdoc/api/template/static/scripts/main.js b/config/jsdoc/api/template/static/scripts/main.js index e9d7e604b5..d923dedccb 100644 --- a/config/jsdoc/api/template/static/scripts/main.js +++ b/config/jsdoc/api/template/static/scripts/main.js @@ -29,7 +29,7 @@ $(function () { var getSearchWeight = function (searchTerm, $matchedItem) { let weight = 0; // We could get smarter on the weight here - if ($matchedItem.data('shortname') === searchTerm) { + if ($matchedItem.data('name') === searchTerm) { weight++; } return weight; @@ -48,7 +48,7 @@ $(function () { .replace('module-', 'module:') .replace(/_/g, '/') .replace(/-/g, '~'); - var $currentItem = $('.navigation .item[data-name*="' + longname.toLowerCase() + '"]:eq(0)'); + var $currentItem = $('.navigation .item[data-longname="' + longname + '"]:eq(0)'); if ($currentItem.length) { $currentItem diff --git a/config/jsdoc/api/template/tmpl/navigation.tmpl b/config/jsdoc/api/template/tmpl/navigation.tmpl index 90e7e854e2..104c8e98ef 100644 --- a/config/jsdoc/api/template/tmpl/navigation.tmpl +++ b/config/jsdoc/api/template/tmpl/navigation.tmpl @@ -15,11 +15,11 @@ function getItemCssClass(type) { } const printList = v => { ?> -
    • "> { const cls = v.stability && v.stability !== 'stable' ? ' class="unstable"' : ''; ?> -
    • >">
        -
      • +
      • From 8b857eed26279ec4cc0f0edd4281568c9ba29412 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Sun, 9 Feb 2020 17:19:11 +0100 Subject: [PATCH 11/72] Change prettyname of classes Now also includes the class name if it is different than its module name. `ol/source/Vector` -> `ol/source/Vector~VectorSource`. --- config/jsdoc/api/template/publish.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/config/jsdoc/api/template/publish.js b/config/jsdoc/api/template/publish.js index ecda2d2fb1..d8222784dc 100644 --- a/config/jsdoc/api/template/publish.js +++ b/config/jsdoc/api/template/publish.js @@ -189,9 +189,15 @@ function attachModuleSymbols(doclets, modules) { } function getPrettyName(longname) { - return longname - .split('~')[0] - .replace('module:', ''); + const fullname = longname.replace('module:', ''); + const parts = fullname.split(/[~\.]/); + if (parts.length > 1) { + const pathParts = parts[0].split('/'); + if (parts[parts.length - 1] === pathParts[pathParts.length - 1]) { + return parts[0]; + } + } + return fullname; } /** From cc561dab8eb6846d213a3af05735f206761363c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Sat, 15 Feb 2020 22:14:04 +0100 Subject: [PATCH 12/72] Allow word wrap before '.' and '~' in class names --- config/jsdoc/api/template/tmpl/navigation.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/jsdoc/api/template/tmpl/navigation.tmpl b/config/jsdoc/api/template/tmpl/navigation.tmpl index 104c8e98ef..7a688e7452 100644 --- a/config/jsdoc/api/template/tmpl/navigation.tmpl +++ b/config/jsdoc/api/template/tmpl/navigation.tmpl @@ -45,7 +45,7 @@ function listContent(item, title, listItemPrinter) {
      • - + Date: Sun, 16 Feb 2020 10:27:24 +0100 Subject: [PATCH 13/72] Indent line-wrapped class names --- config/jsdoc/api/template/static/styles/jaguar.css | 9 +++++++-- config/jsdoc/api/template/tmpl/navigation.tmpl | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/config/jsdoc/api/template/static/styles/jaguar.css b/config/jsdoc/api/template/static/styles/jaguar.css index 88433f363f..0088caa282 100644 --- a/config/jsdoc/api/template/static/styles/jaguar.css +++ b/config/jsdoc/api/template/static/styles/jaguar.css @@ -136,6 +136,11 @@ li { border-bottom: 1px solid #333; } +.navigation .glyphicon { + margin-right: 3px; + flex-shrink: 0; +} + .navigation li.perfect-match { border: 5px solid orange; } @@ -148,8 +153,8 @@ li { } .navigation li.item .title { cursor: pointer; - position: relative; - display: block; + display: -ms-flexbox; + display: flex; font-size: 0.85em; } .navigation li.item .title a { diff --git a/config/jsdoc/api/template/tmpl/navigation.tmpl b/config/jsdoc/api/template/tmpl/navigation.tmpl index 7a688e7452..6445c908a5 100644 --- a/config/jsdoc/api/template/tmpl/navigation.tmpl +++ b/config/jsdoc/api/template/tmpl/navigation.tmpl @@ -45,7 +45,7 @@ function listContent(item, title, listItemPrinter) {
      • - + Date: Thu, 13 Feb 2020 22:29:04 +0100 Subject: [PATCH 14/72] Improved weight function. ++++ Full match from start to end +++ Full match between word boundaries ++ Begin matches at word boundary, multiple matches are better + Matches somewhere Classes with (multiple) members matching at the beginning are weighted higher. --- .../jsdoc/api/template/static/scripts/main.js | 64 ++++++++++++------- 1 file changed, 42 insertions(+), 22 deletions(-) diff --git a/config/jsdoc/api/template/static/scripts/main.js b/config/jsdoc/api/template/static/scripts/main.js index d923dedccb..894b822242 100644 --- a/config/jsdoc/api/template/static/scripts/main.js +++ b/config/jsdoc/api/template/static/scripts/main.js @@ -2,19 +2,7 @@ $(function () { // Allow user configuration? const allowRegex = true; - - const reNotCache = {}; - function escapeRegexp(s, not) { - if (not) { - let re = reNotCache[not]; - if (!re) { - const characters = '-\/\\^$*+?.()|[\]{}'.replace(new RegExp('[' + escapeRegexp(not) + ']', 'g'), ''); - re = reNotCache[not] = new RegExp('[' + escapeRegexp(characters) + ']', 'g'); - } - return s.replace(re, '\\$&'); - } - return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') - } + const minInputForFullText = 1; function constructRegex(searchTerm, makeRe, allowRegex) { try { @@ -23,17 +11,47 @@ $(function () { } } catch (e) { } - return makeRe(escapeRegexp(searchTerm, '.')); + // In case of invalid regexp fall back to non-regexp, but still allow . to match / + return makeRe(searchTerm.replace(/\./g, '/').replace(/[.*+?^${}()|[\]\\]/g, '\\$&')); } - var getSearchWeight = function (searchTerm, $matchedItem) { - let weight = 0; - // We could get smarter on the weight here - if ($matchedItem.data('name') === searchTerm) { - weight++; + function getWeightFunction(searchTerm, allowRegex) { + function makeRe(searchTerm) { + return { + begin: new RegExp('(?:[.~]|\\b)' + searchTerm, 'g'), // Also match . and ~ to demote double matches, in weight function + name: new RegExp('\\b' + searchTerm + '(?:[~.]|$)'), // Match until module end or name end + fullName: new RegExp('^' + searchTerm + '$') + } } - return weight; - }; + const re = constructRegex(searchTerm, makeRe, allowRegex); + return function (matchedItem, beginOnly) { + // We could get smarter on the weight here + let weight = 0; + const name = matchedItem.data('name'); + const match = name.match(re.begin); + if (match) { + // `ol/geom/Geometry` matches twice when searching 'geom', is weighted higher. + // but don't boost something like `ol/source/Vector~VectorSource` when searching for 'Vect'. + let matches = match.length; + if (matches > 1 && /[.~]/.test(match[matches - 1])) { + matches -= 1; + } + weight += matches * 10000; + if (!beginOnly) { + // Full match of the last part of the path is weighted even higher + // Complete match is weighted highest. + if (re.fullName.test(name)) { + weight += 10000000; + } else if (re.name.test(name)) { + weight += 1000000; + } + } + // If everything else is equal, prefer shorter names. + weight -= name.length; + } + return weight; + } + } // sort function callback var weightSorter = function (a, b) { @@ -63,6 +81,8 @@ $(function () { if (searchTerm.length > 1) { searchTerm = searchTerm.toLowerCase(); + const getSearchWeight = getWeightFunction(searchTerm, allowRegex); + const beginOnly = searchTerm.length < minInputForFullText; const regexp = constructRegex(searchTerm, function (searchTerm) { return new RegExp(searchTerm); }, allowRegex); @@ -77,7 +97,7 @@ $(function () { const $members = $item.closest('.member-list'); // Do the weight thing - const weight = getSearchWeight(searchTerm, $classEntry); + const weight = getSearchWeight($classEntry, beginOnly); $classEntry.data('weight', weight); $item.show(); From b613e8e77fa7100c43944a61d2bd79ea10a8e8a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Sat, 15 Feb 2020 10:59:26 +0100 Subject: [PATCH 15/72] Fix regex dot escape --- config/jsdoc/api/template/static/scripts/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/jsdoc/api/template/static/scripts/main.js b/config/jsdoc/api/template/static/scripts/main.js index 894b822242..f47d626ff1 100644 --- a/config/jsdoc/api/template/static/scripts/main.js +++ b/config/jsdoc/api/template/static/scripts/main.js @@ -12,7 +12,7 @@ $(function () { } catch (e) { } // In case of invalid regexp fall back to non-regexp, but still allow . to match / - return makeRe(searchTerm.replace(/\./g, '/').replace(/[.*+?^${}()|[\]\\]/g, '\\$&')); + return makeRe(searchTerm.replace(/[.*+?^${}()|[\]\\]/g, '\\$&').replace(/\\\./g, '[./]')); } function getWeightFunction(searchTerm, allowRegex) { From 15beb1f2c6f0d2432e6c5b49ae51703fa2f4f175 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Sat, 15 Feb 2020 15:52:04 +0100 Subject: [PATCH 16/72] Put more weight on the base name --- .../jsdoc/api/template/static/scripts/main.js | 39 +++++++++---------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/config/jsdoc/api/template/static/scripts/main.js b/config/jsdoc/api/template/static/scripts/main.js index f47d626ff1..e065efab5a 100644 --- a/config/jsdoc/api/template/static/scripts/main.js +++ b/config/jsdoc/api/template/static/scripts/main.js @@ -18,37 +18,36 @@ $(function () { function getWeightFunction(searchTerm, allowRegex) { function makeRe(searchTerm) { return { - begin: new RegExp('(?:[.~]|\\b)' + searchTerm, 'g'), // Also match . and ~ to demote double matches, in weight function - name: new RegExp('\\b' + searchTerm + '(?:[~.]|$)'), // Match until module end or name end - fullName: new RegExp('^' + searchTerm + '$') + begin: new RegExp('\\b' + searchTerm), // Begin matches word boundary + baseName: new RegExp('\\b' + searchTerm + '[^/]*$'), // Begin matches word boundary of class / module name + fullName: new RegExp('\\b' + searchTerm + '(?:[~.]|$)'), // Complete word(s) of class / module matches + completeName: new RegExp('^' + searchTerm + '$') // Match from start to finish } } const re = constructRegex(searchTerm, makeRe, allowRegex); return function (matchedItem, beginOnly) { // We could get smarter on the weight here - let weight = 0; const name = matchedItem.data('name'); - const match = name.match(re.begin); - if (match) { - // `ol/geom/Geometry` matches twice when searching 'geom', is weighted higher. - // but don't boost something like `ol/source/Vector~VectorSource` when searching for 'Vect'. - let matches = match.length; - if (matches > 1 && /[.~]/.test(match[matches - 1])) { - matches -= 1; - } - weight += matches * 10000; - if (!beginOnly) { - // Full match of the last part of the path is weighted even higher - // Complete match is weighted highest. + if (beginOnly) { + return re.baseName.test(name) ? 10000 : 0; + } + let weight = 0; + if (name.match(re.begin)) { + weight += 10000; + if (re.baseName.test(name)) { + weight += 1000000; if (re.fullName.test(name)) { + // Full match of the last part of the path is weighted even higher weight += 10000000; - } else if (re.name.test(name)) { - weight += 1000000; + if (re.completeName.test(name)) { + // Complete match is weighted highest. + weight += 100000000; + } } } - // If everything else is equal, prefer shorter names. - weight -= name.length; } + // If everything else is equal, prefer shorter names. + weight -= name.length; return weight; } } From 99d9a9ff86cb0f5795c4778ea29ccc522405dc76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Sun, 16 Feb 2020 14:10:31 +0100 Subject: [PATCH 17/72] Use strict mode --- config/jsdoc/api/template/static/scripts/main.js | 1 + 1 file changed, 1 insertion(+) diff --git a/config/jsdoc/api/template/static/scripts/main.js b/config/jsdoc/api/template/static/scripts/main.js index e065efab5a..3bd79e9e1b 100644 --- a/config/jsdoc/api/template/static/scripts/main.js +++ b/config/jsdoc/api/template/static/scripts/main.js @@ -1,4 +1,5 @@ $(function () { + 'use strict'; // Allow user configuration? const allowRegex = true; From 646ecfd40546a50b4af41af033c9e2a5b82c12c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Sat, 15 Feb 2020 22:12:06 +0100 Subject: [PATCH 18/72] Weight function prefer classes over modules --- config/jsdoc/api/template/static/scripts/main.js | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/config/jsdoc/api/template/static/scripts/main.js b/config/jsdoc/api/template/static/scripts/main.js index 3bd79e9e1b..2d32f6e9de 100644 --- a/config/jsdoc/api/template/static/scripts/main.js +++ b/config/jsdoc/api/template/static/scripts/main.js @@ -32,23 +32,20 @@ $(function () { if (beginOnly) { return re.baseName.test(name) ? 10000 : 0; } - let weight = 0; + // If everything else is equal, prefer shorter names, and prefer classes over modules + let weight = matchedItem.data('longname').length - name.length * 100; if (name.match(re.begin)) { - weight += 10000; + weight += 100000; if (re.baseName.test(name)) { - weight += 1000000; + weight += 10000000; if (re.fullName.test(name)) { - // Full match of the last part of the path is weighted even higher - weight += 10000000; + weight += 100000000; if (re.completeName.test(name)) { - // Complete match is weighted highest. - weight += 100000000; + weight += 1000000000; } } } } - // If everything else is equal, prefer shorter names. - weight -= name.length; return weight; } } From 2dec296aaec918ac410e856a50a2c1adf8d375f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Sun, 9 Feb 2020 19:14:34 +0100 Subject: [PATCH 19/72] Use css to show / hide items; track matched items ... to improve search speed. Instead of marking all items as hidden, and then marking the matched ones again, this keeps track of all matched items and only removes those that no longer match and adds those that previously did not match. --- .../jsdoc/api/template/static/scripts/main.js | 230 +++++++++++++----- .../api/template/static/styles/jaguar.css | 44 +++- .../jsdoc/api/template/tmpl/navigation.tmpl | 6 +- 3 files changed, 213 insertions(+), 67 deletions(-) diff --git a/config/jsdoc/api/template/static/scripts/main.js b/config/jsdoc/api/template/static/scripts/main.js index 2d32f6e9de..6d41345717 100644 --- a/config/jsdoc/api/template/static/scripts/main.js +++ b/config/jsdoc/api/template/static/scripts/main.js @@ -3,7 +3,9 @@ $(function () { // Allow user configuration? const allowRegex = true; - const minInputForFullText = 1; + const minInputForSearch = 1; + const minInputForFullText = 2; + const expandAllOnInputWithoutSearch = true; function constructRegex(searchTerm, makeRe, allowRegex) { try { @@ -28,12 +30,12 @@ $(function () { const re = constructRegex(searchTerm, makeRe, allowRegex); return function (matchedItem, beginOnly) { // We could get smarter on the weight here - const name = matchedItem.data('name'); + const name = matchedItem.dataset.name; if (beginOnly) { return re.baseName.test(name) ? 10000 : 0; } // If everything else is equal, prefer shorter names, and prefer classes over modules - let weight = matchedItem.data('longname').length - name.length * 100; + let weight = matchedItem.dataset.longname.length - name.length * 100; if (name.match(re.begin)) { weight += 100000; if (re.baseName.test(name)) { @@ -50,70 +52,162 @@ $(function () { } } - // sort function callback - var weightSorter = function (a, b) { - var aW = $(a).data('weight') || 0; - var bW = $(b).data('weight') || 0; - return bW - aW; - }; + const search = (function () { + const $nav = $('.navigation'); + const $navList = $nav.find('.list'); + let $classItems; + let $members; + let stateClass = (function () { + $nav.removeClass('search-started searching'); + $nav.addClass('search-empty'); + return 'search-empty'; + })(); + let manualToggles = {}; - // Show an item related a current documentation automatically - const longname = $('.page-title').data('filename') - .replace(/\.[a-z]+$/, '') - .replace('module-', 'module:') - .replace(/_/g, '/') - .replace(/-/g, '~'); - var $currentItem = $('.navigation .item[data-longname="' + longname + '"]:eq(0)'); + // Show an item related a current documentation automatically + const longname = $('.page-title').data('filename') + .replace(/\.[a-z]+$/, '') + .replace('module-', 'module:') + .replace(/_/g, '/') + .replace(/-/g, '~'); + const $currentItem = $navList.find('.item[data-longname="' + longname + '"]:eq(0)'); + $currentItem.prependTo($navList); + $currentItem.addClass('item-current'); + return { + $nav: $nav, + $navList: $navList, + $currentItem: $currentItem, + lastSearchTerm: undefined, + lastState: {}, + getClassList: function () { + return $classItems || ($classItems = $navList.find('li.item')); + }, + getMembers: function () { + return $members || ($members = $navList.find('.item li')); + }, + changeStateClass: function (newClass) { + if (newClass !== stateClass) { + const navNode = $nav.get(0); + navNode.classList.remove(stateClass); + navNode.classList.add(newClass); + stateClass = newClass; + } + }, + manualToggle: function ($node, show) { + $node.toggleClass('toggle-manual-hide', !show); + $node.toggleClass('toggle-manual-show', show); + manualToggles[$node.data('longname')] = $node; + }, + clearManualToggles: function() { + for (let clsName in manualToggles) { + manualToggles[clsName].removeClass('toggle-manual-show toggle-manual-hide'); + } + manualToggles = {}; + }, + }; + })(); - if ($currentItem.length) { - $currentItem - .prependTo('.navigation .list') - .show() - .find('.member-list') - .show(); + const dummy = {subItems: {}}; + function clearOldMatches(lastState, searchState) { + for (let itemName in lastState) { + const lastItem = lastState[itemName]; + const item = searchState[itemName]; + if (!item) { + lastItem.item.classList.remove('match'); + } + if (lastItem.subItems) { + clearOldMatches(lastItem.subItems, (item || dummy).subItems); + } + } } function doSearch(searchTerm) { - var $el = $('.navigation'); - - if (searchTerm.length > 1) { - searchTerm = searchTerm.toLowerCase(); - const getSearchWeight = getWeightFunction(searchTerm, allowRegex); - const beginOnly = searchTerm.length < minInputForFullText; - const regexp = constructRegex(searchTerm, function (searchTerm) { - return new RegExp(searchTerm); - }, allowRegex); - $el.find('li, .member-list').hide(); - - $el.find('li').each(function (i, v) { - const $item = $(v); - const name = $item.data('name'); - - if (regexp.test(name)) { - const $classEntry = $item.closest('.item'); - const $members = $item.closest('.member-list'); - - // Do the weight thing - const weight = getSearchWeight($classEntry, beginOnly); - $classEntry.data('weight', weight); - - $item.show(); - $members.show(); - $classEntry.show(); - } - }); - - $(".navigation ul.list li.item:visible") - .sort(weightSorter) // sort elements - .appendTo(".navigation ul.list"); // append again to the list - - } else { - $currentItem.prependTo('.navigation .list'); - $currentItem.find('.member-list, li').show(); - $el.find('.item').show(); + searchTerm = searchTerm.toLowerCase(); + const lastSearchTerm = search.lastSearchTerm; + if (searchTerm === lastSearchTerm) { + return; } - $el.find('.list').scrollTop(0); + // Avoid layout reflow by scrolling to top first. + search.$navList.scrollTop(0); + search.lastSearchTerm = searchTerm; + search.clearManualToggles(); + + if (searchTerm.length < minInputForSearch) { + const state = searchTerm.length && expandAllOnInputWithoutSearch ? 'search-started' : 'search-empty'; + search.changeStateClass(state); + if (lastSearchTerm !== undefined && lastSearchTerm.length >= minInputForSearch) { + // Restore the original, sorted order + search.$navList.append(search.getClassList()); + } + if (state === 'search-empty') { + search.manualToggle(search.$currentItem, true); + } + } else { + search.changeStateClass('searching'); + searchTerm = searchTerm.toLowerCase(); + const beginOnly = searchTerm.length < minInputForFullText; + const getSearchWeight = getWeightFunction(searchTerm, allowRegex); + const re = constructRegex(searchTerm, function (searchTerm) { + return new RegExp((beginOnly ? '\\b' : '') + searchTerm); + }, allowRegex); + const navList = search.$navList.get(0); + const classes = []; + const searchState = {}; + search.getMembers().each(function (i, li) { + const name = li.dataset.name; + if (re.test(name)) { + const itemMember = li.parentElement.parentElement; + const classEntry = itemMember.parentElement; + const className = classEntry.dataset.longname; + let cls = searchState[className]; + if (!cls) { + cls = searchState[className] = { + item: classEntry, + // Do the weight thing + weight: getSearchWeight(classEntry, beginOnly) * 10000, + subItems: {} + }; + classes.push(cls); + classEntry.classList.add('match'); + } + cls.weight += getSearchWeight(li, true) + 1; + const memberType = itemMember.dataset.type; + let members = cls.subItems[memberType]; + if (!members) { + members = cls.subItems[memberType] = { + item: itemMember, + subItems: {} + }; + itemMember.classList.add('match'); + } + members.subItems[name] = { item: li }; + li.classList.add('match'); + } + }); + search.getClassList().each(function (i, classEntry) { + const className = classEntry.dataset.longname; + if (!(className in searchState) && re.test(classEntry.dataset.name)) { + const cls = searchState[className] = { + item: classEntry, + // Do the weight thing + weight: getSearchWeight(classEntry, beginOnly) * 10000, + subItems: {} + }; + classes.push(cls); + classEntry.classList.add('match'); + } + }); + clearOldMatches(search.lastState, searchState); + search.lastState = searchState; + + classes.sort(function (a, b) { + return a.weight - b.weight; + }); + for (let i = classes.length - 1; i >= 0; --i) { + navList.appendChild(classes[i].item); + } + } } const searchInput = $('#search').get(0); @@ -132,7 +226,11 @@ $(function () { const time = Date.now() - start brandNode.innerHTML = time + ' ms'; - console.log(searchTerm + ':', time, 'ms'); + const msg = [searchTerm + ':', time, 'ms']; + if (searchTerm.length >= minInputForSearch) { + msg.push(search.lastState); + } + console.log.apply(console, msg); start = undefined; }, 0); } @@ -145,8 +243,14 @@ $(function () { } // Toggle when click an item element - $('.navigation').on('click', '.toggle', function (e) { - $(this).parent().parent().find('.member-list').toggle(); + search.$nav.on('click', '.toggle', function (e) { + const clsItem = $(this).closest('.item'); + let shown; + clsItem.find('.member-list').each(function (i, v) { + shown = $(v).is(':visible'); + return !shown; + }); + search.manualToggle(clsItem, !shown); }); // Auto resizing on navigation diff --git a/config/jsdoc/api/template/static/styles/jaguar.css b/config/jsdoc/api/template/static/styles/jaguar.css index 0088caa282..bf605518d7 100644 --- a/config/jsdoc/api/template/static/styles/jaguar.css +++ b/config/jsdoc/api/template/static/styles/jaguar.css @@ -190,9 +190,51 @@ li { margin-top: 2px; } .navigation li.item .member-list { - display: none; padding-left: 8px; } + +/* search state */ +/* show all classes when search is empty */ +.navigation.search-empty li.item { + display: block; +} +/* hide all members by default when search is empty */ +.navigation.search-empty li.item .member-list { + display: none; +} +/* but show the members of the current pages module / class */ +.navigation.search-empty li.item.item-current .member-list { + display: block; +} +/* expand all members when one character is entered in the search field */ +.navigation.search-started li.item, +.navigation.search-started .member-list, +.navigation.search-started .member-list li { + display: block; +} +/* when more than one character is entered hide everything that is not a match */ +.navigation.searching li.item, +.navigation.searching .member-list, +.navigation.searching .member-list li { + display: none; +} +.navigation.searching li.item.match, +.navigation.searching .member-list.match, +.navigation.searching .member-list li.match { + display: block; +} +/* allow user to hide / show members */ +.navigation .item.toggle-manual-show .member-list, +.navigation .item.toggle-manual-show li { + display: block!important; +} +.navigation .item.toggle-manual-hide .member-list, +.navigation .item.toggle-manual-hide li, +.navigation.searching .item.toggle-manual-show .member-list:not(.match), +.navigation.searching .item.toggle-manual-show li:not(.match) { + display: none!important; +} + .main { padding: 20px 20px; margin-left: 250px; diff --git a/config/jsdoc/api/template/tmpl/navigation.tmpl b/config/jsdoc/api/template/tmpl/navigation.tmpl index 6445c908a5..7cea44991b 100644 --- a/config/jsdoc/api/template/tmpl/navigation.tmpl +++ b/config/jsdoc/api/template/tmpl/navigation.tmpl @@ -25,7 +25,7 @@ const printListWithStability = v => { function listContent(item, title, listItemPrinter) { const type = title.toLowerCase(); if (item[type] && item[type].length) { ?> -
        +
          -
          +
            -
          • +
          • From b46b250d753dd697a47cf97f60c9b4f059aa6cc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Sat, 15 Feb 2020 00:20:16 +0100 Subject: [PATCH 20/72] On toggle when searching show unfiltered instead of hiding all --- .../jsdoc/api/template/static/scripts/main.js | 20 ++++++++++++------- .../api/template/static/styles/jaguar.css | 10 ++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/config/jsdoc/api/template/static/scripts/main.js b/config/jsdoc/api/template/static/scripts/main.js index 6d41345717..a3c26d5c3f 100644 --- a/config/jsdoc/api/template/static/scripts/main.js +++ b/config/jsdoc/api/template/static/scripts/main.js @@ -72,7 +72,7 @@ $(function () { .replace(/-/g, '~'); const $currentItem = $navList.find('.item[data-longname="' + longname + '"]:eq(0)'); $currentItem.prependTo($navList); - $currentItem.addClass('item-current'); + $currentItem.addClass('item-current toggle-manual-show'); return { $nav: $nav, $navList: $navList, @@ -245,12 +245,18 @@ $(function () { // Toggle when click an item element search.$nav.on('click', '.toggle', function (e) { const clsItem = $(this).closest('.item'); - let shown; - clsItem.find('.member-list').each(function (i, v) { - shown = $(v).is(':visible'); - return !shown; - }); - search.manualToggle(clsItem, !shown); + let show; + if (clsItem.hasClass('toggle-manual-show')) { + show = false; + } else if (clsItem.hasClass('toggle-manual-hide')) { + show = true; + } else { + clsItem.find('.member-list li').each(function (i, v) { + show = $(v).is(':hidden'); + return !show; + }); + } + search.manualToggle(clsItem, !!show); }); // Auto resizing on navigation diff --git a/config/jsdoc/api/template/static/styles/jaguar.css b/config/jsdoc/api/template/static/styles/jaguar.css index bf605518d7..4416e22291 100644 --- a/config/jsdoc/api/template/static/styles/jaguar.css +++ b/config/jsdoc/api/template/static/styles/jaguar.css @@ -202,10 +202,6 @@ li { .navigation.search-empty li.item .member-list { display: none; } -/* but show the members of the current pages module / class */ -.navigation.search-empty li.item.item-current .member-list { - display: block; -} /* expand all members when one character is entered in the search field */ .navigation.search-started li.item, .navigation.search-started .member-list, @@ -228,10 +224,8 @@ li { .navigation .item.toggle-manual-show li { display: block!important; } -.navigation .item.toggle-manual-hide .member-list, -.navigation .item.toggle-manual-hide li, -.navigation.searching .item.toggle-manual-show .member-list:not(.match), -.navigation.searching .item.toggle-manual-show li:not(.match) { +.navigation:not(.searching) .item.toggle-manual-hide .member-list, +.navigation:not(.searching) .item.toggle-manual-hide li { display: none!important; } From ee8ec6f03a90bec0a4328a106597d8595b2bd890 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Sat, 15 Feb 2020 01:46:36 +0100 Subject: [PATCH 21/72] Shorter css paths in navigation --- .../jsdoc/api/template/static/scripts/main.js | 19 +++++------ .../api/template/static/styles/jaguar.css | 32 ++++++++----------- .../jsdoc/api/template/tmpl/navigation.tmpl | 4 +-- 3 files changed, 24 insertions(+), 31 deletions(-) diff --git a/config/jsdoc/api/template/static/scripts/main.js b/config/jsdoc/api/template/static/scripts/main.js index a3c26d5c3f..590535809f 100644 --- a/config/jsdoc/api/template/static/scripts/main.js +++ b/config/jsdoc/api/template/static/scripts/main.js @@ -54,12 +54,13 @@ $(function () { const search = (function () { const $nav = $('.navigation'); - const $navList = $nav.find('.list'); + const $navList = $nav.find('.navigation-list'); + const navListNode = $navList.get(0); let $classItems; let $members; let stateClass = (function () { - $nav.removeClass('search-started searching'); - $nav.addClass('search-empty'); + $navList.removeClass('search-started searching'); + $navList.addClass('search-empty'); return 'search-empty'; })(); let manualToggles = {}; @@ -72,7 +73,6 @@ $(function () { .replace(/-/g, '~'); const $currentItem = $navList.find('.item[data-longname="' + longname + '"]:eq(0)'); $currentItem.prependTo($navList); - $currentItem.addClass('item-current toggle-manual-show'); return { $nav: $nav, $navList: $navList, @@ -87,9 +87,8 @@ $(function () { }, changeStateClass: function (newClass) { if (newClass !== stateClass) { - const navNode = $nav.get(0); - navNode.classList.remove(stateClass); - navNode.classList.add(newClass); + navListNode.classList.remove(stateClass); + navListNode.classList.add(newClass); stateClass = newClass; } }, @@ -238,9 +237,7 @@ $(function () { // Search Items searchInput.addEventListener('input', queueSearch); - if (searchInput.value) { - doSearch(searchInput.value); - } + doSearch(searchInput.value); // Toggle when click an item element search.$nav.on('click', '.toggle', function (e) { @@ -264,7 +261,7 @@ $(function () { var height = $(window).height(); var $el = $('.navigation'); - $el.height(height).find('.list').height(height - 133); + $el.height(height).find('.navigation-list').height(height - 133); }; $(window).on('resize', _onResize); diff --git a/config/jsdoc/api/template/static/styles/jaguar.css b/config/jsdoc/api/template/static/styles/jaguar.css index 4416e22291..3feba8e1c2 100644 --- a/config/jsdoc/api/template/static/styles/jaguar.css +++ b/config/jsdoc/api/template/static/styles/jaguar.css @@ -124,7 +124,7 @@ li { color: #fff; border-color: #555; } -.navigation .list { +.navigation .navigation-list { padding: 10px 15px 0 15px; position: relative; overflow: auto; @@ -195,37 +195,33 @@ li { /* search state */ /* show all classes when search is empty */ -.navigation.search-empty li.item { +.navigation-list.search-empty .item { display: block; } /* hide all members by default when search is empty */ -.navigation.search-empty li.item .member-list { +.navigation-list.search-empty .item .member-list { display: none; } -/* expand all members when one character is entered in the search field */ -.navigation.search-started li.item, -.navigation.search-started .member-list, -.navigation.search-started .member-list li { +/* expand all members when input in search field available but too short to search */ +.navigation-list.search-started li, +.navigation-list.search-started .member-list { display: block; } -/* when more than one character is entered hide everything that is not a match */ -.navigation.searching li.item, -.navigation.searching .member-list, -.navigation.searching .member-list li { +/* when searching hide everything that is not a match */ +.navigation-list.searching li, +.navigation-list.searching .member-list { display: none; } -.navigation.searching li.item.match, -.navigation.searching .member-list.match, -.navigation.searching .member-list li.match { +.navigation-list.searching .match { display: block; } /* allow user to hide / show members */ -.navigation .item.toggle-manual-show .member-list, -.navigation .item.toggle-manual-show li { +.navigation-list .item.toggle-manual-show li, +.navigation-list .item.toggle-manual-show .member-list { display: block!important; } -.navigation:not(.searching) .item.toggle-manual-hide .member-list, -.navigation:not(.searching) .item.toggle-manual-hide li { +.navigation-list:not(.searching) .item.toggle-manual-hide li, +.navigation-list:not(.searching) .item.toggle-manual-hide .member-list { display: none!important; } diff --git a/config/jsdoc/api/template/tmpl/navigation.tmpl b/config/jsdoc/api/template/tmpl/navigation.tmpl index 7cea44991b..736ff49f34 100644 --- a/config/jsdoc/api/template/tmpl/navigation.tmpl +++ b/config/jsdoc/api/template/tmpl/navigation.tmpl @@ -36,11 +36,11 @@ function listContent(item, title, listItemPrinter) { } } ?> -
            +
            -
            • From bf2a7bd21a42d5b1a2fa5287f9fbecc5d24851b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Sat, 15 Feb 2020 11:01:07 +0100 Subject: [PATCH 22/72] Allow toggel on whole title, add toggle transition --- config/jsdoc/api/template/static/scripts/main.js | 12 +++++++----- config/jsdoc/api/template/static/styles/jaguar.css | 13 +++++++++++++ config/jsdoc/api/template/tmpl/navigation.tmpl | 6 +++--- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/config/jsdoc/api/template/static/scripts/main.js b/config/jsdoc/api/template/static/scripts/main.js index 590535809f..fe68f8a6b2 100644 --- a/config/jsdoc/api/template/static/scripts/main.js +++ b/config/jsdoc/api/template/static/scripts/main.js @@ -53,8 +53,7 @@ $(function () { } const search = (function () { - const $nav = $('.navigation'); - const $navList = $nav.find('.navigation-list'); + const $navList = $('.navigation-list'); const navListNode = $navList.get(0); let $classItems; let $members; @@ -74,7 +73,6 @@ $(function () { const $currentItem = $navList.find('.item[data-longname="' + longname + '"]:eq(0)'); $currentItem.prependTo($navList); return { - $nav: $nav, $navList: $navList, $currentItem: $currentItem, lastSearchTerm: undefined, @@ -93,13 +91,14 @@ $(function () { } }, manualToggle: function ($node, show) { + $node.addClass('toggle-manual'); $node.toggleClass('toggle-manual-hide', !show); $node.toggleClass('toggle-manual-show', show); manualToggles[$node.data('longname')] = $node; }, clearManualToggles: function() { for (let clsName in manualToggles) { - manualToggles[clsName].removeClass('toggle-manual-show toggle-manual-hide'); + manualToggles[clsName].removeClass('toggle-manual toggle-manual-show toggle-manual-hide'); } manualToggles = {}; }, @@ -240,7 +239,10 @@ $(function () { doSearch(searchInput.value); // Toggle when click an item element - search.$nav.on('click', '.toggle', function (e) { + search.$navList.on('click', '.toggle', function (e) { + if (event.target.tagName.toLowerCase() === 'a') { + return; + } const clsItem = $(this).closest('.item'); let show; if (clsItem.hasClass('toggle-manual-show')) { diff --git a/config/jsdoc/api/template/static/styles/jaguar.css b/config/jsdoc/api/template/static/styles/jaguar.css index 3feba8e1c2..43a455cadf 100644 --- a/config/jsdoc/api/template/static/styles/jaguar.css +++ b/config/jsdoc/api/template/static/styles/jaguar.css @@ -140,6 +140,19 @@ li { margin-right: 3px; flex-shrink: 0; } +.navigation .item .glyphicon:before { + display: inline-block; +} +.navigation .item.toggle-manual .glyphicon:before { + transition: transform .1s; +} +.navigation .item-class.toggle-manual-show .glyphicon:before { + /* With 90deg the icon slightly slides left at transition end */ + transform: rotate(89.9deg); +} +.navigation .item-module.toggle-manual-show .glyphicon:before { + transform: rotate(45deg); +} .navigation li.perfect-match { border: 5px solid orange; diff --git a/config/jsdoc/api/template/tmpl/navigation.tmpl b/config/jsdoc/api/template/tmpl/navigation.tmpl index 736ff49f34..ac3dc9f227 100644 --- a/config/jsdoc/api/template/tmpl/navigation.tmpl +++ b/config/jsdoc/api/template/tmpl/navigation.tmpl @@ -42,9 +42,9 @@ function listContent(item, title, listItemPrinter) {
              -
            • - - +
            • + + Date: Sat, 15 Feb 2020 22:19:43 +0100 Subject: [PATCH 23/72] Avoid deprecated jquery :eq selector --- config/jsdoc/api/template/static/scripts/main.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/jsdoc/api/template/static/scripts/main.js b/config/jsdoc/api/template/static/scripts/main.js index fe68f8a6b2..50c8baaf6c 100644 --- a/config/jsdoc/api/template/static/scripts/main.js +++ b/config/jsdoc/api/template/static/scripts/main.js @@ -70,11 +70,11 @@ $(function () { .replace('module-', 'module:') .replace(/_/g, '/') .replace(/-/g, '~'); - const $currentItem = $navList.find('.item[data-longname="' + longname + '"]:eq(0)'); - $currentItem.prependTo($navList); + const currentItem = navListNode.querySelector('.item[data-longname="' + longname + '"]'); + $navList.prepend(currentItem); return { $navList: $navList, - $currentItem: $currentItem, + $currentItem: $(currentItem), lastSearchTerm: undefined, lastState: {}, getClassList: function () { From 6b9a35b7b937cd02a02ffdf371f009fdf3376731 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Sat, 22 Feb 2020 14:14:09 +0100 Subject: [PATCH 24/72] Always sort top level matches before member matches --- .../jsdoc/api/template/static/scripts/main.js | 43 +++++++++---------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/config/jsdoc/api/template/static/scripts/main.js b/config/jsdoc/api/template/static/scripts/main.js index 50c8baaf6c..120eff635b 100644 --- a/config/jsdoc/api/template/static/scripts/main.js +++ b/config/jsdoc/api/template/static/scripts/main.js @@ -32,18 +32,18 @@ $(function () { // We could get smarter on the weight here const name = matchedItem.dataset.name; if (beginOnly) { - return re.baseName.test(name) ? 10000 : 0; + return re.baseName.test(name) ? 100 : 1; } // If everything else is equal, prefer shorter names, and prefer classes over modules - let weight = matchedItem.dataset.longname.length - name.length * 100; + let weight = 10000 + matchedItem.dataset.longname.length - name.length * 100; if (name.match(re.begin)) { - weight += 100000; + weight += 10000; if (re.baseName.test(name)) { - weight += 10000000; + weight += 10000; if (re.fullName.test(name)) { - weight += 100000000; + weight += 10000; if (re.completeName.test(name)) { - weight += 1000000000; + weight += 10000; } } } @@ -152,6 +152,19 @@ $(function () { const navList = search.$navList.get(0); const classes = []; const searchState = {}; + search.getClassList().each(function (i, classEntry) { + const className = classEntry.dataset.longname; + if (!(className in searchState) && re.test(classEntry.dataset.name)) { + const cls = searchState[className] = { + item: classEntry, + // Do the weight thing + weight: getSearchWeight(classEntry, beginOnly) * 100000, + subItems: {} + }; + classes.push(cls); + classEntry.classList.add('match'); + } + }); search.getMembers().each(function (i, li) { const name = li.dataset.name; if (re.test(name)) { @@ -162,14 +175,13 @@ $(function () { if (!cls) { cls = searchState[className] = { item: classEntry, - // Do the weight thing - weight: getSearchWeight(classEntry, beginOnly) * 10000, + weight: 0, subItems: {} }; classes.push(cls); classEntry.classList.add('match'); } - cls.weight += getSearchWeight(li, true) + 1; + cls.weight += getSearchWeight(li, true); const memberType = itemMember.dataset.type; let members = cls.subItems[memberType]; if (!members) { @@ -183,19 +195,6 @@ $(function () { li.classList.add('match'); } }); - search.getClassList().each(function (i, classEntry) { - const className = classEntry.dataset.longname; - if (!(className in searchState) && re.test(classEntry.dataset.name)) { - const cls = searchState[className] = { - item: classEntry, - // Do the weight thing - weight: getSearchWeight(classEntry, beginOnly) * 10000, - subItems: {} - }; - classes.push(cls); - classEntry.classList.add('match'); - } - }); clearOldMatches(search.lastState, searchState); search.lastState = searchState; From c2505f938ef7160d18a85860b0248798adb4a2f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Fri, 21 Feb 2020 23:47:16 +0100 Subject: [PATCH 25/72] Remove measuring code --- config/jsdoc/api/template/static/scripts/main.js | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/config/jsdoc/api/template/static/scripts/main.js b/config/jsdoc/api/template/static/scripts/main.js index 120eff635b..d0fb7b12f4 100644 --- a/config/jsdoc/api/template/static/scripts/main.js +++ b/config/jsdoc/api/template/static/scripts/main.js @@ -210,25 +210,13 @@ $(function () { const searchInput = $('#search').get(0); // Skip searches when typing fast. let key; - let start; - const brandNode = document.querySelector('.brand'); function queueSearch() { if (!key) { - start = Date.now(); key = setTimeout(function () { key = undefined; const searchTerm = searchInput.value; doSearch(searchTerm); - - const time = Date.now() - start - brandNode.innerHTML = time + ' ms'; - const msg = [searchTerm + ':', time, 'ms']; - if (searchTerm.length >= minInputForSearch) { - msg.push(search.lastState); - } - console.log.apply(console, msg); - start = undefined; }, 0); } } From 6ae6d0b835ae41d2d3e0095079ce84d0cff0b297 Mon Sep 17 00:00:00 2001 From: mike-000 <49240900+mike-000@users.noreply.github.com> Date: Sat, 22 Feb 2020 22:40:29 +0000 Subject: [PATCH 26/72] Optional extra stops to refine extent transforms Add optional extra stops to refine some non-parallel transforms Refine extent transforms use by Gratucule by using 32 points (8 per side) instead of the standard corners only transform Update Graticule class description with current limitations Correct projection extent in Mollweide example and revise opening zoom level correspondingly --- examples/sphere-mollweide.js | 6 +++--- src/ol/extent.js | 38 +++++++++++++++++++++++++++--------- src/ol/layer/Graticule.js | 7 ++++--- src/ol/proj.js | 6 ++++-- 4 files changed, 40 insertions(+), 17 deletions(-) diff --git a/examples/sphere-mollweide.js b/examples/sphere-mollweide.js index 7540cd095b..83fc6adcc4 100644 --- a/examples/sphere-mollweide.js +++ b/examples/sphere-mollweide.js @@ -17,8 +17,8 @@ register(proj4); // and a world extent. These are required for the Graticule. const sphereMollweideProjection = new Projection({ code: 'ESRI:53009', - extent: [-9009954.605703328, -9009954.605703328, - 9009954.605703328, 9009954.605703328], + extent: [-18019909.21177587, -9009954.605703328, + 18019909.21177587, 9009954.605703328], worldExtent: [-179, -89.99, 179, 89.99] }); @@ -37,6 +37,6 @@ const map = new Map({ view: new View({ center: [0, 0], projection: sphereMollweideProjection, - zoom: 0 + zoom: 1 }) }); diff --git a/src/ol/extent.js b/src/ol/extent.js index cc74b803fb..94eb9cb249 100644 --- a/src/ol/extent.js +++ b/src/ol/extent.js @@ -778,18 +778,38 @@ export function intersectsSegment(extent, start, end) { * @param {import("./proj.js").TransformFunction} transformFn Transform function. * Called with `[minX, minY, maxX, maxY]` extent coordinates. * @param {Extent=} opt_extent Destination extent. + * @param {number=} opt_stops Number of stops per side used for the transform. + * By default only the corners are used. * @return {Extent} Extent. * @api */ -export function applyTransform(extent, transformFn, opt_extent) { - const coordinates = [ - extent[0], extent[1], - extent[0], extent[3], - extent[2], extent[1], - extent[2], extent[3] - ]; +export function applyTransform(extent, transformFn, opt_extent, opt_stops) { + let coordinates = []; + if (opt_stops > 1) { + const width = extent[2] - extent[0]; + const height = extent[3] - extent[1]; + for (let i = 0; i < opt_stops; ++i) { + coordinates.push( + extent[0] + width * i / opt_stops, extent[1], + extent[2], extent[1] + height * i / opt_stops, + extent[2] - width * i / opt_stops, extent[3], + extent[0], extent[3] - height * i / opt_stops + ); + } + } else { + coordinates = [ + extent[0], extent[1], + extent[2], extent[1], + extent[2], extent[3], + extent[0], extent[3] + ]; + } transformFn(coordinates, coordinates, 2); - const xs = [coordinates[0], coordinates[2], coordinates[4], coordinates[6]]; - const ys = [coordinates[1], coordinates[3], coordinates[5], coordinates[7]]; + const xs = []; + const ys = []; + for (let i = 0, l = coordinates.length; i < l; i += 2) { + xs.push(coordinates[i]); + ys.push(coordinates[i + 1]); + } return _boundingExtentXYs(xs, ys, opt_extent); } diff --git a/src/ol/layer/Graticule.js b/src/ol/layer/Graticule.js index f1480dddc9..31e0f5aaee 100644 --- a/src/ol/layer/Graticule.js +++ b/src/ol/layer/Graticule.js @@ -144,7 +144,8 @@ const INTERVALS = [ /** * @classdesc - * Layer that renders a grid for a coordinate system. + * Layer that renders a grid for a coordinate system (currently only EPSG:4326 is supported). + * Note that the view projection must define both extent and worldExtent. * * @fires import("../render/Event.js").RenderEvent * @api @@ -677,7 +678,7 @@ class Graticule extends VectorLayer { Math.min(extent[3], this.maxLatP_) ]; - validExtent = transformExtent(validExtent, this.projection_, 'EPSG:4326'); + validExtent = transformExtent(validExtent, this.projection_, 'EPSG:4326', 8); const maxLat = validExtent[3]; const maxLon = validExtent[2]; const minLat = validExtent[1]; @@ -896,7 +897,7 @@ class Graticule extends VectorLayer { const epsg4326Projection = getProjection('EPSG:4326'); const worldExtent = projection.getWorldExtent(); - const worldExtentP = transformExtent(worldExtent, epsg4326Projection, projection); + const worldExtentP = transformExtent(worldExtent, epsg4326Projection, projection, 8); this.maxLat_ = worldExtent[3]; this.maxLon_ = worldExtent[2]; diff --git a/src/ol/proj.js b/src/ol/proj.js index f64cc05a85..d2be0feb3f 100644 --- a/src/ol/proj.js +++ b/src/ol/proj.js @@ -476,12 +476,14 @@ export function transform(coordinate, source, destination) { * @param {import("./extent.js").Extent} extent The extent to transform. * @param {ProjectionLike} source Source projection-like. * @param {ProjectionLike} destination Destination projection-like. + * @param {number=} opt_stops Number of stops per side used for the transform. + * By default only the corners are used. * @return {import("./extent.js").Extent} The transformed extent. * @api */ -export function transformExtent(extent, source, destination) { +export function transformExtent(extent, source, destination, opt_stops) { const transformFunc = getTransform(source, destination); - return applyTransform(extent, transformFunc); + return applyTransform(extent, transformFunc, undefined, opt_stops); } From 737f3a5066bef26fec7a45fae181e77978f0d168 Mon Sep 17 00:00:00 2001 From: mike-000 <49240900+mike-000@users.noreply.github.com> Date: Mon, 24 Feb 2020 21:53:53 +0000 Subject: [PATCH 27/72] Handle view projections crossing dateline Use custom toLonLat transform to return wrapped longitudes for extents if view projection crosses the dateline. Enhance the validation for center and extents to avoid proj4 errors. --- src/ol/layer/Graticule.js | 71 +++++++++++++++++++++++++++++---------- 1 file changed, 53 insertions(+), 18 deletions(-) diff --git a/src/ol/layer/Graticule.js b/src/ol/layer/Graticule.js index 31e0f5aaee..6c17962753 100644 --- a/src/ol/layer/Graticule.js +++ b/src/ol/layer/Graticule.js @@ -12,10 +12,18 @@ import VectorSource from '../source/Vector.js'; import { equivalent as equivalentProjection, get as getProjection, - getTransform, - transformExtent + getTransform } from '../proj.js'; -import {getCenter, getHeight, getWidth, intersects, equals, getIntersection, isEmpty} from '../extent.js'; +import { + applyTransform, + equals, + getCenter, + getHeight, + getIntersection, + getWidth, + intersects, + isEmpty +} from '../extent.js'; import {clamp} from '../math.js'; import Style from '../style/Style.js'; import Feature from '../Feature.js'; @@ -665,24 +673,30 @@ class Graticule extends VectorLayer { return; } - const centerLonLat = this.toLonLatTransform_(center); + const validCenter = [ + clamp(center[0], this.minLonP_, this.maxLonP_), + clamp(center[1], this.minLatP_, this.maxLatP_) + ]; + + const centerLonLat = this.toLonLatTransform_(validCenter); let centerLon = centerLonLat[0]; let centerLat = centerLonLat[1]; const maxLines = this.maxLines_; let cnt, idx, lat, lon; let validExtent = [ - Math.max(extent[0], this.minLonP_), - Math.max(extent[1], this.minLatP_), - Math.min(extent[2], this.maxLonP_), - Math.min(extent[3], this.maxLatP_) + clamp(extent[0], this.minLonP_, this.maxLonP_), + clamp(extent[1], this.minLatP_, this.maxLatP_), + clamp(extent[2], this.minLonP_, this.maxLonP_), + clamp(extent[3], this.minLatP_, this.maxLatP_) ]; - validExtent = transformExtent(validExtent, this.projection_, 'EPSG:4326', 8); - const maxLat = validExtent[3]; - const maxLon = validExtent[2]; - const minLat = validExtent[1]; - const minLon = validExtent[0]; + validExtent = applyTransform(validExtent, this.toLonLatTransform_, undefined, 8); + + const maxLat = Math.min(validExtent[3], this.maxLat_); + const maxLon = Math.min(validExtent[2], this.maxLon_); + const minLat = Math.max(validExtent[1], this.minLat_); + const minLon = Math.max(validExtent[0], this.minLon_); // Create meridians @@ -897,22 +911,43 @@ class Graticule extends VectorLayer { const epsg4326Projection = getProjection('EPSG:4326'); const worldExtent = projection.getWorldExtent(); - const worldExtentP = transformExtent(worldExtent, epsg4326Projection, projection, 8); this.maxLat_ = worldExtent[3]; this.maxLon_ = worldExtent[2]; this.minLat_ = worldExtent[1]; this.minLon_ = worldExtent[0]; + const toLonLatTransform = getTransform(projection, epsg4326Projection); + if (this.minLon_ < this.maxLon_) { + this.toLonLatTransform_ = toLonLatTransform; + } else { + const split = this.minLon_ + this.maxLon_ / 2; + this.maxLon_ += 360; + this.toLonLatTransform_ = function(coordinates, opt_output, opt_dimension) { + const dimension = opt_dimension || 2; + const lonLatCoordinates = toLonLatTransform(coordinates, opt_output, dimension); + for (let i = 0, l = lonLatCoordinates.length; i < l; i += dimension) { + if (lonLatCoordinates[i] < split) { + lonLatCoordinates[i] += 360; + } + } + return lonLatCoordinates; + }; + } + + this.fromLonLatTransform_ = getTransform(epsg4326Projection, projection); + const worldExtentP = applyTransform( + [this.minLon_, this.minLat_, this.maxLon_, this.maxLat_], + this.fromLonLatTransform_, + undefined, + 8 + ); + this.maxLatP_ = worldExtentP[3]; this.maxLonP_ = worldExtentP[2]; this.minLatP_ = worldExtentP[1]; this.minLonP_ = worldExtentP[0]; - this.fromLonLatTransform_ = getTransform(epsg4326Projection, projection); - - this.toLonLatTransform_ = getTransform(projection, epsg4326Projection); - this.projectionCenterLonLat_ = this.toLonLatTransform_(getCenter(projection.getExtent())); this.projection_ = projection; From 9039e2629b167a1268866190affab70a0aadf2fc Mon Sep 17 00:00:00 2001 From: mike-000 <49240900+mike-000@users.noreply.github.com> Date: Mon, 24 Feb 2020 21:57:22 +0000 Subject: [PATCH 28/72] fix trailing space --- src/ol/layer/Graticule.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ol/layer/Graticule.js b/src/ol/layer/Graticule.js index 6c17962753..b7002c247b 100644 --- a/src/ol/layer/Graticule.js +++ b/src/ol/layer/Graticule.js @@ -677,7 +677,7 @@ class Graticule extends VectorLayer { clamp(center[0], this.minLonP_, this.maxLonP_), clamp(center[1], this.minLatP_, this.maxLatP_) ]; - + const centerLonLat = this.toLonLatTransform_(validCenter); let centerLon = centerLonLat[0]; let centerLat = centerLonLat[1]; From adcf57ef20d03df255b2d1ec45c469d7cc48878c Mon Sep 17 00:00:00 2001 From: mike-000 <49240900+mike-000@users.noreply.github.com> Date: Tue, 25 Feb 2020 13:47:02 +0000 Subject: [PATCH 29/72] Better validation to handle polar projections For some projections (e.g. polar) the maximum or minimum values may be at the center. To improve the display for polar projections take validated center values into account when calculating max and min. --- src/ol/layer/Graticule.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ol/layer/Graticule.js b/src/ol/layer/Graticule.js index b7002c247b..42b5c380fa 100644 --- a/src/ol/layer/Graticule.js +++ b/src/ol/layer/Graticule.js @@ -679,8 +679,8 @@ class Graticule extends VectorLayer { ]; const centerLonLat = this.toLonLatTransform_(validCenter); - let centerLon = centerLonLat[0]; - let centerLat = centerLonLat[1]; + let centerLon = clamp(centerLonLat[0], this.minLon_, this.maxLon_); + let centerLat = clamp(centerLonLat[1], this.minLat_, this.maxLat_); const maxLines = this.maxLines_; let cnt, idx, lat, lon; @@ -693,10 +693,10 @@ class Graticule extends VectorLayer { validExtent = applyTransform(validExtent, this.toLonLatTransform_, undefined, 8); - const maxLat = Math.min(validExtent[3], this.maxLat_); - const maxLon = Math.min(validExtent[2], this.maxLon_); - const minLat = Math.max(validExtent[1], this.minLat_); - const minLon = Math.max(validExtent[0], this.minLon_); + const maxLat = clamp(validExtent[3], centerLat, this.maxLat_); + const maxLon = clamp(validExtent[2], centerLon, this.maxLon_); + const minLat = clamp(validExtent[1], this.minLat_, centerLat); + const minLon = clamp(validExtent[0], this.minLon_, centerLon); // Create meridians From 591e5ce01bbf9ccffe9e4d749584abcc1f77c5f3 Mon Sep 17 00:00:00 2001 From: mike-000 <49240900+mike-000@users.noreply.github.com> Date: Wed, 26 Feb 2020 22:17:49 +0000 Subject: [PATCH 30/72] More validation. Handle voids in some projections. Handle NaN latitude transform results at void centers of some projections (e.g. Pole LAEA). Clamp latitudes to not go beyond the poles when calculating intervals. Further improve polar projections by checking if extent contains max and min intersection coordinates when calculating max and min. --- src/ol/layer/Graticule.js | 66 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 61 insertions(+), 5 deletions(-) diff --git a/src/ol/layer/Graticule.js b/src/ol/layer/Graticule.js index 42b5c380fa..e7e61a7aba 100644 --- a/src/ol/layer/Graticule.js +++ b/src/ol/layer/Graticule.js @@ -16,6 +16,7 @@ import { } from '../proj.js'; import { applyTransform, + containsCoordinate, equals, getCenter, getHeight, @@ -285,6 +286,30 @@ class Graticule extends VectorLayer { */ this.projectionCenterLonLat_ = null; + /** + * @type {import("../coordinate.js").Coordinate} + * @private + */ + this.blLonLatP_ = null; + + /** + * @type {import("../coordinate.js").Coordinate} + * @private + */ + this.brLonLatP_ = null; + + /** + * @type {import("../coordinate.js").Coordinate} + * @private + */ + this.tlLonLatP_ = null; + + /** + * @type {import("../coordinate.js").Coordinate} + * @private + */ + this.trLonLatP_ = null; + /** * @type {Array} * @private @@ -679,19 +704,40 @@ class Graticule extends VectorLayer { ]; const centerLonLat = this.toLonLatTransform_(validCenter); + if (isNaN(centerLonLat[1])) { + centerLonLat[1] = Math.abs(this.maxLat_) >= Math.abs(this.minLat_) ? + this.maxLat_ : this.minLat_; + } let centerLon = clamp(centerLonLat[0], this.minLon_, this.maxLon_); let centerLat = clamp(centerLonLat[1], this.minLat_, this.maxLat_); const maxLines = this.maxLines_; let cnt, idx, lat, lon; - let validExtent = [ + const validExtentP = [ clamp(extent[0], this.minLonP_, this.maxLonP_), clamp(extent[1], this.minLatP_, this.maxLatP_), clamp(extent[2], this.minLonP_, this.maxLonP_), clamp(extent[3], this.minLatP_, this.maxLatP_) ]; - validExtent = applyTransform(validExtent, this.toLonLatTransform_, undefined, 8); + const validExtent = applyTransform(validExtentP, this.toLonLatTransform_, undefined, 8); + + if (containsCoordinate(validExtentP, this.blLonLatP_)) { + validExtent[0] = this.minLon_; + validExtent[1] = this.minLat_; + } + if (containsCoordinate(validExtentP, this.brLonLatP_)) { + validExtent[2] = this.maxLon_; + validExtent[1] = this.minLat_; + } + if (containsCoordinate(validExtentP, this.tlLonLatP_)) { + validExtent[0] = this.minLon_; + validExtent[3] = this.maxLat_; + } + if (containsCoordinate(validExtentP, this.trLonLatP_)) { + validExtent[2] = this.maxLon_; + validExtent[3] = this.maxLat_; + } const maxLat = clamp(validExtent[3], centerLat, this.maxLat_); const maxLon = clamp(validExtent[2], centerLon, this.maxLon_); @@ -767,11 +813,12 @@ class Graticule extends VectorLayer { /** @type {Array} **/ const p2 = []; for (let i = 0, ii = this.intervals_.length; i < ii; ++i) { - const delta = this.intervals_[i] / 2; + const delta = clamp(this.intervals_[i] / 2, 0, 90); + const clampedLat = clamp(centerLat, -90 + delta, 90 - delta); p1[0] = centerLon - delta; - p1[1] = centerLat - delta; + p1[1] = clampedLat - delta; p2[0] = centerLon + delta; - p2[1] = centerLat + delta; + p2[1] = clampedLat + delta; this.fromLonLatTransform_(p1, p1); this.fromLonLatTransform_(p2, p2); const dist = Math.pow(p2[0] - p1[0], 2) + Math.pow(p2[1] - p1[1], 2); @@ -948,7 +995,16 @@ class Graticule extends VectorLayer { this.minLatP_ = worldExtentP[1]; this.minLonP_ = worldExtentP[0]; + this.blLonLatP_ = this.fromLonLatTransform_([this.minLon_, this.minLat_]); + this.brLonLatP_ = this.fromLonLatTransform_([this.maxLon_, this.minLat_]); + this.tlLonLatP_ = this.fromLonLatTransform_([this.minLon_, this.maxLat_]); + this.trLonLatP_ = this.fromLonLatTransform_([this.maxLon_, this.maxLat_]); + this.projectionCenterLonLat_ = this.toLonLatTransform_(getCenter(projection.getExtent())); + if (isNaN(this.projectionCenterLonLat_[1])) { + this.projectionCenterLonLat_[1] = Math.abs(this.maxLat_) >= Math.abs(this.minLat_) ? + this.maxLat_ : this.minLat_; + } this.projection_ = projection; } From 633396e7df71700364b2f343bfba0a51f9059f3c Mon Sep 17 00:00:00 2001 From: mike-000 <49240900+mike-000@users.noreply.github.com> Date: Thu, 27 Feb 2020 12:12:57 +0000 Subject: [PATCH 31/72] test using extra stops for extent transform --- test/spec/ol/extent.test.js | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/test/spec/ol/extent.test.js b/test/spec/ol/extent.test.js index eb59120a2e..d98a0dfe61 100644 --- a/test/spec/ol/extent.test.js +++ b/test/spec/ol/extent.test.js @@ -1,5 +1,6 @@ import * as _ol_extent_ from '../../../src/ol/extent.js'; import {getTransform} from '../../../src/ol/proj.js'; +import {register} from '../../../src/ol/proj/proj4.js'; describe('ol.extent', function() { @@ -783,6 +784,38 @@ describe('ol.extent', function() { expect(destinationExtent[3]).to.be(30); }); + it('can use the stops option', function() { + proj4.defs('EPSG:32632', '+proj=utm +zone=32 +datum=WGS84 +units=m +no_defs'); + register(proj4); + const transformFn = getTransform('EPSG:4326', 'EPSG:32632'); + const sourceExtentN = [6, 0, 12, 84]; + const destinationExtentN = _ol_extent_.applyTransform( + sourceExtentN, transformFn); + expect(destinationExtentN).not.to.be(undefined); + expect(destinationExtentN).not.to.be(null); + expect(destinationExtentN[0]).to.roughlyEqual(166021.44308053964, 1e-8); + expect(destinationExtentN[2]).to.roughlyEqual(0, 1e-8); + expect(destinationExtentN[1]).to.roughlyEqual(833978.5569194605, 1e-8); + expect(destinationExtentN[3]).to.roughlyEqual(9329005.182447437, 1e-8); + const sourceExtentNS = [6, -84, 12, 84]; + const destinationExtentNS = _ol_extent_.applyTransform( + sourceExtentNS, transformFn); + expect(destinationExtentNS).not.to.be(undefined); + expect(destinationExtentNS).not.to.be(null); + expect(destinationExtentNS[0]).to.roughlyEqual(465005.34493886377, 1e-8); + expect(destinationExtentNS[2]).to.roughlyEqual(-destinationExtentN[3], 1e-8); + expect(destinationExtentNS[1]).to.roughlyEqual(534994.6550611362, 1e-8); + expect(destinationExtentNS[3]).to.roughlyEqual(destinationExtentN[3], 1e-8); + const destinationExtentNS2 = _ol_extent_.applyTransform( + sourceExtentNS, transformFn, undefined, 2); + expect(destinationExtentNS2).not.to.be(undefined); + expect(destinationExtentNS2).not.to.be(null); + expect(destinationExtentNS2[0]).to.roughlyEqual(destinationExtentN[0], 1e-8); + expect(destinationExtentNS2[2]).to.roughlyEqual(-destinationExtentN[3], 1e-8); + expect(destinationExtentNS2[1]).to.roughlyEqual(destinationExtentN[2], 1e-8); + expect(destinationExtentNS2[3]).to.roughlyEqual(destinationExtentN[3], 1e-8); + }); + }); }); From ac2b58c554c07d4fc6a62cdf63a24231a178fca6 Mon Sep 17 00:00:00 2001 From: mike-000 <49240900+mike-000@users.noreply.github.com> Date: Thu, 27 Feb 2020 12:19:31 +0000 Subject: [PATCH 32/72] test using extra stops for extent transform correct coordinate order --- test/spec/ol/extent.test.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/spec/ol/extent.test.js b/test/spec/ol/extent.test.js index d98a0dfe61..3e12639d19 100644 --- a/test/spec/ol/extent.test.js +++ b/test/spec/ol/extent.test.js @@ -794,8 +794,8 @@ describe('ol.extent', function() { expect(destinationExtentN).not.to.be(undefined); expect(destinationExtentN).not.to.be(null); expect(destinationExtentN[0]).to.roughlyEqual(166021.44308053964, 1e-8); - expect(destinationExtentN[2]).to.roughlyEqual(0, 1e-8); - expect(destinationExtentN[1]).to.roughlyEqual(833978.5569194605, 1e-8); + expect(destinationExtentN[2]).to.roughlyEqual(833978.5569194605, 1e-8); + expect(destinationExtentN[1]).to.roughlyEqual(0, 1e-8); expect(destinationExtentN[3]).to.roughlyEqual(9329005.182447437, 1e-8); const sourceExtentNS = [6, -84, 12, 84]; const destinationExtentNS = _ol_extent_.applyTransform( @@ -803,16 +803,16 @@ describe('ol.extent', function() { expect(destinationExtentNS).not.to.be(undefined); expect(destinationExtentNS).not.to.be(null); expect(destinationExtentNS[0]).to.roughlyEqual(465005.34493886377, 1e-8); - expect(destinationExtentNS[2]).to.roughlyEqual(-destinationExtentN[3], 1e-8); - expect(destinationExtentNS[1]).to.roughlyEqual(534994.6550611362, 1e-8); + expect(destinationExtentNS[2]).to.roughlyEqual(534994.6550611362, 1e-8); + expect(destinationExtentNS[1]).to.roughlyEqual(-destinationExtentN[3], 1e-8); expect(destinationExtentNS[3]).to.roughlyEqual(destinationExtentN[3], 1e-8); const destinationExtentNS2 = _ol_extent_.applyTransform( sourceExtentNS, transformFn, undefined, 2); expect(destinationExtentNS2).not.to.be(undefined); expect(destinationExtentNS2).not.to.be(null); expect(destinationExtentNS2[0]).to.roughlyEqual(destinationExtentN[0], 1e-8); - expect(destinationExtentNS2[2]).to.roughlyEqual(-destinationExtentN[3], 1e-8); - expect(destinationExtentNS2[1]).to.roughlyEqual(destinationExtentN[2], 1e-8); + expect(destinationExtentNS2[2]).to.roughlyEqual(destinationExtentN[2], 1e-8); + expect(destinationExtentNS2[1]).to.roughlyEqual(-destinationExtentN[3], 1e-8); expect(destinationExtentNS2[3]).to.roughlyEqual(destinationExtentN[3], 1e-8); }); From b8e34ef5bf2b9fb3f4faf3130d4b5ffbd01a6bbc Mon Sep 17 00:00:00 2001 From: mike-000 <49240900+mike-000@users.noreply.github.com> Date: Thu, 27 Feb 2020 19:12:40 +0000 Subject: [PATCH 33/72] rename some variables and add comments --- src/ol/layer/Graticule.js | 86 ++++++++++++++++++++++++++------------- 1 file changed, 58 insertions(+), 28 deletions(-) diff --git a/src/ol/layer/Graticule.js b/src/ol/layer/Graticule.js index e7e61a7aba..0fbc0cea50 100644 --- a/src/ol/layer/Graticule.js +++ b/src/ol/layer/Graticule.js @@ -218,25 +218,25 @@ class Graticule extends VectorLayer { * @type {number} * @private */ - this.maxLatP_ = Infinity; + this.maxX_ = Infinity; /** * @type {number} * @private */ - this.maxLonP_ = Infinity; + this.maxY_ = Infinity; /** * @type {number} * @private */ - this.minLatP_ = -Infinity; + this.minX_ = -Infinity; /** * @type {number} * @private */ - this.minLonP_ = -Infinity; + this.minY_ = -Infinity; /** * @type {number} @@ -290,25 +290,25 @@ class Graticule extends VectorLayer { * @type {import("../coordinate.js").Coordinate} * @private */ - this.blLonLatP_ = null; + this.bottomLeft_ = null; /** * @type {import("../coordinate.js").Coordinate} * @private */ - this.brLonLatP_ = null; + this.bottomRight_ = null; /** * @type {import("../coordinate.js").Coordinate} * @private */ - this.tlLonLatP_ = null; + this.topLeft_ = null; /** * @type {import("../coordinate.js").Coordinate} * @private */ - this.trLonLatP_ = null; + this.topRight_ = null; /** * @type {Array} @@ -698,12 +698,18 @@ class Graticule extends VectorLayer { return; } - const validCenter = [ - clamp(center[0], this.minLonP_, this.maxLonP_), - clamp(center[1], this.minLatP_, this.maxLatP_) + // Constrain the center to fit into the extent available to the graticule + + const validCenterP = [ + clamp(center[0], this.minX_, this.maxX_), + clamp(center[1], this.minY_, this.maxY_) ]; - const centerLonLat = this.toLonLatTransform_(validCenter); + // Transform the center to lon lat + // Some projections may have a void area at the poles + // so replace any NaN latitudes with the min or max value closest to a pole + + const centerLonLat = this.toLonLatTransform_(validCenterP); if (isNaN(centerLonLat[1])) { centerLonLat[1] = Math.abs(this.maxLat_) >= Math.abs(this.minLat_) ? this.maxLat_ : this.minLat_; @@ -713,32 +719,42 @@ class Graticule extends VectorLayer { const maxLines = this.maxLines_; let cnt, idx, lat, lon; + // Limit the extent to fit into the extent available to the graticule + const validExtentP = [ - clamp(extent[0], this.minLonP_, this.maxLonP_), - clamp(extent[1], this.minLatP_, this.maxLatP_), - clamp(extent[2], this.minLonP_, this.maxLonP_), - clamp(extent[3], this.minLatP_, this.maxLatP_) + clamp(extent[0], this.minX_, this.maxX_), + clamp(extent[1], this.minY_, this.maxY_), + clamp(extent[2], this.minX_, this.maxX_), + clamp(extent[3], this.minY_, this.maxY_) ]; + // Transform the extent to get the lon lat ranges for the edges of the extent + const validExtent = applyTransform(validExtentP, this.toLonLatTransform_, undefined, 8); - if (containsCoordinate(validExtentP, this.blLonLatP_)) { + // Check if extremities of the world extent lie inside the extent + // (for example the pole in a polar projection) + // and extend the extent as appropriate + + if (containsCoordinate(validExtentP, this.bottomLeft_)) { validExtent[0] = this.minLon_; validExtent[1] = this.minLat_; } - if (containsCoordinate(validExtentP, this.brLonLatP_)) { + if (containsCoordinate(validExtentP, this.bottomRight_)) { validExtent[2] = this.maxLon_; validExtent[1] = this.minLat_; } - if (containsCoordinate(validExtentP, this.tlLonLatP_)) { + if (containsCoordinate(validExtentP, this.topLeft_)) { validExtent[0] = this.minLon_; validExtent[3] = this.maxLat_; } - if (containsCoordinate(validExtentP, this.trLonLatP_)) { + if (containsCoordinate(validExtentP, this.topRight_)) { validExtent[2] = this.maxLon_; validExtent[3] = this.maxLat_; } + // The transformed center may also extend the lon lat ranges used for rendering + const maxLat = clamp(validExtent[3], centerLat, this.maxLat_); const maxLon = clamp(validExtent[2], centerLon, this.maxLon_); const minLat = clamp(validExtent[1], this.minLat_, centerLat); @@ -814,6 +830,7 @@ class Graticule extends VectorLayer { const p2 = []; for (let i = 0, ii = this.intervals_.length; i < ii; ++i) { const delta = clamp(this.intervals_[i] / 2, 0, 90); + // Don't attempt to transform latitudes beyond the poles! const clampedLat = clamp(centerLat, -90 + delta, 90 - delta); p1[0] = centerLon - delta; p1[1] = clampedLat - delta; @@ -964,6 +981,9 @@ class Graticule extends VectorLayer { this.minLat_ = worldExtent[1]; this.minLon_ = worldExtent[0]; + // If the world extent crosses the dateline define a custom transform to + // return longitudes which wrap the dateline + const toLonLatTransform = getTransform(projection, epsg4326Projection); if (this.minLon_ < this.maxLon_) { this.toLonLatTransform_ = toLonLatTransform; @@ -982,6 +1002,9 @@ class Graticule extends VectorLayer { }; } + // Transform the extent to get the limits of the view projection extent + // which should be available to the graticule + this.fromLonLatTransform_ = getTransform(epsg4326Projection, projection); const worldExtentP = applyTransform( [this.minLon_, this.minLat_, this.maxLon_, this.maxLat_], @@ -990,15 +1013,22 @@ class Graticule extends VectorLayer { 8 ); - this.maxLatP_ = worldExtentP[3]; - this.maxLonP_ = worldExtentP[2]; - this.minLatP_ = worldExtentP[1]; - this.minLonP_ = worldExtentP[0]; + this.minX_ = worldExtentP[0]; + this.maxX_ = worldExtentP[2]; + this.minY_ = worldExtentP[1]; + this.maxY_ = worldExtentP[3]; - this.blLonLatP_ = this.fromLonLatTransform_([this.minLon_, this.minLat_]); - this.brLonLatP_ = this.fromLonLatTransform_([this.maxLon_, this.minLat_]); - this.tlLonLatP_ = this.fromLonLatTransform_([this.minLon_, this.maxLat_]); - this.trLonLatP_ = this.fromLonLatTransform_([this.maxLon_, this.maxLat_]); + // Determine the view projection coordinates of the extremities of the world extent + // as these may lie inside a view extent (for example the pole in a polar projection) + + this.bottomLeft_ = this.fromLonLatTransform_([this.minLon_, this.minLat_]); + this.bottomRight_ = this.fromLonLatTransform_([this.maxLon_, this.minLat_]); + this.topLeft_ = this.fromLonLatTransform_([this.minLon_, this.maxLat_]); + this.topRight_ = this.fromLonLatTransform_([this.maxLon_, this.maxLat_]); + + // Transform the projection center to lon lat + // Some projections may have a void area at the poles + // so replace any NaN latitudes with the min or max value closest to a pole this.projectionCenterLonLat_ = this.toLonLatTransform_(getCenter(projection.getExtent())); if (isNaN(this.projectionCenterLonLat_[1])) { From 203f5578836f346015964cb642d94742a0b29c90 Mon Sep 17 00:00:00 2001 From: mike-000 <49240900+mike-000@users.noreply.github.com> Date: Thu, 27 Feb 2020 20:53:58 +0000 Subject: [PATCH 34/72] Ensure example opens at correct zoom Set multiWorld: true so view opens at zoom 2 on wide displays Set wrapX false on source --- examples/modify-test.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/examples/modify-test.js b/examples/modify-test.js index f399546a03..5da43080af 100644 --- a/examples/modify-test.js +++ b/examples/modify-test.js @@ -140,7 +140,8 @@ const geojsonObject = { }; const source = new VectorSource({ - features: (new GeoJSON()).readFeatures(geojsonObject) + features: (new GeoJSON()).readFeatures(geojsonObject), + wrapX: false }); const layer = new VectorLayer({ @@ -232,6 +233,7 @@ const map = new Map({ target: 'map', view: new View({ center: [0, 1000000], - zoom: 2 + zoom: 2, + multiWorld: true }) }); From 47ed2963c4059517a9aebf5296e96e077b288444 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Thu, 27 Feb 2020 22:50:03 +0100 Subject: [PATCH 35/72] Default exported classes have same prettyname as modules --- config/jsdoc/api/plugins/api.js | 23 +++++++++++++++++++++++ config/jsdoc/api/template/publish.js | 20 ++++++++------------ 2 files changed, 31 insertions(+), 12 deletions(-) diff --git a/config/jsdoc/api/plugins/api.js b/config/jsdoc/api/plugins/api.js index 0ebda4f356..b5ff2190ab 100644 --- a/config/jsdoc/api/plugins/api.js +++ b/config/jsdoc/api/plugins/api.js @@ -106,6 +106,20 @@ function includeTypes(doclet) { } } +const defaultExports = {}; +const path = require('path'); +const moduleRoot = path.join(process.cwd(), 'src'); + +// Tag default exported Identifiers because their name should be the same as the module name. +exports.astNodeVisitor = { + visitNode: function(node, e, parser, currentSourceName) { + if (node.type === 'Identifier' && node.parent.type === 'ExportDefaultDeclaration') { + const modulePath = path.relative(moduleRoot, currentSourceName).replace(/\.js$/, ''); + defaultExports['module:' + modulePath + '~' + node.name] = true; + } + } +}; + exports.handlers = { newDoclet: function(e) { @@ -169,6 +183,15 @@ exports.handlers = { delete doclet.undocumented; } } + }, + + processingComplete(e) { + const byLongname = e.doclets.index.longname; + for (const name in defaultExports) { + byLongname[name].forEach(function(doclet) { + doclet.isDefaultExport = true; + }); + } } }; diff --git a/config/jsdoc/api/template/publish.js b/config/jsdoc/api/template/publish.js index d8222784dc..3ac0e65570 100644 --- a/config/jsdoc/api/template/publish.js +++ b/config/jsdoc/api/template/publish.js @@ -188,14 +188,10 @@ function attachModuleSymbols(doclets, modules) { }); } -function getPrettyName(longname) { - const fullname = longname.replace('module:', ''); - const parts = fullname.split(/[~\.]/); - if (parts.length > 1) { - const pathParts = parts[0].split('/'); - if (parts[parts.length - 1] === pathParts[pathParts.length - 1]) { - return parts[0]; - } +function getPrettyName(doclet) { + const fullname = doclet.longname.replace('module:', ''); + if (doclet.isDefaultExport) { + return fullname.split('~')[0]; } return fullname; } @@ -218,8 +214,8 @@ function buildNav(members) { // merge namespaces and classes, then sort const merged = members.modules.concat(members.classes); merged.sort(function(a, b) { - const prettyNameA = getPrettyName(a.longname).toLowerCase(); - const prettyNameB = getPrettyName(b.longname).toLowerCase(); + const prettyNameA = getPrettyName(a).toLowerCase(); + const prettyNameB = getPrettyName(b).toLowerCase(); if (prettyNameA > prettyNameB) { return 1; } @@ -235,7 +231,7 @@ function buildNav(members) { nav.push({ type: 'class', longname: v.longname, - prettyname: getPrettyName(v.longname), + prettyname: getPrettyName(v), name: v.name, module: find({ kind: 'module', @@ -286,7 +282,7 @@ function buildNav(members) { nav.push({ type: 'module', longname: v.longname, - prettyname: getPrettyName(v.longname), + prettyname: getPrettyName(v), name: v.name, members: members, methods: methods, From bc8499472c71306357b9ccf805cddee1a8c1083c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Thu, 27 Feb 2020 22:56:33 +0100 Subject: [PATCH 36/72] Current item may be undefined Worked fine before, but better safe than sorry. --- config/jsdoc/api/template/static/scripts/main.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/config/jsdoc/api/template/static/scripts/main.js b/config/jsdoc/api/template/static/scripts/main.js index d0fb7b12f4..8a053e5c7a 100644 --- a/config/jsdoc/api/template/static/scripts/main.js +++ b/config/jsdoc/api/template/static/scripts/main.js @@ -71,10 +71,12 @@ $(function () { .replace(/_/g, '/') .replace(/-/g, '~'); const currentItem = navListNode.querySelector('.item[data-longname="' + longname + '"]'); - $navList.prepend(currentItem); + if (currentItem) { + $navList.prepend(currentItem); + } return { $navList: $navList, - $currentItem: $(currentItem), + $currentItem: currentItem ? $(currentItem) : undefined, lastSearchTerm: undefined, lastState: {}, getClassList: function () { @@ -138,7 +140,7 @@ $(function () { // Restore the original, sorted order search.$navList.append(search.getClassList()); } - if (state === 'search-empty') { + if (state === 'search-empty' && search.$currentItem) { search.manualToggle(search.$currentItem, true); } } else { From e484eca1a16291577f2f8105c123731c400c23c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Thu, 27 Feb 2020 23:47:22 +0100 Subject: [PATCH 37/72] Some more cleanup No need to sort beforehand and therefore sorting can be done at last too. Also forEach is just fine, no need for underscore. This changes the navigation default order for modules to be after classes when the name is the same. --- config/jsdoc/api/template/publish.js | 104 +++++++++++++-------------- 1 file changed, 51 insertions(+), 53 deletions(-) diff --git a/config/jsdoc/api/template/publish.js b/config/jsdoc/api/template/publish.js index 3ac0e65570..c1d4b56156 100644 --- a/config/jsdoc/api/template/publish.js +++ b/config/jsdoc/api/template/publish.js @@ -14,7 +14,6 @@ const path = require('jsdoc/lib/jsdoc/path'); const taffy = require('taffydb').taffy; const handle = require('jsdoc/lib/jsdoc/util/error').handle; const helper = require('jsdoc/lib/jsdoc/util/templateHelper'); -const _ = require('underscore'); const htmlsafe = helper.htmlsafe; const linkto = helper.linkto; const resolveAuthorLinks = helper.resolveAuthorLinks; @@ -211,23 +210,9 @@ function getPrettyName(doclet) { */ function buildNav(members) { const nav = []; - // merge namespaces and classes, then sort - const merged = members.modules.concat(members.classes); - merged.sort(function(a, b) { - const prettyNameA = getPrettyName(a).toLowerCase(); - const prettyNameB = getPrettyName(b).toLowerCase(); - if (prettyNameA > prettyNameB) { - return 1; - } - if (prettyNameA < prettyNameB) { - return -1; - } - return 0; - }); - - _.each(merged, function(v) { + members.classes.forEach(function(v) { // exclude interfaces from sidebar - if (v.interface !== true && v.kind === 'class') { + if (v.interface !== true) { nav.push({ type: 'class', longname: v.longname, @@ -255,44 +240,57 @@ function buildNav(members) { memberof: v.longname }) }); - } else if (v.kind == 'module') { - const classes = find({ - kind: 'class', - memberof: v.longname - }); - const members = find({ - kind: 'member', - memberof: v.longname - }); - const methods = find({ - kind: 'function', - memberof: v.longname - }); - const typedefs = find({ - kind: 'typedef', - memberof: v.longname - }); - const events = find({ - kind: 'event', - memberof: v.longname - }); - // Only add modules that contain more than just classes with their - // associated Options typedef - if (typedefs.length > classes.length || members.length + methods.length > 0) { - nav.push({ - type: 'module', - longname: v.longname, - prettyname: getPrettyName(v), - name: v.name, - members: members, - methods: methods, - typedefs: typedefs, - fires: v.fires, - events: events - }); - } } }); + members.modules.forEach(function(v) { + const classes = find({ + kind: 'class', + memberof: v.longname + }); + const members = find({ + kind: 'member', + memberof: v.longname + }); + const methods = find({ + kind: 'function', + memberof: v.longname + }); + const typedefs = find({ + kind: 'typedef', + memberof: v.longname + }); + const events = find({ + kind: 'event', + memberof: v.longname + }); + // Only add modules that contain more than just classes with their + // associated Options typedef + if (typedefs.length > classes.length || members.length + methods.length > 0) { + nav.push({ + type: 'module', + longname: v.longname, + prettyname: getPrettyName(v), + name: v.name, + members: members, + methods: methods, + typedefs: typedefs, + fires: v.fires, + events: events + }); + } + }); + + nav.sort(function(a, b) { + const prettyNameA = a.prettyname.toLowerCase(); + const prettyNameB = b.prettyname.toLowerCase(); + if (prettyNameA > prettyNameB) { + return 1; + } + if (prettyNameA < prettyNameB) { + return -1; + } + return 0; + }); return nav; } From d28be3c1600b5152a5802702a4e8677ce90ffdbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Fri, 28 Feb 2020 21:44:06 +0100 Subject: [PATCH 38/72] Fix building apidoc on windows --- config/jsdoc/api/plugins/api.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/jsdoc/api/plugins/api.js b/config/jsdoc/api/plugins/api.js index b5ff2190ab..edeaf1b3b9 100644 --- a/config/jsdoc/api/plugins/api.js +++ b/config/jsdoc/api/plugins/api.js @@ -115,7 +115,7 @@ exports.astNodeVisitor = { visitNode: function(node, e, parser, currentSourceName) { if (node.type === 'Identifier' && node.parent.type === 'ExportDefaultDeclaration') { const modulePath = path.relative(moduleRoot, currentSourceName).replace(/\.js$/, ''); - defaultExports['module:' + modulePath + '~' + node.name] = true; + defaultExports['module:' + modulePath.replace(/\\/g, '/') + '~' + node.name] = true; } } }; From 5ba978311ed6fada5d15c8fcf4024f1c55a2b234 Mon Sep 17 00:00:00 2001 From: mike-000 <49240900+mike-000@users.noreply.github.com> Date: Fri, 28 Feb 2020 21:47:22 +0000 Subject: [PATCH 39/72] Fix "Cannot read property 'anchor' of undefined" --- src/ol/View.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/ol/View.js b/src/ol/View.js index 27ab568daa..8a8234c354 100644 --- a/src/ol/View.js +++ b/src/ol/View.js @@ -609,10 +609,14 @@ class View extends BaseObject { if (series[0].callback) { animationCallback(series[0].callback, false); } - anchor = anchor || - series.filter(function(animation) { + if (!anchor) { + const animations = series.filter(function(animation) { return !animation.complete; - })[0].anchor; + }); + if (animations.length > 0) { + anchor = animations[0].anchor; + } + } } this.animations_.length = 0; this.cancelAnchor_ = anchor; From ce6d7bd55cd43832764778b27b4c32fe24fd34ef Mon Sep 17 00:00:00 2001 From: mike-000 <49240900+mike-000@users.noreply.github.com> Date: Sat, 29 Feb 2020 10:12:48 +0000 Subject: [PATCH 40/72] Fix "Cannot read property 'anchor' of undefined" replace unnecessary filter with for loop and break --- src/ol/View.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/ol/View.js b/src/ol/View.js index 8a8234c354..9b5211fdf1 100644 --- a/src/ol/View.js +++ b/src/ol/View.js @@ -610,11 +610,12 @@ class View extends BaseObject { animationCallback(series[0].callback, false); } if (!anchor) { - const animations = series.filter(function(animation) { - return !animation.complete; - }); - if (animations.length > 0) { - anchor = animations[0].anchor; + for (let j = 0, jj = series.length; j < jj; ++j) { + const animation = series[j]; + if (!animation.complete) { + anchor = animation.anchor; + break; + } } } } From 1d7d7a7eefc73f0f6f9c495aec2b6c048cca8993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Sat, 29 Feb 2020 23:28:51 +0100 Subject: [PATCH 41/72] Sort events / observables in all cases Right now this only changes the order of events of the UrlTile class. --- config/jsdoc/api/plugins/api.js | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/config/jsdoc/api/plugins/api.js b/config/jsdoc/api/plugins/api.js index edeaf1b3b9..0c4d80e85e 100644 --- a/config/jsdoc/api/plugins/api.js +++ b/config/jsdoc/api/plugins/api.js @@ -120,6 +120,19 @@ exports.astNodeVisitor = { } }; +function sortOtherMembers(doclet) { + if (doclet.fires) { + doclet.fires.sort(function(a, b) { + return a.split(/#?event:/)[1] < b.split(/#?event:/)[1] ? -1 : 1; + }); + } + if (doclet.observables) { + doclet.observables.sort(function(a, b) { + return a.name < b.name ? -1 : 1; + }); + } +} + exports.handlers = { newDoclet: function(e) { @@ -149,16 +162,7 @@ exports.handlers = { if (doclet.kind == 'class') { includeAugments(doclet); } - if (doclet.fires) { - doclet.fires.sort(function(a, b) { - return a.split(/#?event:/)[1] < b.split(/#?event:/)[1] ? -1 : 1; - }); - } - if (doclet.observables) { - doclet.observables.sort(function(a, b) { - return a.name < b.name ? -1 : 1; - }); - } + sortOtherMembers(doclet); // Always document namespaces and items with stability annotation continue; } @@ -175,6 +179,7 @@ exports.handlers = { // constructor from the docs. doclet._hideConstructor = true; includeAugments(doclet); + sortOtherMembers(doclet); } else if (!doclet._hideConstructor && !(doclet.kind == 'typedef' && doclet.longname in types)) { // Remove all other undocumented symbols doclet.undocumented = true; From 3014df167773042ef72f9c20acfd1ae5d403de1f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 2 Mar 2020 08:42:59 +0000 Subject: [PATCH 42/72] Bump @babel/core from 7.8.4 to 7.8.6 Bumps [@babel/core](https://github.com/babel/babel) from 7.8.4 to 7.8.6. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.8.4...v7.8.6) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 200 ++++++++-------------------------------------- 1 file changed, 32 insertions(+), 168 deletions(-) diff --git a/package-lock.json b/package-lock.json index 53c84749ee..e3f0233f24 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,18 +25,18 @@ } }, "@babel/core": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.8.4.tgz", - "integrity": "sha512-0LiLrB2PwrVI+a2/IEskBopDYSd8BCb3rOvH7D5tzoWd696TBEduBvuLVm4Nx6rltrLZqvI3MCalB2K2aVzQjA==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.8.6.tgz", + "integrity": "sha512-Sheg7yEJD51YHAvLEV/7Uvw95AeWqYPL3Vk3zGujJKIhJ+8oLw2ALaf3hbucILhKsgSoADOvtKRJuNVdcJkOrg==", "dev": true, "requires": { "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.8.4", + "@babel/generator": "^7.8.6", "@babel/helpers": "^7.8.4", - "@babel/parser": "^7.8.4", - "@babel/template": "^7.8.3", - "@babel/traverse": "^7.8.4", - "@babel/types": "^7.8.3", + "@babel/parser": "^7.8.6", + "@babel/template": "^7.8.6", + "@babel/traverse": "^7.8.6", + "@babel/types": "^7.8.6", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.1", @@ -57,46 +57,17 @@ } }, "@babel/generator": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.4.tgz", - "integrity": "sha512-PwhclGdRpNAf3IxZb0YVuITPZmmrXz9zf6fH8lT4XbrmfQKr6ryBzhv593P5C6poJRciFCL/eHGW2NuGrgEyxA==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.6.tgz", + "integrity": "sha512-4bpOR5ZBz+wWcMeVtcf7FbjcFzCp+817z2/gHNncIRcM9MmKzUhtWCYAq27RAfUrAFwb+OCG1s9WEaVxfi6cjg==", "dev": true, "requires": { - "@babel/types": "^7.8.3", + "@babel/types": "^7.8.6", "jsesc": "^2.5.1", "lodash": "^4.17.13", "source-map": "^0.5.0" } }, - "@babel/helper-function-name": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz", - "integrity": "sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==", - "dev": true, - "requires": { - "@babel/helper-get-function-arity": "^7.8.3", - "@babel/template": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz", - "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==", - "dev": true, - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz", - "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==", - "dev": true, - "requires": { - "@babel/types": "^7.8.3" - } - }, "@babel/highlight": { "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz", @@ -109,43 +80,43 @@ } }, "@babel/parser": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.4.tgz", - "integrity": "sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.6.tgz", + "integrity": "sha512-trGNYSfwq5s0SgM1BMEB8hX3NDmO7EP2wsDGDexiaKMB92BaRpS+qZfpkMqUBhcsOTBwNy9B/jieo4ad/t/z2g==", "dev": true }, "@babel/template": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.3.tgz", - "integrity": "sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", + "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", "dev": true, "requires": { "@babel/code-frame": "^7.8.3", - "@babel/parser": "^7.8.3", - "@babel/types": "^7.8.3" + "@babel/parser": "^7.8.6", + "@babel/types": "^7.8.6" } }, "@babel/traverse": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.4.tgz", - "integrity": "sha512-NGLJPZwnVEyBPLI+bl9y9aSnxMhsKz42so7ApAv9D+b4vAFPpY013FTS9LdKxcABoIYFU52HcYga1pPlx454mg==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.6.tgz", + "integrity": "sha512-2B8l0db/DPi8iinITKuo7cbPznLCEk0kCxDoB9/N6gGNg/gxOXiR/IcymAFPiBwk5w6TtQ27w4wpElgp9btR9A==", "dev": true, "requires": { "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.8.4", + "@babel/generator": "^7.8.6", "@babel/helper-function-name": "^7.8.3", "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/parser": "^7.8.4", - "@babel/types": "^7.8.3", + "@babel/parser": "^7.8.6", + "@babel/types": "^7.8.6", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.13" } }, "@babel/types": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.3.tgz", - "integrity": "sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", + "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", "dev": true, "requires": { "esutils": "^2.0.2", @@ -1365,123 +1336,16 @@ "@babel/types": "^7.8.3" }, "dependencies": { - "@babel/code-frame": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", - "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", - "dev": true, - "requires": { - "@babel/highlight": "^7.8.3" - } - }, - "@babel/generator": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.4.tgz", - "integrity": "sha512-PwhclGdRpNAf3IxZb0YVuITPZmmrXz9zf6fH8lT4XbrmfQKr6ryBzhv593P5C6poJRciFCL/eHGW2NuGrgEyxA==", - "dev": true, - "requires": { - "@babel/types": "^7.8.3", - "jsesc": "^2.5.1", - "lodash": "^4.17.13", - "source-map": "^0.5.0" - } - }, - "@babel/helper-function-name": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz", - "integrity": "sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==", - "dev": true, - "requires": { - "@babel/helper-get-function-arity": "^7.8.3", - "@babel/template": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz", - "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==", - "dev": true, - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz", - "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==", - "dev": true, - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/highlight": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz", - "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==", - "dev": true, - "requires": { - "chalk": "^2.0.0", - "esutils": "^2.0.2", - "js-tokens": "^4.0.0" - } - }, - "@babel/parser": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.4.tgz", - "integrity": "sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw==", - "dev": true - }, - "@babel/template": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.3.tgz", - "integrity": "sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/parser": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, - "@babel/traverse": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.4.tgz", - "integrity": "sha512-NGLJPZwnVEyBPLI+bl9y9aSnxMhsKz42so7ApAv9D+b4vAFPpY013FTS9LdKxcABoIYFU52HcYga1pPlx454mg==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.8.4", - "@babel/helper-function-name": "^7.8.3", - "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/parser": "^7.8.4", - "@babel/types": "^7.8.3", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.13" - } - }, "@babel/types": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.3.tgz", - "integrity": "sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", + "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", "dev": true, "requires": { "esutils": "^2.0.2", "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" } - }, - "jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", - "dev": true - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true } } }, From 9f6b021000304d13b32e036afebc27b60a67eafc Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 2 Mar 2020 08:44:00 +0000 Subject: [PATCH 43/72] Bump mocha from 7.0.1 to 7.1.0 Bumps [mocha](https://github.com/mochajs/mocha) from 7.0.1 to 7.1.0. - [Release notes](https://github.com/mochajs/mocha/releases) - [Changelog](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md) - [Commits](https://github.com/mochajs/mocha/compare/v7.0.1...v7.1.0) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 53c84749ee..c41238a81b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8573,12 +8573,12 @@ "dev": true }, "log-symbols": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz", - "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz", + "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==", "dev": true, "requires": { - "chalk": "^2.0.1" + "chalk": "^2.4.2" } }, "log4js": { @@ -8972,9 +8972,9 @@ } }, "mocha": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-7.0.1.tgz", - "integrity": "sha512-9eWmWTdHLXh72rGrdZjNbG3aa1/3NRPpul1z0D979QpEnFdCG0Q5tv834N+94QEN2cysfV72YocQ3fn87s70fg==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-7.1.0.tgz", + "integrity": "sha512-MymHK8UkU0K15Q/zX7uflZgVoRWiTjy0fXE/QjKts6mowUvGxOdPhZ2qj3b0iZdUrNZlW9LAIMFHB4IW+2b3EQ==", "dev": true, "requires": { "ansi-colors": "3.2.3", @@ -8988,7 +8988,7 @@ "growl": "1.10.5", "he": "1.2.0", "js-yaml": "3.13.1", - "log-symbols": "2.2.0", + "log-symbols": "3.0.0", "minimatch": "3.0.4", "mkdirp": "0.5.1", "ms": "2.1.1", diff --git a/package.json b/package.json index 11ae5d3f71..473fce6634 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "karma-webpack": "^4.0.0-rc.2", "loglevelnext": "^3.0.1", "marked": "0.8.0", - "mocha": "7.0.1", + "mocha": "7.1.0", "ol-mapbox-style": "^6.0.0", "pixelmatch": "^5.1.0", "pngjs": "^3.4.0", From f59f4e2d563c164d770066534029c66b89780d46 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 2 Mar 2020 08:44:52 +0000 Subject: [PATCH 44/72] Bump @babel/preset-env from 7.8.4 to 7.8.6 Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.8.4 to 7.8.6. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.8.4...v7.8.6) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 976 ++++++---------------------------------------- 1 file changed, 118 insertions(+), 858 deletions(-) diff --git a/package-lock.json b/package-lock.json index 53c84749ee..79cab728fb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,9 +14,9 @@ } }, "@babel/compat-data": { - "version": "7.8.5", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.8.5.tgz", - "integrity": "sha512-jWYUqQX/ObOhG1UiEkbH5SANsE/8oKXiQWjj7p7xgj9Zmnt//aUvyz4dBkK0HNsS8/cbyC5NmmH87VekW+mXFg==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.8.6.tgz", + "integrity": "sha512-CurCIKPTkS25Mb8mz267vU95vy+TyUpnctEX2lV33xWNmHAfjruztgiPBbXZRh3xZZy1CYvGx6XfxyTVS+sk7Q==", "dev": true, "requires": { "browserslist": "^4.8.5", @@ -232,9 +232,9 @@ }, "dependencies": { "@babel/types": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.3.tgz", - "integrity": "sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", + "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", "dev": true, "requires": { "esutils": "^2.0.2", @@ -255,9 +255,9 @@ }, "dependencies": { "@babel/types": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.3.tgz", - "integrity": "sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", + "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", "dev": true, "requires": { "esutils": "^2.0.2", @@ -278,133 +278,26 @@ "@babel/types": "^7.8.3" }, "dependencies": { - "@babel/code-frame": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", - "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", - "dev": true, - "requires": { - "@babel/highlight": "^7.8.3" - } - }, - "@babel/generator": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.4.tgz", - "integrity": "sha512-PwhclGdRpNAf3IxZb0YVuITPZmmrXz9zf6fH8lT4XbrmfQKr6ryBzhv593P5C6poJRciFCL/eHGW2NuGrgEyxA==", - "dev": true, - "requires": { - "@babel/types": "^7.8.3", - "jsesc": "^2.5.1", - "lodash": "^4.17.13", - "source-map": "^0.5.0" - } - }, - "@babel/helper-function-name": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz", - "integrity": "sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==", - "dev": true, - "requires": { - "@babel/helper-get-function-arity": "^7.8.3", - "@babel/template": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz", - "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==", - "dev": true, - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz", - "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==", - "dev": true, - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/highlight": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz", - "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==", - "dev": true, - "requires": { - "chalk": "^2.0.0", - "esutils": "^2.0.2", - "js-tokens": "^4.0.0" - } - }, - "@babel/parser": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.4.tgz", - "integrity": "sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw==", - "dev": true - }, - "@babel/template": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.3.tgz", - "integrity": "sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/parser": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, - "@babel/traverse": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.4.tgz", - "integrity": "sha512-NGLJPZwnVEyBPLI+bl9y9aSnxMhsKz42so7ApAv9D+b4vAFPpY013FTS9LdKxcABoIYFU52HcYga1pPlx454mg==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.8.4", - "@babel/helper-function-name": "^7.8.3", - "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/parser": "^7.8.4", - "@babel/types": "^7.8.3", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.13" - } - }, "@babel/types": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.3.tgz", - "integrity": "sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", + "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", "dev": true, "requires": { "esutils": "^2.0.2", "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" } - }, - "jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", - "dev": true - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true } } }, "@babel/helper-compilation-targets": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.4.tgz", - "integrity": "sha512-3k3BsKMvPp5bjxgMdrFyq0UaEO48HciVrOVF0+lon8pp95cyJ2ujAh0TrBHNMnJGT2rr0iKOJPFFbSqjDyf/Pg==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.6.tgz", + "integrity": "sha512-UrJdk27hKVJSnibFcUWYLkCL0ZywTUoot8yii1lsHJcvwrypagmYKjHLMWivQPm4s6GdyygCL8fiH5EYLxhQwQ==", "dev": true, "requires": { - "@babel/compat-data": "^7.8.4", + "@babel/compat-data": "^7.8.6", "browserslist": "^4.8.5", "invariant": "^2.2.4", "levenary": "^1.1.1", @@ -412,11 +305,12 @@ } }, "@babel/helper-create-regexp-features-plugin": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.3.tgz", - "integrity": "sha512-Gcsm1OHCUr9o9TcJln57xhWHtdXbA2pgQ58S0Lxlks0WMGNXuki4+GLfX0p+L2ZkINUGZvfkz8rzoqJQSthI+Q==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.6.tgz", + "integrity": "sha512-bPyujWfsHhV/ztUkwGHz/RPV1T1TDEsSZDsN42JPehndA+p1KKTh3npvTadux0ZhCrytx9tvjpWNowKby3tM6A==", "dev": true, "requires": { + "@babel/helper-annotate-as-pure": "^7.8.3", "@babel/helper-regex": "^7.8.3", "regexpu-core": "^4.6.0" }, @@ -457,67 +351,10 @@ "lodash": "^4.17.13" }, "dependencies": { - "@babel/code-frame": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", - "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", - "dev": true, - "requires": { - "@babel/highlight": "^7.8.3" - } - }, - "@babel/helper-function-name": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz", - "integrity": "sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==", - "dev": true, - "requires": { - "@babel/helper-get-function-arity": "^7.8.3", - "@babel/template": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz", - "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==", - "dev": true, - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/highlight": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz", - "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==", - "dev": true, - "requires": { - "chalk": "^2.0.0", - "esutils": "^2.0.2", - "js-tokens": "^4.0.0" - } - }, - "@babel/parser": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.4.tgz", - "integrity": "sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw==", - "dev": true - }, - "@babel/template": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.3.tgz", - "integrity": "sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/parser": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, "@babel/types": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.3.tgz", - "integrity": "sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", + "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", "dev": true, "requires": { "esutils": "^2.0.2", @@ -537,123 +374,16 @@ "@babel/types": "^7.8.3" }, "dependencies": { - "@babel/code-frame": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", - "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", - "dev": true, - "requires": { - "@babel/highlight": "^7.8.3" - } - }, - "@babel/generator": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.4.tgz", - "integrity": "sha512-PwhclGdRpNAf3IxZb0YVuITPZmmrXz9zf6fH8lT4XbrmfQKr6ryBzhv593P5C6poJRciFCL/eHGW2NuGrgEyxA==", - "dev": true, - "requires": { - "@babel/types": "^7.8.3", - "jsesc": "^2.5.1", - "lodash": "^4.17.13", - "source-map": "^0.5.0" - } - }, - "@babel/helper-function-name": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz", - "integrity": "sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==", - "dev": true, - "requires": { - "@babel/helper-get-function-arity": "^7.8.3", - "@babel/template": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz", - "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==", - "dev": true, - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz", - "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==", - "dev": true, - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/highlight": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz", - "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==", - "dev": true, - "requires": { - "chalk": "^2.0.0", - "esutils": "^2.0.2", - "js-tokens": "^4.0.0" - } - }, - "@babel/parser": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.4.tgz", - "integrity": "sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw==", - "dev": true - }, - "@babel/template": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.3.tgz", - "integrity": "sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/parser": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, - "@babel/traverse": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.4.tgz", - "integrity": "sha512-NGLJPZwnVEyBPLI+bl9y9aSnxMhsKz42so7ApAv9D+b4vAFPpY013FTS9LdKxcABoIYFU52HcYga1pPlx454mg==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.8.4", - "@babel/helper-function-name": "^7.8.3", - "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/parser": "^7.8.4", - "@babel/types": "^7.8.3", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.13" - } - }, "@babel/types": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.3.tgz", - "integrity": "sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", + "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", "dev": true, "requires": { "esutils": "^2.0.2", "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" } - }, - "jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", - "dev": true - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true } } }, @@ -713,9 +443,9 @@ }, "dependencies": { "@babel/types": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.3.tgz", - "integrity": "sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", + "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", "dev": true, "requires": { "esutils": "^2.0.2", @@ -735,9 +465,9 @@ }, "dependencies": { "@babel/types": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.3.tgz", - "integrity": "sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", + "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", "dev": true, "requires": { "esutils": "^2.0.2", @@ -757,16 +487,17 @@ } }, "@babel/helper-module-transforms": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.8.3.tgz", - "integrity": "sha512-C7NG6B7vfBa/pwCOshpMbOYUmrYQDfCpVL/JCRu0ek8B5p8kue1+BCXpg2vOYs7w5ACB9GTOBYQ5U6NwrMg+3Q==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.8.6.tgz", + "integrity": "sha512-RDnGJSR5EFBJjG3deY0NiL0K9TO8SXxS9n/MPsbPK/s9LbQymuLNtlzvDiNS7IpecuL45cMeLVkA+HfmlrnkRg==", "dev": true, "requires": { "@babel/helper-module-imports": "^7.8.3", + "@babel/helper-replace-supers": "^7.8.6", "@babel/helper-simple-access": "^7.8.3", "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/template": "^7.8.3", - "@babel/types": "^7.8.3", + "@babel/template": "^7.8.6", + "@babel/types": "^7.8.6", "lodash": "^4.17.13" }, "dependencies": { @@ -788,15 +519,6 @@ "@babel/types": "^7.8.3" } }, - "@babel/helper-split-export-declaration": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz", - "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==", - "dev": true, - "requires": { - "@babel/types": "^7.8.3" - } - }, "@babel/highlight": { "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz", @@ -809,26 +531,26 @@ } }, "@babel/parser": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.4.tgz", - "integrity": "sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.6.tgz", + "integrity": "sha512-trGNYSfwq5s0SgM1BMEB8hX3NDmO7EP2wsDGDexiaKMB92BaRpS+qZfpkMqUBhcsOTBwNy9B/jieo4ad/t/z2g==", "dev": true }, "@babel/template": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.3.tgz", - "integrity": "sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", + "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", "dev": true, "requires": { "@babel/code-frame": "^7.8.3", - "@babel/parser": "^7.8.3", - "@babel/types": "^7.8.3" + "@babel/parser": "^7.8.6", + "@babel/types": "^7.8.6" } }, "@babel/types": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.3.tgz", - "integrity": "sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", + "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", "dev": true, "requires": { "esutils": "^2.0.2", @@ -848,9 +570,9 @@ }, "dependencies": { "@babel/types": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.3.tgz", - "integrity": "sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", + "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", "dev": true, "requires": { "esutils": "^2.0.2", @@ -888,136 +610,29 @@ "@babel/types": "^7.8.3" }, "dependencies": { - "@babel/code-frame": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", - "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", - "dev": true, - "requires": { - "@babel/highlight": "^7.8.3" - } - }, - "@babel/generator": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.4.tgz", - "integrity": "sha512-PwhclGdRpNAf3IxZb0YVuITPZmmrXz9zf6fH8lT4XbrmfQKr6ryBzhv593P5C6poJRciFCL/eHGW2NuGrgEyxA==", - "dev": true, - "requires": { - "@babel/types": "^7.8.3", - "jsesc": "^2.5.1", - "lodash": "^4.17.13", - "source-map": "^0.5.0" - } - }, - "@babel/helper-function-name": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz", - "integrity": "sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==", - "dev": true, - "requires": { - "@babel/helper-get-function-arity": "^7.8.3", - "@babel/template": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz", - "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==", - "dev": true, - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz", - "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==", - "dev": true, - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/highlight": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz", - "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==", - "dev": true, - "requires": { - "chalk": "^2.0.0", - "esutils": "^2.0.2", - "js-tokens": "^4.0.0" - } - }, - "@babel/parser": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.4.tgz", - "integrity": "sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw==", - "dev": true - }, - "@babel/template": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.3.tgz", - "integrity": "sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/parser": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, - "@babel/traverse": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.4.tgz", - "integrity": "sha512-NGLJPZwnVEyBPLI+bl9y9aSnxMhsKz42so7ApAv9D+b4vAFPpY013FTS9LdKxcABoIYFU52HcYga1pPlx454mg==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.8.4", - "@babel/helper-function-name": "^7.8.3", - "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/parser": "^7.8.4", - "@babel/types": "^7.8.3", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.13" - } - }, "@babel/types": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.3.tgz", - "integrity": "sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", + "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", "dev": true, "requires": { "esutils": "^2.0.2", "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" } - }, - "jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", - "dev": true - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true } } }, "@babel/helper-replace-supers": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.3.tgz", - "integrity": "sha512-xOUssL6ho41U81etpLoT2RTdvdus4VfHamCuAm4AHxGr+0it5fnwoVdwUJ7GFEqCsQYzJUhcbsN9wB9apcYKFA==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz", + "integrity": "sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==", "dev": true, "requires": { "@babel/helper-member-expression-to-functions": "^7.8.3", "@babel/helper-optimise-call-expression": "^7.8.3", - "@babel/traverse": "^7.8.3", - "@babel/types": "^7.8.3" + "@babel/traverse": "^7.8.6", + "@babel/types": "^7.8.6" }, "dependencies": { "@babel/code-frame": { @@ -1030,46 +645,17 @@ } }, "@babel/generator": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.4.tgz", - "integrity": "sha512-PwhclGdRpNAf3IxZb0YVuITPZmmrXz9zf6fH8lT4XbrmfQKr6ryBzhv593P5C6poJRciFCL/eHGW2NuGrgEyxA==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.6.tgz", + "integrity": "sha512-4bpOR5ZBz+wWcMeVtcf7FbjcFzCp+817z2/gHNncIRcM9MmKzUhtWCYAq27RAfUrAFwb+OCG1s9WEaVxfi6cjg==", "dev": true, "requires": { - "@babel/types": "^7.8.3", + "@babel/types": "^7.8.6", "jsesc": "^2.5.1", "lodash": "^4.17.13", "source-map": "^0.5.0" } }, - "@babel/helper-function-name": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz", - "integrity": "sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==", - "dev": true, - "requires": { - "@babel/helper-get-function-arity": "^7.8.3", - "@babel/template": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz", - "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==", - "dev": true, - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz", - "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==", - "dev": true, - "requires": { - "@babel/types": "^7.8.3" - } - }, "@babel/highlight": { "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz", @@ -1082,43 +668,32 @@ } }, "@babel/parser": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.4.tgz", - "integrity": "sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.6.tgz", + "integrity": "sha512-trGNYSfwq5s0SgM1BMEB8hX3NDmO7EP2wsDGDexiaKMB92BaRpS+qZfpkMqUBhcsOTBwNy9B/jieo4ad/t/z2g==", "dev": true }, - "@babel/template": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.3.tgz", - "integrity": "sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/parser": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, "@babel/traverse": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.4.tgz", - "integrity": "sha512-NGLJPZwnVEyBPLI+bl9y9aSnxMhsKz42so7ApAv9D+b4vAFPpY013FTS9LdKxcABoIYFU52HcYga1pPlx454mg==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.6.tgz", + "integrity": "sha512-2B8l0db/DPi8iinITKuo7cbPznLCEk0kCxDoB9/N6gGNg/gxOXiR/IcymAFPiBwk5w6TtQ27w4wpElgp9btR9A==", "dev": true, "requires": { "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.8.4", + "@babel/generator": "^7.8.6", "@babel/helper-function-name": "^7.8.3", "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/parser": "^7.8.4", - "@babel/types": "^7.8.3", + "@babel/parser": "^7.8.6", + "@babel/types": "^7.8.6", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.13" } }, "@babel/types": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.3.tgz", - "integrity": "sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", + "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", "dev": true, "requires": { "esutils": "^2.0.2", @@ -1150,47 +725,10 @@ "@babel/types": "^7.8.3" }, "dependencies": { - "@babel/code-frame": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", - "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", - "dev": true, - "requires": { - "@babel/highlight": "^7.8.3" - } - }, - "@babel/highlight": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz", - "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==", - "dev": true, - "requires": { - "chalk": "^2.0.0", - "esutils": "^2.0.2", - "js-tokens": "^4.0.0" - } - }, - "@babel/parser": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.4.tgz", - "integrity": "sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw==", - "dev": true - }, - "@babel/template": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.3.tgz", - "integrity": "sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/parser": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, "@babel/types": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.3.tgz", - "integrity": "sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", + "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", "dev": true, "requires": { "esutils": "^2.0.2", @@ -1234,123 +772,16 @@ "@babel/types": "^7.8.3" }, "dependencies": { - "@babel/code-frame": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", - "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", - "dev": true, - "requires": { - "@babel/highlight": "^7.8.3" - } - }, - "@babel/generator": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.4.tgz", - "integrity": "sha512-PwhclGdRpNAf3IxZb0YVuITPZmmrXz9zf6fH8lT4XbrmfQKr6ryBzhv593P5C6poJRciFCL/eHGW2NuGrgEyxA==", - "dev": true, - "requires": { - "@babel/types": "^7.8.3", - "jsesc": "^2.5.1", - "lodash": "^4.17.13", - "source-map": "^0.5.0" - } - }, - "@babel/helper-function-name": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz", - "integrity": "sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==", - "dev": true, - "requires": { - "@babel/helper-get-function-arity": "^7.8.3", - "@babel/template": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz", - "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==", - "dev": true, - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz", - "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==", - "dev": true, - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/highlight": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz", - "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==", - "dev": true, - "requires": { - "chalk": "^2.0.0", - "esutils": "^2.0.2", - "js-tokens": "^4.0.0" - } - }, - "@babel/parser": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.4.tgz", - "integrity": "sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw==", - "dev": true - }, - "@babel/template": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.3.tgz", - "integrity": "sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/parser": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, - "@babel/traverse": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.4.tgz", - "integrity": "sha512-NGLJPZwnVEyBPLI+bl9y9aSnxMhsKz42so7ApAv9D+b4vAFPpY013FTS9LdKxcABoIYFU52HcYga1pPlx454mg==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.8.4", - "@babel/helper-function-name": "^7.8.3", - "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/parser": "^7.8.4", - "@babel/types": "^7.8.3", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.13" - } - }, "@babel/types": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.3.tgz", - "integrity": "sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", + "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", "dev": true, "requires": { "esutils": "^2.0.2", "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" } - }, - "jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", - "dev": true - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true } } }, @@ -1685,9 +1116,9 @@ } }, "@babel/types": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.3.tgz", - "integrity": "sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", + "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", "dev": true, "requires": { "esutils": "^2.0.2", @@ -1717,9 +1148,9 @@ } }, "@babel/plugin-transform-classes": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.8.3.tgz", - "integrity": "sha512-SjT0cwFJ+7Rbr1vQsvphAHwUHvSUPmMjMU/0P59G8U2HLFqSa082JO7zkbDNWs9kH/IUqpHI6xWNesGf8haF1w==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.8.6.tgz", + "integrity": "sha512-k9r8qRay/R6v5aWZkrEclEhKO6mc1CCQr2dLsVHBmOQiMpN6I2bpjX3vgnldUWeEI1GHVNByULVxZ4BdP4Hmdg==", "dev": true, "requires": { "@babel/helper-annotate-as-pure": "^7.8.3", @@ -1727,88 +1158,9 @@ "@babel/helper-function-name": "^7.8.3", "@babel/helper-optimise-call-expression": "^7.8.3", "@babel/helper-plugin-utils": "^7.8.3", - "@babel/helper-replace-supers": "^7.8.3", + "@babel/helper-replace-supers": "^7.8.6", "@babel/helper-split-export-declaration": "^7.8.3", "globals": "^11.1.0" - }, - "dependencies": { - "@babel/code-frame": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", - "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", - "dev": true, - "requires": { - "@babel/highlight": "^7.8.3" - } - }, - "@babel/helper-function-name": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz", - "integrity": "sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==", - "dev": true, - "requires": { - "@babel/helper-get-function-arity": "^7.8.3", - "@babel/template": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz", - "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==", - "dev": true, - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz", - "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==", - "dev": true, - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/highlight": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz", - "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==", - "dev": true, - "requires": { - "chalk": "^2.0.0", - "esutils": "^2.0.2", - "js-tokens": "^4.0.0" - } - }, - "@babel/parser": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.4.tgz", - "integrity": "sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw==", - "dev": true - }, - "@babel/template": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.3.tgz", - "integrity": "sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/parser": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, - "@babel/types": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.3.tgz", - "integrity": "sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==", - "dev": true, - "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.13", - "to-fast-properties": "^2.0.0" - } - } } }, "@babel/plugin-transform-computed-properties": { @@ -1859,9 +1211,9 @@ } }, "@babel/plugin-transform-for-of": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.8.4.tgz", - "integrity": "sha512-iAXNlOWvcYUYoV8YIxwS7TxGRJcxyl8eQCfT+A5j8sKUzRFvJdcyjp97jL2IghWSRDaL2PU2O2tX8Cu9dTBq5A==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.8.6.tgz", + "integrity": "sha512-M0pw4/1/KI5WAxPsdcUL/w2LJ7o89YHN3yLkzNjg7Yl15GlVGgzHyCU+FMeAxevHGsLVmUqbirlUIKTafPmzdw==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.8.3" @@ -1875,76 +1227,6 @@ "requires": { "@babel/helper-function-name": "^7.8.3", "@babel/helper-plugin-utils": "^7.8.3" - }, - "dependencies": { - "@babel/code-frame": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", - "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", - "dev": true, - "requires": { - "@babel/highlight": "^7.8.3" - } - }, - "@babel/helper-function-name": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz", - "integrity": "sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==", - "dev": true, - "requires": { - "@babel/helper-get-function-arity": "^7.8.3", - "@babel/template": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz", - "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==", - "dev": true, - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/highlight": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz", - "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==", - "dev": true, - "requires": { - "chalk": "^2.0.0", - "esutils": "^2.0.2", - "js-tokens": "^4.0.0" - } - }, - "@babel/parser": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.4.tgz", - "integrity": "sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw==", - "dev": true - }, - "@babel/template": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.3.tgz", - "integrity": "sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/parser": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, - "@babel/types": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.3.tgz", - "integrity": "sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==", - "dev": true, - "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.13", - "to-fast-properties": "^2.0.0" - } - } } }, "@babel/plugin-transform-literals": { @@ -2047,28 +1329,6 @@ "@babel/helper-call-delegate": "^7.8.3", "@babel/helper-get-function-arity": "^7.8.3", "@babel/helper-plugin-utils": "^7.8.3" - }, - "dependencies": { - "@babel/helper-get-function-arity": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz", - "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==", - "dev": true, - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/types": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.3.tgz", - "integrity": "sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==", - "dev": true, - "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.13", - "to-fast-properties": "^2.0.0" - } - } } }, "@babel/plugin-transform-property-literals": { @@ -2156,13 +1416,13 @@ } }, "@babel/preset-env": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.8.4.tgz", - "integrity": "sha512-HihCgpr45AnSOHRbS5cWNTINs0TwaR8BS8xIIH+QwiW8cKL0llV91njQMpeMReEPVs+1Ao0x3RLEBLtt1hOq4w==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.8.6.tgz", + "integrity": "sha512-M5u8llV9DIVXBFB/ArIpqJuvXpO+ymxcJ6e8ZAmzeK3sQeBNOD1y+rHvHCGG4TlEmsNpIrdecsHGHT8ZCoOSJg==", "dev": true, "requires": { - "@babel/compat-data": "^7.8.4", - "@babel/helper-compilation-targets": "^7.8.4", + "@babel/compat-data": "^7.8.6", + "@babel/helper-compilation-targets": "^7.8.6", "@babel/helper-module-imports": "^7.8.3", "@babel/helper-plugin-utils": "^7.8.3", "@babel/plugin-proposal-async-generator-functions": "^7.8.3", @@ -2185,13 +1445,13 @@ "@babel/plugin-transform-async-to-generator": "^7.8.3", "@babel/plugin-transform-block-scoped-functions": "^7.8.3", "@babel/plugin-transform-block-scoping": "^7.8.3", - "@babel/plugin-transform-classes": "^7.8.3", + "@babel/plugin-transform-classes": "^7.8.6", "@babel/plugin-transform-computed-properties": "^7.8.3", "@babel/plugin-transform-destructuring": "^7.8.3", "@babel/plugin-transform-dotall-regex": "^7.8.3", "@babel/plugin-transform-duplicate-keys": "^7.8.3", "@babel/plugin-transform-exponentiation-operator": "^7.8.3", - "@babel/plugin-transform-for-of": "^7.8.4", + "@babel/plugin-transform-for-of": "^7.8.6", "@babel/plugin-transform-function-name": "^7.8.3", "@babel/plugin-transform-literals": "^7.8.3", "@babel/plugin-transform-member-expression-literals": "^7.8.3", @@ -2212,7 +1472,7 @@ "@babel/plugin-transform-template-literals": "^7.8.3", "@babel/plugin-transform-typeof-symbol": "^7.8.4", "@babel/plugin-transform-unicode-regex": "^7.8.3", - "@babel/types": "^7.8.3", + "@babel/types": "^7.8.6", "browserslist": "^4.8.5", "core-js-compat": "^3.6.2", "invariant": "^2.2.2", @@ -2230,9 +1490,9 @@ } }, "@babel/types": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.3.tgz", - "integrity": "sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", + "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", "dev": true, "requires": { "esutils": "^2.0.2", @@ -3625,14 +2885,14 @@ } }, "browserslist": { - "version": "4.8.6", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.8.6.tgz", - "integrity": "sha512-ZHao85gf0eZ0ESxLfCp73GG9O/VTytYDIkIiZDlURppLTI9wErSM/5yAKEq6rcUdxBLjMELmrYUJGg5sxGKMHg==", + "version": "4.9.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.9.1.tgz", + "integrity": "sha512-Q0DnKq20End3raFulq6Vfp1ecB9fh8yUNV55s8sekaDDeqBaCtWlRHCUdaWyUeSSBJM7IbM6HcsyaeYqgeDhnw==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001023", - "electron-to-chromium": "^1.3.341", - "node-releases": "^1.1.47" + "caniuse-lite": "^1.0.30001030", + "electron-to-chromium": "^1.3.363", + "node-releases": "^1.1.50" } }, "buble": { @@ -3801,9 +3061,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30001023", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001023.tgz", - "integrity": "sha512-C5TDMiYG11EOhVOA62W1p3UsJ2z4DsHtMBQtjzp3ZsUglcQn62WOUgW0y795c7A5uZ+GCEIvzkMatLIlAsbNTA==", + "version": "1.0.30001031", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001031.tgz", + "integrity": "sha512-DpAP5a1NGRLgYfaNCaXIRyGARi+3tJA2quZXNNA1Du26VyVkqvy2tznNu5ANyN1Y5aX44QDotZSVSUSi2uMGjg==", "dev": true }, "caseless": { @@ -4768,9 +4028,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.344", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.344.tgz", - "integrity": "sha512-tvbx2Wl8WBR+ym3u492D0L6/jH+8NoQXqe46+QhbWH3voVPauGuZYeb1QAXYoOAWuiP2dbSvlBx0kQ1F3hu/Mw==", + "version": "1.3.364", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.364.tgz", + "integrity": "sha512-V6hyxQ9jzt6Jy6w8tAv4HHKhIaVS6psG/gmwtQ+2+itdkWMHJLHJ4m1sFep/fWkdKvfJcPXuywfnECRzfNa7gw==", "dev": true }, "elliptic": { @@ -9370,9 +8630,9 @@ } }, "node-releases": { - "version": "1.1.47", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.47.tgz", - "integrity": "sha512-k4xjVPx5FpwBUj0Gw7uvFOTF4Ep8Hok1I6qjwL3pLfwe7Y0REQSAqOwwv9TWBCUtMHxcXfY4PgRLRozcChvTcA==", + "version": "1.1.50", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.50.tgz", + "integrity": "sha512-lgAmPv9eYZ0bGwUYAKlr8MG6K4CvWliWqnkcT2P8mMAgVrH3lqfBPorFlxiG1pHQnqmavJZ9vbMXUTNyMLbrgQ==", "dev": true, "requires": { "semver": "^6.3.0" From 88f958286b5ec90651d8a5d483e242c36b91bbed Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 2 Mar 2020 08:45:52 +0000 Subject: [PATCH 45/72] Bump rollup from 1.31.1 to 1.32.0 Bumps [rollup](https://github.com/rollup/rollup) from 1.31.1 to 1.32.0. - [Release notes](https://github.com/rollup/rollup/releases) - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md) - [Commits](https://github.com/rollup/rollup/compare/v1.31.1...v1.32.0) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 53c84749ee..bd4fe8f47a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10783,9 +10783,9 @@ } }, "rollup": { - "version": "1.31.1", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.31.1.tgz", - "integrity": "sha512-2JREN1YdrS/kpPzEd33ZjtuNbOuBC3ePfuZBdKEybvqcEcszW1ckyVqzcEiEe0nE8sqHK+pbJg+PsAgRJ8+1dg==", + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.32.0.tgz", + "integrity": "sha512-ab2tF5pdDqm2zuI8j02ceyrJSScl9V2C24FgWQ1v1kTFTu1UrG5H0hpP++mDZlEFyZX4k0chtGEHU2i+pAzBgA==", "dev": true, "requires": { "@types/estree": "*", @@ -10794,9 +10794,9 @@ }, "dependencies": { "acorn": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz", - "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz", + "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==", "dev": true } } From 40d44db85e596c42d398e1b804bcaa64988ceb26 Mon Sep 17 00:00:00 2001 From: Olivier Guyot Date: Tue, 3 Mar 2020 09:45:57 +0100 Subject: [PATCH 46/72] Shader Builder / use vertex context to parse the symbol rotation expression Previously the expression was parsed in the fragment shader context, which meant in case the expression used an attributes the resulting GLSL code would be wrong. Fragment shader context: `float angle = v_heading; // we're using the varying: not OK` Vertex shader context: `float angle = a_heading; // we're using the attribute: OK` --- src/ol/webgl/ShaderBuilder.js | 2 +- test/spec/ol/webgl/shaderbuilder.test.js | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/ol/webgl/ShaderBuilder.js b/src/ol/webgl/ShaderBuilder.js index a2b21298c4..22b089f5e5 100644 --- a/src/ol/webgl/ShaderBuilder.js +++ b/src/ol/webgl/ShaderBuilder.js @@ -427,6 +427,7 @@ export function parseLiteralStyle(style) { const parsedSize = expressionToGlsl(vertContext, size, ValueTypes.NUMBER_ARRAY | ValueTypes.NUMBER); const parsedOffset = expressionToGlsl(vertContext, offset, ValueTypes.NUMBER_ARRAY); const parsedTexCoord = expressionToGlsl(vertContext, texCoord, ValueTypes.NUMBER_ARRAY); + const parsedRotation = expressionToGlsl(vertContext, rotation, ValueTypes.NUMBER); /** * @type {import("../style/expressions.js").ParsingContext} @@ -439,7 +440,6 @@ export function parseLiteralStyle(style) { }; const parsedColor = expressionToGlsl(fragContext, color, ValueTypes.COLOR); const parsedOpacity = expressionToGlsl(fragContext, opacity, ValueTypes.NUMBER); - const parsedRotation = expressionToGlsl(fragContext, rotation, ValueTypes.NUMBER); let opacityFilter = '1.0'; const visibleSize = `vec2(${expressionToGlsl(fragContext, size, ValueTypes.NUMBER_ARRAY | ValueTypes.NUMBER)}).x`; diff --git a/test/spec/ol/webgl/shaderbuilder.test.js b/test/spec/ol/webgl/shaderbuilder.test.js index 78ac4390e9..dfcf8e334f 100644 --- a/test/spec/ol/webgl/shaderbuilder.test.js +++ b/test/spec/ol/webgl/shaderbuilder.test.js @@ -511,6 +511,20 @@ void main(void) { expect(result.uniforms).to.have.property('u_ratio'); }); + it('parses a style with a rotation expression using an attribute', function() { + const result = parseLiteralStyle({ + symbol: { + symbolType: 'square', + size: 6, + rotation: ['get', 'heading'] + } + }); + + expect(result.builder.attributes).to.eql(['float a_heading']); + expect(result.builder.varyings).to.eql([]); + expect(result.builder.rotationExpression).to.eql('a_heading'); + }); + it('correctly adds string variables to the string literals mapping', function() { const result = parseLiteralStyle({ variables: { From 21fcb4621b31ba765293e72dd8e6c6e0e5f69090 Mon Sep 17 00:00:00 2001 From: Jackie Ng Date: Wed, 4 Mar 2020 23:38:54 +1100 Subject: [PATCH 47/72] Ensure consistent optionality for options.projection for all ImageSource-derived constructor options --- src/ol/source/ImageCanvas.js | 2 +- src/ol/source/ImageMapGuide.js | 2 +- src/ol/source/ImageStatic.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ol/source/ImageCanvas.js b/src/ol/source/ImageCanvas.js index 2137d7aa6a..b0988f5f28 100644 --- a/src/ol/source/ImageCanvas.js +++ b/src/ol/source/ImageCanvas.js @@ -33,7 +33,7 @@ import ImageSource from './Image.js'; * the value returned by the function is later changed then * `changed` should be called on the source for the source to * invalidate the current cached image. See: {@link module:ol/Observable~Observable#changed} - * @property {import("../proj.js").ProjectionLike} projection Projection. + * @property {import("../proj.js").ProjectionLike} [projection] Projection. Default is the view projection. * @property {number} [ratio=1.5] Ratio. 1 means canvases are the size of the map viewport, 2 means twice the * width and height of the map viewport, and so on. Must be `1` or higher. * @property {Array} [resolutions] Resolutions. diff --git a/src/ol/source/ImageMapGuide.js b/src/ol/source/ImageMapGuide.js index c47794c5ec..d39f82e111 100644 --- a/src/ol/source/ImageMapGuide.js +++ b/src/ol/source/ImageMapGuide.js @@ -20,7 +20,7 @@ import {appendParams} from '../uri.js'; * @property {boolean} [hidpi=true] Use the `ol/Map#pixelRatio` value when requesting * the image from the remote server. * @property {boolean} [useOverlay] If `true`, will use `GETDYNAMICMAPOVERLAYIMAGE`. - * @property {import("../proj.js").ProjectionLike} projection Projection. + * @property {import("../proj.js").ProjectionLike} [projection] Projection. Default is the view projection. * @property {number} [ratio=1] Ratio. `1` means image requests are the size of the map viewport, `2` means * twice the width and height of the map viewport, and so on. Must be `1` or higher. * @property {Array} [resolutions] Resolutions. diff --git a/src/ol/source/ImageStatic.js b/src/ol/source/ImageStatic.js index 2df587238a..146a0fb1d5 100644 --- a/src/ol/source/ImageStatic.js +++ b/src/ol/source/ImageStatic.js @@ -19,7 +19,7 @@ import ImageSource, {defaultImageLoadFunction} from './Image.js'; * @property {import("../extent.js").Extent} [imageExtent] Extent of the image in map coordinates. * This is the [left, bottom, right, top] map coordinates of your image. * @property {import("../Image.js").LoadFunction} [imageLoadFunction] Optional function to load an image given a URL. - * @property {import("../proj.js").ProjectionLike} projection Projection. + * @property {import("../proj.js").ProjectionLike} [projection] Projection. Default is the view projection. * @property {import("../size.js").Size} [imageSize] Size of the image in pixels. Usually the image size is auto-detected, so this * only needs to be set if auto-detection fails for some reason. * @property {string} url Image URL. From 6d16fe8405a1029882015e96d69353940540f94a Mon Sep 17 00:00:00 2001 From: Jackie Ng Date: Thu, 5 Mar 2020 01:01:03 +1100 Subject: [PATCH 48/72] Make arg2 of GeometryFunction also optional as it comes after an optional arg1 --- src/ol/interaction/Draw.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ol/interaction/Draw.js b/src/ol/interaction/Draw.js index 9b43feae21..b00c73f25c 100644 --- a/src/ol/interaction/Draw.js +++ b/src/ol/interaction/Draw.js @@ -110,7 +110,7 @@ import {fromUserCoordinate, getUserProjection} from '../proj.js'; * geometry is the geometry that is returned when the function is called without * a second argument. * @typedef {function(!SketchCoordType, import("../geom/SimpleGeometry.js").default=, - * import("../proj/Projection.js").default): + * import("../proj/Projection.js").default=): * import("../geom/SimpleGeometry.js").default} GeometryFunction */ From 315db526c921eea5f8ad1b32a92d3030af1dfec3 Mon Sep 17 00:00:00 2001 From: mike-000 <49240900+mike-000@users.noreply.github.com> Date: Thu, 5 Mar 2020 15:17:34 +0000 Subject: [PATCH 49/72] Replace Bing layer with MapTiler --- examples/vector-wfs.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/examples/vector-wfs.js b/examples/vector-wfs.js index 970719ab30..fdf003beb9 100644 --- a/examples/vector-wfs.js +++ b/examples/vector-wfs.js @@ -3,7 +3,7 @@ import View from '../src/ol/View.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.js'; import {bbox as bboxStrategy} from '../src/ol/loadingstrategy.js'; -import BingMaps from '../src/ol/source/BingMaps.js'; +import XYZ from '../src/ol/source/XYZ.js'; import VectorSource from '../src/ol/source/Vector.js'; import {Stroke, Style} from '../src/ol/style.js'; @@ -30,10 +30,15 @@ const vector = new VectorLayer({ }) }); +const key = 'get_your_own_D6rA4zTHduk6KOKTXzGB'; +const attributions = '© MapTiler ' + + '© OpenStreetMap contributors'; + const raster = new TileLayer({ - source: new BingMaps({ - imagerySet: 'Aerial', - key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5' + source: new XYZ({ + attributions: attributions, + url: 'https://api.maptiler.com/tiles/satellite/{z}/{x}/{y}.jpg?key=' + key, + maxZoom: 20 }) }); From c4d864ed4560733997937c35a724e3b33ef666a7 Mon Sep 17 00:00:00 2001 From: mike-000 <49240900+mike-000@users.noreply.github.com> Date: Thu, 5 Mar 2020 15:21:11 +0000 Subject: [PATCH 50/72] Replace Bing layer with MapTiler --- examples/vector-wfs-getfeature.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/examples/vector-wfs-getfeature.js b/examples/vector-wfs-getfeature.js index a46043a59d..6f7a3e88f4 100644 --- a/examples/vector-wfs-getfeature.js +++ b/examples/vector-wfs-getfeature.js @@ -7,7 +7,7 @@ import { } from '../src/ol/format/filter.js'; import {WFS, GeoJSON} from '../src/ol/format.js'; import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.js'; -import BingMaps from '../src/ol/source/BingMaps.js'; +import XYZ from '../src/ol/source/XYZ.js'; import VectorSource from '../src/ol/source/Vector.js'; import {Stroke, Style} from '../src/ol/style.js'; @@ -23,10 +23,15 @@ const vector = new VectorLayer({ }) }); +const key = 'get_your_own_D6rA4zTHduk6KOKTXzGB'; +const attributions = '© MapTiler ' + + '© OpenStreetMap contributors'; + const raster = new TileLayer({ - source: new BingMaps({ - imagerySet: 'Aerial', - key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5' + source: new XYZ({ + attributions: attributions, + url: 'https://api.maptiler.com/tiles/satellite/{z}/{x}/{y}.jpg?key=' + key, + maxZoom: 20 }) }); From 737c30fedcb64adc0726afcf67fec40791f99e81 Mon Sep 17 00:00:00 2001 From: mike-000 <49240900+mike-000@users.noreply.github.com> Date: Thu, 5 Mar 2020 15:25:48 +0000 Subject: [PATCH 51/72] Replace Bing layer with MapTiler --- examples/vector-wfs.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/vector-wfs.html b/examples/vector-wfs.html index 8939a01f20..fbdda2500d 100644 --- a/examples/vector-wfs.html +++ b/examples/vector-wfs.html @@ -4,9 +4,9 @@ title: WFS shortdesc: Example of using WFS with a BBOX strategy. docs: > This example loads new features from GeoServer WFS when the view extent changes. -tags: "vector, WFS, bbox, loading, server" +tags: "vector, WFS, bbox, loading, server, maptiler" cloak: - - key: As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5 - value: Your Bing Maps Key from http://www.bingmapsportal.com/ here + - key: get_your_own_D6rA4zTHduk6KOKTXzGB + value: Get your own API key at https://www.maptiler.com/cloud/ ---
              From 408eac2524a9b939823202c468c6b1d1d42029e2 Mon Sep 17 00:00:00 2001 From: mike-000 <49240900+mike-000@users.noreply.github.com> Date: Thu, 5 Mar 2020 15:27:18 +0000 Subject: [PATCH 52/72] Replace Bing layer with MapTiler --- examples/vector-wfs-getfeature.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/vector-wfs-getfeature.html b/examples/vector-wfs-getfeature.html index e04e55ba44..600b5840ee 100644 --- a/examples/vector-wfs-getfeature.html +++ b/examples/vector-wfs-getfeature.html @@ -6,9 +6,9 @@ docs: > This example generates a `GetFeature` request which uses a `PropertyIsEqualTo` and a `PropertyIsLike` filter, and then posts the request to load the features that match the query. -tags: "vector, WFS, GetFeature, filter" +tags: "vector, WFS, GetFeature, filter, maptiler" cloak: - - key: As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5 - value: Your Bing Maps Key from http://www.bingmapsportal.com/ here + - key: get_your_own_D6rA4zTHduk6KOKTXzGB + value: Get your own API key at https://www.maptiler.com/cloud/ ---
              From 9d0b139432d5573b6b8872a5ec91771869dbca85 Mon Sep 17 00:00:00 2001 From: mike-000 <49240900+mike-000@users.noreply.github.com> Date: Thu, 5 Mar 2020 17:41:33 +0000 Subject: [PATCH 53/72] Ensure example opens at correct zoom wrapX: false not needed for consistency with OL5 --- examples/modify-test.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/examples/modify-test.js b/examples/modify-test.js index 5da43080af..b816f467a3 100644 --- a/examples/modify-test.js +++ b/examples/modify-test.js @@ -140,8 +140,7 @@ const geojsonObject = { }; const source = new VectorSource({ - features: (new GeoJSON()).readFeatures(geojsonObject), - wrapX: false + features: (new GeoJSON()).readFeatures(geojsonObject) }); const layer = new VectorLayer({ From 601023acf47f8a85679d750eaeb6a58652b332a8 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 9 Mar 2020 08:34:28 +0000 Subject: [PATCH 54/72] Bump rollup from 1.32.0 to 1.32.1 Bumps [rollup](https://github.com/rollup/rollup) from 1.32.0 to 1.32.1. - [Release notes](https://github.com/rollup/rollup/releases) - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md) - [Commits](https://github.com/rollup/rollup/compare/v1.32.0...v1.32.1) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index fab8a35d0d..adaa5f6683 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9907,9 +9907,9 @@ } }, "rollup": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.32.0.tgz", - "integrity": "sha512-ab2tF5pdDqm2zuI8j02ceyrJSScl9V2C24FgWQ1v1kTFTu1UrG5H0hpP++mDZlEFyZX4k0chtGEHU2i+pAzBgA==", + "version": "1.32.1", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.32.1.tgz", + "integrity": "sha512-/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==", "dev": true, "requires": { "@types/estree": "*", From a8dcadbd9940052696025627eec5a07806b6df7f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 9 Mar 2020 08:35:54 +0000 Subject: [PATCH 55/72] Bump @babel/core from 7.8.6 to 7.8.7 Bumps [@babel/core](https://github.com/babel/babel) from 7.8.6 to 7.8.7. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.8.6...v7.8.7) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/package-lock.json b/package-lock.json index fab8a35d0d..ab3c53e796 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,18 +25,18 @@ } }, "@babel/core": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.8.6.tgz", - "integrity": "sha512-Sheg7yEJD51YHAvLEV/7Uvw95AeWqYPL3Vk3zGujJKIhJ+8oLw2ALaf3hbucILhKsgSoADOvtKRJuNVdcJkOrg==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.8.7.tgz", + "integrity": "sha512-rBlqF3Yko9cynC5CCFy6+K/w2N+Sq/ff2BPy+Krp7rHlABIr5epbA7OxVeKoMHB39LZOp1UY5SuLjy6uWi35yA==", "dev": true, "requires": { "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.8.6", + "@babel/generator": "^7.8.7", "@babel/helpers": "^7.8.4", - "@babel/parser": "^7.8.6", + "@babel/parser": "^7.8.7", "@babel/template": "^7.8.6", "@babel/traverse": "^7.8.6", - "@babel/types": "^7.8.6", + "@babel/types": "^7.8.7", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.1", @@ -57,12 +57,12 @@ } }, "@babel/generator": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.6.tgz", - "integrity": "sha512-4bpOR5ZBz+wWcMeVtcf7FbjcFzCp+817z2/gHNncIRcM9MmKzUhtWCYAq27RAfUrAFwb+OCG1s9WEaVxfi6cjg==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.7.tgz", + "integrity": "sha512-DQwjiKJqH4C3qGiyQCAExJHoZssn49JTMJgZ8SANGgVFdkupcUhLOdkAeoC6kmHZCPfoDG5M0b6cFlSN5wW7Ew==", "dev": true, "requires": { - "@babel/types": "^7.8.6", + "@babel/types": "^7.8.7", "jsesc": "^2.5.1", "lodash": "^4.17.13", "source-map": "^0.5.0" @@ -80,9 +80,9 @@ } }, "@babel/parser": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.6.tgz", - "integrity": "sha512-trGNYSfwq5s0SgM1BMEB8hX3NDmO7EP2wsDGDexiaKMB92BaRpS+qZfpkMqUBhcsOTBwNy9B/jieo4ad/t/z2g==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.7.tgz", + "integrity": "sha512-9JWls8WilDXFGxs0phaXAZgpxTZhSk/yOYH2hTHC0X1yC7Z78IJfvR1vJ+rmJKq3I35td2XzXzN6ZLYlna+r/A==", "dev": true }, "@babel/template": { @@ -114,9 +114,9 @@ } }, "@babel/types": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", - "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz", + "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==", "dev": true, "requires": { "esutils": "^2.0.2", @@ -768,9 +768,9 @@ }, "dependencies": { "@babel/types": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", - "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz", + "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==", "dev": true, "requires": { "esutils": "^2.0.2", From 365e14148a4e41eb25a3427fbb0b644d4d48da9a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 9 Mar 2020 08:36:16 +0000 Subject: [PATCH 56/72] Bump yargs from 15.1.0 to 15.3.0 Bumps [yargs](https://github.com/yargs/yargs) from 15.1.0 to 15.3.0. - [Release notes](https://github.com/yargs/yargs/releases) - [Changelog](https://github.com/yargs/yargs/blob/master/CHANGELOG.md) - [Commits](https://github.com/yargs/yargs/compare/v15.1.0...v15.3.0) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index fab8a35d0d..fd9605d85c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2924,6 +2924,12 @@ "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", "dev": true }, + "camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true + }, "caniuse-lite": { "version": "1.0.30001031", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001031.tgz", @@ -12567,9 +12573,9 @@ "dev": true }, "yargs": { - "version": "15.1.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.1.0.tgz", - "integrity": "sha512-T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg==", + "version": "15.3.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.0.tgz", + "integrity": "sha512-g/QCnmjgOl1YJjGsnUg2SatC7NUYEiLXJqxNOQU9qSpjzGtGXda9b+OKccr1kLTy8BN9yqEyqfq5lxlwdc13TA==", "dev": true, "requires": { "cliui": "^6.0.0", @@ -12582,7 +12588,7 @@ "string-width": "^4.2.0", "which-module": "^2.0.0", "y18n": "^4.0.0", - "yargs-parser": "^16.1.0" + "yargs-parser": "^18.1.0" }, "dependencies": { "ansi-regex": { @@ -12601,12 +12607,6 @@ "color-convert": "^2.0.1" } }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true - }, "cliui": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", @@ -12711,9 +12711,9 @@ } }, "yargs-parser": { - "version": "16.1.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-16.1.0.tgz", - "integrity": "sha512-H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg==", + "version": "18.1.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.0.tgz", + "integrity": "sha512-o/Jr6JBOv6Yx3pL+5naWSoIA2jJ+ZkMYQG/ie9qFbukBe4uzmBatlXFOiu/tNKRWEtyf+n5w7jc/O16ufqOTdQ==", "dev": true, "requires": { "camelcase": "^5.0.0", From 80c36b298de212a9496464c7d2603e725a680de7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 9 Mar 2020 08:37:17 +0000 Subject: [PATCH 57/72] Bump webpack from 4.41.6 to 4.42.0 Bumps [webpack](https://github.com/webpack/webpack) from 4.41.6 to 4.42.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.41.6...v4.42.0) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 18 +++++++++--------- package.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index fab8a35d0d..3d15bfebae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11236,9 +11236,9 @@ "dev": true }, "terser": { - "version": "4.6.3", - "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.3.tgz", - "integrity": "sha512-Lw+ieAXmY69d09IIc/yqeBqXpEQIpDGZqT34ui1QWXIUpR2RjbqEkT8X7Lgex19hslSqcWM5iMN2kM11eMsESQ==", + "version": "4.6.6", + "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.6.tgz", + "integrity": "sha512-4lYPyeNmstjIIESr/ysHg2vUPRGf2tzF9z2yYwnowXVuVzLEamPN1Gfrz7f8I9uEPuHcbFlW4PLIAsJoxXyJ1g==", "dev": true, "requires": { "commander": "^2.20.0", @@ -12036,9 +12036,9 @@ "dev": true }, "webpack": { - "version": "4.41.6", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.41.6.tgz", - "integrity": "sha512-yxXfV0Zv9WMGRD+QexkZzmGIh54bsvEs+9aRWxnN8erLWEOehAKUTeNBoUbA6HPEZPlRo7KDi2ZcNveoZgK9MA==", + "version": "4.42.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.42.0.tgz", + "integrity": "sha512-EzJRHvwQyBiYrYqhyjW9AqM90dE4+s1/XtCfn7uWg6cS72zH+2VPFAlsnW0+W0cDi0XRjNKUMoJtpSi50+Ph6w==", "dev": true, "requires": { "@webassemblyjs/ast": "1.8.5", @@ -12073,9 +12073,9 @@ "dev": true }, "ajv": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.11.0.tgz", - "integrity": "sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==", + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz", + "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", diff --git a/package.json b/package.json index 473fce6634..6b632827b9 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "typescript": "3.5.3", "url-polyfill": "^1.1.5", "walk": "^2.3.9", - "webpack": "4.41.6", + "webpack": "4.42.0", "webpack-cli": "^3.3.2", "webpack-dev-middleware": "^3.6.2", "webpack-dev-server": "^3.3.1", From 0613444f12e58626f1134993562cc1202d8ab6ff Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 9 Mar 2020 08:37:51 +0000 Subject: [PATCH 58/72] Bump @babel/preset-env from 7.8.6 to 7.8.7 Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.8.6 to 7.8.7. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.8.6...v7.8.7) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 200 +++++++++++++++++++++++++--------------------- 1 file changed, 109 insertions(+), 91 deletions(-) diff --git a/package-lock.json b/package-lock.json index fab8a35d0d..f26dda9335 100644 --- a/package-lock.json +++ b/package-lock.json @@ -203,9 +203,9 @@ }, "dependencies": { "@babel/types": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", - "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz", + "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==", "dev": true, "requires": { "esutils": "^2.0.2", @@ -226,9 +226,9 @@ }, "dependencies": { "@babel/types": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", - "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz", + "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==", "dev": true, "requires": { "esutils": "^2.0.2", @@ -239,20 +239,20 @@ } }, "@babel/helper-call-delegate": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.8.3.tgz", - "integrity": "sha512-6Q05px0Eb+N4/GTyKPPvnkig7Lylw+QzihMpws9iiZQv7ZImf84ZsZpQH7QoWN4n4tm81SnSzPgHw2qtO0Zf3A==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.8.7.tgz", + "integrity": "sha512-doAA5LAKhsFCR0LAFIf+r2RSMmC+m8f/oQ+URnUET/rWeEzC0yTRmAGyWkD4sSu3xwbS7MYQ2u+xlt1V5R56KQ==", "dev": true, "requires": { "@babel/helper-hoist-variables": "^7.8.3", "@babel/traverse": "^7.8.3", - "@babel/types": "^7.8.3" + "@babel/types": "^7.8.7" }, "dependencies": { "@babel/types": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", - "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz", + "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==", "dev": true, "requires": { "esutils": "^2.0.2", @@ -263,13 +263,13 @@ } }, "@babel/helper-compilation-targets": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.6.tgz", - "integrity": "sha512-UrJdk27hKVJSnibFcUWYLkCL0ZywTUoot8yii1lsHJcvwrypagmYKjHLMWivQPm4s6GdyygCL8fiH5EYLxhQwQ==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz", + "integrity": "sha512-4mWm8DCK2LugIS+p1yArqvG1Pf162upsIsjE7cNBjez+NjliQpVhj20obE520nao0o14DaTnFJv+Fw5a0JpoUw==", "dev": true, "requires": { "@babel/compat-data": "^7.8.6", - "browserslist": "^4.8.5", + "browserslist": "^4.9.1", "invariant": "^2.2.4", "levenary": "^1.1.1", "semver": "^5.5.0" @@ -323,9 +323,9 @@ }, "dependencies": { "@babel/types": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", - "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz", + "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==", "dev": true, "requires": { "esutils": "^2.0.2", @@ -346,9 +346,9 @@ }, "dependencies": { "@babel/types": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", - "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz", + "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==", "dev": true, "requires": { "esutils": "^2.0.2", @@ -414,9 +414,9 @@ }, "dependencies": { "@babel/types": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", - "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz", + "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==", "dev": true, "requires": { "esutils": "^2.0.2", @@ -436,9 +436,9 @@ }, "dependencies": { "@babel/types": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", - "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz", + "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==", "dev": true, "requires": { "esutils": "^2.0.2", @@ -502,9 +502,9 @@ } }, "@babel/parser": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.6.tgz", - "integrity": "sha512-trGNYSfwq5s0SgM1BMEB8hX3NDmO7EP2wsDGDexiaKMB92BaRpS+qZfpkMqUBhcsOTBwNy9B/jieo4ad/t/z2g==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.7.tgz", + "integrity": "sha512-9JWls8WilDXFGxs0phaXAZgpxTZhSk/yOYH2hTHC0X1yC7Z78IJfvR1vJ+rmJKq3I35td2XzXzN6ZLYlna+r/A==", "dev": true }, "@babel/template": { @@ -519,9 +519,9 @@ } }, "@babel/types": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", - "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz", + "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==", "dev": true, "requires": { "esutils": "^2.0.2", @@ -541,9 +541,9 @@ }, "dependencies": { "@babel/types": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", - "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz", + "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==", "dev": true, "requires": { "esutils": "^2.0.2", @@ -582,9 +582,9 @@ }, "dependencies": { "@babel/types": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", - "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz", + "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==", "dev": true, "requires": { "esutils": "^2.0.2", @@ -616,12 +616,12 @@ } }, "@babel/generator": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.6.tgz", - "integrity": "sha512-4bpOR5ZBz+wWcMeVtcf7FbjcFzCp+817z2/gHNncIRcM9MmKzUhtWCYAq27RAfUrAFwb+OCG1s9WEaVxfi6cjg==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.7.tgz", + "integrity": "sha512-DQwjiKJqH4C3qGiyQCAExJHoZssn49JTMJgZ8SANGgVFdkupcUhLOdkAeoC6kmHZCPfoDG5M0b6cFlSN5wW7Ew==", "dev": true, "requires": { - "@babel/types": "^7.8.6", + "@babel/types": "^7.8.7", "jsesc": "^2.5.1", "lodash": "^4.17.13", "source-map": "^0.5.0" @@ -639,9 +639,9 @@ } }, "@babel/parser": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.6.tgz", - "integrity": "sha512-trGNYSfwq5s0SgM1BMEB8hX3NDmO7EP2wsDGDexiaKMB92BaRpS+qZfpkMqUBhcsOTBwNy9B/jieo4ad/t/z2g==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.7.tgz", + "integrity": "sha512-9JWls8WilDXFGxs0phaXAZgpxTZhSk/yOYH2hTHC0X1yC7Z78IJfvR1vJ+rmJKq3I35td2XzXzN6ZLYlna+r/A==", "dev": true }, "@babel/traverse": { @@ -662,9 +662,9 @@ } }, "@babel/types": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", - "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz", + "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==", "dev": true, "requires": { "esutils": "^2.0.2", @@ -697,9 +697,9 @@ }, "dependencies": { "@babel/types": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", - "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz", + "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==", "dev": true, "requires": { "esutils": "^2.0.2", @@ -744,9 +744,9 @@ }, "dependencies": { "@babel/types": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", - "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz", + "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==", "dev": true, "requires": { "esutils": "^2.0.2", @@ -980,9 +980,9 @@ } }, "@babel/types": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", - "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz", + "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==", "dev": true, "requires": { "esutils": "^2.0.2", @@ -1185,12 +1185,12 @@ } }, "@babel/plugin-transform-parameters": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.4.tgz", - "integrity": "sha512-IsS3oTxeTsZlE5KqzTbcC2sV0P9pXdec53SU+Yxv7o/6dvGM5AkTotQKhoSffhNgZ/dftsSiOoxy7evCYJXzVA==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.7.tgz", + "integrity": "sha512-brYWaEPTRimOctz2NDA3jnBbDi7SVN2T4wYuu0aqSzxC3nozFZngGaw29CJ9ZPweB7k+iFmZuoG3IVPIcXmD2g==", "dev": true, "requires": { - "@babel/helper-call-delegate": "^7.8.3", + "@babel/helper-call-delegate": "^7.8.7", "@babel/helper-get-function-arity": "^7.8.3", "@babel/helper-plugin-utils": "^7.8.3" } @@ -1205,12 +1205,12 @@ } }, "@babel/plugin-transform-regenerator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.3.tgz", - "integrity": "sha512-qt/kcur/FxrQrzFR432FGZznkVAjiyFtCOANjkAKwCbt465L6ZCiUQh2oMYGU3Wo8LRFJxNDFwWn106S5wVUNA==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz", + "integrity": "sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA==", "dev": true, "requires": { - "regenerator-transform": "^0.14.0" + "regenerator-transform": "^0.14.2" } }, "@babel/plugin-transform-reserved-words": { @@ -1280,13 +1280,13 @@ } }, "@babel/preset-env": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.8.6.tgz", - "integrity": "sha512-M5u8llV9DIVXBFB/ArIpqJuvXpO+ymxcJ6e8ZAmzeK3sQeBNOD1y+rHvHCGG4TlEmsNpIrdecsHGHT8ZCoOSJg==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.8.7.tgz", + "integrity": "sha512-BYftCVOdAYJk5ASsznKAUl53EMhfBbr8CJ1X+AJLfGPscQkwJFiaV/Wn9DPH/7fzm2v6iRYJKYHSqyynTGw0nw==", "dev": true, "requires": { "@babel/compat-data": "^7.8.6", - "@babel/helper-compilation-targets": "^7.8.6", + "@babel/helper-compilation-targets": "^7.8.7", "@babel/helper-module-imports": "^7.8.3", "@babel/helper-plugin-utils": "^7.8.3", "@babel/plugin-proposal-async-generator-functions": "^7.8.3", @@ -1326,9 +1326,9 @@ "@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3", "@babel/plugin-transform-new-target": "^7.8.3", "@babel/plugin-transform-object-super": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.8.4", + "@babel/plugin-transform-parameters": "^7.8.7", "@babel/plugin-transform-property-literals": "^7.8.3", - "@babel/plugin-transform-regenerator": "^7.8.3", + "@babel/plugin-transform-regenerator": "^7.8.7", "@babel/plugin-transform-reserved-words": "^7.8.3", "@babel/plugin-transform-shorthand-properties": "^7.8.3", "@babel/plugin-transform-spread": "^7.8.3", @@ -1336,7 +1336,7 @@ "@babel/plugin-transform-template-literals": "^7.8.3", "@babel/plugin-transform-typeof-symbol": "^7.8.4", "@babel/plugin-transform-unicode-regex": "^7.8.3", - "@babel/types": "^7.8.6", + "@babel/types": "^7.8.7", "browserslist": "^4.8.5", "core-js-compat": "^3.6.2", "invariant": "^2.2.2", @@ -1354,9 +1354,9 @@ } }, "@babel/types": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", - "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz", + "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==", "dev": true, "requires": { "esutils": "^2.0.2", @@ -1366,6 +1366,23 @@ } } }, + "@babel/runtime": { + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", + "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", + "dev": true, + "requires": { + "regenerator-runtime": "^0.13.4" + }, + "dependencies": { + "regenerator-runtime": { + "version": "0.13.4", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", + "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==", + "dev": true + } + } + }, "@babel/template": { "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.3.tgz", @@ -2925,9 +2942,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30001031", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001031.tgz", - "integrity": "sha512-DpAP5a1NGRLgYfaNCaXIRyGARi+3tJA2quZXNNA1Du26VyVkqvy2tznNu5ANyN1Y5aX44QDotZSVSUSi2uMGjg==", + "version": "1.0.30001033", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001033.tgz", + "integrity": "sha512-8Ibzxee6ibc5q88cM1usPsMpJOG5CTq0s/dKOmlekPbDGKt+UrnOOTPSjQz3kVo6yL7N4SB5xd+FGLHQmbzh6A==", "dev": true }, "caseless": { @@ -3892,9 +3909,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.364", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.364.tgz", - "integrity": "sha512-V6hyxQ9jzt6Jy6w8tAv4HHKhIaVS6psG/gmwtQ+2+itdkWMHJLHJ4m1sFep/fWkdKvfJcPXuywfnECRzfNa7gw==", + "version": "1.3.372", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.372.tgz", + "integrity": "sha512-77a4jYC52OdisHM+Tne7dgWEvQT1FoNu/jYl279pP88ZtG4ZRIPyhQwAKxj6C2rzsyC1OwsOds9JlZtNncSz6g==", "dev": true }, "elliptic": { @@ -8494,9 +8511,9 @@ } }, "node-releases": { - "version": "1.1.50", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.50.tgz", - "integrity": "sha512-lgAmPv9eYZ0bGwUYAKlr8MG6K4CvWliWqnkcT2P8mMAgVrH3lqfBPorFlxiG1pHQnqmavJZ9vbMXUTNyMLbrgQ==", + "version": "1.1.51", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.51.tgz", + "integrity": "sha512-1eQEs6HFYY1kMXQPOLzCf7HdjReErmvn85tZESMczdCNVWP3Y7URYLBAyYynuI7yef1zj4HN5q+oB2x67QU0lw==", "dev": true, "requires": { "semver": "^6.3.0" @@ -9632,12 +9649,13 @@ "dev": true }, "regenerator-transform": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.1.tgz", - "integrity": "sha512-flVuee02C3FKRISbxhXl9mGzdbWUVHubl1SMaknjxkFB1/iqpJhArQUvRxOOPEc/9tAiX0BaQ28FJH10E4isSQ==", + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.2.tgz", + "integrity": "sha512-V4+lGplCM/ikqi5/mkkpJ06e9Bujq1NFmNLvsCs56zg3ZbzrnUzAtizZ24TXxtRX/W2jcdScwQCnbL0CICTFkQ==", "dev": true, "requires": { - "private": "^0.1.6" + "@babel/runtime": "^7.8.4", + "private": "^0.1.8" } }, "regex-not": { From 2123d199269e68b61ec0d89c9321b598aca4eb5d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 9 Mar 2020 08:38:41 +0000 Subject: [PATCH 59/72] Bump rollup-plugin-babel from 4.3.3 to 4.4.0 Bumps [rollup-plugin-babel](https://github.com/rollup/rollup-plugin-babel) from 4.3.3 to 4.4.0. - [Release notes](https://github.com/rollup/rollup-plugin-babel/releases) - [Changelog](https://github.com/rollup/rollup-plugin-babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/rollup/rollup-plugin-babel/compare/v4.3.3...v4.4.0) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index fab8a35d0d..905fa517be 100644 --- a/package-lock.json +++ b/package-lock.json @@ -449,12 +449,25 @@ } }, "@babel/helper-module-imports": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz", - "integrity": "sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz", + "integrity": "sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==", "dev": true, "requires": { - "@babel/types": "^7.0.0" + "@babel/types": "^7.8.3" + }, + "dependencies": { + "@babel/types": { + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz", + "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + } } }, "@babel/helper-module-transforms": { @@ -9926,9 +9939,9 @@ } }, "rollup-plugin-babel": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/rollup-plugin-babel/-/rollup-plugin-babel-4.3.3.tgz", - "integrity": "sha512-tKzWOCmIJD/6aKNz0H1GMM+lW1q9KyFubbWzGiOG540zxPPifnEAHTZwjo0g991Y+DyOZcLqBgqOdqazYE5fkw==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/rollup-plugin-babel/-/rollup-plugin-babel-4.4.0.tgz", + "integrity": "sha512-Lek/TYp1+7g7I+uMfJnnSJ7YWoD58ajo6Oarhlex7lvUce+RCKRuGRSgztDO3/MF/PuGKmUL5iTHKf208UNszw==", "dev": true, "requires": { "@babel/helper-module-imports": "^7.0.0", From ad476f608647c71ab6690879f69c494cbf7bbc10 Mon Sep 17 00:00:00 2001 From: Andreas Hocevar Date: Mon, 9 Mar 2020 13:19:30 +0100 Subject: [PATCH 60/72] Detect Zoomify server-side retina tiles --- src/ol/source/Zoomify.js | 24 +++++++++++++++++++----- test/spec/ol/source/zoomify.test.js | 16 ++++++++++++++-- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/src/ol/source/Zoomify.js b/src/ol/source/Zoomify.js index 509a7e0ae2..59cf65e288 100644 --- a/src/ol/source/Zoomify.js +++ b/src/ol/source/Zoomify.js @@ -11,6 +11,7 @@ import {createCanvasContext2D} from '../dom.js'; import {toSize} from '../size.js'; import TileImage from './TileImage.js'; import TileGrid from '../tilegrid/TileGrid.js'; +import {getCenter} from '../extent.js'; /** @@ -88,7 +89,7 @@ export class CustomTile extends ImageTile { * @property {number} [tilePixelRatio] The pixel ratio used by the tile service. For example, if the tile service advertizes 256px by 256px tiles but actually sends 512px by 512px images (for retina/hidpi devices) then `tilePixelRatio` should be set to `2` * @property {number} [reprojectionErrorThreshold=0.5] Maximum allowed reprojection error (in pixels). * Higher values can increase reprojection performance, but decrease precision. - * @property {string} [url] URL template or base URL of the Zoomify service. + * @property {string} url URL template or base URL of the Zoomify service. * A base URL is the fixed part * of the URL, excluding the tile group, z, x, and y folder structure, e.g. * `http://my.zoomify.info/IMAGE.TIF/`. A URL template must include @@ -100,7 +101,7 @@ export class CustomTile extends ImageTile { * A `{?-?}` template pattern, for example `subdomain{a-f}.domain.com`, may be * used instead of defining each one separately in the `urls` option. * @property {string} [tierSizeCalculation] Tier size calculation method: `default` or `truncated`. - * @property {import("../size.js").Size} [size] Size of the image. + * @property {import("../size.js").Size} size * @property {import("../extent.js").Extent} [extent] Extent for the TileGrid that is created. * Default sets the TileGrid in the * fourth quadrant, meaning extent is `[0, -height, width, 0]`. To change the @@ -125,11 +126,11 @@ export class CustomTile extends ImageTile { class Zoomify extends TileImage { /** - * @param {Options=} opt_options Options. + * @param {Options} opt_options Options. */ constructor(opt_options) { - const options = opt_options || {}; + const options = opt_options; const size = options.size; const tierSizeCalculation = options.tierSizeCalculation !== undefined ? @@ -196,7 +197,7 @@ class Zoomify extends TileImage { } const urls = expandUrl(url); - const tileWidth = tileSize * tilePixelRatio; + let tileWidth = tileSize * tilePixelRatio; /** * @param {string} template Template. @@ -259,6 +260,19 @@ class Zoomify extends TileImage { */ this.zDirection = options.zDirection; + // Server retina tile detection (non-standard): + // Try loading the center tile for the highest resolution. If it is not + // available, we are dealing with retina tiles, and need to adjust the + // tile url calculation. + const tileUrl = tileGrid.getTileCoordForCoordAndResolution(getCenter(tileGrid.getExtent()), resolutions[resolutions.length - 1]); + const testTileUrl = tileUrlFunction(tileUrl, 1, null); + const image = new Image(); + image.addEventListener('error', function() { + tileWidth = tileSize; + this.changed(); + }.bind(this)); + image.src = testTileUrl; + } } diff --git a/test/spec/ol/source/zoomify.test.js b/test/spec/ol/source/zoomify.test.js index 3edf6fb68f..3385979774 100644 --- a/test/spec/ol/source/zoomify.test.js +++ b/test/spec/ol/source/zoomify.test.js @@ -45,7 +45,7 @@ describe('ol.source.Zoomify', function() { describe('constructor', function() { - it('requires config "size"', function() { + it('requires config "size" and "url"', function() { let source; // undefined config object @@ -58,7 +58,7 @@ describe('ol.source.Zoomify', function() { source = new Zoomify({}); }).to.throwException(); - // not passing "size" in config object + // passing "url" in config object expect(function() { source = new Zoomify({ url: 'some-url' @@ -70,6 +70,14 @@ describe('ol.source.Zoomify', function() { source = new Zoomify({ size: [47, 11] }); + }).to.throwException(); + + // passing "size" and "url" in config object + expect(function() { + source = new Zoomify({ + url: '', + size: [47, 11] + }); }).to.not.throwException(); // we got a source expect(source).to.be.a(Zoomify); @@ -88,6 +96,7 @@ describe('ol.source.Zoomify', function() { it('does not need "tierSizeCalculation" option', function() { expect(function() { new Zoomify({ + url: '', size: [47, 11] }); }).to.not.throwException(); @@ -96,6 +105,7 @@ describe('ol.source.Zoomify', function() { it('accepts "tierSizeCalculation" option "default"', function() { expect(function() { new Zoomify({ + url: '', size: [47, 11], tierSizeCalculation: 'default' }); @@ -105,6 +115,7 @@ describe('ol.source.Zoomify', function() { it('accepts "tierSizeCalculation" option "truncated"', function() { expect(function() { new Zoomify({ + url: '', size: [47, 11], tierSizeCalculation: 'truncated' }); @@ -115,6 +126,7 @@ describe('ol.source.Zoomify', function() { // passing unknown string will throw expect(function() { new Zoomify({ + url: '', size: [47, 11], tierSizeCalculation: 'ace-of-spades' }); From 5424e3eae26d69bdbf1238dffa26f4dc3a6a77ae Mon Sep 17 00:00:00 2001 From: Andreas Hocevar Date: Sun, 8 Mar 2020 18:05:42 +0100 Subject: [PATCH 61/72] Keep the render loop running during simulation --- examples/geolocation-orientation.js | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/geolocation-orientation.js b/examples/geolocation-orientation.js index b9eae92681..e8934cf56c 100644 --- a/examples/geolocation-orientation.js +++ b/examples/geolocation-orientation.js @@ -147,6 +147,7 @@ function updateView() { view.setCenter(getCenterWithHeading(c, -c[2], view.getResolution())); view.setRotation(-c[2]); marker.setPosition(c); + map.render(); } } From 6019a61cca3aaf8d997203d206f83b49faec94de Mon Sep 17 00:00:00 2001 From: mike-000 <49240900+mike-000@users.noreply.github.com> Date: Mon, 9 Mar 2020 14:54:24 +0000 Subject: [PATCH 62/72] Add show graticule option --- examples/reprojection-by-code.html | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/examples/reprojection-by-code.html b/examples/reprojection-by-code.html index 319309832a..df386d4864 100644 --- a/examples/reprojection-by-code.html +++ b/examples/reprojection-by-code.html @@ -6,12 +6,12 @@ docs: > This example shows client-side raster reprojection capabilities from OSM (EPSG:3857) to arbitrary projection by searching in EPSG.io database. -tags: "reprojection, projection, proj4js, epsg.io" +tags: "reprojection, projection, proj4js, epsg.io, graticule" ---
              - +
              @@ -19,5 +19,9 @@ tags: "reprojection, projection, proj4js, epsg.io" Render reprojection edges +
              From c5fd013e317278df7f5152567740247ccff10959 Mon Sep 17 00:00:00 2001 From: Andreas Hocevar Date: Mon, 9 Mar 2020 16:11:24 +0100 Subject: [PATCH 63/72] Resolve constraints when updating size --- src/ol/View.js | 2 +- test/spec/ol/view.test.js | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/ol/View.js b/src/ol/View.js index 27ab568daa..2397693cda 100644 --- a/src/ol/View.js +++ b/src/ol/View.js @@ -405,7 +405,6 @@ class View extends BaseObject { } else if (options.zoom !== undefined) { this.setZoom(options.zoom); } - this.resolveConstraints(0); this.setProperties(properties); @@ -762,6 +761,7 @@ class View extends BaseObject { */ setViewportSize(opt_size) { this.viewportSize_ = Array.isArray(opt_size) ? opt_size.slice() : [100, 100]; + this.resolveConstraints(0); } /** diff --git a/test/spec/ol/view.test.js b/test/spec/ol/view.test.js index 4ec4a4bce6..3e186909e9 100644 --- a/test/spec/ol/view.test.js +++ b/test/spec/ol/view.test.js @@ -35,6 +35,7 @@ describe('ol.View', function() { maxResolution: 1000, resolution: 1200 }); + view.setViewportSize(); expect(view.getResolution()).to.eql(1000); expect(view.targetResolution_).to.eql(1000); }); @@ -45,6 +46,7 @@ describe('ol.View', function() { minResolution: 128, resolution: 50 }); + view.setViewportSize(); expect(view.getResolution()).to.eql(128); expect(view.targetResolution_).to.eql(128); }); @@ -54,6 +56,7 @@ describe('ol.View', function() { resolutions: [1024, 512, 256, 128, 64, 32], resolution: 1200 }); + view.setViewportSize(); expect(view.getResolution()).to.eql(1024); expect(view.targetResolution_).to.eql(1024); @@ -61,6 +64,7 @@ describe('ol.View', function() { resolutions: [1024, 512, 256, 128, 64, 32], resolution: 10 }); + view.setViewportSize(); expect(view.getResolution()).to.eql(32); expect(view.targetResolution_).to.eql(32); }); @@ -70,6 +74,7 @@ describe('ol.View', function() { minZoom: 3, zoom: 2 }); + view.setViewportSize(); expect(view.getZoom()).to.eql(3); expect(view.targetResolution_).to.eql(view.getMaxResolution()); }); @@ -79,6 +84,7 @@ describe('ol.View', function() { maxZoom: 4, zoom: 5 }); + view.setViewportSize(); expect(view.getZoom()).to.eql(4); expect(view.targetResolution_).to.eql(view.getMaxResolution() / Math.pow(2, 4)); }); @@ -89,6 +95,7 @@ describe('ol.View', function() { extent: [0, 0, 50, 50], resolution: 1 }); + view.setViewportSize(); expect(view.getResolution()).to.eql(0.5); expect(view.targetResolution_).to.eql(0.5); }); From 230c6b011e9439ce3d009c39b9cb568cb382cf61 Mon Sep 17 00:00:00 2001 From: mike-000 <49240900+mike-000@users.noreply.github.com> Date: Mon, 9 Mar 2020 15:24:01 +0000 Subject: [PATCH 64/72] Improve the calculation of projection extent Add show graticule option --- examples/reprojection-by-code.js | 39 ++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/examples/reprojection-by-code.js b/examples/reprojection-by-code.js index 346cb3067a..880b200ece 100644 --- a/examples/reprojection-by-code.js +++ b/examples/reprojection-by-code.js @@ -1,19 +1,34 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; import {applyTransform} from '../src/ol/extent.js'; +import Graticule from '../src/ol/layer/Graticule.js'; import TileLayer from '../src/ol/layer/Tile.js'; import {get as getProjection, getTransform} from '../src/ol/proj.js'; import {register} from '../src/ol/proj/proj4.js'; import OSM from '../src/ol/source/OSM.js'; import TileImage from '../src/ol/source/TileImage.js'; +import Stroke from '../src/ol/style/Stroke.js'; import proj4 from 'proj4'; +const graticule = new Graticule({ + // the style to use for the lines, optional. + strokeStyle: new Stroke({ + color: "rgba(255,120,0,0.9)", + width: 2, + lineDash: [0.5, 4] + }), + showLabels: true, + visible: false, + wrapX: false +}); + const map = new Map({ layers: [ new TileLayer({ source: new OSM() - }) + }), + graticule ], target: 'map', view: new View({ @@ -28,6 +43,7 @@ const queryInput = document.getElementById('epsg-query'); const searchButton = document.getElementById('epsg-search'); const resultSpan = document.getElementById('epsg-result'); const renderEdgesCheckbox = document.getElementById('render-edges'); +const showGraticuleCheckbox = document.getElementById('show-graticule'); function setProjection(code, name, proj4def, bbox) { if (code === null || name === null || proj4def === null || bbox === null) { @@ -48,9 +64,15 @@ function setProjection(code, name, proj4def, bbox) { const newProj = getProjection(newProjCode); const fromLonLat = getTransform('EPSG:4326', newProj); - // very approximate calculation of projection extent - const extent = applyTransform( - [bbox[1], bbox[2], bbox[3], bbox[0]], fromLonLat); + let worldExtent = [bbox[1], bbox[2], bbox[3], bbox[0]]; + newProj.setWorldExtent(worldExtent); + + // approximate calculation of projection extent, + // checking if the world extent crosses the dateline + if (bbox[1] > bbox[3]) { + worldExtent = [bbox[1], bbox[2], bbox[3] + 360, bbox[0]]; + } + const extent = applyTransform(worldExtent, fromLonLat, undefined, 8); newProj.setExtent(extent); const newView = new View({ projection: newProj @@ -98,7 +120,7 @@ searchButton.onclick = function(event) { /** - * Handle change event. + * Handle checkbox change event. */ renderEdgesCheckbox.onchange = function() { map.getLayers().forEach(function(layer) { @@ -110,3 +132,10 @@ renderEdgesCheckbox.onchange = function() { } }); }; + +/** + * Handle checkbox change event. + */ +showGraticuleCheckbox.onchange = function() { + graticule.setVisible(showGraticuleCheckbox.checked); +}; From 7c22b5a238dce4687d14b30fffeca3a02e0558ff Mon Sep 17 00:00:00 2001 From: mike-000 <49240900+mike-000@users.noreply.github.com> Date: Mon, 9 Mar 2020 16:09:07 +0000 Subject: [PATCH 65/72] Improve the calculation of projection extent fix quotes --- examples/reprojection-by-code.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/reprojection-by-code.js b/examples/reprojection-by-code.js index 880b200ece..0f72fa3a48 100644 --- a/examples/reprojection-by-code.js +++ b/examples/reprojection-by-code.js @@ -14,7 +14,7 @@ import proj4 from 'proj4'; const graticule = new Graticule({ // the style to use for the lines, optional. strokeStyle: new Stroke({ - color: "rgba(255,120,0,0.9)", + color: 'rgba(255,120,0,0.9)', width: 2, lineDash: [0.5, 4] }), From 85d84a0c40f8a22c3b9dcb136738a17e79be4aa4 Mon Sep 17 00:00:00 2001 From: Sampo Osmonen Date: Mon, 9 Mar 2020 19:37:21 +0200 Subject: [PATCH 66/72] Add safeguard to handleTouchMove --- src/ol/MapBrowserEventHandler.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ol/MapBrowserEventHandler.js b/src/ol/MapBrowserEventHandler.js index e19b74e55e..18f5899701 100644 --- a/src/ol/MapBrowserEventHandler.js +++ b/src/ol/MapBrowserEventHandler.js @@ -275,7 +275,8 @@ class MapBrowserEventHandler extends EventTarget { * @private */ handleTouchMove_(event) { - if (this.originalPointerMoveEvent_.defaultPrevented) { + // In some environments (such as iOS 12), this handler can get called once before the `originalPointerMoveEvent_` is initialized. This prevents crashes in those situations (but may not work correctly if `originalPointerMoveEvent_` lags behind the current event?). + if (this.originalPointerMoveEvent_ && this.originalPointerMoveEvent_.defaultPrevented) { event.preventDefault(); } } From e6a2d4b2355208b91f7ccf438cfd8aa268e619ae Mon Sep 17 00:00:00 2001 From: John Leonard Date: Mon, 9 Mar 2020 18:36:12 +0000 Subject: [PATCH 67/72] fix: handle layer clear event in case clear(true) called and individual delete feature events aren't generated --- src/ol/renderer/webgl/PointsLayer.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/ol/renderer/webgl/PointsLayer.js b/src/ol/renderer/webgl/PointsLayer.js index d6da17801d..b35e3831b7 100644 --- a/src/ol/renderer/webgl/PointsLayer.js +++ b/src/ol/renderer/webgl/PointsLayer.js @@ -290,7 +290,8 @@ class WebGLPointsLayerRenderer extends WebGLLayerRenderer { this.sourceListenKeys_ = [ listen(source, VectorEventType.ADDFEATURE, this.handleSourceFeatureAdded_, this), listen(source, VectorEventType.CHANGEFEATURE, this.handleSourceFeatureChanged_, this), - listen(source, VectorEventType.REMOVEFEATURE, this.handleSourceFeatureDelete_, this) + listen(source, VectorEventType.REMOVEFEATURE, this.handleSourceFeatureDelete_, this), + listen(source, VectorEventType.CLEAR, this.handleSourceFeatureClear_, this) ]; source.forEachFeature(function(feature) { this.featureCache_[getUid(feature)] = { @@ -339,6 +340,14 @@ class WebGLPointsLayerRenderer extends WebGLLayerRenderer { this.featureCount_--; } + /** + * @private + */ + handleSourceFeatureClear_() { + this.featureCache_ = {}; + this.featureCount_ = 0; + } + /** * @inheritDoc */ From a1386e3a1f986a96fff4105aff735c46c3a6234b Mon Sep 17 00:00:00 2001 From: Andreas Hocevar Date: Tue, 10 Mar 2020 09:36:10 +0100 Subject: [PATCH 68/72] Update comment --- src/ol/MapBrowserEventHandler.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ol/MapBrowserEventHandler.js b/src/ol/MapBrowserEventHandler.js index 18f5899701..e9b37eb8c6 100644 --- a/src/ol/MapBrowserEventHandler.js +++ b/src/ol/MapBrowserEventHandler.js @@ -275,7 +275,8 @@ class MapBrowserEventHandler extends EventTarget { * @private */ handleTouchMove_(event) { - // In some environments (such as iOS 12), this handler can get called once before the `originalPointerMoveEvent_` is initialized. This prevents crashes in those situations (but may not work correctly if `originalPointerMoveEvent_` lags behind the current event?). + // Due to https://github.com/mpizenberg/elm-pep/issues/2, `this.originalPointerMoveEvent_` + // may not be initialized yet when we get here on a platform without native pointer events. if (this.originalPointerMoveEvent_ && this.originalPointerMoveEvent_.defaultPrevented) { event.preventDefault(); } From dd480feda10cb1626c5cbd907366d2a6e7985155 Mon Sep 17 00:00:00 2001 From: Sampo Osmonen Date: Tue, 10 Mar 2020 12:56:15 +0200 Subject: [PATCH 69/72] Prevent touchmove event default when no preceding pointer event Prevents zooming the page instead of the map on the first interaction --- src/ol/MapBrowserEventHandler.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ol/MapBrowserEventHandler.js b/src/ol/MapBrowserEventHandler.js index e9b37eb8c6..1c70416eb7 100644 --- a/src/ol/MapBrowserEventHandler.js +++ b/src/ol/MapBrowserEventHandler.js @@ -277,7 +277,7 @@ class MapBrowserEventHandler extends EventTarget { handleTouchMove_(event) { // Due to https://github.com/mpizenberg/elm-pep/issues/2, `this.originalPointerMoveEvent_` // may not be initialized yet when we get here on a platform without native pointer events. - if (this.originalPointerMoveEvent_ && this.originalPointerMoveEvent_.defaultPrevented) { + if (!this.originalPointerMoveEvent_ || this.originalPointerMoveEvent_.defaultPrevented) { event.preventDefault(); } } From e099257461014e06b7703db6f5251f4123558ad4 Mon Sep 17 00:00:00 2001 From: Lydia de Jongh Date: Tue, 10 Mar 2020 12:51:05 +0100 Subject: [PATCH 70/72] Add support for EventListener Object See: https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/addEventListener Support for native javascript eventListener.handleEvent() Typedef not correct yet. --- src/ol/events.js | 2 +- src/ol/events/Target.js | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/ol/events.js b/src/ol/events.js index 5a64a185ce..de13619cc5 100644 --- a/src/ol/events.js +++ b/src/ol/events.js @@ -18,7 +18,7 @@ import {clear} from './obj.js'; * Listener function. This function is called with an event object as argument. * When the function returns `false`, event propagation will stop. * - * @typedef {function((Event|import("./events/Event.js").default)): (void|boolean)} ListenerFunction + * @typedef {EventListener|function((Event|import("./events/Event.js").default)): (void|boolean)} ListenerFunction * @api */ diff --git a/src/ol/events/Target.js b/src/ol/events/Target.js index 766a954479..5e84ef10b2 100644 --- a/src/ol/events/Target.js +++ b/src/ol/events/Target.js @@ -107,6 +107,17 @@ class Target extends Disposable { this.pendingRemovals_[type] = 0; } ++this.dispatching_[type]; + for (let i = 0, ii = listeners.length; i < ii; ++i) { + if (listeners[i].handleEvent) { + propagate = listeners[i].handleEvent(evt); + } else { + propagate = listeners[i].call(this, evt); + } + if (propagate === false || evt.propagationStopped) { + propagate = false; + break; + } + } for (let i = 0, ii = listeners.length; i < ii; ++i) { if (listeners[i].call(this, evt) === false || evt.propagationStopped) { propagate = false; From 4fa454f2b3d5f2483006c6c06eb54647fa22d5d4 Mon Sep 17 00:00:00 2001 From: Andreas Hocevar Date: Tue, 10 Mar 2020 14:20:12 +0100 Subject: [PATCH 71/72] Fix types --- src/ol/Observable.js | 2 +- src/ol/events.js | 11 +++++++++-- src/ol/events/Target.js | 20 +++++++++----------- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/ol/Observable.js b/src/ol/Observable.js index b4d548a43b..347e131c73 100644 --- a/src/ol/Observable.js +++ b/src/ol/Observable.js @@ -51,7 +51,7 @@ class Observable extends EventTarget { /** * Listen for a certain type of event. * @param {string|Array} type The event type or array of event types. - * @param {function(?): ?} listener The listener function. + * @param {import("./events.js").ListenerFunction} listener The listener function. * @return {import("./events.js").EventsKey|Array} Unique key for the listener. If * called with an array of event types as the first argument, the return * will be an array of keys. diff --git a/src/ol/events.js b/src/ol/events.js index de13619cc5..f234e82dca 100644 --- a/src/ol/events.js +++ b/src/ol/events.js @@ -13,15 +13,22 @@ import {clear} from './obj.js'; * @api */ - /** * Listener function. This function is called with an event object as argument. * When the function returns `false`, event propagation will stop. * - * @typedef {EventListener|function((Event|import("./events/Event.js").default)): (void|boolean)} ListenerFunction + * @typedef {function((Event|import("./events/Event.js").default)): (void|boolean)} ListenerFunction * @api */ +/** + * @typedef {Object} ListenerObject + * @property {ListenerFunction} handleEvent + */ + +/** + * @typedef {ListenerFunction|ListenerObject} Listener + */ /** * Registers an event listener on an event target. Inspired by diff --git a/src/ol/events/Target.js b/src/ol/events/Target.js index 5e84ef10b2..6dd9a1c762 100644 --- a/src/ol/events/Target.js +++ b/src/ol/events/Target.js @@ -56,7 +56,7 @@ class Target extends Disposable { /** * @private - * @type {!Object>} + * @type {!Object>} */ this.listeners_ = {}; @@ -64,7 +64,7 @@ class Target extends Disposable { /** * @param {string} type Type. - * @param {import("../events.js").ListenerFunction} listener Listener. + * @param {import("../events.js").Listener} listener Listener. */ addEventListener(type, listener) { if (!type || !listener) { @@ -85,15 +85,13 @@ class Target extends Disposable { * of this type. The event parameter can either be a string or an * Object with a `type` property. * - * @param {{type: string, - * target: (EventTargetLike|undefined), - * propagationStopped: (boolean|undefined)}| - * import("./Event.js").default|string} event Event object. + * @param {import("./Event.js").default|string} event Event object. * @return {boolean|undefined} `false` if anyone called preventDefault on the * event object or if any of the listeners returned false. * @api */ dispatchEvent(event) { + /** @type {import("./Event.js").default|Event} */ const evt = typeof event === 'string' ? new Event(event) : event; const type = evt.type; if (!evt.target) { @@ -108,10 +106,10 @@ class Target extends Disposable { } ++this.dispatching_[type]; for (let i = 0, ii = listeners.length; i < ii; ++i) { - if (listeners[i].handleEvent) { - propagate = listeners[i].handleEvent(evt); + if ('handleEvent' in listeners[i]) { + propagate = /** @type {import("../events.js").ListenerObject} */ (listeners[i]).handleEvent(evt); } else { - propagate = listeners[i].call(this, evt); + propagate = /** @type {import("../events.js").ListenerFunction} */ (listeners[i]).call(this, evt); } if (propagate === false || evt.propagationStopped) { propagate = false; @@ -149,7 +147,7 @@ class Target extends Disposable { * order that they will be called in. * * @param {string} type Type. - * @return {Array} Listeners. + * @return {Array} Listeners. */ getListeners(type) { return this.listeners_[type]; @@ -168,7 +166,7 @@ class Target extends Disposable { /** * @param {string} type Type. - * @param {import("../events.js").ListenerFunction} listener Listener. + * @param {import("../events.js").Listener} listener Listener. */ removeEventListener(type, listener) { const listeners = this.listeners_[type]; From e59aa02a15b3c0c92ad1a27772ea7c354e47318c Mon Sep 17 00:00:00 2001 From: Andreas Hocevar Date: Tue, 10 Mar 2020 14:20:20 +0100 Subject: [PATCH 72/72] Remove duplicated for loop --- src/ol/events/Target.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/ol/events/Target.js b/src/ol/events/Target.js index 6dd9a1c762..7ea0ccf929 100644 --- a/src/ol/events/Target.js +++ b/src/ol/events/Target.js @@ -116,12 +116,6 @@ class Target extends Disposable { break; } } - for (let i = 0, ii = listeners.length; i < ii; ++i) { - if (listeners[i].call(this, evt) === false || evt.propagationStopped) { - propagate = false; - break; - } - } --this.dispatching_[type]; if (this.dispatching_[type] === 0) { let pendingRemovals = this.pendingRemovals_[type];