From 52021e5207cef81c9c993fb23eebea3ea4396c6e Mon Sep 17 00:00:00 2001 From: Stuart Fraser Date: Thu, 21 Sep 2023 11:00:55 +0100 Subject: [PATCH 1/9] Update exposure_category.csv Suggestion to include indicator of economic value (e.g. GDP) and social(+economic) development (e.g. HDI) into exposure category codelist - this is a gap that surfaced when adding some GFDRR exposure data (R5 project) --- schema/codelists/closed/exposure_category.csv | 2 ++ 1 file changed, 2 insertions(+) diff --git a/schema/codelists/closed/exposure_category.csv b/schema/codelists/closed/exposure_category.csv index 287fb0ed..8ee3d537 100644 --- a/schema/codelists/closed/exposure_category.csv +++ b/schema/codelists/closed/exposure_category.csv @@ -4,3 +4,5 @@ buildings,Buildings,"Residential, commercial, industrial and public-service buil infrastructure,Infrastructure,"Lifelines infrastructure, including transport, communications, energy, water." population,Population,People. natural_environment,Natural environment,"The natural environment, including forestry and other types of vegetation." +economic_indicator,Economic Indicator,"Economic activity and growth, including measures of economic value such as Gross Domestic Product (GDP)." +development_index,Development Index,"Social development, or social and economic development, such as the Human Development Index (HDI)." From 6817c6fe36328c1359510b8214902492b3f90e0c Mon Sep 17 00:00:00 2001 From: Stuart Fraser Date: Thu, 21 Sep 2023 11:41:23 +0100 Subject: [PATCH 2/9] Delete specs/code-lists/CSV directory delete codelists> csv directory (superceded by schema > codelists > open / closed) --- specs/code-lists/CSV/frequency_type.csv | 4 ---- specs/code-lists/CSV/occupancy.csv | 12 ------------ specs/code-lists/CSV/val_type.csv | 5 ----- 3 files changed, 21 deletions(-) delete mode 100644 specs/code-lists/CSV/frequency_type.csv delete mode 100644 specs/code-lists/CSV/occupancy.csv delete mode 100644 specs/code-lists/CSV/val_type.csv diff --git a/specs/code-lists/CSV/frequency_type.csv b/specs/code-lists/CSV/frequency_type.csv deleted file mode 100644 index 365da92c..00000000 --- a/specs/code-lists/CSV/frequency_type.csv +++ /dev/null @@ -1,4 +0,0 @@ -Code,Label -Rate of Exceedence,Rate of Exceedence -Probability of Exceedence,Probability of Exceedence -Return Period,Return Period diff --git a/specs/code-lists/CSV/occupancy.csv b/specs/code-lists/CSV/occupancy.csv deleted file mode 100644 index b961b4c6..00000000 --- a/specs/code-lists/CSV/occupancy.csv +++ /dev/null @@ -1,12 +0,0 @@ -Code -Residential -Commercial -Industrial -Infrastructure -Healthcare -Educational -Government -Crop -Livestock -Forestry -Mixed diff --git a/specs/code-lists/CSV/val_type.csv b/specs/code-lists/CSV/val_type.csv deleted file mode 100644 index 8fbc96ac..00000000 --- a/specs/code-lists/CSV/val_type.csv +++ /dev/null @@ -1,5 +0,0 @@ -Code,Label -Structure,Structure -Content,Content -Product,Product -Others,Others From 3c52a44fc809bf9a5d1ca681ef1f5f1199408f23 Mon Sep 17 00:00:00 2001 From: Stuart Fraser Date: Thu, 21 Sep 2023 11:55:09 +0100 Subject: [PATCH 3/9] Update metric_dimension.csv adding `indicator_index_value` to be used with new exposure_category `economic_indicator` and `development_index` --- schema/codelists/closed/metric_dimension.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/schema/codelists/closed/metric_dimension.csv b/schema/codelists/closed/metric_dimension.csv index 6ea98ca5..65c83857 100644 --- a/schema/codelists/closed/metric_dimension.csv +++ b/schema/codelists/closed/metric_dimension.csv @@ -4,3 +4,4 @@ content,Content,Physical contents of a structure. product,Product,"Products produced by businesses, which may or may not be physical items." disruption,Disruption (Business Interruption),Planned operations or service provision of a business or infrastructure. population,Population,"Injuries, fatalities, and displacements of a population." +indicator_index_value,Indicator or index value,"Value of economic indicator or development index." From 8c4fe912d045a6f2361171a5632ed9cbe522f421 Mon Sep 17 00:00:00 2001 From: Mattia Amadio <44863827+matamadio@users.noreply.github.com> Date: Tue, 26 Sep 2023 16:47:51 +0200 Subject: [PATCH 4/9] Update IMT.csv Add imt code for cyclone wind speed 10-min sustained. It was already there as km/h but STORM uses m/s... This makes me reconsider the discussion in #5, and splitting IMT into two separate codelists: - metric (optional) - unit (mandatory) So even if the specific metric (larger range of variability) is not in the codelist, one can still indicate the unit if part of the most common ones (smaller range of variability). --- schema/codelists/open/IMT.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/schema/codelists/open/IMT.csv b/schema/codelists/open/IMT.csv index 3dde0e1f..5dface40 100644 --- a/schema/codelists/open/IMT.csv +++ b/schema/codelists/open/IMT.csv @@ -19,6 +19,7 @@ fl_wv:m/s,Flood flow velocity (m/s),fl_wv,m/s,The rate at which flood waters mov v_ect(3s):km/h,3-sec at 10m sustained wind speed (kph),v_ect(3s),km/h,"The average speed of the wind over a 3-second time period, measured at a height of 10 meters (about 33 feet) above the ground or sea surface. Expressed in kilometers per hour (kph)." v_ect(1m):km/h,1-min at 10m sustained wind speed (kph),v_ect(1m),km/h,"The average speed of the wind over a 1-minute time period, measured at a height of 10 meters (about 33 feet) above the ground or sea surface. Expressed in kilometers per hour (kph)." v_etc(10m):km/h,10-min sustained wind speed (kph),v_ect(10m),km/h,The average wind speed over a period of 10 minutes. Expressed in kilometers per hour (kph). +v_etc(10m):m/s,10-min sustained wind speed (mps),v_ect(10m),m/s,The average wind speed over a period of 10 minutes. Expressed in meters per second (mps). PGWS_tcy:km/h,Peak gust wind speed,PGWS_tcy,km/h,The peak gust wind speed in the open terrain. Expressed in kilometers per hour (kph). ls_fd:m,Landslide flow depth,ls_fd,m,The depth of the landslide flow. Expressed in meters (m). I_DF:m3/s2,Debris-flow intensity index,I_DF,m3/s2,A landslide intensity index proposed by Jakob et al. (2012). Expressed in meters cubed per second squared (m3/s2). From fdefdef565709710ed79d7f60bfbdad3f3b1350d Mon Sep 17 00:00:00 2001 From: odscjen Date: Mon, 9 Oct 2023 16:38:06 +0100 Subject: [PATCH 5/9] fix test failure in metric_dimensions.csv --- schema/codelists/closed/metric_dimension.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema/codelists/closed/metric_dimension.csv b/schema/codelists/closed/metric_dimension.csv index 65c83857..aeb9ac90 100644 --- a/schema/codelists/closed/metric_dimension.csv +++ b/schema/codelists/closed/metric_dimension.csv @@ -4,4 +4,4 @@ content,Content,Physical contents of a structure. product,Product,"Products produced by businesses, which may or may not be physical items." disruption,Disruption (Business Interruption),Planned operations or service provision of a business or infrastructure. population,Population,"Injuries, fatalities, and displacements of a population." -indicator_index_value,Indicator or index value,"Value of economic indicator or development index." +indicator_index_value,Indicator or index value,Value of economic indicator or development index. From 6d970567c5b39b4bacc743ae4bafe8d19b4d8a3a Mon Sep 17 00:00:00 2001 From: Mattia Amadio <44863827+matamadio@users.noreply.github.com> Date: Mon, 9 Oct 2023 18:57:11 +0200 Subject: [PATCH 6/9] Update schema/codelists/open/IMT.csv Co-authored-by: odscjen <95221058+odscjen@users.noreply.github.com> --- schema/codelists/open/IMT.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema/codelists/open/IMT.csv b/schema/codelists/open/IMT.csv index 5dface40..2a4ff467 100644 --- a/schema/codelists/open/IMT.csv +++ b/schema/codelists/open/IMT.csv @@ -19,7 +19,7 @@ fl_wv:m/s,Flood flow velocity (m/s),fl_wv,m/s,The rate at which flood waters mov v_ect(3s):km/h,3-sec at 10m sustained wind speed (kph),v_ect(3s),km/h,"The average speed of the wind over a 3-second time period, measured at a height of 10 meters (about 33 feet) above the ground or sea surface. Expressed in kilometers per hour (kph)." v_ect(1m):km/h,1-min at 10m sustained wind speed (kph),v_ect(1m),km/h,"The average speed of the wind over a 1-minute time period, measured at a height of 10 meters (about 33 feet) above the ground or sea surface. Expressed in kilometers per hour (kph)." v_etc(10m):km/h,10-min sustained wind speed (kph),v_ect(10m),km/h,The average wind speed over a period of 10 minutes. Expressed in kilometers per hour (kph). -v_etc(10m):m/s,10-min sustained wind speed (mps),v_ect(10m),m/s,The average wind speed over a period of 10 minutes. Expressed in meters per second (mps). +v_etc(10m):m/s,10-min sustained wind speed in m/s,v_ect(10m),m/s,The average wind speed over a period of 10 minutes. Expressed in meters per second (m/s). PGWS_tcy:km/h,Peak gust wind speed,PGWS_tcy,km/h,The peak gust wind speed in the open terrain. Expressed in kilometers per hour (kph). ls_fd:m,Landslide flow depth,ls_fd,m,The depth of the landslide flow. Expressed in meters (m). I_DF:m3/s2,Debris-flow intensity index,I_DF,m3/s2,A landslide intensity index proposed by Jakob et al. (2012). Expressed in meters cubed per second squared (m3/s2). From 47cb7fd55e43d9083edeee0a17e9d3436d05bc58 Mon Sep 17 00:00:00 2001 From: Mattia Amadio <44863827+matamadio@users.noreply.github.com> Date: Thu, 12 Oct 2023 12:36:19 +0200 Subject: [PATCH 7/9] Update license.csv Added custom and commercial licenses - no urls --- schema/codelists/open/license.csv | 2 ++ 1 file changed, 2 insertions(+) diff --git a/schema/codelists/open/license.csv b/schema/codelists/open/license.csv index 3038c5ac..959b9773 100644 --- a/schema/codelists/open/license.csv +++ b/schema/codelists/open/license.csv @@ -8,3 +8,5 @@ CC BY-NC-ND 4.0,Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 Int ODbL-1.0,Open Data Commons Open Database License,https://opendatacommons.org/licenses/odbl/summary/,Data,Open Definition recommended conformant license ODC-By-1.0,Open Data Commons Attribution License,https://opendatacommons.org/licenses/by/1-0/,Data,Open Definition recommended conformant license PDDL-1.0,Open Data Commons Public Domain Dedication and License,http://opendatacommons.org/licenses/pddl/1.0/,Data,Open Definition recommended conformant license +Custom,Open License specified externally,,"Content,Data", +Copyright,Commercial License specified externally,,"Content,Data", From 13a32733746271957e81d5b7325ec727675805f6 Mon Sep 17 00:00:00 2001 From: Mattia Amadio <44863827+matamadio@users.noreply.github.com> Date: Tue, 17 Oct 2023 12:10:37 +0200 Subject: [PATCH 8/9] Update rdls_schema.json Add "description" to _source_ attributes. --- schema/rdls_schema.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/schema/rdls_schema.json b/schema/rdls_schema.json index cdac391c..c2eb72bf 100644 --- a/schema/rdls_schema.json +++ b/schema/rdls_schema.json @@ -880,6 +880,12 @@ "description": "The name or title of the source.", "minLength": 1 }, + "description": { + "title": "Description", + "type": "string", + "description": "The details about the source dataset or model.", + "minLength": 1 + }, "url": { "title": "URL", "type": "string", From 2f97b8bd9c9691e3062494a95f3f7a796d6ba82f Mon Sep 17 00:00:00 2001 From: Mattia Amadio <44863827+matamadio@users.noreply.github.com> Date: Mon, 30 Oct 2023 16:32:29 +0100 Subject: [PATCH 9/9] Fix PR errors --- schema/codelists/open/license.csv | 4 ++-- schema/rdls_schema.json | 18 +++++++++++++----- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/schema/codelists/open/license.csv b/schema/codelists/open/license.csv index 959b9773..dcb4f889 100644 --- a/schema/codelists/open/license.csv +++ b/schema/codelists/open/license.csv @@ -8,5 +8,5 @@ CC BY-NC-ND 4.0,Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 Int ODbL-1.0,Open Data Commons Open Database License,https://opendatacommons.org/licenses/odbl/summary/,Data,Open Definition recommended conformant license ODC-By-1.0,Open Data Commons Attribution License,https://opendatacommons.org/licenses/by/1-0/,Data,Open Definition recommended conformant license PDDL-1.0,Open Data Commons Public Domain Dedication and License,http://opendatacommons.org/licenses/pddl/1.0/,Data,Open Definition recommended conformant license -Custom,Open License specified externally,,"Content,Data", -Copyright,Commercial License specified externally,,"Content,Data", +Custom,Open License specified externally,,"Content,Data", +Copyright,Commercial License specified externally,,"Content,Data", diff --git a/schema/rdls_schema.json b/schema/rdls_schema.json index c2eb72bf..13465f7f 100644 --- a/schema/rdls_schema.json +++ b/schema/rdls_schema.json @@ -191,7 +191,9 @@ "buildings", "infrastructure", "population", - "natural_environment" + "natural_environment", + "economic_indicator", + "development_index" ] }, "taxonomy": { @@ -376,7 +378,9 @@ "buildings", "infrastructure", "population", - "natural_environment" + "natural_environment", + "economic_indicator", + "development_index" ] }, "cost": { @@ -1831,7 +1835,8 @@ "content", "product", "disruption", - "population" + "population", + "indicator_index_value" ] }, "quantity_kind": { @@ -1872,7 +1877,8 @@ "content", "product", "disruption", - "population" + "population", + "indicator_index_value" ] }, "unit": { @@ -2434,7 +2440,9 @@ "buildings", "infrastructure", "population", - "natural_environment" + "natural_environment", + "economic_indicator", + "development_index" ] }, "cost": {