Skip to content

options for land plot - #109

Merged
jucordero merged 2 commits into
FixOurFood:ffc_modelfrom
jucordero:land_plots
Jul 29, 2026
Merged

options for land plot#109
jucordero merged 2 commits into
FixOurFood:ffc_modelfrom
jucordero:land_plots

Conversation

@jucordero

Copy link
Copy Markdown
Collaborator

Description

Adds the option to disable legend and adds detection of categorical vs continuous DataArrays, with the option to force categorical for segmentation mapping.

Checklist

@jucordero
jucordero merged commit 953a3d2 into FixOurFood:ffc_model Jul 29, 2026
4 checks passed
@jucordero
jucordero deleted the land_plots branch July 29, 2026 09:12
jucordero added a commit that referenced this pull request Aug 5, 2026
* Changes to food scaling function (#98)

* Changes to food scaling function

* scale above threshold, deprecated drop in tests

* Guard against fallback being defined but origin being not

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* accept scalar conv_arr, fixed conversion, input params in pipeline mode

* unit tests, fixed behaviour of scale parameter

---------

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* added land conversion methods (#100)

* added land conversion methods

* unit tests and docs

* fixed mask and value_array validation in add_category

* added food scaling from land function (#104)

* added food scaling from land function

* Update agrifoodpy/food/model.py

multiple sum

Co-authored-by: Juan Pablo Cordero <34517350+jucordero@users.noreply.github.com>

* Update agrifoodpy/food/model.py

Co-authored-by: Juan Pablo Cordero <34517350+jucordero@users.noreply.github.com>

* Update agrifoodpy/food/model.py

removed land_dimension option

Co-authored-by: Juan Pablo Cordero <34517350+jucordero@users.noreply.github.com>

* Update agrifoodpy/food/model.py

Co-authored-by: Juan Pablo Cordero <34517350+jucordero@users.noreply.github.com>

* added unittest and characters limit

* Update agrifoodpy/food/model.py

Co-authored-by: Juan Pablo Cordero <34517350+jucordero@users.noreply.github.com>

* Update agrifoodpy/food/model.py

Co-authored-by: Juan Pablo Cordero <34517350+jucordero@users.noreply.github.com>

* Update agrifoodpy/food/model.py

Co-authored-by: Juan Pablo Cordero <34517350+jucordero@users.noreply.github.com>

* removed datablock and out_key from food_scaling_from_land

---------

Co-authored-by: Juan Pablo Cordero <34517350+jucordero@users.noreply.github.com>

* FFC project future (#106)

* projecting food balance sheet by population

* Removed stale tests

* fixed docs, guards for zero denoms, consistent docs

* changed labelling for no show parameters in plot functions

* unit tests

* additional scalings and new parser constructor (#105)

* additional scalings and new parser constructor

* updated docs

* multiple return keys for tuple returning functions (#107)

* multiple return keys for tuple returning functions

* return key validation and tuple keys

* fixed docstrings

* options for land plot (#109)

* options for land plot

* updated label values

---------

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: OttaviaTr <74863355+OttaviaTr@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant