openforis-whisp 0.1.0a5__tar.gz → 0.1.0a7__tar.gz

{openforis_whisp-0.1.0a5 → openforis_whisp-0.1.0a7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: openforis-whisp
-Version: 0.1.0a5
+Version: 0.1.0a7
 Summary: Whisp (What is in that plot) is an open-source solution which helps to produce relevant forest monitoring information and support compliance with deforestation-related regulations.
 License: MIT
 Keywords: whisp,geospatial,data-processing
@@ -21,6 +21,7 @@ Requires-Dist: country_converter (>=0.7,<2.0.0)
 Requires-Dist: earthengine-api
 Requires-Dist: geemap
 Requires-Dist: geojson (>=2.5.0,<3.0.0)
+Requires-Dist: geopandas (>=1.0.1,<2.0.0)
 Requires-Dist: ipykernel (>=6.17.1,<7.0.0)
 Requires-Dist: numpy (>=1.21.0,<3.0.0)
 Requires-Dist: pandas (>=1.3.0,<3.0.0)
@@ -30,7 +31,7 @@ Requires-Dist: python-dotenv (>=1.0.1,<2.0.0)
 Requires-Dist: rsa (>=4.2,<5.0.0)
 Requires-Dist: shapely (>=2.0.2,<3.0.0)
 Project-URL: Documentation, https://github.com/forestdatapartnership/whisp#readme
-Project-URL: Development Branch, https://github.com/forestdatapartnership/whisp/tree/package-test-new-structure
+Project-URL: Development Branch, https://github.com/forestdatapartnership/whisp/tree/main
 Project-URL: Issues, https://github.com/forestdatapartnership/whisp/issues
 Project-URL: Repository, https://github.com/forestdatapartnership/whisp
 Description-Content-Type: text/markdown
@@ -74,7 +75,7 @@ The Forest Data Partnership promotes this approach for forest and commodities mo
 
 2. [Whisp in Earthmap](https://whisp.earthmap.org/?aoi=WHISP&boundary=plot1&layers=%7B%22CocoaETH%22%3A%7B%22opacity%22%3A1%7D%2C%22JRCForestMask%22%3A%7B%22opacity%22%3A1%7D%2C%22planet_rgb%22%3A%7B%22opacity%22%3A1%2C%22date%22%3A%222020-12%22%7D%7D&map=%7B%22center%22%3A%7B%22lat%22%3A7%2C%22lng%22%3A4%7D%2C%22zoom%22%3A3%2C%22mapType%22%3A%22satellite%22%7D&statisticsOpen=true) supports the visualization of geometries on actual maps with the possibility to toggle different relevant map products around tree cover, commodities and deforestation. It is practical for demonstration purposes and spot checks of single geometries but not recommended for larger datasets.
 
-3. Datasets of any size, especially when holding more than 1000 geometries, can be "whisped" through the [python package on pip](https://pypi.org/project/openforis-whisp/). See example [Colab Notebook](https://github.com/forestdatapartnership/whisp/blob/package-test-new-structure/notebooks/Colab_whisp_geojson_to_csv.ipynb) for implementation with a geojson input. For the detailed procedure please go to the section [Whisp notebooks](#whisp_notebooks).
+3. Datasets of any size, especially when holding more than 1000 geometries, can be "whisped" through the [python package on pip](https://pypi.org/project/openforis-whisp/). See example [Colab Notebook](https://github.com/forestdatapartnership/whisp/blob/main/notebooks/Colab_whisp_geojson_to_csv.ipynb) for implementation with a geojson input. For the detailed procedure please go to the section [Whisp notebooks](#whisp_notebooks).
 
 
 ## Whisp datasets <a name="whisp_datasets"></a>
@@ -111,7 +112,7 @@ However, under the same circumstances but with <u>no</u> disturbances reported a
 
 For most users we suggest using the Whisp App to process their plot data. But for some, using the python package directly will fit their workflow.
 
-A simple example of the package functionality can be seen in this [Colab Notebook](https://github.com/forestdatapartnership/whisp/blob/package-test-new-structure/notebooks/Colab_whisp_geojson_to_csv.ipynb) 
+A simple example of the package functionality can be seen in this [Colab Notebook](https://github.com/forestdatapartnership/whisp/blob/main/notebooks/Colab_whisp_geojson_to_csv.ipynb) 
 
 ## Requirements for running the package
 
@@ -144,7 +145,7 @@ More info on Whisp can be found in [here](https://openknowledge.fao.org/items/e9
 There are two main approaches: to request a layer be incorporated into the core Whisp inputs, or to add in your own data directly to complement the core ones in Whisp. Currently the latter approach is under revision since moving to implementation in a python package. In the meantime please contact us through the issues page if this is functionality is useful to you.
 
 ## Contributing to the Whisp code base
-Contributions to the Whisp code in GitHub are welcome. They can be made by forking the repository making and pushing the required changes, then making a pull request to the Whisp repository. After briefly reviewing the request, we can make a branch for which to make a new pull request to. If in doubt get in contact first or log as an issue [here](https://github.com/forestdatapartnership/whisp/issues/).
+Contributions to the Whisp code in GitHub are welcome. They can be made by forking the repository making and pushing the required changes, then making a pull request to the Whisp repository. After briefly reviewing the request, we can make a branch for which to make a new pull request to. After final checks we can then incorporate the code in main. If in doubt get in contact first or log as an issue [here](https://github.com/forestdatapartnership/whisp/issues/).
 
 Install the package in editable mode with the additional dependencies required for testing and running pre-commit hooks:
 ```
@@ -162,3 +163,25 @@ You should be able to run the Pytest suite by simple running the `pytest` comman
 
 Please read the [contributing guidelines](contributing_guidelines.md) for good practice recommendations.
 
+
+## Code of Conduct <a name="whisp_conduct"></a>
+
+**Purpose**  
+We are dedicated to maintaining a safe and respectful environment for all users. Harassment or abusive behavior will not be tolerated. <br>
+
+**Scope**  
+This Code applies to all interactions on the repository and on the app.
+
+**Expectations** <br>
+*- Respect others:* Treat all contributors and users with courtesy and kindness. <br>
+*- Constructive communication:* Engage respectfully, even in disagreements. <br>
+*- Protect privacy:* Do not share personal information without consent.
+
+**Prohibited Conduct** <br>
+*- Harassment:* Unwanted or abusive communication, stalking, threats, or bullying.<br>
+*- Discrimination:* Any form of hate speech or exclusion based on race, gender, orientation, or other identities.<br>
+*- Inappropriate Content:* Posting offensive, harmful, or explicit material.
+
+**Reporting**  
+Users can report violations directly to us by emailing the address listed in the "Contact Us" section of the website:
+https://openforis.org/solutions/whisp/

{openforis_whisp-0.1.0a5 → openforis_whisp-0.1.0a7}/README.md

@@ -37,7 +37,7 @@ The Forest Data Partnership promotes this approach for forest and commodities mo
 
 2. [Whisp in Earthmap](https://whisp.earthmap.org/?aoi=WHISP&boundary=plot1&layers=%7B%22CocoaETH%22%3A%7B%22opacity%22%3A1%7D%2C%22JRCForestMask%22%3A%7B%22opacity%22%3A1%7D%2C%22planet_rgb%22%3A%7B%22opacity%22%3A1%2C%22date%22%3A%222020-12%22%7D%7D&map=%7B%22center%22%3A%7B%22lat%22%3A7%2C%22lng%22%3A4%7D%2C%22zoom%22%3A3%2C%22mapType%22%3A%22satellite%22%7D&statisticsOpen=true) supports the visualization of geometries on actual maps with the possibility to toggle different relevant map products around tree cover, commodities and deforestation. It is practical for demonstration purposes and spot checks of single geometries but not recommended for larger datasets.
 
-3. Datasets of any size, especially when holding more than 1000 geometries, can be "whisped" through the [python package on pip](https://pypi.org/project/openforis-whisp/). See example [Colab Notebook](https://github.com/forestdatapartnership/whisp/blob/package-test-new-structure/notebooks/Colab_whisp_geojson_to_csv.ipynb) for implementation with a geojson input. For the detailed procedure please go to the section [Whisp notebooks](#whisp_notebooks).
+3. Datasets of any size, especially when holding more than 1000 geometries, can be "whisped" through the [python package on pip](https://pypi.org/project/openforis-whisp/). See example [Colab Notebook](https://github.com/forestdatapartnership/whisp/blob/main/notebooks/Colab_whisp_geojson_to_csv.ipynb) for implementation with a geojson input. For the detailed procedure please go to the section [Whisp notebooks](#whisp_notebooks).
 
 
 ## Whisp datasets <a name="whisp_datasets"></a>
@@ -74,7 +74,7 @@ However, under the same circumstances but with <u>no</u> disturbances reported a
 
 For most users we suggest using the Whisp App to process their plot data. But for some, using the python package directly will fit their workflow.
 
-A simple example of the package functionality can be seen in this [Colab Notebook](https://github.com/forestdatapartnership/whisp/blob/package-test-new-structure/notebooks/Colab_whisp_geojson_to_csv.ipynb) 
+A simple example of the package functionality can be seen in this [Colab Notebook](https://github.com/forestdatapartnership/whisp/blob/main/notebooks/Colab_whisp_geojson_to_csv.ipynb) 
 
 ## Requirements for running the package
 
@@ -107,7 +107,7 @@ More info on Whisp can be found in [here](https://openknowledge.fao.org/items/e9
 There are two main approaches: to request a layer be incorporated into the core Whisp inputs, or to add in your own data directly to complement the core ones in Whisp. Currently the latter approach is under revision since moving to implementation in a python package. In the meantime please contact us through the issues page if this is functionality is useful to you.
 
 ## Contributing to the Whisp code base
-Contributions to the Whisp code in GitHub are welcome. They can be made by forking the repository making and pushing the required changes, then making a pull request to the Whisp repository. After briefly reviewing the request, we can make a branch for which to make a new pull request to. If in doubt get in contact first or log as an issue [here](https://github.com/forestdatapartnership/whisp/issues/).
+Contributions to the Whisp code in GitHub are welcome. They can be made by forking the repository making and pushing the required changes, then making a pull request to the Whisp repository. After briefly reviewing the request, we can make a branch for which to make a new pull request to. After final checks we can then incorporate the code in main. If in doubt get in contact first or log as an issue [here](https://github.com/forestdatapartnership/whisp/issues/).
 
 Install the package in editable mode with the additional dependencies required for testing and running pre-commit hooks:
 ```
@@ -124,3 +124,26 @@ pre-commit install
 You should be able to run the Pytest suite by simple running the `pytest` command from the repo's root folder.
 
 Please read the [contributing guidelines](contributing_guidelines.md) for good practice recommendations.
+
+
+## Code of Conduct <a name="whisp_conduct"></a>
+
+**Purpose**  
+We are dedicated to maintaining a safe and respectful environment for all users. Harassment or abusive behavior will not be tolerated. <br>
+
+**Scope**  
+This Code applies to all interactions on the repository and on the app.
+
+**Expectations** <br>
+*- Respect others:* Treat all contributors and users with courtesy and kindness. <br>
+*- Constructive communication:* Engage respectfully, even in disagreements. <br>
+*- Protect privacy:* Do not share personal information without consent.
+
+**Prohibited Conduct** <br>
+*- Harassment:* Unwanted or abusive communication, stalking, threats, or bullying.<br>
+*- Discrimination:* Any form of hate speech or exclusion based on race, gender, orientation, or other identities.<br>
+*- Inappropriate Content:* Posting offensive, harmful, or explicit material.
+
+**Reporting**  
+Users can report violations directly to us by emailing the address listed in the "Contact Us" section of the website:
+https://openforis.org/solutions/whisp/

{openforis_whisp-0.1.0a5 → openforis_whisp-0.1.0a7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "openforis-whisp"
-version = "0.1.0a5"
+version = "0.1.0a7"
 description = "Whisp (What is in that plot) is an open-source solution which helps to produce relevant forest monitoring information and support compliance with deforestation-related regulations."
 repository = "https://github.com/forestdatapartnership/whisp"
 authors = ["Andy Arnell <and.arnell@fao.org>"]
@@ -22,7 +22,7 @@ classifiers = [
 
 [tool.poetry.urls]
 "Documentation" = "https://github.com/forestdatapartnership/whisp#readme"
-"Development Branch" = "https://github.com/forestdatapartnership/whisp/tree/package-test-new-structure"
+"Development Branch" = "https://github.com/forestdatapartnership/whisp/tree/main"
 "Issues" = "https://github.com/forestdatapartnership/whisp/issues"
 
 [tool.poetry.dependencies]
@@ -39,6 +39,7 @@ pydantic-core = ">=2.14.0,<3.0.0"  # Updated version constraint
 rsa = ">=4.2,<5.0.0"  # Updated version constraint
 ipykernel = ">=6.17.1,<7.0.0"  # Compatible with Colab
 shapely = "^2.0.2"
+geopandas = "^1.0.1"
 
 [tool.poetry.group.dev.dependencies]
 pytest = ">=6.2.5,<7.0.0"

{openforis_whisp-0.1.0a5 → openforis_whisp-0.1.0a7}/src/openforis_whisp/risk.py

@@ -21,8 +21,8 @@ def whisp_risk(
     df: data_lookup_type,  # CHECK THIS
     ind_1_pcent_threshold: float = 10,  # default values (draft decision tree and parameters)
     ind_2_pcent_threshold: float = 10,  # default values (draft decision tree and parameters)
-    ind_3_pcent_threshold: float = 0,  # default values (draft decision tree and parameters)
-    ind_4_pcent_threshold: float = 0,  # default values (draft decision tree and parameters)
+    ind_3_pcent_threshold: float = 10,  # default values (draft decision tree and parameters)
+    ind_4_pcent_threshold: float = 10,  # default values (draft decision tree and parameters)
     ind_1_input_columns: pd.Series = None,  # see lookup_gee_datasets for details
     ind_2_input_columns: pd.Series = None,  # see lookup_gee_datasets for details
     ind_3_input_columns: pd.Series = None,  # see lookup_gee_datasets for details