diff --git a/geest/core/generate_model.py b/geest/core/generate_model.py index bac710fa..e083ec7c 100755 --- a/geest/core/generate_model.py +++ b/geest/core/generate_model.py @@ -33,10 +33,10 @@ def load_spreadsheet(self): "Indicator", "Default Indicator Factor Weighting", "ID", + "Naming convention for outputs", "Factor Description", - "Default Index Score", "Index Score", - "Use Default Index Score", + "Use Index Score", "Default Multi Buffer Distances", "Use Multi Buffer Point", "Default Single Buffer Distance", @@ -141,21 +141,24 @@ def parse_to_json(self): # These are all parsed from the spreadsheet "indicator": row["Indicator"] if not pd.isna(row["Indicator"]) else "", "id": row["ID"] if not pd.isna(row["ID"]) else "", + "output_filename": ( + row["Naming convention for outputs"] + if not pd.isna(row["Naming convention for outputs"]) + else "" + ), "description": "", "default_factor_weighting": default_factor_weighting, # Initialise the weighting to the default value "factor_weighting": default_factor_weighting, - "default_index_score": ( - row["Default Index Score"] - if not pd.isna(row["Default Index Score"]) - else "" + "index_score": ( + row["Index Score"] if not pd.isna(row["Index Score"]) else "" ), "index_score": ( row["Index Score"] if not pd.isna(row["Index Score"]) else "" ), - "use_default_index_score": ( - row["Use Default Index Score"] - if not pd.isna(row["Use Default Index Score"]) + "use_index_score": ( + row["Use Index Score"] + if not pd.isna(row["Use Index Score"]) else "" ), "default_multi_buffer_distances": ( diff --git a/geest/core/json_tree_item.py b/geest/core/json_tree_item.py index ee80afdd..342f0425 100644 --- a/geest/core/json_tree_item.py +++ b/geest/core/json_tree_item.py @@ -347,7 +347,7 @@ def getStatus(self): # Test for algs requiring vector inputs self.isIndicator() and analysis_mode - not in ["use_default_index_score", "use_environmental_hazards"] + not in ["use_index_score", "use_environmental_hazards"] and not data.get(qgis_layer_source_key, False) and not data.get(qgis_layer_shapefile_key, False) ): @@ -355,13 +355,13 @@ def getStatus(self): if ( # Test for algs requiring raster inputs self.isIndicator() - and analysis_mode not in ["use_default_index_score"] + and analysis_mode not in ["use_index_score"] and analysis_mode in ["use_environmental_hazards"] and not data.get(qgis_layer_source_key, False) and not data.get(qgis_layer_raster_key, False) ): # log_message(f"Indicator {data.get('id')} is missing a raster input") - # log_message(f"analysis_mode in use_default_index_score, use_environmental_hazards: {analysis_mode in ['use_default_index_score', 'use_environmental_hazards']}") + # log_message(f"analysis_mode in use_index_score, use_environmental_hazards: {analysis_mode in ['use_index_score', 'use_environmental_hazards']}") # log_message(f"qgis_layer_source_key: {qgis_layer_source_key}: {data.get(qgis_layer_source_key, False)}") # log_message(f"qgis_layer_raster_key: {qgis_layer_raster_key}: {data.get(qgis_layer_raster_key, False)}") return "Not configured (optional)" diff --git a/geest/core/workflow_factory.py b/geest/core/workflow_factory.py index ef64fea1..5d8d6968 100644 --- a/geest/core/workflow_factory.py +++ b/geest/core/workflow_factory.py @@ -65,7 +65,7 @@ def create_workflow( analysis_mode = attributes.get("analysis_mode", "") - if analysis_mode == "use_default_index_score": + if analysis_mode == "use_index_score": return DefaultIndexScoreWorkflow(item, cell_size_m, feedback, context) elif analysis_mode == "Do Not Use": return DontUseWorkflow(item, cell_size_m, feedback, context) diff --git a/geest/core/workflows/__init__.py b/geest/core/workflows/__init__.py index 775eb2c8..32a9af50 100644 --- a/geest/core/workflows/__init__.py +++ b/geest/core/workflows/__init__.py @@ -1,5 +1,5 @@ from .dont_use_workflow import DontUseWorkflow -from .default_index_score_workflow import DefaultIndexScoreWorkflow +from .index_score_workflow import DefaultIndexScoreWorkflow from .factor_aggregation_workflow import FactorAggregationWorkflow from .dimension_aggregation_workflow import DimensionAggregationWorkflow from .analysis_aggregation_workflow import AnalysisAggregationWorkflow diff --git a/geest/core/workflows/default_index_score_workflow.py b/geest/core/workflows/index_score_workflow.py similarity index 95% rename from geest/core/workflows/default_index_score_workflow.py rename to geest/core/workflows/index_score_workflow.py index 61670cb6..a3df85b2 100644 --- a/geest/core/workflows/default_index_score_workflow.py +++ b/geest/core/workflows/index_score_workflow.py @@ -19,7 +19,7 @@ class DefaultIndexScoreWorkflow(WorkflowBase): """ - Concrete implementation of a 'use_default_index_score' workflow. + Concrete implementation of a 'use_index_score' workflow. """ def __init__( @@ -39,11 +39,9 @@ def __init__( super().__init__( item, cell_size_m, feedback, context ) # ⭐️ Item is a reference - whatever you change in this item will directly update the tree - self.index_score = float( - (self.attributes.get("default_index_score", 0) / 100) * 5 - ) + self.index_score = float((self.attributes.get("index_score", 0) / 100) * 5) self.features_layer = True # Normally we would set this to a QgsVectorLayer but in this workflow it is not needed - self.workflow_name = "default_index_score" + self.workflow_name = "index_score" def _process_features_for_area( self, diff --git a/geest/gui/configuration_widget_factory.py b/geest/gui/configuration_widget_factory.py index 7a481fda..5a487d4e 100644 --- a/geest/gui/configuration_widget_factory.py +++ b/geest/gui/configuration_widget_factory.py @@ -43,7 +43,7 @@ def create_widget( return DontUseConfigurationWidget( analysis_mode="Do Not Use", attributes=attributes ) - if key == "use_default_index_score" and value == 1: + if key == "use_index_score" and value == 1: return IndexScoreConfigurationWidget( analysis_mode=key, attributes=attributes ) diff --git a/geest/gui/datasource_widget_factory.py b/geest/gui/datasource_widget_factory.py index 7e4e797a..ecf374fb 100644 --- a/geest/gui/datasource_widget_factory.py +++ b/geest/gui/datasource_widget_factory.py @@ -39,7 +39,7 @@ def create_widget( cleaned_key = widget_key[4:] if widget_key == "indicator_required" and value == 0: return None - if widget_key == "use_default_index_score" and value == 1: + if widget_key == "use_index_score" and value == 1: return FixedValueDataSourceWidget( widget_key=widget_key, attributes=attributes ) diff --git a/geest/gui/widgets/datasource_widgets/fixed_value_datasource_widget.py b/geest/gui/widgets/datasource_widgets/fixed_value_datasource_widget.py index 41fcbf04..33721af1 100644 --- a/geest/gui/widgets/datasource_widgets/fixed_value_datasource_widget.py +++ b/geest/gui/widgets/datasource_widgets/fixed_value_datasource_widget.py @@ -46,7 +46,7 @@ def _add_raster_layer_widgets(self) -> None: self.spin_box = QDoubleSpinBox() self.spin_box.setRange(0, 100) self.spin_box.setSingleStep(1) - self.spin_box.setValue(self.attributes.get(f"default_index_score", 0)) + self.spin_box.setValue(self.attributes.get(f"index_score", 0)) self.layout.addWidget(self.spin_box) def update_attributes(self): @@ -60,4 +60,4 @@ def update_attributes(self): """ # Collect data for the raster layerfactorlayer_data_weighting value = self.spin_box.value() - self.attributes["default_index_score"] = value + self.attributes["index_score"] = value diff --git a/geest/resources/README-DEVELOPERS.md b/geest/resources/README-DEVELOPERS.md index 168721cf..c8828393 100644 --- a/geest/resources/README-DEVELOPERS.md +++ b/geest/resources/README-DEVELOPERS.md @@ -19,9 +19,9 @@ graph TB D --> D2[id: string] D --> D3[description: string] D --> D4[default_factor_weighting: number] - D --> D5[default_index_score: integer] + D --> D5[index_score: integer] D --> D6[index_score: integer] - D --> D7[use_default_index_score: integer] + D --> D7[use_index_score: integer] D --> D8[default_multi_buffer_distances: string] D --> D9[use_multi_buffer_point: integer] D --> D10[default_single_buffer_distance: integer] diff --git a/geest/resources/geest2.ods b/geest/resources/geest2.ods index 459d1c9e..76dcac5a 100644 Binary files a/geest/resources/geest2.ods and b/geest/resources/geest2.ods differ diff --git a/geest/resources/model.json b/geest/resources/model.json index 6c659f98..c8ea4b11 100644 --- a/geest/resources/model.json +++ b/geest/resources/model.json @@ -16,18 +16,18 @@ { "indicator": "WBL 2024 Workplace Index Score", "id": "Workplace_Index", + "output_filename": "WD_output", "description": "", "default_factor_weighting": 1.0, "factor_weighting": 1.0, - "default_index_score": 0, "index_score": 100, - "use_default_index_score": 1, + "use_index_score": 1, "default_multi_buffer_distances": "0,0,0", "use_multi_buffer_point": 0, "default_single_buffer_distance": 0, "use_single_buffer_point": 0, "use_classify_polygon_into_classes": 0, - "use_classify_safety_polygon_into_classes": "", + "use_classify_safety_polygon_into_classes": 0, "use_csv_to_point_layer": 0, "use_polygon_per_cell": 0, "use_polyline_per_cell": 0, @@ -49,18 +49,18 @@ { "indicator": "Average value of WBL Pay Score and Parenthood Index Score", "id": "Pay_Parenthood_Index", + "output_filename": "RF_output", "description": "", "default_factor_weighting": 1.0, "factor_weighting": 1.0, - "default_index_score": 0, "index_score": 100, - "use_default_index_score": 1, + "use_index_score": 1, "default_multi_buffer_distances": "0,0,0", "use_multi_buffer_point": 0, "default_single_buffer_distance": 0, "use_single_buffer_point": 0, "use_classify_polygon_into_classes": 0, - "use_classify_safety_polygon_into_classes": "", + "use_classify_safety_polygon_into_classes": 0, "use_csv_to_point_layer": 0, "use_polygon_per_cell": 0, "use_polyline_per_cell": 0, @@ -82,18 +82,18 @@ { "indicator": "WBL 2024 Entrepeneurship Index Score", "id": "Entrepeneurship_Index", + "output_filename": "FIN_output", "description": "", "default_factor_weighting": 1.0, "factor_weighting": 1.0, - "default_index_score": 0, "index_score": 100, - "use_default_index_score": 1, + "use_index_score": 1, "default_multi_buffer_distances": "0,0,0", "use_multi_buffer_point": 0, "default_single_buffer_distance": 0, "use_single_buffer_point": 0, "use_classify_polygon_into_classes": 0, - "use_classify_safety_polygon_into_classes": "", + "use_classify_safety_polygon_into_classes": 0, "use_csv_to_point_layer": 0, "use_polygon_per_cell": 0, "use_polyline_per_cell": 0, @@ -124,18 +124,18 @@ { "indicator": "Location of kindergartens/childcare", "id": "Kindergartens_Location", + "output_filename": "WTP_Kindergartens_output", "description": "", "default_factor_weighting": 0.2, "factor_weighting": 0.2, - "default_index_score": 0, "index_score": 0, - "use_default_index_score": 0, - "default_multi_buffer_distances": "250, 500, 750, 1000, 1250", + "use_index_score": 0, + "default_multi_buffer_distances": "400, 800, 1200, 1500, 2000", "use_multi_buffer_point": 1, "default_single_buffer_distance": 0, "use_single_buffer_point": 0, "use_classify_polygon_into_classes": 0, - "use_classify_safety_polygon_into_classes": "", + "use_classify_safety_polygon_into_classes": 0, "use_csv_to_point_layer": 0, "use_polygon_per_cell": 0, "use_polyline_per_cell": 0, @@ -148,18 +148,18 @@ { "indicator": "Location of primary schools", "id": "Primary_School_Location", + "output_filename": "WTP_Primary_Schools_output", "description": "", "default_factor_weighting": 0.2, "factor_weighting": 0.2, - "default_index_score": 0, "index_score": 0, - "use_default_index_score": 0, - "default_multi_buffer_distances": "250, 500, 750, 1000, 1250", + "use_index_score": 0, + "default_multi_buffer_distances": "400, 800, 1200, 1500, 2000", "use_multi_buffer_point": 1, "default_single_buffer_distance": 0, "use_single_buffer_point": 0, "use_classify_polygon_into_classes": 0, - "use_classify_safety_polygon_into_classes": "", + "use_classify_safety_polygon_into_classes": 0, "use_csv_to_point_layer": 0, "use_polygon_per_cell": 0, "use_polyline_per_cell": 0, @@ -172,18 +172,18 @@ { "indicator": "Location of groceries", "id": "Groceries_Location", + "output_filename": "WTP_Groceries_output", "description": "", "default_factor_weighting": 0.2, "factor_weighting": 0.2, - "default_index_score": 0, "index_score": 0, - "use_default_index_score": 0, - "default_multi_buffer_distances": "250, 500, 750, 1000, 1250", + "use_index_score": 0, + "default_multi_buffer_distances": "400, 800, 1200, 1500, 2000", "use_multi_buffer_point": 1, "default_single_buffer_distance": 0, "use_single_buffer_point": 0, "use_classify_polygon_into_classes": 0, - "use_classify_safety_polygon_into_classes": 0.0, + "use_classify_safety_polygon_into_classes": 0, "use_csv_to_point_layer": 0, "use_polygon_per_cell": 0, "use_polyline_per_cell": 0, @@ -196,18 +196,18 @@ { "indicator": "Location of pharmacies", "id": "Pharmacies_Location", + "output_filename": "WTP_Pharmacies_output", "description": "", "default_factor_weighting": 0.2, "factor_weighting": 0.2, - "default_index_score": 0, "index_score": 0, - "use_default_index_score": 0, - "default_multi_buffer_distances": "250, 500, 750, 1000, 1250", + "use_index_score": 0, + "default_multi_buffer_distances": "400, 800, 1200, 1500, 2000", "use_multi_buffer_point": 1, "default_single_buffer_distance": 0, "use_single_buffer_point": 0, "use_classify_polygon_into_classes": 0, - "use_classify_safety_polygon_into_classes": 0.0, + "use_classify_safety_polygon_into_classes": 0, "use_csv_to_point_layer": 0, "use_polygon_per_cell": 0, "use_polyline_per_cell": 0, @@ -220,18 +220,18 @@ { "indicator": "Location of green spaces", "id": "Green_Space_location", + "output_filename": "WTP_Green_Spaces_output", "description": "", "default_factor_weighting": 0.2, "factor_weighting": 0.2, - "default_index_score": 0, "index_score": 0, - "use_default_index_score": 0, - "default_multi_buffer_distances": "250, 500, 750, 1000, 1250", + "use_index_score": 0, + "default_multi_buffer_distances": "400, 800, 1200, 1500, 2000", "use_multi_buffer_point": 1, "default_single_buffer_distance": 0, "use_single_buffer_point": 0, "use_classify_polygon_into_classes": 0, - "use_classify_safety_polygon_into_classes": 0.0, + "use_classify_safety_polygon_into_classes": 0, "use_csv_to_point_layer": 0, "use_polygon_per_cell": 0, "use_polyline_per_cell": 0, @@ -253,18 +253,18 @@ { "indicator": "Location of public transportation stops, including maritime", "id": "Pulic_Transport_location", + "output_filename": "PBT_output", "description": "", "default_factor_weighting": 1.0, "factor_weighting": 1.0, - "default_index_score": 0, "index_score": 0, - "use_default_index_score": 0, + "use_index_score": 0, "default_multi_buffer_distances": "250, 500, 750, 1000, 1250", "use_multi_buffer_point": 1, "default_single_buffer_distance": 0, "use_single_buffer_point": 0, "use_classify_polygon_into_classes": 0, - "use_classify_safety_polygon_into_classes": 0.0, + "use_classify_safety_polygon_into_classes": 0, "use_csv_to_point_layer": 0, "use_polygon_per_cell": 0, "use_polyline_per_cell": 0, @@ -286,18 +286,18 @@ { "indicator": "Location of hospitals and clinics", "id": "Hospital_Location", + "output_filename": "HEF_output", "description": "", "default_factor_weighting": 1.0, "factor_weighting": 1.0, - "default_index_score": 0, "index_score": 0, - "use_default_index_score": 0, - "default_multi_buffer_distances": "250, 500, 750, 1000, 1250", + "use_index_score": 0, + "default_multi_buffer_distances": "2000, 4000, 6000, 8000, 10000", "use_multi_buffer_point": 1, "default_single_buffer_distance": 0, "use_single_buffer_point": 0, "use_classify_polygon_into_classes": 0, - "use_classify_safety_polygon_into_classes": 0.0, + "use_classify_safety_polygon_into_classes": 0, "use_csv_to_point_layer": 0, "use_polygon_per_cell": 0, "use_polyline_per_cell": 0, @@ -319,18 +319,18 @@ { "indicator": "Location of universities and technical schools", "id": "Universities_Location", + "output_filename": "ETF_output", "description": "", "default_factor_weighting": 1.0, "factor_weighting": 1.0, - "default_index_score": 0, "index_score": 0, - "use_default_index_score": 0, - "default_multi_buffer_distances": "250, 500, 750, 1000, 1250", + "use_index_score": 0, + "default_multi_buffer_distances": "2000, 4000, 6000, 8000, 10000", "use_multi_buffer_point": 1, "default_single_buffer_distance": 0, "use_single_buffer_point": 0, "use_classify_polygon_into_classes": 0, - "use_classify_safety_polygon_into_classes": 0.0, + "use_classify_safety_polygon_into_classes": 0, "use_csv_to_point_layer": 0, "use_polygon_per_cell": 0, "use_polyline_per_cell": 0, @@ -352,18 +352,18 @@ { "indicator": "Location of Banks and other FF", "id": "Banks_Location", + "output_filename": "FIF_output", "description": "", "default_factor_weighting": 1.0, "factor_weighting": 1.0, - "default_index_score": 0, "index_score": 0, - "use_default_index_score": 0, - "default_multi_buffer_distances": "250, 500, 750, 1000, 1250", + "use_index_score": 0, + "default_multi_buffer_distances": "400, 800, 1200, 2000, 3000", "use_multi_buffer_point": 1, "default_single_buffer_distance": 0, "use_single_buffer_point": 0, "use_classify_polygon_into_classes": 0, - "use_classify_safety_polygon_into_classes": 0.0, + "use_classify_safety_polygon_into_classes": 0, "use_csv_to_point_layer": 0, "use_polygon_per_cell": 0, "use_polyline_per_cell": 0, @@ -394,18 +394,18 @@ { "indicator": "Location of street crossings", "id": "Street_Crossing_Location", + "output_filename": "AT_Crosswalks_output", "description": "", "default_factor_weighting": 0.25, "factor_weighting": 0.25, - "default_index_score": 0, "index_score": 0, - "use_default_index_score": 0, + "use_index_score": 0, "default_multi_buffer_distances": "0,0,0", "use_multi_buffer_point": 0, "default_single_buffer_distance": 0, "use_single_buffer_point": 0, "use_classify_polygon_into_classes": 0, - "use_classify_safety_polygon_into_classes": 0.0, + "use_classify_safety_polygon_into_classes": 0, "use_csv_to_point_layer": 0, "use_polygon_per_cell": 0, "use_polyline_per_cell": 0, @@ -418,18 +418,18 @@ { "indicator": "Location of cycle paths", "id": "Cycle_Paths_Location", + "output_filename": "AT_Cycle_Paths_output", "description": "", "default_factor_weighting": 0.25, "factor_weighting": 0.25, - "default_index_score": 0, "index_score": 0, - "use_default_index_score": 0, + "use_index_score": 0, "default_multi_buffer_distances": "0,0,0", "use_multi_buffer_point": 0, "default_single_buffer_distance": 0, "use_single_buffer_point": 0, "use_classify_polygon_into_classes": 0, - "use_classify_safety_polygon_into_classes": 0.0, + "use_classify_safety_polygon_into_classes": 0, "use_csv_to_point_layer": 0, "use_polygon_per_cell": 0, "use_polyline_per_cell": 1, @@ -442,18 +442,18 @@ { "indicator": "Location of footpaths", "id": "Footpaths_Location", + "output_filename": "AT_Pathways_output", "description": "", "default_factor_weighting": 0.25, "factor_weighting": 0.25, - "default_index_score": 0, "index_score": 0, - "use_default_index_score": 0, + "use_index_score": 0, "default_multi_buffer_distances": "0,0,0", "use_multi_buffer_point": 0, "default_single_buffer_distance": 0, "use_single_buffer_point": 0, "use_classify_polygon_into_classes": 0, - "use_classify_safety_polygon_into_classes": 0.0, + "use_classify_safety_polygon_into_classes": 0, "use_csv_to_point_layer": 0, "use_polygon_per_cell": 0, "use_polyline_per_cell": 1, @@ -466,18 +466,18 @@ { "indicator": "Block Layout", "id": "Block_Layout", + "output_filename": "AT_Block_Lengths_output", "description": "", "default_factor_weighting": 0.25, "factor_weighting": 0.25, - "default_index_score": 0, "index_score": 0, - "use_default_index_score": 0, + "use_index_score": 0, "default_multi_buffer_distances": "0,0,0", "use_multi_buffer_point": 0, "default_single_buffer_distance": 0, "use_single_buffer_point": 0, "use_classify_polygon_into_classes": 0, - "use_classify_safety_polygon_into_classes": 0.0, + "use_classify_safety_polygon_into_classes": 0, "use_csv_to_point_layer": 0, "use_polygon_per_cell": 1, "use_polyline_per_cell": 0, @@ -499,18 +499,18 @@ { "indicator": "Street lights/Nigthttime lights", "id": "Street_Lights", + "output_filename": "SAF_output", "description": "", "default_factor_weighting": 1.0, "factor_weighting": 1.0, - "default_index_score": 0, "index_score": 100, - "use_default_index_score": 1, + "use_index_score": 1, "default_multi_buffer_distances": "0,0,0", "use_multi_buffer_point": 0, "default_single_buffer_distance": 0, "use_single_buffer_point": 0, "use_classify_polygon_into_classes": 0, - "use_classify_safety_polygon_into_classes": 1.0, + "use_classify_safety_polygon_into_classes": 1, "use_csv_to_point_layer": 0, "use_polygon_per_cell": 0, "use_polyline_per_cell": 0, @@ -532,18 +532,18 @@ { "indicator": "ACLED data (Violence Estimated Events)", "id": "FCV", + "output_filename": "FCV_output", "description": "", "default_factor_weighting": 1.0, "factor_weighting": 1.0, - "default_index_score": 0, "index_score": 0, - "use_default_index_score": 0, + "use_index_score": 0, "default_multi_buffer_distances": "0,0,0", "use_multi_buffer_point": 0, "default_single_buffer_distance": 5000, "use_single_buffer_point": 1, "use_classify_polygon_into_classes": 0, - "use_classify_safety_polygon_into_classes": 0.0, + "use_classify_safety_polygon_into_classes": 0, "use_csv_to_point_layer": 1, "use_polygon_per_cell": 0, "use_polyline_per_cell": 0, @@ -565,18 +565,18 @@ { "indicator": "percentage of the labor force comprising women with university degrees", "id": "Education", + "output_filename": "EDU_output", "description": "", "default_factor_weighting": 1.0, "factor_weighting": 1.0, - "default_index_score": 0, "index_score": 100, - "use_default_index_score": 1, + "use_index_score": 1, "default_multi_buffer_distances": "0,0,0", "use_multi_buffer_point": 0, "default_single_buffer_distance": 0, "use_single_buffer_point": 0, "use_classify_polygon_into_classes": 1, - "use_classify_safety_polygon_into_classes": 0.0, + "use_classify_safety_polygon_into_classes": 0, "use_csv_to_point_layer": 0, "use_polygon_per_cell": 0, "use_polyline_per_cell": 0, @@ -598,18 +598,18 @@ { "indicator": "Individuals using the Internet (% of population)", "id": "Digital_Inclusion", + "output_filename": "DIG_output", "description": "", "default_factor_weighting": 1.0, "factor_weighting": 1.0, - "default_index_score": 0, "index_score": 100, - "use_default_index_score": 1, + "use_index_score": 1, "default_multi_buffer_distances": "0,0,0", "use_multi_buffer_point": 0, "default_single_buffer_distance": 0, "use_single_buffer_point": 0, "use_classify_polygon_into_classes": 1, - "use_classify_safety_polygon_into_classes": 0.0, + "use_classify_safety_polygon_into_classes": 0, "use_csv_to_point_layer": 0, "use_polygon_per_cell": 0, "use_polyline_per_cell": 0, @@ -631,18 +631,18 @@ { "indicator": "Fire Hazards", "id": "Fire", + "output_filename": "ENV_Fires_output", "description": "", "default_factor_weighting": 0.2, "factor_weighting": 0.2, - "default_index_score": 0, "index_score": 0, - "use_default_index_score": 0, + "use_index_score": 0, "default_multi_buffer_distances": "0,0,0", "use_multi_buffer_point": 0, "default_single_buffer_distance": 0, "use_single_buffer_point": 0, "use_classify_polygon_into_classes": 0, - "use_classify_safety_polygon_into_classes": 0.0, + "use_classify_safety_polygon_into_classes": 0, "use_csv_to_point_layer": 0, "use_polygon_per_cell": 0, "use_polyline_per_cell": 0, @@ -655,18 +655,18 @@ { "indicator": "Flood Hazards", "id": "Flood", + "output_filename": "ENV_Floods_output", "description": "", "default_factor_weighting": 0.2, "factor_weighting": 0.2, - "default_index_score": 0, "index_score": 0, - "use_default_index_score": 0, + "use_index_score": 0, "default_multi_buffer_distances": "0,0,0", "use_multi_buffer_point": 0, "default_single_buffer_distance": 0, "use_single_buffer_point": 0, "use_classify_polygon_into_classes": 0, - "use_classify_safety_polygon_into_classes": 0.0, + "use_classify_safety_polygon_into_classes": 0, "use_csv_to_point_layer": 0, "use_polygon_per_cell": 0, "use_polyline_per_cell": 0, @@ -679,18 +679,18 @@ { "indicator": "Landslide", "id": "Landslide", + "output_filename": "ENV_Landslides_output", "description": "", "default_factor_weighting": 0.2, "factor_weighting": 0.2, - "default_index_score": 0, "index_score": 0, - "use_default_index_score": 0, + "use_index_score": 0, "default_multi_buffer_distances": "0,0,0", "use_multi_buffer_point": 0, "default_single_buffer_distance": 0, "use_single_buffer_point": 0, "use_classify_polygon_into_classes": 0, - "use_classify_safety_polygon_into_classes": 0.0, + "use_classify_safety_polygon_into_classes": 0, "use_csv_to_point_layer": 0, "use_polygon_per_cell": 0, "use_polyline_per_cell": 0, @@ -703,18 +703,18 @@ { "indicator": "Tropical Cyclone", "id": "Cyclone", + "output_filename": "ENV_Cyclones_output", "description": "", "default_factor_weighting": 0.2, "factor_weighting": 0.2, - "default_index_score": 0, "index_score": 0, - "use_default_index_score": 0, + "use_index_score": 0, "default_multi_buffer_distances": "0,0,0", "use_multi_buffer_point": 0, "default_single_buffer_distance": 0, "use_single_buffer_point": 0, "use_classify_polygon_into_classes": 0, - "use_classify_safety_polygon_into_classes": 0.0, + "use_classify_safety_polygon_into_classes": 0, "use_csv_to_point_layer": 0, "use_polygon_per_cell": 0, "use_polyline_per_cell": 0, @@ -727,18 +727,18 @@ { "indicator": "Drought", "id": "Drought", + "output_filename": "ENV_Drought_output", "description": "", "default_factor_weighting": 0.2, "factor_weighting": 0.2, - "default_index_score": 0, "index_score": 0, - "use_default_index_score": 0, + "use_index_score": 0, "default_multi_buffer_distances": "0,0,0", "use_multi_buffer_point": 0, "default_single_buffer_distance": 0, "use_single_buffer_point": 0, "use_classify_polygon_into_classes": 0, - "use_classify_safety_polygon_into_classes": 0.0, + "use_classify_safety_polygon_into_classes": 0, "use_csv_to_point_layer": 0, "use_polygon_per_cell": 0, "use_polyline_per_cell": 0, @@ -760,18 +760,18 @@ { "indicator": "Water points (OSM), catch basins, water valves and fire hydrants", "id": "Water_Sanitation", + "output_filename": "WAS_output", "description": "", "default_factor_weighting": 1.0, "factor_weighting": 1.0, - "default_index_score": 0, "index_score": 0, - "use_default_index_score": 0, + "use_index_score": 0, "default_multi_buffer_distances": "0,0,0", "use_multi_buffer_point": 0, "default_single_buffer_distance": 1000, "use_single_buffer_point": 1, "use_classify_polygon_into_classes": 0, - "use_classify_safety_polygon_into_classes": 0.0, + "use_classify_safety_polygon_into_classes": 0, "use_csv_to_point_layer": 0, "use_polygon_per_cell": 0, "use_polyline_per_cell": 0, diff --git a/geest/resources/schema.json b/geest/resources/schema.json index 88f310b8..1709254e 100644 --- a/geest/resources/schema.json +++ b/geest/resources/schema.json @@ -56,13 +56,13 @@ "default_factor_weighting": { "type": "number" }, - "default_index_score": { + "index_score": { "type": "integer" }, "index_score": { "type": "integer" }, - "use_default_index_score": { + "use_index_score": { "type": "integer" }, "default_multi_buffer_distances": { @@ -140,9 +140,9 @@ "id", "description", "default_factor_weighting", - "default_index_score", "index_score", - "use_default_index_score", + "index_score", + "use_index_score", "default_multi_buffer_distances", "use_multi_buffer_point", "default_single_buffer_distance",