FarmMaps/FarmMapsApiClient
10
0
Fork 1
Code Issues Pull Requests Releases Activity

master #16

Merged
mark merged 70 commits from :master into master 2025-01-10 15:39:26 +00:00
Conversation 0 Commits 70 Files Changed 33 +2724 -263
mark commented 2025-01-10 15:38:52 +00:00
Owner
Copy Link
No description provided.
mark added 70 commits 2025-01-10 15:38:53 +00:00
test e66820bd87
blah test 32138bef80
Merge branch 'master' of https://git.akkerweb.nl/abel/FarmMapsApiClient_KB34_MAST c79e0d062c
probeersel om een runKPItask te maken 7dda21dd77
geupdate runKPIitemtask, helaas nog geen KPI data gevonden als child item be22d631bc
aggegrate KPI = false toegevoegd aan inputs b7bedf182c
ook in in de andere KPIinout toegevoegd 8f8f857bf0
de properties voor de KPI task worden nu correct doorgegeven denk ik 3d7bf186e7
KPI items ophalen voor een cropfield werkt nu. wel dus een bestaand cropfield ingeven bij de settings in de BIN. Alle KPIs worden opgehaald na een minuut wachten. 55f00da9d0
KPI items opslaan werkt. alle KPI items worden nu naar een JSON file in de dowload folder geschreven 7149086ce2
Input aangepast, nu kan er van de gegeven input een cropfield wordern gemaakt, en hier kunnen vervolgens KPIs over berekend worden. Volgende stap is het strippen van de KPIinput om te kijken wat het minimale is dat nodig is om de kpis te berekenen. 8bb5c6f581
nu kan er van de gegeven input een cropfield wordern gemaakt, en hier kunnen vervolgens KPIs over berekend worden. Volgende stap is het strippen van de KPIinput om te kijken wat het minimale is dat nodig is om de kpis te berekenen. verder nu eem aantal inputs die niet nodig waren verwijdertInput aangepast, 59f9ef4743
de niet verplichte inputs verwijderd van de input file. Wel wordt er dus de input file gebruikt die in de C:\Users\hoeve065\Documents\hoofdmap_werk\project_KB34MAST nutrienten DB\API04.03\FarmMapsApiClient_KB34_MAST\FarmmapsKPI\bin\Debug\netcoreapp3.1\KPIInput.json staat, en niet bij het KPI programma. 8c5a0aed95
Merge branch 'master' of https://git.akkerweb.nl/abel/FarmMapsApiClient_KB34_MAST 641e09f833
update TargetFramework of all projects to netcoreapp3.1. Except FarmmapsAPi & Secrets which remain 2.1 9be9eb3145
niewste versie b99191b7b1
handles existing cropfielditemcode 8a770a1762
Extra note to Clone the git repository to a local drive. DON'T clone to a network drive like "My Documents". Latter may cause authentication problems. f04cc239d5
in KPIApplication possible to (1) add an operation, e.g. applying fertilizer and (2) add a cropfield characteristic containing cropyield. fedd363075
start & end date & geometry added to operations item and to cropfield characteristics item 1cc36422a4
farmmapsKPI receives minimum necessary input and writes relevant KPI output 4102ed628e
TODO 8771e47b28
don't write duplicate KPIOutput items to output csv 1a9d5af5f6
also write totalNapplied to csv file with KPI outputs per cropfield 2d588026e2
new project to download latest version of editeelt codelists d8c2ecb88b
also commit this file 546ce131e4
update todo list 90f285a0d1
and of course also add & commit this one ... 7f3b87ae38
remove author name from code 6eb36b2b4f
error catching and console input to ask which KPIinput file to use 6d903c3e9b
download codelist CL405, soil types 847ff75845
Added codelist CL251: Codering teeltdoelen (CropProductionPurposeCode) da808362c3
Get polygon area from geometry and give to operations if operation was on whole field cfba86cf75 
Time tracker for how much time the KPI calculations take
More testing & demo's in KPIInput.json: f1707c432f 
* pesticide
* effect of soiltype: yes, different target & threshold for nitrogen (OK)
* effect of productionpurpose: none?
* effect of location: different nitrogen balance due to different atmospheric deposition (OK)

