New Forge Algorithms #30

sliu008 · 2024-11-18T18:34:07Z

Added a new bin average method for thinning
Added open cv strategy to generating footprint
Added License
Update way configuration structure are for forge-py
Update documentations

jamesfwood · 2024-11-19T17:45:39Z

README.md

+           "simplify":0.3,
+           "min_area": 30,
+           "fill_kernel": [30,30],
+           "group": "group for lon lat"


Let's get rid of these groups and put them in the latVar, lonVar, and timeVar.
Same for in alpha_shape

jamesfwood · 2024-11-19T18:23:06Z

tests/input/SCATSAT1_ESDR_L2_WIND_STRESS_V1.1.cfg

-        ]
+    "footprint":{
+      "strategy":"alpha_shape",
+      "alpha_shape":{


Update this example file

jamesfwood · 2024-11-19T18:25:28Z

podaac/forge_py/forge.py


-    wkt_alphashape = dumps(alpha_shape)
-    return wkt_alphashape
+    return dumps(footprint, trim=True)


 def fit_footprint(


This is only for alpha_shape right? Can you move all the alpha_shape strategy to a new file? And keep the forge.py small and simple. Maybe you can create a new subdir with strategy and then put the open_cv_footprint.py and the alpha_shape_footprint.py in there to keep it more organized. Sound good?

jamesfwood · 2024-11-19T18:28:35Z

CHANGELOG.md

@@ -8,6 +8,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]

 ### Added
+- Updated alpha shape algorithm with bin average thinning


Update this with the new suggestions too

jamesfwood · 2024-11-19T18:32:40Z

README.md

+## Configuration Options
+
+### `footprint`
+* **`lonVar`** (string, required): Longitude variable in the dataset.


Add that group is supported and give an example

jamesfwood · 2024-11-19T18:32:52Z

README.md

+  * **`pixel_height`** (int, optional, default: 1800): Desired pixel height for the input image.
+  * **`min_area`** (int, optional): Minimum area for polygons to be retained.
+  * **`fill_kernel`** (list of int, optional, default: [20,20]): Kernel size for filling holes in polygons.
+  * **`group`** (string, optional): NetCDF file group to use for input data for lon lat.


remove this

jamesfwood · 2024-11-19T18:33:01Z

README.md

+    * **`value`** (list of float or float): Thinning parameters.
+  * **`cutoff_lat`** (int, optional): Latitude cutoff for smoothing.
+  * **`smooth_poles`** (list of int, optional): Latitude range for smoothing near poles.
+  * **`group`** (string, optional): NetCDF file group to use for input data for lon lat.


remove this

jamesfwood · 2024-11-19T18:33:25Z

README.md

+           "thinning": {"method": "bin_avg", "value": [0.5, 0.5]},
+           "cutoff_lat": 80,
+           "smooth_poles": [78,80],
+           "group": "group for lon lat",


jamesfwood · 2024-11-19T18:34:20Z

podaac/forge_py/forge.py

+    return strategy, {**common_params, **strategy_params}
+
+
+def thinning_bin_avg(x, y, rx, ry):


move to their specific file in the strategy, e.g. alpha_shape

jamesfwood · 2024-11-19T18:34:33Z

podaac/forge_py/forge.py

+    return xy_thinned["x"].values, xy_thinned["y"].values
+
+
+def remove_small_polygons(geometry, min_area):


move to open_cv file, unless it's used by both? is it?

jamesfwood · 2024-11-19T22:48:38Z

tests/input/SCATSAT1_ESDR_L2_WIND_STRESS_V1.1.cfg

+      "strategy":"alpha_shape",
+      "alpha_shape":{
+         "thinning":{
+            "method":"standard",


This needs updating
"thinning": {"method": "bin_avg", "value": [0.5, 0.5]},

still needs updating

does it work with one value and not an array?

podaac/forge_py/forge.py

README.md

jamesfwood · 2024-11-19T23:42:54Z

tests/input/SCATSAT1_ESDR_L2_WIND_STRESS_V1.1.cfg

+      "strategy":"alpha_shape",
+      "alpha_shape":{
+         "thinning":{
+            "method":"standard",


still needs updating

jamesfwood · 2024-11-19T23:45:02Z

tests/input/SCATSAT1_ESDR_L2_WIND_STRESS_V1.1.cfg

+      "strategy":"alpha_shape",
+      "alpha_shape":{
+         "thinning":{
+            "method":"standard",


does it work with one value and not an array?

* update version * /version 0.3.0-alpha.6 * New Forge Algorithms (#30) * add open cv as a strategy * add pillow * update code * fix flake * change format on how config files are passed into forge-py * fix pylint * poetry update * added in function to remove small polygons * fix pylint and flake8 * add licnese and update readme * add terraform readme * update terraform readme * update terraform readme output * update poetry lock file * Trigger build * update readme * update changelog * have lon lat variable have groups * add alpha shape file for strategy * update documentation * change spacing in pylintrc * update folders structure * update folder name * update docs * updated docs * update tests * update readme * update tests and save processed image * update * remove print * fix docs * update file names * update readme * update poetry lock * add fill value for open cv * Update README.md * fix code remove redundant valid points --------- Co-authored-by: James Wood <[email protected]> * update dependencies * update * update * update * /version 0.3.0-alpha.7 * release 0.3.0 * /version 0.3.0-rc.1 * deploy * /version 0.3.0-rc.2 * make fill kernel optional defaults to none * /version 0.3.0-rc.3 * rebuild * rebuild * /version 0.3.0-rc.4 --------- Co-authored-by: James Wood <[email protected]> Co-authored-by: jamesfwood <[email protected]> Co-authored-by: Simon Liu <[email protected]> Co-authored-by: Simon Liu <[email protected]> Co-authored-by: sliu008 <[email protected]>

sliu008 added 30 commits October 25, 2024 11:15

/deploy sit

3fbd0dc

/deploy sit

09bc9a1

/deploy sit

21bd432

add open cv as a strategy

3e12cf3

add pillow

6fdba0b

update code

6e0a332

fix flake

ec61429

/deploy sit

9bc41a9

/deploy sit

c943f8e

/deploy sit

82351dc

/deploy sit

51b90bf

/deploy sit

b110060

/deploy sit

ab1c0d7

/deploy sit

dcc4553

/deploy sit

c68fd18

/deploy sit

ca98637

/deploy sit

4711582

/deploy sit

1d39c39

change format on how config files are passed into forge-py

a87f3e7

fix pylint

2d6e65f

poetry update

0af2b0f

added in function to remove small polygons

9bfbdc5

fix pylint and flake8

5e4a50d

/deploy sit

e50a278

/deploy sit

7bc5310

/deploy sit

de064ca

/deploy sit

e6afb67

add licnese and update readme

4e2794e

add terraform readme

9713a65

update terraform readme

8ff55e2

sliu008 added 2 commits November 14, 2024 15:22

update readme

6cb4fc7

update changelog

aa2f45e

sliu008 requested a review from jamesfwood November 18, 2024 18:34

jamesfwood requested changes Nov 19, 2024

View reviewed changes

sliu008 added 4 commits November 19, 2024 13:10

have lon lat variable have groups

80cfc63

add alpha shape file for strategy

580b2a4

update documentation

11a044f

change spacing in pylintrc

ed48e73

jamesfwood requested changes Nov 19, 2024

View reviewed changes

sliu008 added 2 commits November 19, 2024 14:52

update folders structure

f0b4533

update folder name

f73549f

jamesfwood requested changes Nov 19, 2024

View reviewed changes

sliu008 and others added 14 commits November 19, 2024 15:54

update docs

f180b91

updated docs

3def3a0

update tests

f5bf7a0

update readme

1292aaa

update tests and save processed image

8d47f5d

update

6069e74

remove print

3fe3a8f

fix docs

fd02197

update file names

5a4a4b6

update readme

86b5f52

update poetry lock

48b34c9

add fill value for open cv

da61af8

Update README.md

4c54606

fix code remove redundant valid points

ca66b73

jamesfwood approved these changes Nov 26, 2024

View reviewed changes

jamesfwood merged commit 6f7ac1a into develop Nov 26, 2024
1 check passed

jamesfwood deleted the feature/new_config branch November 26, 2024 19:56

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

New Forge Algorithms #30

New Forge Algorithms #30

sliu008 commented Nov 18, 2024

jamesfwood Nov 19, 2024

jamesfwood Nov 19, 2024

jamesfwood Nov 19, 2024

jamesfwood Nov 19, 2024

jamesfwood Nov 19, 2024

jamesfwood Nov 19, 2024

jamesfwood Nov 19, 2024

jamesfwood Nov 19, 2024

jamesfwood Nov 19, 2024

jamesfwood Nov 19, 2024

jamesfwood Nov 19, 2024

jamesfwood Nov 19, 2024

jamesfwood Nov 19, 2024

jamesfwood Nov 19, 2024

jamesfwood Nov 19, 2024

		return strategy, {common_params, strategy_params}


		def thinning_bin_avg(x, y, rx, ry):

		return xy_thinned["x"].values, xy_thinned["y"].values


		def remove_small_polygons(geometry, min_area):

New Forge Algorithms #30

New Forge Algorithms #30

Conversation

sliu008 commented Nov 18, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment