From f9934ccf27818a472a1b4c80e2e0abf0730d39ef Mon Sep 17 00:00:00 2001 From: Willem Dantuma Date: Tue, 29 Sep 2020 14:56:23 +0200 Subject: [PATCH 1/5] Fix AW-1355 --- projects/common-map/src/fm-map/effects/map.effects.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/common-map/src/fm-map/effects/map.effects.ts b/projects/common-map/src/fm-map/effects/map.effects.ts index 4e17cf7..d26b101 100644 --- a/projects/common-map/src/fm-map/effects/map.effects.ts +++ b/projects/common-map/src/fm-map/effects/map.effects.ts @@ -150,8 +150,10 @@ export class MapEffects { for (let f of action.features) { extend(extent, (f as Feature).getGeometry().getExtent()); } + if(action.features && action.features.length >0) { + actions.push(new mapActions.SetExtent(extent)); + } } - actions.push(new mapActions.SetExtent(extent)); } return actions; })); From 2fd109d96713caa4c70611ffd73b5fe656a1d296 Mon Sep 17 00:00:00 2001 From: Willem Dantuma Date: Tue, 29 Sep 2020 15:27:21 +0200 Subject: [PATCH 2/5] Fix AW-1414 --- .../selected-item-temporal.component.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html b/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html index 10ef92f..aa205a3 100644 --- a/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html +++ b/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html @@ -36,7 +36,10 @@
From 84d6f44e9b80b7c3af3fc5f7fa5b3ae0d5e503db Mon Sep 17 00:00:00 2001 From: Willem Dantuma Date: Tue, 29 Sep 2020 20:57:14 +0200 Subject: [PATCH 3/5] Fix transition --- .../components/menu-background/menu-background.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/common/src/fm/components/menu-background/menu-background.component.scss b/projects/common/src/fm/components/menu-background/menu-background.component.scss index 8622cf5..0ce509b 100644 --- a/projects/common/src/fm/components/menu-background/menu-background.component.scss +++ b/projects/common/src/fm/components/menu-background/menu-background.component.scss @@ -7,7 +7,7 @@ bottom:0; opacity: 0; background-color: #000000; - transition: opacity 0s ease-out 1s; + transition: opacity 0.3s ease-out; pointer-events: none; z-index:99; } From 7bdb48b6449528bc3496a5347fdc602e2eb57d2f Mon Sep 17 00:00:00 2001 From: Willem Dantuma Date: Wed, 30 Sep 2020 18:30:36 +0200 Subject: [PATCH 4/5] Fix signalr authentication --- projects/common/src/fm/services/event.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/common/src/fm/services/event.service.ts b/projects/common/src/fm/services/event.service.ts index d71e489..a0eb406 100644 --- a/projects/common/src/fm/services/event.service.ts +++ b/projects/common/src/fm/services/event.service.ts @@ -42,8 +42,8 @@ export class EventService { } private Authenticate() { - var accessToken = this.oauthService.getAccessToken(); - if (accessToken) { + var accessToken = this.oauthService.getAccessToken(); + if (this.oauthService.hasValidAccessToken()) { this._connection.send('authenticate', this.oauthService.getAccessToken()); this.authenticated=true; } else { From 835851350c5bdc2c569acf8594794bd7f0c59e94 Mon Sep 17 00:00:00 2001 From: Willem Dantuma Date: Fri, 2 Oct 2020 07:46:59 +0200 Subject: [PATCH 5/5] Fix i18n tags --- .../histogram-details.component.html | 10 +++---- .../statistics-details.component.html | 28 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/projects/common-map/src/fm-map/components/legend/histogram-details/histogram-details.component.html b/projects/common-map/src/fm-map/components/legend/histogram-details/histogram-details.component.html index e9e618c..f90fd6f 100644 --- a/projects/common-map/src/fm-map/components/legend/histogram-details/histogram-details.component.html +++ b/projects/common-map/src/fm-map/components/legend/histogram-details/histogram-details.component.html @@ -1,15 +1,15 @@
-
Average:
+
Average:
{{histogram.mean| number:'1.0-2'}}
-
Standard deviation:
+
Standard deviation:
{{histogram.stddev| number:'1.0-2'}}
-
Min:
+
Min:
{{histogram.min| number:'1.0-2'}}
-
Max:
+
Max:
{{histogram.max| number:'1.0-2'}}
-
Confidence interval:
+
Confidence interval:
{{histogram.confidence * 100| number:'1.0-0'}}%
diff --git a/projects/common-map/src/fm-map/components/legend/statistics-details/statistics-details.component.html b/projects/common-map/src/fm-map/components/legend/statistics-details/statistics-details.component.html index b9885f5..4fecbaa 100644 --- a/projects/common-map/src/fm-map/components/legend/statistics-details/statistics-details.component.html +++ b/projects/common-map/src/fm-map/components/legend/statistics-details/statistics-details.component.html @@ -1,36 +1,36 @@
-
Data points:
+
Data points:
{{statistics.populationCount}}
-
Min:
+
Min:
{{statistics.min| number:'1.0-2'}}
-
Max:
+
Max:
{{statistics.max| number:'1.0-2'}}
-
Min+1:
+
Min+1:
{{statistics.minPlus| number:'1.0-2'}}
-
Max-1:
+
Max-1:
{{statistics.maxMinus| number:'1.0-2'}}
-
Average:
+
Average:
{{statistics.mean| number:'1.0-2'}}
-
Standard deviation:
+
Standard deviation:
{{statistics.stddev| number:'1.0-2'}}
-
Mode:
+
Mode:
{{statistics.mode| number:'1.0-2'}}
-
Median:
+
Median:
{{statistics.median| number:'1.0-2'}}
-
Kurtosis:
+
Kurtosis:
{{statistics.curtosis| number:'1.0-2'}}
-
Skewness:
+
Skewness:
{{statistics.skewness| number:'1.0-2'}}
-
Variance:
+
Variance:
{{statistics.variance| number:'1.0-2'}}
-
Coefficient of variation:
+
Coefficient of variation:
{{statistics.variationCoefficient | number:'1.0-2'}}
-
90% Confidence interval:
+
90% Confidence interval:
{{statistics.confidenceIntervalLow | number:'1.0-2'}} - {{statistics.confidenceIntervalHigh | number:'1.0-2'}}