Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump js-yaml from 3.7.0 to 3.13.1 in /src/resources/lib/es6-promise-4.1.0 #3

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Bump js-yaml from 3.7.0 to 3.13.1 in /src/resources/lib/es6-promise-4.1.0 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6d73a68
Remove legend width when minimizing
hwbllmnn Aug 5, 2019
54c826d
Open real filter window if vector layer is server bound
hwbllmnn Aug 5, 2019
e57f426
Request chart data from server in case of vector layers
hwbllmnn Aug 5, 2019
486c4a9
bugfix of retrieving titleTpl in D3Chart
mpochert Aug 5, 2019
4fbef59
Merge branch 'fix-minimize' into 'master'
hwbllmnn Aug 6, 2019
50c6eff
Merge branch 'vector-server' into 'master'
hwbllmnn Aug 6, 2019
58f6177
Merge remote-tracking branch 'customer/master' into customer-changes
hwbllmnn Aug 6, 2019
2fbcfc9
Merge branch 'customer-changes' into 'master'
hwbllmnn Aug 6, 2019
53af472
Bump js-yaml in /src/resources/lib/es6-promise-4.1.0
dependabot[bot] Nov 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/app/util/Filter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion src/app/view/component/D3Chart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 || '';
Expand Down
3 changes: 2 additions & 1 deletion src/app/view/component/D3ChartController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,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();
Expand Down
5 changes: 0 additions & 5 deletions src/app/view/component/MapController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
5 changes: 5 additions & 0 deletions src/app/view/menu/LayerSettingsMenuController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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');
Expand Down
4 changes: 2 additions & 2 deletions src/classic/src/view/panel/RoutingLegendTree.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 13 additions & 9 deletions src/resources/lib/es6-promise-4.1.0/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -2709,11 +2713,11 @@ [email protected]:
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"
Expand Down Expand Up @@ -3863,7 +3867,7 @@ [email protected]:

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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -4579,7 +4583,7 @@ [email protected]:

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"
Expand Down