-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: fixed processing graph keyword (#69)
Co-authored-by: Gerald Walter Irsiegler <gerald@Irsiegler-P14s>
- Loading branch information
Showing
3 changed files
with
171 additions
and
112 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| [tool.poetry] | ||
| name = "openeo-pg-parser-networkx" | ||
| version = "2023.10.5" | ||
| version = "2023.10.6" | ||
|
|
||
| description = "Parse OpenEO process graphs from JSON to traversible Python objects." | ||
| authors = ["Lukas Weidenholzer <[email protected]>", "Sean Hoyal <[email protected]>", "Valentina Hutter <[email protected]>", "Gerald Irsiegler <[email protected]>"] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,116 +1,175 @@ | ||
| { | ||
| "loadcollection1":{ | ||
| "process_id":"load_collection", | ||
| "arguments":{ | ||
| "bands":[ | ||
| "B02", | ||
| "B03" | ||
| ], | ||
| "id":"boa_sentinel_2", | ||
| "spatial_extent":{ | ||
| "west":11.389, | ||
| "east":11.39, | ||
| "south":46.349, | ||
| "north":46.35 | ||
| }, | ||
| "temporal_extent":[ | ||
| "2016-09-01", | ||
| "2018-09-01" | ||
| ] | ||
| "id": "testcurvefitgerald22", | ||
| "process_graph": { | ||
| "loadcollection1": { | ||
| "process_id": "load_collection", | ||
| "arguments": { | ||
| "bands": [ | ||
| "B02", | ||
| "B03" | ||
| ], | ||
| "id": "boa_sentinel_2", | ||
| "spatial_extent": { | ||
| "west": 11.5, | ||
| "east": 11.8, | ||
| "south": 47, | ||
| "north": 47.3 | ||
| }, | ||
| "temporal_extent": [ | ||
| "2016-09-01", | ||
| "2018-09-01" | ||
| ] | ||
| } | ||
| }, | ||
| "apply1":{ | ||
| "process_id":"apply", | ||
| "arguments":{ | ||
| "data":{ | ||
| "from_node":"loadcollection1" | ||
| }, | ||
| "process":{ | ||
| "process_graph":{ | ||
| "clip1":{ | ||
| "process_id":"clip", | ||
| "arguments":{ | ||
| "max":5000, | ||
| "min":0, | ||
| "x":{ | ||
| "from_parameter":"x" | ||
| } | ||
| }, | ||
| "result":true | ||
| } | ||
| }, | ||
| "apply1": { | ||
| "process_id": "apply", | ||
| "arguments": { | ||
| "data": { | ||
| "from_node": "loadcollection1" | ||
| }, | ||
| "process": { | ||
| "process_graph": { | ||
| "clip1": { | ||
| "process_id": "clip", | ||
| "arguments": { | ||
| "max": 5000, | ||
| "min": 0, | ||
| "x": { | ||
| "from_parameter": "x" | ||
| } | ||
| }, | ||
| "result": true | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "fitcurve1":{ | ||
| "process_id":"fit_curve", | ||
| "arguments":{ | ||
| "data":{ | ||
| "from_node":"apply1" | ||
| }, | ||
| "dimension":"time", | ||
| "function":{ | ||
| "process_graph":{ | ||
| "arrayelement1":{ | ||
| "process_id":"array_element", | ||
| "arguments":{ | ||
| "data":{ | ||
| "from_parameter":"parameters" | ||
| }, | ||
| "index":0 | ||
| } | ||
| }, | ||
| "arrayelement2":{ | ||
| "process_id":"array_element", | ||
| "arguments":{ | ||
| "data":{ | ||
| "from_parameter":"parameters" | ||
| }, | ||
| "index":1 | ||
| } | ||
| }, | ||
| "multiply1":{ | ||
| "process_id":"multiply", | ||
| "arguments":{ | ||
| "x":{ | ||
| "from_node":"arrayelement2" | ||
| }, | ||
| "y":{ | ||
| "from_parameter":"x" | ||
| } | ||
| } | ||
| }, | ||
| "add1":{ | ||
| "process_id":"add", | ||
| "arguments":{ | ||
| "x":{ | ||
| "from_node":"arrayelement1" | ||
| }, | ||
| "y":{ | ||
| "from_node":"multiply1" | ||
| } | ||
| }, | ||
| "result":true | ||
| } | ||
| }, | ||
| "fitcurve1": { | ||
| "process_id": "fit_curve", | ||
| "arguments": { | ||
| "data": { | ||
| "from_node": "apply1" | ||
| }, | ||
| "dimension": "t", | ||
| "function": { | ||
| "process_graph": { | ||
| "arrayelement1": { | ||
| "process_id": "array_element", | ||
| "arguments": { | ||
| "data": { | ||
| "from_parameter": "parameters" | ||
| }, | ||
| "index": 0 | ||
| } | ||
| }, | ||
| "arrayelement2": { | ||
| "process_id": "array_element", | ||
| "arguments": { | ||
| "data": { | ||
| "from_parameter": "parameters" | ||
| }, | ||
| "index": 1 | ||
| } | ||
| }, | ||
| "multiply1": { | ||
| "process_id": "multiply", | ||
| "arguments": { | ||
| "x": 1.991021277657232e-7, | ||
| "y": { | ||
| "from_parameter": "x" | ||
| } | ||
| } | ||
| }, | ||
| "cos1": { | ||
| "process_id": "cos", | ||
| "arguments": { | ||
| "x": { | ||
| "from_node": "multiply1" | ||
| } | ||
| } | ||
| }, | ||
| "multiply2": { | ||
| "process_id": "multiply", | ||
| "arguments": { | ||
| "x": { | ||
| "from_node": "arrayelement2" | ||
| }, | ||
| "y": { | ||
| "from_node": "cos1" | ||
| } | ||
| } | ||
| }, | ||
| "add1": { | ||
| "process_id": "add", | ||
| "arguments": { | ||
| "x": { | ||
| "from_node": "arrayelement1" | ||
| }, | ||
| "y": { | ||
| "from_node": "multiply2" | ||
| } | ||
| } | ||
| }, | ||
| "arrayelement3": { | ||
| "process_id": "array_element", | ||
| "arguments": { | ||
| "data": { | ||
| "from_parameter": "parameters" | ||
| }, | ||
| "index": 2 | ||
| } | ||
| }, | ||
| "sin1": { | ||
| "process_id": "sin", | ||
| "arguments": { | ||
| "x": { | ||
| "from_node": "multiply1" | ||
| } | ||
| } | ||
| }, | ||
| "multiply3": { | ||
| "process_id": "multiply", | ||
| "arguments": { | ||
| "x": { | ||
| "from_node": "arrayelement3" | ||
| }, | ||
| "y": { | ||
| "from_node": "sin1" | ||
| } | ||
| } | ||
| }, | ||
| "add2": { | ||
| "process_id": "add", | ||
| "arguments": { | ||
| "x": { | ||
| "from_node": "add1" | ||
| }, | ||
| "y": { | ||
| "from_node": "multiply3" | ||
| } | ||
| }, | ||
| "result": true | ||
| } | ||
| }, | ||
| "parameters":[ | ||
| 1, | ||
| 2 | ||
| ] | ||
| } | ||
| }, | ||
| "parameters": [ | ||
| 400, | ||
| 100, | ||
| -100 | ||
| ] | ||
| } | ||
| }, | ||
| "saveresult1":{ | ||
| "process_id":"save_result", | ||
| "arguments":{ | ||
| "data":{ | ||
| "from_node":"fitcurve1" | ||
| }, | ||
| "format":"NetCDF", | ||
| "options":{ | ||
|
|
||
| } | ||
| }, | ||
| "saveresult1": { | ||
| "process_id": "save_result", | ||
| "arguments": { | ||
| "data": { | ||
| "from_node": "fitcurve1" | ||
| }, | ||
| "format": "NetCDF", | ||
| "options": { | ||
| } | ||
| }, | ||
| "result":true | ||
| } | ||
| "result": true | ||
| } | ||
| } | ||
| } |