From 6d73a68f8560cf40b4f9c9eeddd42cb9bd306a83 Mon Sep 17 00:00:00 2001 From: Andreas Schmitz Date: Mon, 5 Aug 2019 09:28:47 +0200 Subject: [PATCH 1/5] Remove legend width when minimizing --- src/app/view/menu/LayerSettingsMenuController.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/app/view/menu/LayerSettingsMenuController.js b/src/app/view/menu/LayerSettingsMenuController.js index 466bddb3..66fbfec9 100644 --- a/src/app/view/menu/LayerSettingsMenuController.js +++ b/src/app/view/menu/LayerSettingsMenuController.js @@ -84,6 +84,10 @@ Ext.define('Koala.view.menu.LayerSettingsMenuController', { } if (me.cartoWindowsMinimized) { if (legend) { + var width = parseInt(chart.el.dom.style.width, 10); + chart.fullWidth = width; + width -= legend.getBoundingClientRect().width; + chart.el.dom.style.width = width + 'px'; chart.getController().toggleLegendVisibility(); chart.legendToggled = true; } else { @@ -99,6 +103,7 @@ Ext.define('Koala.view.menu.LayerSettingsMenuController', { } } else { if (chart.legendToggled) { + chart.el.dom.style.width = chart.fullWidth + 'px'; chart.getController().toggleLegendVisibility(); } svg = el.querySelector('svg'); From 54c826d6170253a16cadd9b0c4f92c7f72c024bf Mon Sep 17 00:00:00 2001 From: Andreas Schmitz Date: Mon, 5 Aug 2019 09:55:54 +0200 Subject: [PATCH 2/5] Open real filter window if vector layer is server bound --- src/classic/src/view/panel/RoutingLegendTree.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/classic/src/view/panel/RoutingLegendTree.js b/src/classic/src/view/panel/RoutingLegendTree.js index 1c721336..6cb545b1 100644 --- a/src/classic/src/view/panel/RoutingLegendTree.js +++ b/src/classic/src/view/panel/RoutingLegendTree.js @@ -317,8 +317,8 @@ Ext.define('Koala.view.panel.RoutingLegendTree', { changeFilterHandler: function(btn) { var layer = btn.layerRec.getOlLayer(); - - if (layer instanceof ol.layer.Vector) { + var serverBased = Koala.util.Object.getPathStrOr(layer, 'metadata/layerConfig/vector/url', false); + if (layer instanceof ol.layer.Vector && !serverBased) { if (!layer.filterGridWindow) { layer.filterGridWindow = Ext.create('Koala.view.window.FilterGridWindow', { layer: layer From e57f4260cc3de1faa010e97e7c4c4bf92208e886 Mon Sep 17 00:00:00 2001 From: Andreas Schmitz Date: Mon, 5 Aug 2019 10:15:02 +0200 Subject: [PATCH 3/5] Request chart data from server in case of vector layers --- src/app/util/Filter.js | 3 ++- src/app/view/component/D3ChartController.js | 3 ++- src/app/view/component/MapController.js | 5 ----- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/app/util/Filter.js b/src/app/util/Filter.js index ad0a3119..916420a8 100644 --- a/src/app/util/Filter.js +++ b/src/app/util/Filter.js @@ -119,7 +119,8 @@ Ext.define('Koala.util.Filter', { */ getStartEndFilterFromMetadata: function(metadata) { var layer = Koala.util.Layer.findLayerFromMetadata(metadata); - if (layer instanceof ol.layer.Vector) { + var serverBased = Koala.util.Object.getPathStrOr(layer, 'metadata/layerConfig/vector/url', false); + if (layer instanceof ol.layer.Vector && !serverBased) { return Koala.util.Filter.getStartEndFilterFromVectorLayer(layer, metadata); } diff --git a/src/app/view/component/D3ChartController.js b/src/app/view/component/D3ChartController.js index 6bc47444..ce9811e4 100644 --- a/src/app/view/component/D3ChartController.js +++ b/src/app/view/component/D3ChartController.js @@ -760,7 +760,8 @@ Ext.define('Koala.view.component.D3ChartController', { return; } - if (layer instanceof ol.layer.Vector) { + var serverBased = Koala.util.Object.getPathStrOr(layer, 'metadata/layerConfig/vector/url', false); + if (layer instanceof ol.layer.Vector && !serverBased) { var fmt = new ol.format.GeoJSON(); var data = layer.originalFeatures || layer.getSource().getFeatures(); data = data.slice(); diff --git a/src/app/view/component/MapController.js b/src/app/view/component/MapController.js index eb436f46..8da81e7a 100644 --- a/src/app/view/component/MapController.js +++ b/src/app/view/component/MapController.js @@ -80,11 +80,6 @@ Ext.define('Koala.view.component.MapController', { } }, me); - // if (me.distinctGeoms.length > 3) { - // Ext.Msg.alert(viewModel.get('warning'), viewModel.get('tooManyFeatures')); - // return; - // } - Ext.each(me.distinctGeoms, function(olFeat) { var layer = olFeat.get('layer'); var idField = Koala.util.Object.getPathStrOr(layer, From 486c4a992a2b20ea16088222d11f33bc59539926 Mon Sep 17 00:00:00 2001 From: "Marco Pochert, Bundesamt fuer Strahlenschutz, RN 1" Date: Mon, 5 Aug 2019 16:27:37 +0200 Subject: [PATCH 4/5] bugfix of retrieving titleTpl in D3Chart --- src/app/view/component/D3Chart.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/view/component/D3Chart.js b/src/app/view/component/D3Chart.js index cf1be651..fe38e133 100644 --- a/src/app/view/component/D3Chart.js +++ b/src/app/view/component/D3Chart.js @@ -104,7 +104,7 @@ Ext.define('Koala.view.component.D3Chart',{ var chartConfig = olLayer.get('timeSeriesChartProperties'); var StringUtil = Koala.util.String; var valFromSeq = StringUtil.getValueFromSequence; - var titleTpl = 'titleTpl' in chartConfig ? chartConfig.titleTpl : ''; + var titleTpl = (chartConfig.titleTpl) ? chartConfig.titleTpl : ''; var title = Koala.util.String.replaceTemplateStrings(titleTpl, olFeat); var yLabel = chartConfig.yAxisLabel || ''; var xLabel = chartConfig.xAxisLabel || ''; From 53af4723a655106440d1721dfac94955982f1a54 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 8 Nov 2019 12:50:40 +0000 Subject: [PATCH 5/5] Bump js-yaml in /src/resources/lib/es6-promise-4.1.0 Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 3.7.0 to 3.13.1. - [Release notes](https://github.com/nodeca/js-yaml/releases) - [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md) - [Commits](https://github.com/nodeca/js-yaml/compare/3.7.0...3.13.1) Signed-off-by: dependabot[bot] --- src/resources/lib/es6-promise-4.1.0/yarn.lock | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/resources/lib/es6-promise-4.1.0/yarn.lock b/src/resources/lib/es6-promise-4.1.0/yarn.lock index 51ba73b1..ad153abf 100644 --- a/src/resources/lib/es6-promise-4.1.0/yarn.lock +++ b/src/resources/lib/es6-promise-4.1.0/yarn.lock @@ -110,8 +110,8 @@ are-we-there-yet@~1.1.2: readable-stream "^2.0.0 || ^1.1.13" argparse@^1.0.7, argparse@~1.0.2: - version "1.0.9" - resolved "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86" + version "1.0.10" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" dependencies: sprintf-js "~1.0.2" @@ -1826,6 +1826,10 @@ esprima@^2.6.0: version "2.7.3" resolved "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581" +esprima@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + esprima@~3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/esprima/-/esprima-3.0.0.tgz#53cf247acda77313e551c3aa2e73342d3fb4f7d9" @@ -2639,7 +2643,7 @@ is-obj@^1.0.0: is-posix-bracket@^0.1.0: version "0.1.1" - resolved "http://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4" + resolved "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4" is-primitive@^2.0.0: version "2.0.0" @@ -2709,11 +2713,11 @@ js-tokens@1.0.1: resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-1.0.1.tgz#cc435a5c8b94ad15acb7983140fc80182c89aeae" js-yaml@^3.2.5, js-yaml@^3.2.7, js-yaml@^3.6.1: - version "3.7.0" - resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80" + version "3.13.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" dependencies: argparse "^1.0.7" - esprima "^2.6.0" + esprima "^4.0.0" jsesc@~0.5.0: version "0.5.0" @@ -3863,7 +3867,7 @@ regenerator@0.8.40: regex-cache@^0.4.2: version "0.4.3" - resolved "http://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145" + resolved "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145" dependencies: is-equal-shallow "^0.1.3" is-primitive "^2.0.0" @@ -4267,7 +4271,7 @@ spawn-sync@^1.0.15: sprintf-js@~1.0.2: version "1.0.3" - resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" stable@~0.1.3: version "0.1.5" @@ -4579,7 +4583,7 @@ ultron@1.0.x: umd@^3.0.0: version "3.0.1" - resolved "http://registry.npmjs.org/umd/-/umd-3.0.1.tgz#8ae556e11011f63c2596708a8837259f01b3d60e" + resolved "https://registry.npmjs.org/umd/-/umd-3.0.1.tgz#8ae556e11011f63c2596708a8837259f01b3d60e" underscore.string@~2.3.3: version "2.3.3"