diff --git a/geest/gui/dialogs/analysis_aggregation_dialog.py b/geest/gui/dialogs/analysis_aggregation_dialog.py index 571c4a58..847ec799 100644 --- a/geest/gui/dialogs/analysis_aggregation_dialog.py +++ b/geest/gui/dialogs/analysis_aggregation_dialog.py @@ -181,7 +181,7 @@ def __init__(self, analysis_item, parent=None): self.raster_radio_button.setChecked(True) buffer_distance = self.tree_item.attribute("buffer_distance_m", 0) - self.buffer_distance_m.setValue(buffer_distance) + self.buffer_distance_m.setValue(int(buffer_distance)) # Restore the dialog geometry diff --git a/test/test_data/wee_score/accessibility/Accessibility_score_combined.vrt b/test/test_data/wee_score/accessibility/Accessibility_score_combined.vrt index ee2b7ac9..6ddc5ae8 100644 --- a/test/test_data/wee_score/accessibility/Accessibility_score_combined.vrt +++ b/test/test_data/wee_score/accessibility/Accessibility_score_combined.vrt @@ -2,13 +2,6 @@ PROJCS["WGS 84 / UTM zone 20N",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-63],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["Easting",EAST],AXIS["Northing",NORTH],AUTHORITY["EPSG","32620"]] 7.1400000000000000e+05, 1.0000000000000000e+03, 0.0000000000000000e+00, 1.5530000000000000e+06, 0.0000000000000000e+00, -1.0000000000000000e+03 - - 0 - 4.5 - 2.0833333333333 - 1.497683396301 - 100 - 255 Gray diff --git a/test/test_data/wee_score/accessibility/accessibility_masked_0.tif.aux.xml b/test/test_data/wee_score/accessibility/accessibility_masked_0.tif.aux.xml index 3f24ae5e..7385f4a0 100644 --- a/test/test_data/wee_score/accessibility/accessibility_masked_0.tif.aux.xml +++ b/test/test_data/wee_score/accessibility/accessibility_masked_0.tif.aux.xml @@ -1,9 +1,9 @@ + 0 4.5 2.0833333333333 - 0 1.497683396301 100 diff --git a/test/test_data/wee_score/accessibility/women_s_travel_patterns/kindergartens_location/WTP_Kindergartens_output_combined.vrt b/test/test_data/wee_score/accessibility/women_s_travel_patterns/kindergartens_location/WTP_Kindergartens_output_combined.vrt index 5e43444b..88cf3e5b 100644 --- a/test/test_data/wee_score/accessibility/women_s_travel_patterns/kindergartens_location/WTP_Kindergartens_output_combined.vrt +++ b/test/test_data/wee_score/accessibility/women_s_travel_patterns/kindergartens_location/WTP_Kindergartens_output_combined.vrt @@ -2,13 +2,6 @@ PROJCS["WGS 84 / UTM zone 20N",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-63],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["Easting",EAST],AXIS["Northing",NORTH],AUTHORITY["EPSG","32620"]] 7.1400000000000000e+05, 1.0000000000000000e+03, 0.0000000000000000e+00, 1.5530000000000000e+06, 0.0000000000000000e+00, -1.0000000000000000e+03 - - 0 - 5 - 2.0277777777778 - 1.9788620623299 - 100 - 255 Gray diff --git a/test/test_data/wee_score/accessibility/women_s_travel_patterns/kindergartens_location/final_isochrones_0.dbf b/test/test_data/wee_score/accessibility/women_s_travel_patterns/kindergartens_location/final_isochrones_0.dbf index 6ed3552d..9a5d1be3 100644 Binary files a/test/test_data/wee_score/accessibility/women_s_travel_patterns/kindergartens_location/final_isochrones_0.dbf and b/test/test_data/wee_score/accessibility/women_s_travel_patterns/kindergartens_location/final_isochrones_0.dbf differ diff --git a/test/test_data/wee_score/accessibility/women_s_travel_patterns/kindergartens_location/kindergartens_location_area_features_0.dbf b/test/test_data/wee_score/accessibility/women_s_travel_patterns/kindergartens_location/kindergartens_location_area_features_0.dbf index 9533f5fb..92c8c835 100644 Binary files a/test/test_data/wee_score/accessibility/women_s_travel_patterns/kindergartens_location/kindergartens_location_area_features_0.dbf and b/test/test_data/wee_score/accessibility/women_s_travel_patterns/kindergartens_location/kindergartens_location_area_features_0.dbf differ diff --git a/test/test_data/wee_score/accessibility/women_s_travel_patterns/kindergartens_location/kindergartens_location_masked_0.tif.aux.xml b/test/test_data/wee_score/accessibility/women_s_travel_patterns/kindergartens_location/kindergartens_location_masked_0.tif.aux.xml index b2f7390a..af83d8e1 100644 --- a/test/test_data/wee_score/accessibility/women_s_travel_patterns/kindergartens_location/kindergartens_location_masked_0.tif.aux.xml +++ b/test/test_data/wee_score/accessibility/women_s_travel_patterns/kindergartens_location/kindergartens_location_masked_0.tif.aux.xml @@ -1,9 +1,9 @@ + 0 5 2.0277777777778 - 0 1.9788620623299 100 diff --git a/test/test_data/wee_score/accessibility/women_s_travel_patterns/kindergartens_location/kindergartens_location_merged_isochrones_0.dbf b/test/test_data/wee_score/accessibility/women_s_travel_patterns/kindergartens_location/kindergartens_location_merged_isochrones_0.dbf index fc8261e8..7e949988 100644 Binary files a/test/test_data/wee_score/accessibility/women_s_travel_patterns/kindergartens_location/kindergartens_location_merged_isochrones_0.dbf and b/test/test_data/wee_score/accessibility/women_s_travel_patterns/kindergartens_location/kindergartens_location_merged_isochrones_0.dbf differ diff --git a/test/test_data/wee_score/accessibility/women_s_travel_patterns/primary_school_location/WTP_Primary_Schools_output_combined.vrt b/test/test_data/wee_score/accessibility/women_s_travel_patterns/primary_school_location/WTP_Primary_Schools_output_combined.vrt index ed413385..0a86555b 100644 --- a/test/test_data/wee_score/accessibility/women_s_travel_patterns/primary_school_location/WTP_Primary_Schools_output_combined.vrt +++ b/test/test_data/wee_score/accessibility/women_s_travel_patterns/primary_school_location/WTP_Primary_Schools_output_combined.vrt @@ -2,13 +2,6 @@ PROJCS["WGS 84 / UTM zone 20N",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-63],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["Easting",EAST],AXIS["Northing",NORTH],AUTHORITY["EPSG","32620"]] 7.1400000000000000e+05, 1.0000000000000000e+03, 0.0000000000000000e+00, 1.5530000000000000e+06, 0.0000000000000000e+00, -1.0000000000000000e+03 - - 0 - 5 - 2.1388888888889 - 1.8878673708385 - 100 - 255 Gray diff --git a/test/test_data/wee_score/accessibility/women_s_travel_patterns/primary_school_location/final_isochrones_0.dbf b/test/test_data/wee_score/accessibility/women_s_travel_patterns/primary_school_location/final_isochrones_0.dbf index d97b60a8..19f07c9d 100644 Binary files a/test/test_data/wee_score/accessibility/women_s_travel_patterns/primary_school_location/final_isochrones_0.dbf and b/test/test_data/wee_score/accessibility/women_s_travel_patterns/primary_school_location/final_isochrones_0.dbf differ diff --git a/test/test_data/wee_score/accessibility/women_s_travel_patterns/primary_school_location/primary_school_location_area_features_0.dbf b/test/test_data/wee_score/accessibility/women_s_travel_patterns/primary_school_location/primary_school_location_area_features_0.dbf index 9533f5fb..92c8c835 100644 Binary files a/test/test_data/wee_score/accessibility/women_s_travel_patterns/primary_school_location/primary_school_location_area_features_0.dbf and b/test/test_data/wee_score/accessibility/women_s_travel_patterns/primary_school_location/primary_school_location_area_features_0.dbf differ diff --git a/test/test_data/wee_score/accessibility/women_s_travel_patterns/primary_school_location/primary_school_location_masked_0.tif.aux.xml b/test/test_data/wee_score/accessibility/women_s_travel_patterns/primary_school_location/primary_school_location_masked_0.tif.aux.xml index f9018a96..683ce4aa 100644 --- a/test/test_data/wee_score/accessibility/women_s_travel_patterns/primary_school_location/primary_school_location_masked_0.tif.aux.xml +++ b/test/test_data/wee_score/accessibility/women_s_travel_patterns/primary_school_location/primary_school_location_masked_0.tif.aux.xml @@ -1,9 +1,9 @@ + 0 5 2.1388888888889 - 0 1.8878673708385 100 diff --git a/test/test_data/wee_score/accessibility/women_s_travel_patterns/primary_school_location/primary_school_location_merged_isochrones_0.dbf b/test/test_data/wee_score/accessibility/women_s_travel_patterns/primary_school_location/primary_school_location_merged_isochrones_0.dbf index d3e964ab..c29a5ef6 100644 Binary files a/test/test_data/wee_score/accessibility/women_s_travel_patterns/primary_school_location/primary_school_location_merged_isochrones_0.dbf and b/test/test_data/wee_score/accessibility/women_s_travel_patterns/primary_school_location/primary_school_location_merged_isochrones_0.dbf differ diff --git a/test/test_data/wee_score/accessibility/women_s_travel_patterns/women_s_travel_patterns_combined.vrt b/test/test_data/wee_score/accessibility/women_s_travel_patterns/women_s_travel_patterns_combined.vrt index 53ddc8b9..1f471652 100644 --- a/test/test_data/wee_score/accessibility/women_s_travel_patterns/women_s_travel_patterns_combined.vrt +++ b/test/test_data/wee_score/accessibility/women_s_travel_patterns/women_s_travel_patterns_combined.vrt @@ -2,13 +2,6 @@ PROJCS["WGS 84 / UTM zone 20N",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-63],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["Easting",EAST],AXIS["Northing",NORTH],AUTHORITY["EPSG","32620"]] 7.1400000000000000e+05, 1.0000000000000000e+03, 0.0000000000000000e+00, 1.5530000000000000e+06, 0.0000000000000000e+00, -1.0000000000000000e+03 - - 0 - 4.5 - 2.0833333333333 - 1.497683396301 - 100 - 255 Gray diff --git a/test/test_data/wee_score/accessibility/women_s_travel_patterns/women_s_travel_patterns_masked_0.tif.aux.xml b/test/test_data/wee_score/accessibility/women_s_travel_patterns/women_s_travel_patterns_masked_0.tif.aux.xml index 3f24ae5e..7385f4a0 100644 --- a/test/test_data/wee_score/accessibility/women_s_travel_patterns/women_s_travel_patterns_masked_0.tif.aux.xml +++ b/test/test_data/wee_score/accessibility/women_s_travel_patterns/women_s_travel_patterns_masked_0.tif.aux.xml @@ -1,9 +1,9 @@ + 0 4.5 2.0833333333333 - 0 1.497683396301 100 diff --git a/test/test_data/wee_score/admin0.gpkg b/test/test_data/wee_score/admin0.gpkg deleted file mode 100644 index d0ee66aa..00000000 Binary files a/test/test_data/wee_score/admin0.gpkg and /dev/null differ diff --git a/test/test_data/wee_score/contextual/financial_inclusion/entrepeneurship_index/FIN_output_combined.vrt b/test/test_data/wee_score/contextual/financial_inclusion/entrepeneurship_index/FIN_output_combined.vrt index 903b42dd..54eff329 100644 --- a/test/test_data/wee_score/contextual/financial_inclusion/entrepeneurship_index/FIN_output_combined.vrt +++ b/test/test_data/wee_score/contextual/financial_inclusion/entrepeneurship_index/FIN_output_combined.vrt @@ -2,13 +2,6 @@ PROJCS["WGS 84 / UTM zone 20N",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-63],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["Easting",EAST],AXIS["Northing",NORTH],AUTHORITY["EPSG","32620"]] 7.1400000000000000e+05, 1.0000000000000000e+03, 0.0000000000000000e+00, 1.5530000000000000e+06, 0.0000000000000000e+00, -1.0000000000000000e+03 - - 5 - 5 - 5 - 0 - 100 - 255 Gray diff --git a/test/test_data/wee_score/contextual/financial_inclusion/entrepeneurship_index/entrepeneurship_index_area_0.dbf b/test/test_data/wee_score/contextual/financial_inclusion/entrepeneurship_index/entrepeneurship_index_area_0.dbf index 840cdf29..fe6ff4e2 100644 Binary files a/test/test_data/wee_score/contextual/financial_inclusion/entrepeneurship_index/entrepeneurship_index_area_0.dbf and b/test/test_data/wee_score/contextual/financial_inclusion/entrepeneurship_index/entrepeneurship_index_area_0.dbf differ diff --git a/test/test_data/wee_score/contextual/financial_inclusion/entrepeneurship_index/entrepeneurship_index_masked_0.tif.aux.xml b/test/test_data/wee_score/contextual/financial_inclusion/entrepeneurship_index/entrepeneurship_index_masked_0.tif.aux.xml index 1503edef..9875ba02 100644 --- a/test/test_data/wee_score/contextual/financial_inclusion/entrepeneurship_index/entrepeneurship_index_masked_0.tif.aux.xml +++ b/test/test_data/wee_score/contextual/financial_inclusion/entrepeneurship_index/entrepeneurship_index_masked_0.tif.aux.xml @@ -1,9 +1,9 @@ + 5 5 5 - 5 0 100 diff --git a/test/test_data/wee_score/contextual/financial_inclusion/financial_inclusion_combined.vrt b/test/test_data/wee_score/contextual/financial_inclusion/financial_inclusion_combined.vrt index b254013d..7c372bb6 100644 --- a/test/test_data/wee_score/contextual/financial_inclusion/financial_inclusion_combined.vrt +++ b/test/test_data/wee_score/contextual/financial_inclusion/financial_inclusion_combined.vrt @@ -2,13 +2,6 @@ PROJCS["WGS 84 / UTM zone 20N",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-63],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["Easting",EAST],AXIS["Northing",NORTH],AUTHORITY["EPSG","32620"]] 7.1400000000000000e+05, 1.0000000000000000e+03, 0.0000000000000000e+00, 1.5530000000000000e+06, 0.0000000000000000e+00, -1.0000000000000000e+03 - - 5 - 5 - 5 - 0 - 100 - 255 Gray diff --git a/test/test_data/wee_score/contextual/financial_inclusion/financial_inclusion_masked_0.tif.aux.xml b/test/test_data/wee_score/contextual/financial_inclusion/financial_inclusion_masked_0.tif.aux.xml index 1503edef..9875ba02 100644 --- a/test/test_data/wee_score/contextual/financial_inclusion/financial_inclusion_masked_0.tif.aux.xml +++ b/test/test_data/wee_score/contextual/financial_inclusion/financial_inclusion_masked_0.tif.aux.xml @@ -1,9 +1,9 @@ + 5 5 5 - 5 0 100 diff --git a/test/test_data/wee_score/contextual/regulatory_frameworks/pay_parenthood_index/RF_output_combined.vrt b/test/test_data/wee_score/contextual/regulatory_frameworks/pay_parenthood_index/RF_output_combined.vrt index b9f1c0ec..4088c480 100644 --- a/test/test_data/wee_score/contextual/regulatory_frameworks/pay_parenthood_index/RF_output_combined.vrt +++ b/test/test_data/wee_score/contextual/regulatory_frameworks/pay_parenthood_index/RF_output_combined.vrt @@ -2,13 +2,6 @@ PROJCS["WGS 84 / UTM zone 20N",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-63],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["Easting",EAST],AXIS["Northing",NORTH],AUTHORITY["EPSG","32620"]] 7.1400000000000000e+05, 1.0000000000000000e+03, 0.0000000000000000e+00, 1.5530000000000000e+06, 0.0000000000000000e+00, -1.0000000000000000e+03 - - 5 - 5 - 5 - 0 - 100 - 255 Gray diff --git a/test/test_data/wee_score/contextual/regulatory_frameworks/pay_parenthood_index/pay_parenthood_index_area_0.dbf b/test/test_data/wee_score/contextual/regulatory_frameworks/pay_parenthood_index/pay_parenthood_index_area_0.dbf index 840cdf29..fe6ff4e2 100644 Binary files a/test/test_data/wee_score/contextual/regulatory_frameworks/pay_parenthood_index/pay_parenthood_index_area_0.dbf and b/test/test_data/wee_score/contextual/regulatory_frameworks/pay_parenthood_index/pay_parenthood_index_area_0.dbf differ diff --git a/test/test_data/wee_score/contextual/regulatory_frameworks/pay_parenthood_index/pay_parenthood_index_masked_0.tif.aux.xml b/test/test_data/wee_score/contextual/regulatory_frameworks/pay_parenthood_index/pay_parenthood_index_masked_0.tif.aux.xml index 1503edef..9875ba02 100644 --- a/test/test_data/wee_score/contextual/regulatory_frameworks/pay_parenthood_index/pay_parenthood_index_masked_0.tif.aux.xml +++ b/test/test_data/wee_score/contextual/regulatory_frameworks/pay_parenthood_index/pay_parenthood_index_masked_0.tif.aux.xml @@ -1,9 +1,9 @@ + 5 5 5 - 5 0 100 diff --git a/test/test_data/wee_score/contextual/regulatory_frameworks/regulatory_frameworks_combined.vrt b/test/test_data/wee_score/contextual/regulatory_frameworks/regulatory_frameworks_combined.vrt index d81378f3..d3f4f4c7 100644 --- a/test/test_data/wee_score/contextual/regulatory_frameworks/regulatory_frameworks_combined.vrt +++ b/test/test_data/wee_score/contextual/regulatory_frameworks/regulatory_frameworks_combined.vrt @@ -2,13 +2,6 @@ PROJCS["WGS 84 / UTM zone 20N",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-63],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["Easting",EAST],AXIS["Northing",NORTH],AUTHORITY["EPSG","32620"]] 7.1400000000000000e+05, 1.0000000000000000e+03, 0.0000000000000000e+00, 1.5530000000000000e+06, 0.0000000000000000e+00, -1.0000000000000000e+03 - - 5 - 5 - 5 - 0 - 100 - 255 Gray diff --git a/test/test_data/wee_score/contextual/regulatory_frameworks/regulatory_frameworks_masked_0.tif.aux.xml b/test/test_data/wee_score/contextual/regulatory_frameworks/regulatory_frameworks_masked_0.tif.aux.xml index 1503edef..9875ba02 100644 --- a/test/test_data/wee_score/contextual/regulatory_frameworks/regulatory_frameworks_masked_0.tif.aux.xml +++ b/test/test_data/wee_score/contextual/regulatory_frameworks/regulatory_frameworks_masked_0.tif.aux.xml @@ -1,9 +1,9 @@ + 5 5 5 - 5 0 100 diff --git a/test/test_data/wee_score/contextual/workplace_discrimination/workplace_discrimination_combined.vrt b/test/test_data/wee_score/contextual/workplace_discrimination/workplace_discrimination_combined.vrt index 36c60a00..f21630c4 100644 --- a/test/test_data/wee_score/contextual/workplace_discrimination/workplace_discrimination_combined.vrt +++ b/test/test_data/wee_score/contextual/workplace_discrimination/workplace_discrimination_combined.vrt @@ -2,13 +2,6 @@ PROJCS["WGS 84 / UTM zone 20N",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-63],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["Easting",EAST],AXIS["Northing",NORTH],AUTHORITY["EPSG","32620"]] 7.1400000000000000e+05, 1.0000000000000000e+03, 0.0000000000000000e+00, 1.5530000000000000e+06, 0.0000000000000000e+00, -1.0000000000000000e+03 - - 5 - 5 - 5 - 0 - 100 - 255 Gray diff --git a/test/test_data/wee_score/contextual/workplace_discrimination/workplace_discrimination_masked_0.tif.aux.xml b/test/test_data/wee_score/contextual/workplace_discrimination/workplace_discrimination_masked_0.tif.aux.xml index 1503edef..9875ba02 100644 --- a/test/test_data/wee_score/contextual/workplace_discrimination/workplace_discrimination_masked_0.tif.aux.xml +++ b/test/test_data/wee_score/contextual/workplace_discrimination/workplace_discrimination_masked_0.tif.aux.xml @@ -1,9 +1,9 @@ + 5 5 5 - 5 0 100 diff --git a/test/test_data/wee_score/contextual/workplace_discrimination/workplace_index/WD_output_combined.vrt b/test/test_data/wee_score/contextual/workplace_discrimination/workplace_index/WD_output_combined.vrt index ed9ece7d..33b94bd5 100644 --- a/test/test_data/wee_score/contextual/workplace_discrimination/workplace_index/WD_output_combined.vrt +++ b/test/test_data/wee_score/contextual/workplace_discrimination/workplace_index/WD_output_combined.vrt @@ -2,13 +2,6 @@ PROJCS["WGS 84 / UTM zone 20N",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-63],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["Easting",EAST],AXIS["Northing",NORTH],AUTHORITY["EPSG","32620"]] 7.1400000000000000e+05, 1.0000000000000000e+03, 0.0000000000000000e+00, 1.5530000000000000e+06, 0.0000000000000000e+00, -1.0000000000000000e+03 - - 5 - 5 - 5 - 0 - 100 - 255 Gray diff --git a/test/test_data/wee_score/contextual/workplace_discrimination/workplace_index/workplace_index_area_0.dbf b/test/test_data/wee_score/contextual/workplace_discrimination/workplace_index/workplace_index_area_0.dbf index 840cdf29..fe6ff4e2 100644 Binary files a/test/test_data/wee_score/contextual/workplace_discrimination/workplace_index/workplace_index_area_0.dbf and b/test/test_data/wee_score/contextual/workplace_discrimination/workplace_index/workplace_index_area_0.dbf differ diff --git a/test/test_data/wee_score/contextual/workplace_discrimination/workplace_index/workplace_index_masked_0.tif.aux.xml b/test/test_data/wee_score/contextual/workplace_discrimination/workplace_index/workplace_index_masked_0.tif.aux.xml index 1503edef..9875ba02 100644 --- a/test/test_data/wee_score/contextual/workplace_discrimination/workplace_index/workplace_index_masked_0.tif.aux.xml +++ b/test/test_data/wee_score/contextual/workplace_discrimination/workplace_index/workplace_index_masked_0.tif.aux.xml @@ -1,9 +1,9 @@ + 5 5 5 - 5 0 100 diff --git a/test/test_data/wee_score/error.txt b/test/test_data/wee_score/error.txt deleted file mode 100644 index 117e4bc8..00000000 --- a/test/test_data/wee_score/error.txt +++ /dev/null @@ -1,16 +0,0 @@ -Failed to process Do Not Use: Unable to execute algorithm -Could not load source layer for INPUT: invalid value -Traceback (most recent call last): - File "/home/timlinux/.local/share/QGIS/QGIS3/profiles/GEEST2/python/plugins/geest/core/workflows/workflow_base.py", line 240, in execute - area_raster = self._subset_raster_layer( - ^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "/home/timlinux/.local/share/QGIS/QGIS3/profiles/GEEST2/python/plugins/geest/core/workflows/workflow_base.py", line 394, in _subset_raster_layer - aoi = processing.run( - ^^^^^^^^^^^^^^^ - File "/nix/store/klsdmdrqkafiqhgcmvryqy4zli1ksxh2-qgis-unwrapped-3.38.3/share/qgis/python/plugins/processing/tools/general.py", line 109, in run - return Processing.runAlgorithm(algOrName, parameters, onFinish, feedback, context) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "/nix/store/klsdmdrqkafiqhgcmvryqy4zli1ksxh2-qgis-unwrapped-3.38.3/share/qgis/python/plugins/processing/core/Processing.py", line 186, in runAlgorithm - raise QgsProcessingException(msg) -_core.QgsProcessingException: Unable to execute algorithm -Could not load source layer for INPUT: invalid value diff --git a/test/test_data/wee_score/example_result.tif b/test/test_data/wee_score/example_result.tif deleted file mode 100644 index 78bd1b68..00000000 Binary files a/test/test_data/wee_score/example_result.tif and /dev/null differ diff --git a/test/test_data/wee_score/example_result.tif.aux.xml b/test/test_data/wee_score/example_result.tif.aux.xml deleted file mode 100644 index ce6a88d9..00000000 --- a/test/test_data/wee_score/example_result.tif.aux.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - 1 - 15 - 8 - 4.3204937989386 - 93.75 - - - diff --git a/test/test_data/wee_score/masks/polygon_mask.gpkg b/test/test_data/wee_score/masks/polygon_mask.gpkg deleted file mode 100644 index 83a1342b..00000000 Binary files a/test/test_data/wee_score/masks/polygon_mask.gpkg and /dev/null differ diff --git a/test/test_data/wee_score/masks/polygon_mask.gpkg-shm b/test/test_data/wee_score/masks/polygon_mask.gpkg-shm deleted file mode 100644 index bfd126b7..00000000 Binary files a/test/test_data/wee_score/masks/polygon_mask.gpkg-shm and /dev/null differ diff --git a/test/test_data/wee_score/masks/polygon_mask.gpkg-wal b/test/test_data/wee_score/masks/polygon_mask.gpkg-wal deleted file mode 100644 index 9ba7eb43..00000000 Binary files a/test/test_data/wee_score/masks/polygon_mask.gpkg-wal and /dev/null differ diff --git a/test/test_data/wee_score/model.json b/test/test_data/wee_score/model.json index ba9ae62c..9d64be41 100644 --- a/test/test_data/wee_score/model.json +++ b/test/test_data/wee_score/model.json @@ -38,10 +38,11 @@ "analysis_mode": "use_index_score", "guid": "7ae5a61b-318c-4e6e-acfc-2a7045f03fb9", "result": "index_score Workflow Completed", - "execution_start_time": "2024-12-18T23:25:26.249349", + "execution_start_time": "2025-01-05T09:03:53.170384", "result_file": "/home/timlinux/dev/python/GEEST2/test/test_data/wee_score/contextual/workplace_discrimination/workplace_index/WD_output_combined.vrt", - "execution_end_time": "2024-12-18T23:25:27.931080", - "error_file": null + "execution_end_time": "2025-01-05T09:03:54.368598", + "error_file": null, + "error": "" } ], "dimension_weighting": 0.333333, @@ -51,9 +52,9 @@ "default_dimension_weighting": 0.333333, "analysis_mode": "", "result": "factor_aggregation Workflow Completed", - "execution_start_time": "2024-12-18T23:25:31.713939", + "execution_start_time": "2025-01-05T09:04:02.116159", "result_file": "/home/timlinux/dev/python/GEEST2/test/test_data/wee_score/contextual/workplace_discrimination/workplace_discrimination_combined.vrt", - "execution_end_time": "2024-12-18T23:25:32.528534" + "execution_end_time": "2025-01-05T09:04:02.988529" }, { "name": "Regulatory Frameworks", @@ -84,10 +85,11 @@ "analysis_mode": "use_index_score", "guid": "853bc6d4-4ca4-4fb8-9511-aaf384d59725", "result": "index_score Workflow Completed", - "execution_start_time": "2024-12-18T23:25:29.139156", + "execution_start_time": "2025-01-05T09:03:54.489646", "result_file": "/home/timlinux/dev/python/GEEST2/test/test_data/wee_score/contextual/regulatory_frameworks/pay_parenthood_index/RF_output_combined.vrt", - "execution_end_time": "2024-12-18T23:25:30.253193", - "error_file": null + "execution_end_time": "2025-01-05T09:03:55.693147", + "error_file": null, + "error": "" } ], "dimension_weighting": 0.3333333, @@ -97,9 +99,9 @@ "default_dimension_weighting": 0.3333333, "analysis_mode": "", "result": "factor_aggregation Workflow Completed", - "execution_start_time": "2024-12-18T23:25:32.656651", + "execution_start_time": "2025-01-05T09:04:03.124962", "result_file": "/home/timlinux/dev/python/GEEST2/test/test_data/wee_score/contextual/regulatory_frameworks/regulatory_frameworks_combined.vrt", - "execution_end_time": "2024-12-18T23:25:33.511264" + "execution_end_time": "2025-01-05T09:04:03.975809" }, { "name": "Financial Inclusion", @@ -130,10 +132,11 @@ "analysis_mode": "use_index_score", "guid": "81a22788-07d9-4397-b68b-aea1596d8342", "result": "index_score Workflow Completed", - "execution_start_time": "2024-12-18T23:25:30.401850", + "execution_start_time": "2025-01-05T09:03:55.821376", "result_file": "/home/timlinux/dev/python/GEEST2/test/test_data/wee_score/contextual/financial_inclusion/entrepeneurship_index/FIN_output_combined.vrt", - "execution_end_time": "2024-12-18T23:25:31.579591", - "error_file": null + "execution_end_time": "2025-01-05T09:03:57.039000", + "error_file": null, + "error": "" } ], "dimension_weighting": 0.333333, @@ -143,9 +146,9 @@ "default_dimension_weighting": 0.333333, "analysis_mode": "", "result": "factor_aggregation Workflow Completed", - "execution_start_time": "2024-12-18T23:25:33.683431", + "execution_start_time": "2025-01-05T09:04:04.070192", "result_file": "/home/timlinux/dev/python/GEEST2/test/test_data/wee_score/contextual/financial_inclusion/financial_inclusion_combined.vrt", - "execution_end_time": "2024-12-18T23:25:34.529052" + "execution_end_time": "2025-01-05T09:04:04.916855" } ], "analysis_weighting": 0.5, @@ -155,9 +158,9 @@ "default_analysis_weighting": 0.333333, "analysis_mode": "", "result": "dimension_aggregation Workflow Completed", - "execution_start_time": "2024-12-18T23:25:35.741929", + "execution_start_time": "2025-01-05T09:04:06.254043", "result_file": "/home/timlinux/dev/python/GEEST2/test/test_data/wee_score/contextual/Contextual_score_combined.vrt", - "execution_end_time": "2024-12-18T23:25:36.623506" + "execution_end_time": "2025-01-05T09:04:07.143303" }, { "name": "Accessibility", @@ -199,10 +202,11 @@ "multi_buffer_point_layer_id": "fake_childcare_6a120423_4837_409e_893c_cc06dd1bde8f", "multi_buffer_point_shapefile": "", "result": "use_multi_buffer_point Workflow Completed", - "execution_start_time": "2024-12-19T11:03:05.436850", + "execution_start_time": "2025-01-05T09:03:57.184036", "result_file": "/home/timlinux/dev/python/GEEST2/test/test_data/wee_score/accessibility/women_s_travel_patterns/kindergartens_location/WTP_Kindergartens_output_combined.vrt", - "execution_end_time": "2024-12-19T11:03:07.870440", - "error_file": null + "execution_end_time": "2025-01-05T09:03:59.495481", + "error_file": null, + "error": "" }, { "indicator": "Location of primary schools", @@ -236,10 +240,11 @@ "multi_buffer_point_layer_id": "fake_primary_schools_1e5dc698_693d_48f5_afbb_f0e542c94e0a", "multi_buffer_point_shapefile": "", "result": "use_multi_buffer_point Workflow Completed", - "execution_start_time": "2024-12-19T11:03:08.098036", + "execution_start_time": "2025-01-05T09:03:59.632259", "result_file": "/home/timlinux/dev/python/GEEST2/test/test_data/wee_score/accessibility/women_s_travel_patterns/primary_school_location/WTP_Primary_Schools_output_combined.vrt", - "execution_end_time": "2024-12-19T11:03:10.000410", - "error_file": null + "execution_end_time": "2025-01-05T09:04:01.533596", + "error_file": null, + "error": "" }, { "indicator": "Location of groceries", @@ -264,7 +269,13 @@ "use_environmental_hazards": 0, "use_street_lights": 0, "analysis_mode": "use_multi_buffer_point", - "guid": "b0f37ad1-b728-4aa8-8bd6-40e60545a5a7" + "guid": "b0f37ad1-b728-4aa8-8bd6-40e60545a5a7", + "result": "Not Run", + "result_file": "", + "error": "", + "error_file": "", + "execution_start_time": "", + "execution_end_time": "" }, { "indicator": "Location of pharmacies", @@ -289,7 +300,13 @@ "use_environmental_hazards": 0, "use_street_lights": 0, "analysis_mode": "use_multi_buffer_point", - "guid": "f96c74f4-492e-484b-b4e7-d72566071911" + "guid": "f96c74f4-492e-484b-b4e7-d72566071911", + "result": "Not Run", + "result_file": "", + "error": "", + "error_file": "", + "execution_start_time": "", + "execution_end_time": "" }, { "indicator": "Location of green spaces", @@ -314,7 +331,13 @@ "use_environmental_hazards": 0, "use_street_lights": 0, "analysis_mode": "use_multi_buffer_point", - "guid": "6e7df235-9af3-4168-ba97-1004e289d7c7" + "guid": "6e7df235-9af3-4168-ba97-1004e289d7c7", + "result": "Not Run", + "result_file": "", + "error": "", + "error_file": "", + "execution_start_time": "", + "execution_end_time": "" } ], "dimension_weighting": 1.0, @@ -324,9 +347,9 @@ "default_dimension_weighting": 0.2, "analysis_mode": "", "result": "factor_aggregation Workflow Completed", - "execution_start_time": "2024-12-19T11:03:10.163971", + "execution_start_time": "2025-01-05T09:04:05.056071", "result_file": "/home/timlinux/dev/python/GEEST2/test/test_data/wee_score/accessibility/women_s_travel_patterns/women_s_travel_patterns_combined.vrt", - "execution_end_time": "2024-12-19T11:03:11.113707" + "execution_end_time": "2025-01-05T09:04:05.904388" }, { "name": "Access to Public Transport", @@ -355,7 +378,13 @@ "use_environmental_hazards": 0, "use_street_lights": 0, "analysis_mode": "Do Not Use", - "guid": "270bf387-5131-43c9-85f3-75d5c04df854" + "guid": "270bf387-5131-43c9-85f3-75d5c04df854", + "result": "Not Run", + "result_file": "", + "error": "", + "error_file": "", + "execution_start_time": "", + "execution_end_time": "" } ], "dimension_weighting": 0.0, @@ -364,7 +393,7 @@ "description": "Access to Public Transport focuses on the availability and proximity of public transportation stops, which is crucial for women, especially those who rely on buses, trains, or trams to access jobs, education, and essential services.", "default_dimension_weighting": 0.2, "analysis_mode": "", - "result": "", + "result": "Not Run", "execution_start_time": "", "result_file": "", "execution_end_time": "" @@ -396,7 +425,13 @@ "use_environmental_hazards": 0, "use_street_lights": 0, "analysis_mode": "Do Not Use", - "guid": "06ce6151-d70a-4564-bfc9-ca72989555e3" + "guid": "06ce6151-d70a-4564-bfc9-ca72989555e3", + "result": "Not Run", + "result_file": "", + "error": "", + "error_file": "", + "execution_start_time": "", + "execution_end_time": "" } ], "dimension_weighting": 0.0, @@ -405,7 +440,7 @@ "description": "Access to Health Facilities evaluates how easily women can reach healthcare services in terms of distance, impacting their well-being and ability to participate in the workforce.", "default_dimension_weighting": 0.2, "analysis_mode": "", - "result": "", + "result": "Not Run", "execution_start_time": "", "result_file": "", "execution_end_time": "" @@ -437,7 +472,13 @@ "use_environmental_hazards": 0, "use_street_lights": 0, "analysis_mode": "Do Not Use", - "guid": "b4e36508-0005-4f1d-864c-c679dde965c1" + "guid": "b4e36508-0005-4f1d-864c-c679dde965c1", + "result": "Not Run", + "result_file": "", + "error": "", + "error_file": "", + "execution_start_time": "", + "execution_end_time": "" } ], "dimension_weighting": 0.0, @@ -446,7 +487,7 @@ "description": "Access to Education and Training Facilities assesses the proximity to higher education institutions and training centers, influencing women's ability to gain necessary qualifications.", "default_dimension_weighting": 0.2, "analysis_mode": "", - "result": "", + "result": "Not Run", "execution_start_time": "", "result_file": "", "execution_end_time": "" @@ -478,7 +519,13 @@ "use_environmental_hazards": 0, "use_street_lights": 0, "analysis_mode": "Do Not Use", - "guid": "cc080fdb-b57a-4fb6-9868-0afb610684bd" + "guid": "cc080fdb-b57a-4fb6-9868-0afb610684bd", + "result": "Not Run", + "result_file": "", + "error": "", + "error_file": "", + "execution_start_time": "", + "execution_end_time": "" } ], "dimension_weighting": 0.0, @@ -487,7 +534,7 @@ "description": "Access to Financial Facilities focuses on the proximity of banks and financial institutions, which is essential for women\u2019s economic empowerment and ability to access credit.", "default_dimension_weighting": 0.2, "analysis_mode": "", - "result": "", + "result": "Not Run", "execution_start_time": "", "result_file": "", "execution_end_time": "" @@ -500,9 +547,9 @@ "default_analysis_weighting": 0.33333, "analysis_mode": "", "result": "dimension_aggregation Workflow Completed", - "execution_start_time": "2024-12-19T11:03:11.276901", + "execution_start_time": "2025-01-05T09:04:07.277461", "result_file": "/home/timlinux/dev/python/GEEST2/test/test_data/wee_score/accessibility/Accessibility_score_combined.vrt", - "execution_end_time": "2024-12-19T11:03:12.223477" + "execution_end_time": "2025-01-05T09:04:08.167397" }, { "name": "Place Characterization", @@ -535,7 +582,13 @@ "use_environmental_hazards": 0, "use_street_lights": 0, "analysis_mode": "Do Not Use", - "guid": "12e98d92-ae96-4f46-a5f1-6563d97a2692" + "guid": "12e98d92-ae96-4f46-a5f1-6563d97a2692", + "result": "Not Run", + "result_file": "", + "error": "", + "error_file": "", + "execution_start_time": "", + "execution_end_time": "" }, { "indicator": "Location of cycle paths", @@ -560,7 +613,13 @@ "use_environmental_hazards": 0, "use_street_lights": 0, "analysis_mode": "Do Not Use", - "guid": "3d3e239b-3fa6-46bb-abdf-b7fb747e8272" + "guid": "3d3e239b-3fa6-46bb-abdf-b7fb747e8272", + "result": "Not Run", + "result_file": "", + "error": "", + "error_file": "", + "execution_start_time": "", + "execution_end_time": "" }, { "indicator": "Location of footpaths", @@ -585,7 +644,13 @@ "use_environmental_hazards": 0, "use_street_lights": 0, "analysis_mode": "Do Not Use", - "guid": "7eeb6b1e-f304-46f8-a3a4-74b25097e4a5" + "guid": "7eeb6b1e-f304-46f8-a3a4-74b25097e4a5", + "result": "Not Run", + "result_file": "", + "error": "", + "error_file": "", + "execution_start_time": "", + "execution_end_time": "" }, { "indicator": "Block Layout", @@ -610,7 +675,13 @@ "use_environmental_hazards": 0, "use_street_lights": 0, "analysis_mode": "Do Not Use", - "guid": "c1dfcfdc-4f30-4d5b-bd9b-21d2f98148c4" + "guid": "c1dfcfdc-4f30-4d5b-bd9b-21d2f98148c4", + "result": "Not Run", + "result_file": "", + "error": "", + "error_file": "", + "execution_start_time": "", + "execution_end_time": "" } ], "dimension_weighting": 0.142857142857143, @@ -619,7 +690,7 @@ "description": "Active Transport refers to the presence of walkable environments and cycling infrastructure, as women often rely on walking or cycling for their daily commutes and errands.", "default_dimension_weighting": 0.142857142857143, "analysis_mode": "", - "result": "", + "result": "Not Run", "execution_start_time": "", "result_file": "", "execution_end_time": "" @@ -651,7 +722,13 @@ "use_environmental_hazards": 0, "use_street_lights": 1, "analysis_mode": "Do Not Use", - "guid": "1ebfa0a0-582f-4456-8c6d-7fd6c10ef46e" + "guid": "1ebfa0a0-582f-4456-8c6d-7fd6c10ef46e", + "result": "Not Run", + "result_file": "", + "error": "", + "error_file": "", + "execution_start_time": "", + "execution_end_time": "" } ], "dimension_weighting": 0.142857142857143, @@ -660,7 +737,7 @@ "description": "Safety addresses the perceived security of public spaces, evaluated through the availability of adequate lighting, which affects women\u2019s ability to move freely, seek employment, and access essential services.", "default_dimension_weighting": 0.142857142857143, "analysis_mode": "", - "result": "", + "result": "Not Run", "execution_start_time": "", "result_file": "", "execution_end_time": "" @@ -692,7 +769,13 @@ "use_environmental_hazards": 0, "use_street_lights": 0, "analysis_mode": "Do Not Use", - "guid": "4121693a-4454-4aba-8ef0-75e8bbda18ed" + "guid": "4121693a-4454-4aba-8ef0-75e8bbda18ed", + "result": "Not Run", + "result_file": "", + "error": "", + "error_file": "", + "execution_start_time": "", + "execution_end_time": "" } ], "dimension_weighting": 0.142857142857143, @@ -701,7 +784,7 @@ "description": "Fragility, Conflict, and Violence (FCV) considers the frequency of events related to political unrest, conflict, and violence in a region, which can increase women\u2019s vulnerability and limit their access to employment and essential services.", "default_dimension_weighting": 0.142857142857143, "analysis_mode": "", - "result": "", + "result": "Not Run", "execution_start_time": "", "result_file": "", "execution_end_time": "" @@ -733,7 +816,13 @@ "use_environmental_hazards": 0, "use_street_lights": 0, "analysis_mode": "Do Not Use", - "guid": "0d1d75ea-c532-4383-86ea-0df524a39cc2" + "guid": "0d1d75ea-c532-4383-86ea-0df524a39cc2", + "result": "Not Run", + "result_file": "", + "error": "", + "error_file": "", + "execution_start_time": "", + "execution_end_time": "" } ], "dimension_weighting": 0.142857142857143, @@ -742,7 +831,7 @@ "description": "Education refers to the proportion of women in a region who have attained higher education, particularly in the specific field of analysis, serving as an indicator of societal attitudes towards women working in that sector.", "default_dimension_weighting": 0.142857142857143, "analysis_mode": "", - "result": "", + "result": "Not Run", "execution_start_time": "", "result_file": "", "execution_end_time": "" @@ -774,7 +863,13 @@ "use_environmental_hazards": 0, "use_street_lights": 0, "analysis_mode": "Do Not Use", - "guid": "1de8776b-224c-4799-8418-83906cc1ab39" + "guid": "1de8776b-224c-4799-8418-83906cc1ab39", + "result": "Not Run", + "result_file": "", + "error": "", + "error_file": "", + "execution_start_time": "", + "execution_end_time": "" } ], "dimension_weighting": 0.142857142857143, @@ -783,7 +878,7 @@ "description": "Digital Inclusion assesses the presence of digital infrastructure in a specific location, which is essential for women to pursue job opportunities, access training band education opportunities, and use financial services.", "default_dimension_weighting": 0.142857142857143, "analysis_mode": "", - "result": "", + "result": "Not Run", "execution_start_time": "", "result_file": "", "execution_end_time": "" @@ -815,7 +910,13 @@ "use_environmental_hazards": 1, "use_street_lights": 0, "analysis_mode": "Do Not Use", - "guid": "4e2a7af0-7b74-4a16-8d1e-7c62bea7719a" + "guid": "4e2a7af0-7b74-4a16-8d1e-7c62bea7719a", + "result": "Not Run", + "result_file": "", + "error": "", + "error_file": "", + "execution_start_time": "", + "execution_end_time": "" }, { "indicator": "Flood Hazards", @@ -840,7 +941,13 @@ "use_environmental_hazards": 1, "use_street_lights": 0, "analysis_mode": "Do Not Use", - "guid": "5d1c9f67-f007-4f6c-97d4-040e24eb081d" + "guid": "5d1c9f67-f007-4f6c-97d4-040e24eb081d", + "result": "Not Run", + "result_file": "", + "error": "", + "error_file": "", + "execution_start_time": "", + "execution_end_time": "" }, { "indicator": "Landslide", @@ -865,7 +972,13 @@ "use_environmental_hazards": 1, "use_street_lights": 0, "analysis_mode": "Do Not Use", - "guid": "7464d39c-484f-4bf6-9cab-83d30ce84125" + "guid": "7464d39c-484f-4bf6-9cab-83d30ce84125", + "result": "Not Run", + "result_file": "", + "error": "", + "error_file": "", + "execution_start_time": "", + "execution_end_time": "" }, { "indicator": "Tropical Cyclone", @@ -890,7 +1003,13 @@ "use_environmental_hazards": 1, "use_street_lights": 0, "analysis_mode": "Do Not Use", - "guid": "41f656c3-9bf7-42c5-9572-139a3e229d7a" + "guid": "41f656c3-9bf7-42c5-9572-139a3e229d7a", + "result": "Not Run", + "result_file": "", + "error": "", + "error_file": "", + "execution_start_time": "", + "execution_end_time": "" }, { "indicator": "Drought", @@ -915,7 +1034,13 @@ "use_environmental_hazards": 1, "use_street_lights": 0, "analysis_mode": "Do Not Use", - "guid": "41adb08b-4bf8-4e5d-8dc3-20d3f5374d78" + "guid": "41adb08b-4bf8-4e5d-8dc3-20d3f5374d78", + "result": "Not Run", + "result_file": "", + "error": "", + "error_file": "", + "execution_start_time": "", + "execution_end_time": "" } ], "dimension_weighting": 0.142857142857143, @@ -924,7 +1049,7 @@ "description": "Environmental Hazards relate to the impact of environmental risks, such as floods, droughts, landslides, fires, and extreme weather events, which can disrupt job stability, particularly for women in vulnerable sectors.", "default_dimension_weighting": 0.142857142857143, "analysis_mode": "", - "result": "", + "result": "Not Run", "execution_start_time": "", "result_file": "", "execution_end_time": "" @@ -956,7 +1081,13 @@ "use_environmental_hazards": 0, "use_street_lights": 0, "analysis_mode": "Do Not Use", - "guid": "31be7faa-7c48-4e77-b9b6-bf8fa562c7ef" + "guid": "31be7faa-7c48-4e77-b9b6-bf8fa562c7ef", + "result": "Not Run", + "result_file": "", + "error": "", + "error_file": "", + "execution_start_time": "", + "execution_end_time": "" } ], "dimension_weighting": 0.142857142857143, @@ -965,7 +1096,7 @@ "description": "Water and Sanitation concerns the availability of clean water and sanitation facilities, affecting women\u2019s time allocation and capacity to engage in employment.", "default_dimension_weighting": 0.142857142857143, "analysis_mode": "", - "result": "", + "result": "Not Run", "execution_start_time": "", "result_file": "", "execution_end_time": "" @@ -977,41 +1108,46 @@ "output_filename": "Place_score", "default_analysis_weighting": 0.333333, "analysis_mode": "", - "result": "", + "result": "Not Run", "execution_start_time": "", "result_file": "", "execution_end_time": "" } ], "result": "analysis_aggregation Workflow Completed", - "result_file": "/home/timlinux/dev/python/GEEST2/test/test_data/wee_score/_combined.vrt", - "execution_start_time": "2024-12-19T13:07:59.647020", - "execution_end_time": "2024-12-19T13:08:00.475715", + "result_file": "/home/timlinux/dev/python/GEEST2/test/test_data/wee_score/wee_score/WEE_Score_combined.vrt", + "execution_start_time": "2025-01-05T09:15:51.664475", + "execution_end_time": "2025-01-05T09:15:52.503123", "error": "", "error_file": null, + "output_filename": "WEE_Score", + "mask_mode": "point", + "buffer_distance_m": 100, + "opportunities_mask_result_file": "", + "opportunities_mask_result": "", "aggregation_layer": null, - "aggregation_layer_name": "administrative_boundary", - "aggregation_layer_source": "/home/timlinux/dev/python/GEEST2/data/StLucia/saintluciagis.gpkg|layername=administrative_boundary", + "aggregation_layer_name": "admin", + "aggregation_layer_source": "/home/timlinux/dev/python/GEEST2/test/test_data/wee_score/admin0.gpkg|layername=admin", "aggregation_layer_provider_type": "ogr", - "aggregation_layer_crs": "", + "aggregation_layer_crs": "EPSG:32620", "aggregation_layer_wkb_type": 6, - "aggregation_layer_id": "administrative_boundary_7f19d49d_e23e_4737_9d7e_8fc99db4ef72", + "aggregation_layer_id": "admin_2681a7d2_5c5d_4d41_8a0f_74b02334723d", "aggregation_shapefile": "", "population_layer": null, - "population_layer_name": "lca_ppp_2020_UNadj_constrained", - "population_layer_source": "/home/timlinux/dev/python/GEEST2/data/StLucia/Population/lca_ppp_2020_UNadj_constrained.tif", + "population_layer_name": "reclassified_population", + "population_layer_source": "/home/timlinux/dev/python/GEEST2/test/test_data/wee_score/population/reclassified_population.vrt", "population_layer_provider_type": "gdal", - "population_layer_crs": "EPSG:4326", + "population_layer_crs": "EPSG:32620", "population_layer_wkb_type": "", - "population_layer_id": "lca_ppp_2020_UNadj_constrained_ec945779_3222_4975_9f04_3312e7855d64", + "population_layer_id": "reclassified_population_bba75c81_028b_4221_b33f_78c8c31e5e46", "population_shapefile": "", "point_mask_layer": null, - "point_mask_layer_name": "", - "point_mask_layer_source": "", - "point_mask_layer_provider_type": "", - "point_mask_layer_crs": "", - "point_mask_layer_wkb_type": "", - "point_mask_layer_id": "", + "point_mask_layer_name": "fake_childcare", + "point_mask_layer_source": "/home/timlinux/dev/python/GEEST2/test/test_data/points/fake_childcare.gpkg|layername=fake_childcare", + "point_mask_layer_provider_type": "ogr", + "point_mask_layer_crs": "EPSG:32620", + "point_mask_layer_wkb_type": 1, + "point_mask_layer_id": "fake_childcare_6a120423_4837_409e_893c_cc06dd1bde8f", "point_mask_shapefile": "", "polygon_mask_layer": null, "polygon_mask_layer_name": "", @@ -1028,7 +1164,6 @@ "raster_mask_layer_crs": "", "raster_mask_layer_wkb_type": "", "raster_mask_layer_id": "", - "raster_mask_shapefile": "", - "analysis_mode": "analysis_aggregation", - "wee_by_population": "/home/timlinux/dev/python/GEEST2/test/test_data/wee_score/wee_score/wee_by_population_score.vrt" + "raster_mask_raster": "", + "analysis_mode": "analysis_aggregation" } \ No newline at end of file diff --git a/test/test_data/wee_score/opportunity_masks/0.cpg b/test/test_data/wee_score/opportunity_masks/0.cpg new file mode 100644 index 00000000..3ad133c0 --- /dev/null +++ b/test/test_data/wee_score/opportunity_masks/0.cpg @@ -0,0 +1 @@ +UTF-8 \ No newline at end of file diff --git a/test/test_data/wee_score/opportunity_masks/0.dbf b/test/test_data/wee_score/opportunity_masks/0.dbf new file mode 100644 index 00000000..92c8c835 Binary files /dev/null and b/test/test_data/wee_score/opportunity_masks/0.dbf differ diff --git a/test/test_data/wee_score/opportunity_masks/0.prj b/test/test_data/wee_score/opportunity_masks/0.prj new file mode 100644 index 00000000..9c7aa3ca --- /dev/null +++ b/test/test_data/wee_score/opportunity_masks/0.prj @@ -0,0 +1 @@ +PROJCS["WGS_1984_UTM_Zone_20N",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["False_Easting",500000.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",-63.0],PARAMETER["Scale_Factor",0.9996],PARAMETER["Latitude_Of_Origin",0.0],UNIT["Meter",1.0]] \ No newline at end of file diff --git a/test/test_data/wee_score/opportunity_masks/0.shp b/test/test_data/wee_score/opportunity_masks/0.shp new file mode 100644 index 00000000..45e8c5c1 Binary files /dev/null and b/test/test_data/wee_score/opportunity_masks/0.shp differ diff --git a/test/test_data/wee_score/opportunity_masks/0.shx b/test/test_data/wee_score/opportunity_masks/0.shx new file mode 100644 index 00000000..bbf9a90c Binary files /dev/null and b/test/test_data/wee_score/opportunity_masks/0.shx differ diff --git a/test/test_data/wee_score/opportunity_masks/Opportunities_Mask_combined.qml b/test/test_data/wee_score/opportunity_masks/Opportunities_Mask_combined.qml new file mode 100644 index 00000000..fc00b0d8 --- /dev/null +++ b/test/test_data/wee_score/opportunity_masks/Opportunities_Mask_combined.qml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + None + WholeRaster + Estimated + 0.02 + 0.98 + 2 + + + + + + + + + + + + + + + + + + + + resamplingFilter + + 0 + diff --git a/test/test_data/wee_score/wee_score/wee_score.vrt b/test/test_data/wee_score/opportunity_masks/Opportunities_Mask_combined.vrt similarity index 55% rename from test/test_data/wee_score/wee_score/wee_score.vrt rename to test/test_data/wee_score/opportunity_masks/Opportunities_Mask_combined.vrt index 6a9ed1e8..caf09040 100644 --- a/test/test_data/wee_score/wee_score/wee_score.vrt +++ b/test/test_data/wee_score/opportunity_masks/Opportunities_Mask_combined.vrt @@ -1,16 +1,20 @@ - + PROJCS["WGS 84 / UTM zone 20N",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-63],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["Easting",EAST],AXIS["Northing",NORTH],AUTHORITY["EPSG","32620"]] - 7.1500000000000000e+05, 1.0000000000000000e+03, 0.0000000000000000e+00, 1.5520000000000000e+06, 0.0000000000000000e+00, -1.0000000000000000e+03 + 7.1400000000000000e+05, 1.0000000000000000e+03, 0.0000000000000000e+00, 1.5540000000000000e+06, 0.0000000000000000e+00, -1.0000000000000000e+03 - 255 - Gray + 0 + Palette + + + + - wee_score_0.tif + opportunites_mask_0.tif 1 - - - - 255 + + + + 0 diff --git a/test/test_data/wee_score/opportunity_masks/opportunites_mask_0.tif b/test/test_data/wee_score/opportunity_masks/opportunites_mask_0.tif new file mode 100644 index 00000000..f79aeb54 Binary files /dev/null and b/test/test_data/wee_score/opportunity_masks/opportunites_mask_0.tif differ diff --git a/test/test_data/wee_score/opportunity_masks/opportunites_points_buffered_0.cpg b/test/test_data/wee_score/opportunity_masks/opportunites_points_buffered_0.cpg new file mode 100644 index 00000000..3ad133c0 --- /dev/null +++ b/test/test_data/wee_score/opportunity_masks/opportunites_points_buffered_0.cpg @@ -0,0 +1 @@ +UTF-8 \ No newline at end of file diff --git a/test/test_data/wee_score/opportunity_masks/opportunites_points_buffered_0.dbf b/test/test_data/wee_score/opportunity_masks/opportunites_points_buffered_0.dbf new file mode 100644 index 00000000..ed4c9367 Binary files /dev/null and b/test/test_data/wee_score/opportunity_masks/opportunites_points_buffered_0.dbf differ diff --git a/test/test_data/wee_score/opportunity_masks/opportunites_points_buffered_0.prj b/test/test_data/wee_score/opportunity_masks/opportunites_points_buffered_0.prj new file mode 100644 index 00000000..9c7aa3ca --- /dev/null +++ b/test/test_data/wee_score/opportunity_masks/opportunites_points_buffered_0.prj @@ -0,0 +1 @@ +PROJCS["WGS_1984_UTM_Zone_20N",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["False_Easting",500000.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",-63.0],PARAMETER["Scale_Factor",0.9996],PARAMETER["Latitude_Of_Origin",0.0],UNIT["Meter",1.0]] \ No newline at end of file diff --git a/test/test_data/wee_score/opportunity_masks/opportunites_points_buffered_0.shp b/test/test_data/wee_score/opportunity_masks/opportunites_points_buffered_0.shp new file mode 100644 index 00000000..84dafa34 Binary files /dev/null and b/test/test_data/wee_score/opportunity_masks/opportunites_points_buffered_0.shp differ diff --git a/test/test_data/wee_score/opportunity_masks/opportunites_points_buffered_0.shx b/test/test_data/wee_score/opportunity_masks/opportunites_points_buffered_0.shx new file mode 100644 index 00000000..f3fbb61e Binary files /dev/null and b/test/test_data/wee_score/opportunity_masks/opportunites_points_buffered_0.shx differ diff --git a/test/test_data/wee_score/opportunity_masks/opportunites_polygons_clipped_0.cpg b/test/test_data/wee_score/opportunity_masks/opportunites_polygons_clipped_0.cpg new file mode 100644 index 00000000..3ad133c0 --- /dev/null +++ b/test/test_data/wee_score/opportunity_masks/opportunites_polygons_clipped_0.cpg @@ -0,0 +1 @@ +UTF-8 \ No newline at end of file diff --git a/test/test_data/wee_score/opportunity_masks/opportunites_polygons_clipped_0.dbf b/test/test_data/wee_score/opportunity_masks/opportunites_polygons_clipped_0.dbf new file mode 100644 index 00000000..ed4c9367 Binary files /dev/null and b/test/test_data/wee_score/opportunity_masks/opportunites_polygons_clipped_0.dbf differ diff --git a/test/test_data/wee_score/opportunity_masks/opportunites_polygons_clipped_0.prj b/test/test_data/wee_score/opportunity_masks/opportunites_polygons_clipped_0.prj new file mode 100644 index 00000000..9c7aa3ca --- /dev/null +++ b/test/test_data/wee_score/opportunity_masks/opportunites_polygons_clipped_0.prj @@ -0,0 +1 @@ +PROJCS["WGS_1984_UTM_Zone_20N",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["False_Easting",500000.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",-63.0],PARAMETER["Scale_Factor",0.9996],PARAMETER["Latitude_Of_Origin",0.0],UNIT["Meter",1.0]] \ No newline at end of file diff --git a/test/test_data/wee_score/opportunity_masks/opportunites_polygons_clipped_0.shp b/test/test_data/wee_score/opportunity_masks/opportunites_polygons_clipped_0.shp new file mode 100644 index 00000000..84dafa34 Binary files /dev/null and b/test/test_data/wee_score/opportunity_masks/opportunites_polygons_clipped_0.shp differ diff --git a/test/test_data/wee_score/opportunity_masks/opportunites_polygons_clipped_0.shx b/test/test_data/wee_score/opportunity_masks/opportunites_polygons_clipped_0.shx new file mode 100644 index 00000000..f3fbb61e Binary files /dev/null and b/test/test_data/wee_score/opportunity_masks/opportunites_polygons_clipped_0.shx differ diff --git a/test/test_data/wee_score/population/clipped_0.tif b/test/test_data/wee_score/population/clipped_phase1_0.tif similarity index 100% rename from test/test_data/wee_score/population/clipped_0.tif rename to test/test_data/wee_score/population/clipped_phase1_0.tif diff --git a/test/test_data/wee_score/population/clipped_0.tif.aux.xml b/test/test_data/wee_score/population/clipped_phase1_0.tif.aux.xml similarity index 100% rename from test/test_data/wee_score/population/clipped_0.tif.aux.xml rename to test/test_data/wee_score/population/clipped_phase1_0.tif.aux.xml diff --git a/test/test_data/wee_score/population/clipped_phase2_0.tif b/test/test_data/wee_score/population/clipped_phase2_0.tif new file mode 100644 index 00000000..ac62d1c2 Binary files /dev/null and b/test/test_data/wee_score/population/clipped_phase2_0.tif differ diff --git a/test/test_data/wee_score/population/clipped_phase2_0.tif.aux.xml b/test/test_data/wee_score/population/clipped_phase2_0.tif.aux.xml new file mode 100644 index 00000000..cf4f8ca6 --- /dev/null +++ b/test/test_data/wee_score/population/clipped_phase2_0.tif.aux.xml @@ -0,0 +1,11 @@ + + + + 13 + 65 + 33.162367223065 + 9.0874712989202 + 30.26 + + + diff --git a/test/test_data/wee_score/population/clipped_population.vrt b/test/test_data/wee_score/population/clipped_population.vrt index d21310de..0d610b6e 100644 --- a/test/test_data/wee_score/population/clipped_population.vrt +++ b/test/test_data/wee_score/population/clipped_population.vrt @@ -1,15 +1,15 @@ - - GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AXIS["Latitude",NORTH],AXIS["Longitude",EAST],AUTHORITY["EPSG","4326"]] - -6.1019166280774705e+01, 8.3333332806324108e-04, 0.0000000000000000e+00, 1.4039999930666639e+01, 0.0000000000000000e+00, -8.3333332921810537e-04 + + PROJCS["WGS 84 / UTM zone 20N",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-63],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["Easting",EAST],AXIS["Northing",NORTH],AUTHORITY["EPSG","32620"]] + 7.1400000000000000e+05, 9.0909090909090907e+01, 0.0000000000000000e+00, 1.5530000000000000e+06, 0.0000000000000000e+00, -9.0909090909090907e+01 -9999 Gray - clipped_0.tif + clipped_phase2_0.tif 1 - - - + + + -9999 diff --git a/test/test_data/wee_score/population/population.asc b/test/test_data/wee_score/population/population.asc deleted file mode 100644 index 58081b6a..00000000 --- a/test/test_data/wee_score/population/population.asc +++ /dev/null @@ -1,10 +0,0 @@ -ncols 4 -nrows 4 -xllcorner 715000.0 -yllcorner 1548000.0 -cellsize 1000.0 -NODATA_value -9999 -1 1 1 1 -1 2 2 2 -2 2 3 3 -3 3 3 -9999 diff --git a/test/test_data/wee_score/population/population.qml b/test/test_data/wee_score/population/population.qml deleted file mode 100644 index 085c2051..00000000 --- a/test/test_data/wee_score/population/population.qml +++ /dev/null @@ -1,156 +0,0 @@ - - - - 1 - 1 - 1 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - None - WholeRaster - Estimated - 0.02 - 0.98 - 2 - - - - - - - - - - - - - - resamplingFilter - - 0 - diff --git a/test/test_data/wee_score/population/reclassified_0.qml b/test/test_data/wee_score/population/reclassified_0.qml deleted file mode 100644 index 562f5286..00000000 --- a/test/test_data/wee_score/population/reclassified_0.qml +++ /dev/null @@ -1,156 +0,0 @@ - - - - 1 - 1 - 1 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - None - WholeRaster - Estimated - 0.02 - 0.98 - 2 - - - - - - - - - - - - - - resamplingFilter - - 0 - diff --git a/test/test_data/wee_score/population/reclassified_0.tif b/test/test_data/wee_score/population/reclassified_0.tif index 748e25f7..e0eab75d 100644 Binary files a/test/test_data/wee_score/population/reclassified_0.tif and b/test/test_data/wee_score/population/reclassified_0.tif differ diff --git a/test/test_data/wee_score/population/reclassified_0.tif.aux.xml b/test/test_data/wee_score/population/reclassified_0.tif.aux.xml index 83e69542..0dd8f2cd 100644 --- a/test/test_data/wee_score/population/reclassified_0.tif.aux.xml +++ b/test/test_data/wee_score/population/reclassified_0.tif.aux.xml @@ -1,11 +1,11 @@ - 3 - 2 1 - 0.81649658092773 - 30.61 + 3 + 1.5 + 0.62678317052801 + 57.14 diff --git a/test/test_data/wee_score/population/reclassified_population.vrt b/test/test_data/wee_score/population/reclassified_population.vrt index f57d3f25..83e608d3 100644 --- a/test/test_data/wee_score/population/reclassified_population.vrt +++ b/test/test_data/wee_score/population/reclassified_population.vrt @@ -1,16 +1,16 @@ PROJCS["WGS 84 / UTM zone 20N",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-63],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["Easting",EAST],AXIS["Northing",NORTH],AUTHORITY["EPSG","32620"]] 7.1400000000000000e+05, 1.0000000000000000e+03, 0.0000000000000000e+00, 1.5540000000000000e+06, 0.0000000000000000e+00, -1.0000000000000000e+03 - - -9999 + + 0 Gray reclassified_0.tif 1 - + - -9999 + 0 diff --git a/test/test_data/wee_score/population/resampled_0.tif b/test/test_data/wee_score/population/resampled_0.tif index eaf31250..27dfa710 100644 Binary files a/test/test_data/wee_score/population/resampled_0.tif and b/test/test_data/wee_score/population/resampled_0.tif differ diff --git a/test/test_data/wee_score/population/resampled_0.tif.aux.xml b/test/test_data/wee_score/population/resampled_0.tif.aux.xml index 7e1a5148..aa4426ac 100644 --- a/test/test_data/wee_score/population/resampled_0.tif.aux.xml +++ b/test/test_data/wee_score/population/resampled_0.tif.aux.xml @@ -1,11 +1,11 @@ - 7 - 4613 - 1397.8387096774 - 1218.8843681899 - 63.27 + 29 + 4651 + 1507.1724137931 + 1208.8611074768 + 59.18 diff --git a/test/test_data/wee_score/aggregation/boundaries.gpkg b/test/test_data/wee_score/subnational_aggregation/subnational_aggregation.gpkg similarity index 92% rename from test/test_data/wee_score/aggregation/boundaries.gpkg rename to test/test_data/wee_score/subnational_aggregation/subnational_aggregation.gpkg index 77b97517..b04cbdca 100644 Binary files a/test/test_data/wee_score/aggregation/boundaries.gpkg and b/test/test_data/wee_score/subnational_aggregation/subnational_aggregation.gpkg differ diff --git a/test/test_data/wee_score/subnational_aggregation/subnational_aggregation.qml b/test/test_data/wee_score/subnational_aggregation/subnational_aggregation.qml new file mode 100644 index 00000000..e1befb8f --- /dev/null +++ b/test/test_data/wee_score/subnational_aggregation/subnational_aggregation.qml @@ -0,0 +1,570 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 0 + 2 + diff --git a/test/test_data/wee_score/wee.asc b/test/test_data/wee_score/wee.asc deleted file mode 100644 index 28f06749..00000000 --- a/test/test_data/wee_score/wee.asc +++ /dev/null @@ -1,10 +0,0 @@ -ncols 4 -nrows 4 -xllcorner 715000.0 -yllcorner 1548000.0 -cellsize 1000.0 -NODATA_value -9999 -1 2 3 4 -5 1 2 3 -4 5 1 2 -3 4 5 -9999 diff --git a/test/test_data/wee_score/wee.asc.aux.xml b/test/test_data/wee_score/wee.asc.aux.xml deleted file mode 100644 index 5d7c379f..00000000 --- a/test/test_data/wee_score/wee.asc.aux.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - 1 - 5 - 3 - 1.4142135623731 - 93.75 - - - diff --git a/test/test_data/wee_score/wee.qml b/test/test_data/wee_score/wee.qml deleted file mode 100644 index 09ef9b83..00000000 --- a/test/test_data/wee_score/wee.qml +++ /dev/null @@ -1,176 +0,0 @@ - - - - 1 - 1 - 1 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - None - WholeRaster - Estimated - 0.02 - 0.98 - 2 - - - - - - - - - - - - - - - - - - - - - - - resamplingFilter - - 0 - diff --git a/test/test_data/wee_score/wee.tif.aux.xml b/test/test_data/wee_score/wee.tif.aux.xml deleted file mode 100644 index 5d7c379f..00000000 --- a/test/test_data/wee_score/wee.tif.aux.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - 1 - 5 - 3 - 1.4142135623731 - 93.75 - - - diff --git a/test/test_data/wee_score/wee_score/wee_by_population_score.qml b/test/test_data/wee_score/wee_by_population_score/wee_by_population_score.qml similarity index 100% rename from test/test_data/wee_score/wee_score/wee_by_population_score.qml rename to test/test_data/wee_score/wee_by_population_score/wee_by_population_score.qml diff --git a/test/test_data/wee_score/wee_score/wee_by_population_score.vrt b/test/test_data/wee_score/wee_by_population_score/wee_by_population_score.vrt similarity index 100% rename from test/test_data/wee_score/wee_score/wee_by_population_score.vrt rename to test/test_data/wee_score/wee_by_population_score/wee_by_population_score.vrt diff --git a/test/test_data/wee_score/wee_score/wee_by_population_score_0.tif b/test/test_data/wee_score/wee_by_population_score/wee_by_population_score_0.tif similarity index 78% rename from test/test_data/wee_score/wee_score/wee_by_population_score_0.tif rename to test/test_data/wee_score/wee_by_population_score/wee_by_population_score_0.tif index 9979d71f..4d5d3442 100644 Binary files a/test/test_data/wee_score/wee_score/wee_by_population_score_0.tif and b/test/test_data/wee_score/wee_by_population_score/wee_by_population_score_0.tif differ diff --git a/test/test_data/wee_score/wee_by_population_score/wee_by_population_score_0.tif.aux.xml b/test/test_data/wee_score/wee_by_population_score/wee_by_population_score_0.tif.aux.xml new file mode 100644 index 00000000..1742d341 --- /dev/null +++ b/test/test_data/wee_score/wee_by_population_score/wee_by_population_score_0.tif.aux.xml @@ -0,0 +1,11 @@ + + + + 13 + 9.8571428571429 + 6 + 2.1499881347561 + 77.78 + + + diff --git a/test/test_data/wee_score/wee_score.qgz b/test/test_data/wee_score/wee_score.qgz deleted file mode 100644 index dc959b13..00000000 Binary files a/test/test_data/wee_score/wee_score.qgz and /dev/null differ diff --git a/test/test_data/wee_score/_combined.qml b/test/test_data/wee_score/wee_score/WEE_Score_combined.qml similarity index 100% rename from test/test_data/wee_score/_combined.qml rename to test/test_data/wee_score/wee_score/WEE_Score_combined.qml diff --git a/test/test_data/wee_score/_combined.vrt b/test/test_data/wee_score/wee_score/WEE_Score_combined.vrt similarity index 100% rename from test/test_data/wee_score/_combined.vrt rename to test/test_data/wee_score/wee_score/WEE_Score_combined.vrt diff --git a/test/test_data/wee_score/wee_score/validation_points.gpkg b/test/test_data/wee_score/wee_score/validation_points.gpkg deleted file mode 100644 index 5c274a72..00000000 Binary files a/test/test_data/wee_score/wee_score/validation_points.gpkg and /dev/null differ diff --git a/test/test_data/wee_score/wee_score/wee_by_population_score_0.tif.aux.xml b/test/test_data/wee_score/wee_score/wee_by_population_score_0.tif.aux.xml deleted file mode 100644 index 55f6ca93..00000000 --- a/test/test_data/wee_score/wee_score/wee_by_population_score_0.tif.aux.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - 14 - 11.466666666667 - 9 - 1.783878421368 - 41.67 - - - diff --git a/test/test_data/wee_score/wee_masked_0.tif b/test/test_data/wee_score/wee_score/wee_masked_0.tif similarity index 100% rename from test/test_data/wee_score/wee_masked_0.tif rename to test/test_data/wee_score/wee_score/wee_masked_0.tif diff --git a/test/test_data/wee_score/wee_masked_0.tif.aux.xml b/test/test_data/wee_score/wee_score/wee_masked_0.tif.aux.xml similarity index 100% rename from test/test_data/wee_score/wee_masked_0.tif.aux.xml rename to test/test_data/wee_score/wee_score/wee_masked_0.tif.aux.xml diff --git a/test/test_data/wee_score/wee_score/wee_score.qml b/test/test_data/wee_score/wee_score/wee_score.qml deleted file mode 100644 index d315be00..00000000 --- a/test/test_data/wee_score/wee_score/wee_score.qml +++ /dev/null @@ -1,171 +0,0 @@ - - - - 1 - 1 - 1 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - None - WholeRaster - Estimated - 0.02 - 0.98 - 2 - - - - - - - - - - - - - - - - - - - - - - - - - - resamplingFilter - - 0 - diff --git a/test/test_data/wee_score/wee_score/wee_score_0.tif b/test/test_data/wee_score/wee_score/wee_score_0.tif deleted file mode 100644 index eb68b60b..00000000 Binary files a/test/test_data/wee_score/wee_score/wee_score_0.tif and /dev/null differ diff --git a/test/test_data/wee_score/wee_score/wee_score_0.tif.aux.xml b/test/test_data/wee_score/wee_score/wee_score_0.tif.aux.xml deleted file mode 100644 index ce6a88d9..00000000 --- a/test/test_data/wee_score/wee_score/wee_score_0.tif.aux.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - 1 - 15 - 8 - 4.3204937989386 - 93.75 - - - diff --git a/test/test_data/wee_score/womens_economic_empowerment_-_wee_score_aggregated_0.tif b/test/test_data/wee_score/wee_score/womens_economic_empowerment_-_wee_score_aggregated_0.tif similarity index 100% rename from test/test_data/wee_score/womens_economic_empowerment_-_wee_score_aggregated_0.tif rename to test/test_data/wee_score/wee_score/womens_economic_empowerment_-_wee_score_aggregated_0.tif diff --git a/test/test_opportunities_mask.py b/test/test_opportunities_mask.py index 57f352de..e0050fc3 100644 --- a/test/test_opportunities_mask.py +++ b/test/test_opportunities_mask.py @@ -9,6 +9,7 @@ ) # Adjust the import path as necessary from utilities_for_testing import prepare_fixtures from geest.core.algorithms import OpportunitiesMaskProcessor +from geest.core.json_tree_item import JsonTreeItem class TestPolygonOpportunitiesMask(unittest.TestCase): @@ -28,14 +29,78 @@ def setUpClass(cls): ) def setUp(self): + item = JsonTreeItem( + role="analysis", + data={ + "name": "polygon_mask", + "type": "mask", + "path": self.mask_areas_path, + "aggregation_layer": None, + "aggregation_layer_crs": "EPSG:32620", + "aggregation_layer_id": "admin_2681a7d2_5c5d_4d41_8a0f_74b02334723d", + "aggregation_layer_name": "admin", + "aggregation_layer_provider_type": "ogr", + "aggregation_layer_source": "", + "aggregation_layer_wkb_type": 6, + "aggregation_shapefile": "", + "analysis_cell_size_m": 1000, + "analysis_mode": "analysis_aggregation", + "analysis_name": "Women's Economic Empowerment - wee_score", + "buffer_distance_m": 100, + "description": "No Description", + "error": "", + "error_file": None, + "execution_end_time": "2025-01-05T09:15:52.503123", + "execution_start_time": "2025-01-05T09:15:51.664475", + "mask_mode": "point", + "opportunities_mask_result": "", + "opportunities_mask_result_file": "", + "output_filename": "WEE_Score", + "point_mask_layer": None, + "point_mask_layer_crs": "EPSG:32620", + "point_mask_layer_id": "fake_childcare_6a120423_4837_409e_893c_cc06dd1bde8f", + "point_mask_layer_name": "fake_childcare", + "point_mask_layer_provider_type": "ogr", + "point_mask_layer_source": "", + "point_mask_layer_wkb_type": 1, + "point_mask_shapefile": "", + "polygon_mask_layer": None, + "polygon_mask_layer_crs": "", + "polygon_mask_layer_id": "", + "polygon_mask_layer_name": "", + "polygon_mask_layer_provider_type": "", + "polygon_mask_layer_source": "", + "polygon_mask_layer_wkb_type": "", + "polygon_mask_shapefile": "", + "population_layer": None, + "population_layer_crs": "EPSG:32620", + "population_layer_id": "reclassified_population_bba75c81_028b_4221_b33f_78c8c31e5e46", + "population_layer_name": "reclassified_population", + "population_layer_provider_type": "gdal", + "population_layer_source": "", + "population_layer_wkb_type": "", + "population_shapefile": "", + "raster_mask_layer": None, + "raster_mask_layer_crs": "", + "raster_mask_layer_id": "", + "raster_mask_layer_name": "", + "raster_mask_layer_provider_type": "", + "raster_mask_layer_source": "", + "raster_mask_layer_wkb_type": "", + "raster_mask_raster": "", + "result": "analysis_aggregation Workflow Completed", + "result_file": "", + "wee_by_population": "", + "working_folder": "", + }, + ) + self.task = OpportunitiesMaskProcessor( - # geest_raster_path=f"{self.working_directory}/wee_masked_0.tif", - # pop_raster_path=f"{self.working_directory}/population/reclassified_0.tif", + item=item, study_area_gpkg_path=self.study_area_gpkg_path, - mask_areas_path=self.mask_areas_path, working_directory=self.working_directory, - target_crs=None, force_clear=True, + cell_size_m=1000, ) def test_initialization(self): diff --git a/test/test_population_raster_processor.py b/test/test_population_raster_processor.py index df69a5d5..f9f6f794 100644 --- a/test/test_population_raster_processor.py +++ b/test/test_population_raster_processor.py @@ -41,7 +41,6 @@ def test_population_raster_processing(self): population_raster_path=self.input_raster_path, study_area_gpkg_path=self.gpkg_path, working_directory=self.output_directory, - target_crs=QgsCoordinateReferenceSystem("EPSG:32620"), force_clear=True, cell_size_m=100, ) diff --git a/test/test_subnational_aggregation.py b/test/test_subnational_aggregation.py index 1a91b69e..e2f1aa6b 100644 --- a/test/test_subnational_aggregation.py +++ b/test/test_subnational_aggregation.py @@ -22,7 +22,9 @@ def setUpClass(cls): cls.context = QgsProcessingContext() cls.feedback = QgsFeedback() cls.aggregation_areas_path = os.path.join( - cls.working_directory, "aggregation", "boundaries.gpkg|layername=boundaries" + cls.working_directory, + "subnational_aggregation", + "subnational_aggregation.gpkg|layername=subnational_aggregation", ) cls.study_area_gpkg_path = os.path.join( cls.working_directory, "study_area", "study_area.gpkg" diff --git a/test/test_wee_score_processor.py b/test/test_wee_score_processor.py index 48684e02..368d3934 100644 --- a/test/test_wee_score_processor.py +++ b/test/test_wee_score_processor.py @@ -35,7 +35,10 @@ def setUp(self): ) def test_initialization(self): - self.assertTrue(self.task.output_dir.endswith("wee_score")) + self.assertTrue( + self.task.output_dir.endswith("wee_by_population_score"), + msg=f"Output directory is {self.task.output_dir}", + ) self.assertEqual(self.task.target_crs.authid(), "EPSG:32620") def test_run_task(self):