Skip to content

Commit

Permalink
Merge pull request #125 from IDEMSInternational/content/1.3.5
Browse files Browse the repository at this point in the history
content: 1.3.5
  • Loading branch information
esmeetewinkel authored Dec 5, 2024
2 parents b55cf37 + 2c31762 commit f5fbaef
Show file tree
Hide file tree
Showing 30 changed files with 1,695 additions and 238 deletions.
12 changes: 12 additions & 0 deletions app_data/assets/contents.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,10 @@
"md5Checksum": "b3f286e41f079f7db3ca679ce6e83f60",
"size_kb": 4.2
},
"images/activity_bg.svg": {
"md5Checksum": "e25c406d3ff6da9275f56ef29fd5d88f",
"size_kb": 13.8
},
"images/avatar_1.png": {
"md5Checksum": "d2d29806c1c430e574a50ddd19319f52",
"size_kb": 67.7
Expand All @@ -101,6 +105,10 @@
"md5Checksum": "91bd746e278b1939a8eb7ad1ef6cc59d",
"size_kb": 255.4
},
"images/bottom_image.svg": {
"md5Checksum": "8182ec65385018d265d605af8843e0ab",
"size_kb": 6.8
},
"images/diamond.png": {
"md5Checksum": "4e88aed59658d5d1305c1c63b45171ba",
"size_kb": 4.3
Expand Down Expand Up @@ -261,6 +269,10 @@
"md5Checksum": "81136e04436759812dc3f6e90c61de11",
"size_kb": 0.3
},
"images/modal_bg.svg": {
"md5Checksum": "83fa2d24b91d02b6e8c2b3a95607c572",
"size_kb": 37.3
},
"images/module-1.png": {
"md5Checksum": "840e6c66b936d36e7c485c1f96972573",
"size_kb": 28.2
Expand Down
3 changes: 3 additions & 0 deletions app_data/assets/images/activity_bg.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app_data/assets/images/bottom_image.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app_data/assets/images/modal_bg.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
116 changes: 110 additions & 6 deletions app_data/sheets/contents.json
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,88 @@
}
}
},
"comp_map_layer_group_1": {
"flow_type": "data_list",
"flow_name": "comp_map_layer_group_1",
"_xlsxPath": "component_sheets/component_map.xlsx",
"_metadata": {
"point_radius_max": {
"type": "number"
},
"blur": {
"type": "number"
},
"scale_max": {
"type": "number"
},
"scale_min": {
"type": "number"
},
"opacity": {
"type": "number"
},
"visible_default": {
"type": "boolean"
},
"scale_slider": {
"type": "boolean"
},
"point_radius_property_max": {
"type": "number"
}
}
},
"comp_map_layer_group_2": {
"flow_type": "data_list",
"flow_name": "comp_map_layer_group_2",
"_xlsxPath": "component_sheets/component_map.xlsx",
"_metadata": {
"opacity": {
"type": "number"
},
"visible_default": {
"type": "boolean"
},
"point_radius_max": {
"type": "number"
},
"point_radius_property_max": {
"type": "number"
}
}
},
"comp_map_layer_group_3": {
"flow_type": "data_list",
"flow_name": "comp_map_layer_group_3",
"_xlsxPath": "component_sheets/component_map.xlsx",
"_metadata": {
"scale_max": {
"type": "number"
},
"scale_min": {
"type": "number"
},
"opacity": {
"type": "number"
},
"visible_default": {
"type": "boolean"
}
}
},
"comp_map_layer_groups": {
"flow_type": "data_list",
"flow_name": "comp_map_layer_groups",
"_xlsxPath": "component_sheets/component_map.xlsx",
"_metadata": {
"single_selection": {
"type": "boolean"
},
"display_order": {
"type": "number"
}
}
},
"comp_task_bar_legacy_data": {
"flow_type": "data_list",
"flow_name": "comp_task_bar_legacy_data",
Expand Down Expand Up @@ -1276,6 +1358,13 @@
"comp_map": {
"flow_type": "template",
"flow_name": "comp_map",
"parameter_list": {
"app_config": {
"APP_FOOTER_DEFAULTS": {
"templateName": false
}
}
},
"flow_subtype": "component_demo",
"_xlsxPath": "component_sheets/component_map.xlsx"
},
Expand Down Expand Up @@ -1321,6 +1410,12 @@
"flow_subtype": "component_demo",
"_xlsxPath": "component_sheets/component_plh_bottom_nav.xlsx"
},
"comp_plh_completion_modal": {
"flow_type": "template",
"flow_name": "comp_plh_completion_modal",
"flow_subtype": "component_demo",
"_xlsxPath": "component_sheets/component_plh_completion_modal.xlsx"
},
"comp_plh_module_details_header": {
"flow_type": "template",
"flow_name": "comp_plh_module_details_header",
Expand All @@ -1333,12 +1428,6 @@
"flow_subtype": "component_demo",
"_xlsxPath": "component_sheets/component_plh_module_list_item.xlsx"
},
"comp_plh_progress_wheel": {
"flow_type": "template",
"flow_name": "comp_plh_progress_wheel",
"flow_subtype": "component_demo",
"_xlsxPath": "component_sheets/component_plh_progress_wheel.xlsx"
},
"comp_progress_path": {
"flow_type": "template",
"flow_name": "comp_progress_path",
Expand Down Expand Up @@ -3209,6 +3298,11 @@
"flow_name": "debug_task_group_completion",
"_xlsxPath": "debug_sheets/debug_task_group_completion.xlsx"
},
"debug_task_progress_filter": {
"flow_type": "template",
"flow_name": "debug_task_progress_filter",
"_xlsxPath": "debug_sheets/debug_task_progress_filter.xlsx"
},
"doc_field": {
"flow_type": "template",
"flow_name": "doc_field",
Expand Down Expand Up @@ -3315,6 +3409,16 @@
"flow_name": "feat_footer",
"_xlsxPath": "feature_sheets/to_be_sorted/feature_footer.xlsx"
},
"feat_nav_actions_1": {
"flow_type": "template",
"flow_name": "feat_nav_actions_1",
"_xlsxPath": "feature_sheets/feature_nav_actions.xlsx"
},
"feat_nav_actions_2": {
"flow_type": "template",
"flow_name": "feat_nav_actions_2",
"_xlsxPath": "feature_sheets/feature_nav_actions.xlsx"
},
"feat_nav_stack": {
"flow_type": "template",
"flow_name": "feat_nav_stack",
Expand Down
80 changes: 80 additions & 0 deletions app_data/sheets/data_list/comp_map_layer_group_1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
{
"flow_type": "data_list",
"flow_name": "comp_map_layer_group_1",
"status": "released",
"rows": [
{
"id": "conflict_forecast",
"name": "Conflict – Forecast",
"description": "Probability of conflict occuring in the next 4 weeks",
"source_asset": "map_data/forecast_data_geojson.json",
"type": "heatmap",
"property": "pred_prob_any_riot_4w",
"point_radius_max": 14,
"blur": 8,
"scale_max": 1,
"scale_min": 0,
"scale_bins": "0, 0.15, 0.3, 0.4, 0.6, 0.7, 0.8, 1",
"scale_title": "Conflict probability (next 4 weeks)",
"excluded_features_colour": "red",
"gradient_palette": "#c4c4c4, #f0e0cc, #e5c9a9, #d29780, #c4665c, #bc3630, #9d222e, #740035",
"opacity": 1,
"visible_default": false
},
{
"id": "riots_forecast",
"name": "Riots Forecast",
"description": "Next 4 weeks",
"source_asset": "map_data/forecast_riots.json",
"type": "vector",
"stroke": "none",
"property": "prob_bin",
"scale_max": 8,
"scale_min": 1,
"scale_title": "Riots risks level",
"scale_slider": true,
"gradient_palette": "#fcf8f3, #f0e0cc, #e5c9a9, #d29780, #c4665c, #bc3630, #9d222e, #740036",
"visible_default": true
},
{
"id": "conflict_incidence",
"name": "Conflict – Incidence",
"source_asset": "map_data/forecast_data_geojson.json",
"type": "vector",
"fill": "blue",
"stroke": "none",
"point_radius_max": 10,
"point_radius_property_max": 1,
"point_radius_property": "any_riot_4w",
"opacity": 0.5,
"visible_default": false
}
],
"_xlsxPath": "component_sheets/component_map.xlsx",
"_metadata": {
"point_radius_max": {
"type": "number"
},
"blur": {
"type": "number"
},
"scale_max": {
"type": "number"
},
"scale_min": {
"type": "number"
},
"opacity": {
"type": "number"
},
"visible_default": {
"type": "boolean"
},
"scale_slider": {
"type": "boolean"
},
"point_radius_property_max": {
"type": "number"
}
}
}
47 changes: 47 additions & 0 deletions app_data/sheets/data_list/comp_map_layer_group_2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"flow_type": "data_list",
"flow_name": "comp_map_layer_group_2",
"status": "released",
"rows": [
{
"id": "county_bouindaries",
"name": "County Boundaries",
"source_asset": "map_data/ke.json",
"type": "vector",
"fill": "none",
"stroke": "red",
"opacity": 1,
"visible_default": false
},
{
"id": "county_centroids",
"name": "County Centroids",
"description": "Centroids for each county",
"source_asset": "map_data/centroids.json",
"type": "vector",
"fill": "red",
"stroke": "none",
"point_radius_max": 6,
"point_radius_property_max": 50,
"point_radius_property": "centroid_size_sum",
"scale_title": "County Centroids",
"opacity": 1,
"visible_default": true
}
],
"_xlsxPath": "component_sheets/component_map.xlsx",
"_metadata": {
"opacity": {
"type": "number"
},
"visible_default": {
"type": "boolean"
},
"point_radius_max": {
"type": "number"
},
"point_radius_property_max": {
"type": "number"
}
}
}
49 changes: 49 additions & 0 deletions app_data/sheets/data_list/comp_map_layer_group_3.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"flow_type": "data_list",
"flow_name": "comp_map_layer_group_3",
"status": "released",
"rows": [
{
"id": "total_population",
"name": "Total Population",
"description": "Total population by county",
"source_asset": "map_data/population_and_boundaries.json",
"type": "vector",
"property": "sum_Z",
"scale_max": 2000000,
"scale_min": 0,
"scale_title": "Total Population",
"gradient_palette": "#e7e1ef, #c994c7, #dd1c77",
"opacity": 0.8,
"visible_default": false
},
{
"id": "population_density",
"name": "Population Density",
"description": "Average population density by county",
"source_asset": "map_data/population_and_boundaries.json",
"type": "vector",
"property": "mean_Z",
"scale_max": 400,
"scale_min": 0,
"scale_title": "Population Density (units)",
"gradient_palette": "#380645, #298680, yellow",
"visible_default": true
}
],
"_xlsxPath": "component_sheets/component_map.xlsx",
"_metadata": {
"scale_max": {
"type": "number"
},
"scale_min": {
"type": "number"
},
"opacity": {
"type": "number"
},
"visible_default": {
"type": "boolean"
}
}
}
Loading

0 comments on commit f5fbaef

Please sign in to comment.