From e6cda406c96b69025b469fbc397c628a6e446890 Mon Sep 17 00:00:00 2001
From: Mark van der Wal <mark.vanderwal@akkerweb.nl>
Date: Sat, 25 Jul 2020 09:57:24 +0200
Subject: [PATCH] improved alignment of legend. fixed rain in weatherservice.

---
 .../components/legend/legend.component.html   | 24 +++++++++++++------
 .../components/legend/legend.component.scss   |  5 ++++
 .../common/src/fm/services/weather.service.ts |  2 +-
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/projects/common-map/src/fm-map/components/legend/legend.component.html b/projects/common-map/src/fm-map/components/legend/legend.component.html
index 5f2d503..96c5748 100644
--- a/projects/common-map/src/fm-map/components/legend/legend.component.html
+++ b/projects/common-map/src/fm-map/components/legend/legend.component.html
@@ -28,13 +28,23 @@
     </td>
   </tr>
   <tr *ngIf="showHistogram()">
-    <td colspan="4" class="pb-2 pt-2">
-      <div class="info pt-2"  [ngbCollapse]="hideHistogramDetails">
-        <div><span i18n>Average: </span>{{layer.renderer.band.histogram.mean| number:'1.0-3'}}</div>
-        <div><span i18n>Standard deviation: </span>{{layer.renderer.band.histogram.stddev| number:'1.0-3'}}</div>
-        <div><span i18n>Min: </span>{{layer.renderer.band.histogram.min| number:'1.0-3'}}</div>
-        <div><span i18n>Max: </span>{{layer.renderer.band.histogram.max| number:'1.0-3'}}</div>
-        <div *ngIf="showConfidenceInterval()"><span i18n>Confidence interval:</span> {{layer.renderer.band.histogram.confidence * 100| number:'1.0-0'}}%</div>
+    <td colspan="4" class="pb-1 pt-1">
+      <div class="info" [ngbCollapse]="hideHistogramDetails">
+        <div class="row pl-3">
+          <div class="col-8 nopadding" i18n>Average<span>:</span></div>
+          <div class="col-4 pull-left nopadding">{{layer.renderer.band.histogram.mean| number:'1.0-2'}}</div>
+          <div class="col-8 nopadding" i18n>Standard deviation<span>:</span></div>
+          <div class="col-4 pull-left nopadding">{{layer.renderer.band.histogram.stddev| number:'1.0-2'}}</div>
+          <div class="col-8 nopadding" i18n>Min<span>:</span></div>
+          <div class="col-4 pull-left nopadding">{{layer.renderer.band.histogram.min| number:'1.0-2'}}</div>
+          <div class="col-8 nopadding" i18n>Max<span>:</span></div>
+          <div class="col-4 pull-left nopadding">{{layer.renderer.band.histogram.max| number:'1.0-2'}}</div>
+
+          <ng-container *ngIf="showConfidenceInterval()">
+            <div class="col-8 nopadding" i18n>Confidence interval<span>:</span></div>
+            <div class="col-4 pull-left nopadding">{{layer.renderer.band.histogram.confidence * 100| number:'1.0-0'}}%</div>
+          </ng-container>
+        </div>
       </div>
     </td>
   </tr>
diff --git a/projects/common-map/src/fm-map/components/legend/legend.component.scss b/projects/common-map/src/fm-map/components/legend/legend.component.scss
index 8ba4fd7..428b21f 100644
--- a/projects/common-map/src/fm-map/components/legend/legend.component.scss
+++ b/projects/common-map/src/fm-map/components/legend/legend.component.scss
@@ -16,6 +16,11 @@
   margin-bottom: 0;
 }
 
+.nopadding{
+  padding: 0 !important;
+  margin: 0 !important;
+}
+
 span.color {
   display:inline-block;
   width: 1.5em;
diff --git a/projects/common/src/fm/services/weather.service.ts b/projects/common/src/fm/services/weather.service.ts
index 024d7d5..f2402a9 100644
--- a/projects/common/src/fm/services/weather.service.ts
+++ b/projects/common/src/fm/services/weather.service.ts
@@ -91,7 +91,7 @@ export class WeatherService {
             minTemperature: Math.min(...wData.map(d => d.temperature)),
             maxTemperature: Math.max(...wData.map(d => d.temperature)),
             relHumidity: wData.reduce( (r, e) => r + e.relativeHumidity, 0) / wData.length,
-            precipitation: wData.reduce( (r, e) => r + e.rain, 0) * 10,
+            precipitation: wData.reduce( (r, e) => r + e.rain, 0),
             wSpeed: wData.reduce( (r, e) => r + e.windSpeed, 0) / wData.length,
             wDir: bestWindDirection,
             wCardinal: bestCardinal