FarmMaps/FarmMapsLib
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

improved alignment of legend. fixed rain in weatherservice.
All checks were successful
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Mark van der Wal 2020-07-25 09:57:24 +02:00
parent df04397b13
commit e6cda406c9
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
projects/common-map/src/fm-map/components/legend/legend.component.html
View File

@ -28,13 +28,23 @@
</td> </td>
</tr> </tr>
<tr *ngIf="showHistogram()"> <tr *ngIf="showHistogram()">
<td colspan="4" class="pb-2 pt-2"> <td colspan="4" class="pb-1 pt-1">
<div class="info pt-2" [ngbCollapse]="hideHistogramDetails"> <div class="info" [ngbCollapse]="hideHistogramDetails">
<div><span i18n>Average: </span>{{layer.renderer.band.histogram.mean| number:'1.0-3'}}</div> <div class="row pl-3">
<div><span i18n>Standard deviation: </span>{{layer.renderer.band.histogram.stddev| number:'1.0-3'}}</div> <div class="col-8 nopadding" i18n>Average<span>:</span></div>
<div><span i18n>Min: </span>{{layer.renderer.band.histogram.min| number:'1.0-3'}}</div> <div class="col-4 pull-left nopadding">{{layer.renderer.band.histogram.mean| number:'1.0-2'}}</div>
<div><span i18n>Max: </span>{{layer.renderer.band.histogram.max| number:'1.0-3'}}</div> <div class="col-8 nopadding" i18n>Standard deviation<span>:</span></div>
<div *ngIf="showConfidenceInterval()"><span i18n>Confidence interval:</span> {{layer.renderer.band.histogram.confidence * 100| number:'1.0-0'}}%</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> </div>
</td> </td>
</tr> </tr>

5
projects/common-map/src/fm-map/components/legend/legend.component.scss
View File

@ -16,6 +16,11 @@
margin-bottom: 0; margin-bottom: 0;
} }
.nopadding{
padding: 0 !important;
margin: 0 !important;
}
span.color { span.color {
display:inline-block; display:inline-block;
width: 1.5em; width: 1.5em;

2
projects/common/src/fm/services/weather.service.ts
View File

@ -91,7 +91,7 @@ export class WeatherService {
minTemperature: Math.min(...wData.map(d => d.temperature)), minTemperature: Math.min(...wData.map(d => d.temperature)),
maxTemperature: Math.max(...wData.map(d => d.temperature)), maxTemperature: Math.max(...wData.map(d => d.temperature)),
relHumidity: wData.reduce( (r, e) => r + e.relativeHumidity, 0) / wData.length, 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, wSpeed: wData.reduce( (r, e) => r + e.windSpeed, 0) / wData.length,
wDir: bestWindDirection, wDir: bestWindDirection,
wCardinal: bestCardinal wCardinal: bestCardinal