And update TODO.txt
update KPIdefinitions.csv & TODO.txt aef8c7c446
StartDate & EndDate of cropfield. Is relevant for N fixation by leguminose crops where currently N fixation depends on day between these two dates. If not provided a whole year is assumed which leads to high N fixation 0b0ec8f767
two example inputs for testing garden pea (doperwt) for whole year of part of growing period aa18393102
specify how many seconds to wait for the KPItask to be completed 3f66676914
in KPIApplication add bofek to cropfield, because KPI E1 (milieubelastingspunten) only calculated if soil is known d616fd3dfc
read & write KPI "E1" = milieu belastingspunten ("mbp") 9d691dfed1
new Task<Configuration> GetConfiguration 4761166472
add miliebelastingspunten (mbp) and checks on whether KPI task is finished or not yet (if not yet then wait and call again) e4087adc77
details about N & P balance written to output file 5d02370f56
added detailed output for KPI C1 effective organic matter supply 5399fd66df
small updates on KPIdefinitions.csv & TODO.txt 619cb5e92c
bit of code simplification 39ee3263a7
C1 defs dea4f102f5
updated KPI definitions 5d2789a806
add codelist 265. Empty result? 77532fee9f
typos d756f08b4c
DataCropfieldCharacteristics as an array containing cropyield and possibly strawyield. If no strawyield is filled in then straw remains in field. 84f27db16e
updated names of output KPI B1 and B2 + added yieldStraw to output (non functional) 67014e20f5
write A1 yield & strawYield to output ffbb45894a 
update definitions
update TODO.txt
added target and threshold definitions + changed productionPurposeCode to be functional fe2bd98589
updated KPIdefinitions and todolist 0a9a83a5a6
Included relevant codelist for dataOperations operationCode and status. efb4d6833f
added example with greenmanure 6faa5104c8
added code for checking if multiple runs give same KPI output e05bb5a8f7 
(should be but is not, so where is it going wrong?)
calculate KPI's for all example fields instead of one field a98a81776d
throw warning instead of error 24feeba58e
Merge branch 'master' of https://git.akkerweb.nl/abel/FarmMapsApiClient_KB34_MAST fcf6b2af51
removed incorrect duplicate KPIs 6d6b5b1b7a
commented out the totalNfertiliserInput = totalNferiliserCropfield check c2e4f9d861
//added a duplicate counter to deal with calculations where there is more 1 duplicate. 178ba1ea5b
changed explanation of optional inputs for green manure. 752b538780
Added CL104 da82c232e3
Added KPI G1 ammonia emissions (only on test servers) 67e5cb6bb4 
- Ammonia emissions from fertilizers not yet fully functional
KPI ammonia emissions is now fully functional (including in the example input file) fb92fa0d1c
Merge remote-tracking branch 'upstream/master' fd44f99c98 
And updated ShowGeotiff.r using new 'r' 'terra' packages
And added comment for the DataDownloadApplication and for the BulkSatDownloadApplication:
    //To run this app, first go to farmmaps datastore at https://farmmaps.eu/en/editor/plan (or on test)
    //goto 'Apps and Data', goto 'Data', buy (or get for free?): 'SATELLITE'
Delete the FarmmapsCleanUpApplication c6e4f7368f
mark merged commit 56b337aebf into master 2025-01-10 15:39:26 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
Improvements
No Label
Milestone
No items
No Milestone
Assignees
Clear assignees
Fedde GeertKessel Jenkins Jira francisco mark peter pvanoort thomasbeen wdantuma wilco
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: FarmMaps/FarmMapsApiClient#16
No description provided.
Delete Branch ":master"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?