Describing new outputs in the MODEL_SPEC.

RE:natcap#1344
phargogh · Jun 29, 2023 · 78b0e5b · 78b0e5b
1 parent 1226df6
commit 78b0e5b
Showing 1 changed file with 28 additions and 9 deletions.
diff --git a/src/natcap/invest/urban_nature_access.py b/src/natcap/invest/urban_nature_access.py
@@ -446,6 +446,7 @@
                     ),
                     "bands": {1: {'type': 'number', 'units': u.count}},
                 },
+
                 # when RADIUS_OPT_UNIFORM
                 "distance_weighted_population_within_[SEARCH_RADIUS].tif": {
                     "about": gettext(
@@ -466,6 +467,14 @@
                         (f"search_radius_mode == '{RADIUS_OPT_UNIFORM}' or "
                          f"search_radius_mode == '{RADIUS_OPT_POP_GROUP}'"),
                 },
+                "accessible_urban_nature.tif": {
+                    "about": gettext(
+                        "The area of greenspace available within the defined "
+                        "radius, weighted by the selected decay function."),
+                    "bands": {1: {"type": "number", "units": u.m**2}},
+                    "created_if":
+                        f"search_radius_mode == '{RADIUS_OPT_URBAN_NATURE}'",
+                },
                 "urban_nature_population_ratio.tif": {
                     "about": gettext(
                         "The calculated urban nature/population ratio."),
@@ -485,13 +494,22 @@
                     "created_if":
                         f"search_radius_mode == '{RADIUS_OPT_URBAN_NATURE}'",
                 },
+                "accessible_urban_nature_lucode_[LUCODE].tif": {
+                    "about": gettext(
+                        "The area of greenspace available within the radius "
+                        "associated with urban nature class LUCODE, weighted "
+                        "by the selected decay function."),
+                    "bands": {1: {"type": "number", "units": u.m**2}},
+                    "created_if":
+                        f"search_radius_mode == '{RADIUS_OPT_URBAN_NATURE}'",
+                },
                 "urban_nature_supply_percapita_lucode_[LUCODE].tif": {
                     "about": gettext(
                         "The urban nature supplied to populations due to the "
                         "land use land cover code LUCODE"),
                     "bands": {1: {"type": "number", "units": u.m**2/u.person}},
                     "created_if":
-                        f"search_radius_mode == '{RADIUS_OPT_UNIFORM}'",
+                        f"search_radius_mode == '{RADIUS_OPT_URBAN_NATURE}'",
                 },
                 "urban_nature_population_ratio_lucode_[LUCODE].tif": {
                     "about": gettext(
@@ -502,14 +520,6 @@
                     "created_if":
                         f"search_radius_mode == '{RADIUS_OPT_URBAN_NATURE}'",
                 },
-                "urban_nature_supply_percapita_lucode_[LUCODE].tif": {
-                    "about": gettext(
-                        "The urban nature supplied to populations due to "
-                        "the land use land cover class LUCODE."),
-                    "bands": {1: {"type": "number", "units": u.m**2/u.person}},
-                    "created_if":
-                        f"search_radius_mode == '{RADIUS_OPT_URBAN_NATURE}'",
-                },
 
                 # When RADIUS_OPT_POP_GROUP
                 "population_in_[POP_GROUP].tif": {
@@ -521,6 +531,15 @@
                     "created_if":
                         f"search_radius_mode == '{RADIUS_OPT_POP_GROUP}'",
                 },
+                "accessible_urban_nature_to_[POP_GROUP].tif": {
+                    "about": gettext(
+                        "The area of greenspace available within the radius "
+                        "associated with group POP_GROUP, weighted by the "
+                        "selected decay function."),
+                    "bands": {1: {"type": "number", "units": u.m**2}},
+                    "created_if":
+                        f"search_radius_mode == '{RADIUS_OPT_POP_GROUP}'",
+                },
                 "proportion_of_population_in_[POP_GROUP].tif": {
                     "about": gettext(
                         "Each pixel represents the proportion of the total "