Compare commits
31 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 98db16fc7e | |||
| 0f24014de0 | |||
| bd2d025164 | |||
|
cc4cde76cb | ||
|
|
b6c0628682 | ||
|
|
4b9d2e6e05 | ||
|
|
e22878ccdb | ||
|
|
0142c17e2a | ||
|
|
a811e8eaf7 | ||
| 62145b9569 | |||
| 58c84bc13d | |||
|
|
dd44069132 | ||
|
|
c96d751e2e | ||
|
|
a8e55457a5 | ||
|
|
f0caa9e1db | ||
|
|
12923be93e | ||
|
|
046d681b25 | ||
|
|
34d0d86bd5 | ||
| 6e8e8db12e | |||
| f5ec4204fe | |||
| 2d5fb1a48a | |||
| c217195605 | |||
| 7aeff96eed | |||
| 96906d57cf | |||
|
|
1810b0005a | ||
| 53f79ce16a | |||
| e95e29a96a | |||
|
ea976842cd | ||
| f1342b118f | |||
| aa59a17a7c | |||
|
|
fb2b34d7ff |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -362,3 +362,4 @@ MigrationBackup/
|
||||
# Fody - auto-generated XML schema
|
||||
FodyWeavers.xsd
|
||||
|
||||
upstreamProjects/
|
||||
@@ -1913,7 +1913,7 @@ namespace FarmMapsAPI.Carbon
|
||||
var monthClimateList = new List<ClimateVariable>();
|
||||
foreach (var month in gisSoilSet.AllMonths)
|
||||
{
|
||||
var climateYear = loopYear > 2020 || loopYear < 2011 ? 2012 : loopYear;
|
||||
var climateYear = loopYear > 2050 || loopYear < 2011 ? 2012 : loopYear;
|
||||
var monthData = climate.Single(x => x.Key.Item1 == farmZone && x.Key.Item2 == month && x.Key.Item3 == climateYear).Value;
|
||||
var newMonthData = new ClimateVariable(monthData.Temperature, monthData.Precipitation, monthData.Evapotranspiration * 1.25);
|
||||
monthClimateList.Add(newMonthData);
|
||||
|
||||
166
CarbonLib.csproj
166
CarbonLib.csproj
@@ -1,83 +1,83 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp3.1</TargetFramework>
|
||||
<AssemblyName>CarbonLib</AssemblyName>
|
||||
<PackageId>CarbonLib</PackageId>
|
||||
<RuntimeIdentifiers>win10-x64;ubuntu.16.04-x64</RuntimeIdentifiers>
|
||||
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
|
||||
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
|
||||
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
|
||||
<Version>1.3.0</Version>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Base.Core.Common" Version="1.3.0.13" />
|
||||
<PackageReference Include="Base.Core.Common.Geometry" Version="1.7.0" />
|
||||
<PackageReference Include="NetTopologySuite" Version="2.0.0" />
|
||||
<PackageReference Include="NetTopologySuite.IO.GeoJSON" Version="2.0.4" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Update="config\CropCoverMonth.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\CropProperties.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\CropSets.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\CropYield.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\CropYield.json.old">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\Farm_input_sets.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\GIS_Soil_Sets.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\KNMI_data.csv">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\ManCcont.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\Mapping\MappingCropsFarmmapsMiterraRothC.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\Mapping\MappingGreenManureFarmmapsMiterraRothC.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\ParametersRothC.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\PC4\PC4.cpg">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\PC4\PC4.dbf">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\PC4\PC4.prj">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\PC4\PC4.shp">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\PC4\PC4.shx">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\RegionSets.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\SetsForDataTransformation.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\YieldGreenManure.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net6</TargetFramework>
|
||||
<AssemblyName>CarbonLib</AssemblyName>
|
||||
<PackageId>CarbonLib</PackageId>
|
||||
<RuntimeIdentifiers>win10-x64;ubuntu.16.04-x64</RuntimeIdentifiers>
|
||||
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
|
||||
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
|
||||
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
|
||||
<Version>2.2.0</Version>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Base.Core.Common" Version="2.3.0" />
|
||||
<PackageReference Include="Base.Core.Common.Geometry" Version="2.3.0" />
|
||||
<PackageReference Include="NetTopologySuite" Version="2.5.0" />
|
||||
<PackageReference Include="NetTopologySuite.IO.GeoJSON" Version="3.0.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Update="config\CropCoverMonth.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\CropProperties.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\CropSets.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\CropYield.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\CropYield.json.old">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\Farm_input_sets.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\GIS_Soil_Sets.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\KNMI_data.csv">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\ManCcont.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\Mapping\MappingCropsFarmmapsMiterraRothC.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\Mapping\MappingGreenManureFarmmapsMiterraRothC.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\ParametersRothC.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\PC4\PC4.cpg">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\PC4\PC4.dbf">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\PC4\PC4.prj">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\PC4\PC4.shp">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\PC4\PC4.shx">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\RegionSets.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\SetsForDataTransformation.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="config\YieldGreenManure.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
50
Jenkinsfile
vendored
50
Jenkinsfile
vendored
@@ -1,42 +1,30 @@
|
||||
@Library('farmmaps-shared-library') _
|
||||
|
||||
pipeline {
|
||||
agent any
|
||||
environment {
|
||||
APP_VERSION_PREFIX=sh(script: ' cat *.csproj| xmlstarlet sel -t -m "/Project/PropertyGroup/Version" -v . -n|awk -v def="1.0.0" "{print} END { if(NR==0) {print def} }"', returnStdout: true).trim()
|
||||
APP_NAME=sh(script: ' cat *.csproj| xmlstarlet sel -t -m "/Project/PropertyGroup/AssemblyName" -v . -n|awk -v def="App" "{print tolower(\\$0)} END { if(NR==0) {print def} }"', returnStdout: true).trim()
|
||||
APP_VERSION="${APP_VERSION_PREFIX}"
|
||||
agent any;
|
||||
options {
|
||||
copyArtifactPermission projectNames: env.allProjectsArtifactPermission;
|
||||
disableConcurrentBuilds abortPrevious: true;
|
||||
}
|
||||
triggers {
|
||||
upstream(
|
||||
upstreamProjects: '/FarmMaps/Base.Core.Common.Geometry/master',
|
||||
threshold: hudson.model.Result.SUCCESS
|
||||
)
|
||||
}
|
||||
stages {
|
||||
stage('Dotnet Restore') {
|
||||
stage('BaseBuildAll') {
|
||||
steps {
|
||||
sh '''dotnet restore CarbonLib.csproj'''
|
||||
stepBaseBuildAll();
|
||||
}
|
||||
}
|
||||
stage('Dotnet Build') {
|
||||
steps {
|
||||
sh '''dotnet build CarbonLib.csproj'''
|
||||
}
|
||||
}
|
||||
stage('Dotnet Package') {
|
||||
steps {
|
||||
sh '''rm -rf nuget
|
||||
dotnet pack -c release -o nuget -p:PackageVersion=${APP_VERSION} CarbonLib.csproj'''
|
||||
}
|
||||
}
|
||||
stage('Dotnet Publish') {
|
||||
steps {
|
||||
sh '''dotnet nuget push nuget/*.nupkg -k 0c3e3afc-935b-3db1-b023-e0d4799e674d -s https://repository.akkerweb.nl/repository/nuget-hosted/'''
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
post {
|
||||
success {
|
||||
postSuccess();
|
||||
}
|
||||
always {
|
||||
emailext (
|
||||
body: '${DEFAULT_CONTENT}',
|
||||
mimeType: 'text/html',
|
||||
replyTo: '${DEFAULT_REPLYTO}',
|
||||
subject: '${DEFAULT_SUBJECT}',
|
||||
to: emailextrecipients([[$class: 'CulpritsRecipientProvider'], [$class: 'RequesterRecipientProvider']])
|
||||
)
|
||||
postAlways();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,42 +1,30 @@
|
||||
@Library('farmmaps-shared-library') _
|
||||
|
||||
pipeline {
|
||||
agent any
|
||||
environment {
|
||||
APP_VERSION_PREFIX=sh(script: ' cat *.csproj| xmlstarlet sel -t -m "/Project/PropertyGroup/Version" -v . -n|awk -v def="1.0.0" "{print} END { if(NR==0) {print def} }"', returnStdout: true).trim()
|
||||
APP_NAME=sh(script: ' cat *.csproj| xmlstarlet sel -t -m "/Project/PropertyGroup/AssemblyName" -v . -n|awk -v def="App" "{print tolower(\\$0)} END { if(NR==0) {print def} }"', returnStdout: true).trim()
|
||||
APP_VERSION="${APP_VERSION_PREFIX + '-prerelease.' + env.BUILD_NUMBER}"
|
||||
agent any;
|
||||
options {
|
||||
copyArtifactPermission projectNames: env.allProjectsArtifactPermission;
|
||||
disableConcurrentBuilds abortPrevious: true;
|
||||
}
|
||||
triggers {
|
||||
upstream(
|
||||
upstreamProjects: '/FarmMaps.Develop/Base.Core.Common.Geometry/develop',
|
||||
threshold: hudson.model.Result.SUCCESS
|
||||
)
|
||||
}
|
||||
stages {
|
||||
stage('Dotnet Restore') {
|
||||
stage('BaseBuildAll') {
|
||||
steps {
|
||||
sh '''dotnet restore CarbonLib.csproj'''
|
||||
stepBaseBuildAll();
|
||||
}
|
||||
}
|
||||
stage('Dotnet Build'){
|
||||
steps {
|
||||
sh '''dotnet build CarbonLib.csproj'''
|
||||
}
|
||||
}
|
||||
stage('Dotnet Package') {
|
||||
steps {
|
||||
sh '''rm -rf nuget
|
||||
dotnet pack -c debug -o nuget -p:PackageVersion=${APP_VERSION} CarbonLib.csproj'''
|
||||
}
|
||||
}
|
||||
stage('Dotnet Publish') {
|
||||
steps {
|
||||
sh '''dotnet nuget push nuget/*.nupkg -k 0c3e3afc-935b-3db1-b023-e0d4799e674d -s https://repository.akkerweb.nl/repository/nuget-hosted/'''
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
post {
|
||||
success {
|
||||
postSuccess();
|
||||
}
|
||||
always {
|
||||
emailext (
|
||||
body: '${DEFAULT_CONTENT}',
|
||||
mimeType: 'text/html',
|
||||
replyTo: '${DEFAULT_REPLYTO}',
|
||||
subject: '${DEFAULT_SUBJECT}',
|
||||
to: emailextrecipients([[$class: 'CulpritsRecipientProvider'], [$class: 'RequesterRecipientProvider']])
|
||||
)
|
||||
postAlways();
|
||||
}
|
||||
}
|
||||
}
|
||||
5040
config/KNMI_data.csv
5040
config/KNMI_data.csv
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user