diff --git a/deploy/storage/base_bigtable_info.yaml b/deploy/storage/base_bigtable_info.yaml index c6305dba3..84e617127 100644 --- a/deploy/storage/base_bigtable_info.yaml +++ b/deploy/storage/base_bigtable_info.yaml @@ -4,6 +4,6 @@ tables: - frequent_2023_02_23_20_00_54 - ipcc_2023_02_08_11_03_14 - biomedical_2023_02_02_03_45_37 - - disaster_2023_02_08_23_21_25 + - disaster_2023_02_19_23_43_07 - place_2023_02_18_10_00_51 - infrequent_2023_02_23_20_45_50 diff --git a/internal/server/v0/placestatvar/golden/get_place_stat_vars/california.json b/internal/server/v0/placestatvar/golden/get_place_stat_vars/california.json index 3eda3cdc3..9267ce66e 100644 --- a/internal/server/v0/placestatvar/golden/get_place_stat_vars/california.json +++ b/internal/server/v0/placestatvar/golden/get_place_stat_vars/california.json @@ -55139,7 +55139,6 @@ "dc/skgcegwq5m8d1", "dc/skgj72e2knfb3", "dc/skhmftd9szpqd", - "dc/skhpd3d006m38", "dc/skhwy1cwt5y99", "dc/skjbebke7hlk2", "dc/skjmed9kk5kj8", diff --git a/internal/server/v1/event/golden/event_collection/DroughtEvent_BFA_202204.json b/internal/server/v1/event/golden/event_collection/DroughtEvent_BFA_202204.json index e62c02c3a..a17c81000 100644 --- a/internal/server/v1/event/golden/event_collection/DroughtEvent_BFA_202204.json +++ b/internal/server/v1/event/golden/event_collection/DroughtEvent_BFA_202204.json @@ -6,69 +6,28 @@ "Earth", "africa", "country/BFA", + "country/MLI", "country/NER", + "grid_1/12_2", "grid_1/13_0", "grid_1/13_1", - "grid_1/14_1" - ], - "geoLocations": [ - { - "point": { - "latitude": 13, - "longitude": 0 - } - } - ], - "dates": [ - "2022-04" - ], - "propVals": { - "area": { - "vals": [ - "SquareKilometer35957.66959842968" - ] - }, - "endDate": { - "vals": [ - "2022-04" - ] - }, - "geoJsonCoordinatesDP1": { - "vals": [ - "{\\\"type\\\": \\\"Polygon\\\", \\\"coordinates\\\": [[[0.5, 13.5], [0.5, 14.5], [1.5, 14.5], [1.5, 12.5], [-0.5, 12.5], [-0.5, 13.5], [0.5, 13.5]]]}" - ] - }, - "name": { - "vals": [ - "DroughtEvent at LatLong(13.00000:0.00000) on 2022-04" - ] - }, - "observationPeriod": { - "vals": [ - "P1D" - ] - }, - "standardizedPrecipitationIndex": { - "vals": [ - "-2.3297453" - ] - } - }, - "dcid": "droughtEvent/2022-04_grid_1/13_0", - "provenanceId": "dc/8cj6de2" - }, - { - "places": [ - "Earth", - "africa", - "country/BFA", - "country/NER", - "grid_1/12_2", "grid_1/13_2", "grid_1/13_3", + "grid_1/14_1", "grid_1/14_2", "grid_1/14_3", - "grid_1/14_4" + "grid_1/14_4", + "grid_1/15_1", + "grid_1/15_2", + "grid_1/15_3", + "grid_1/15_4", + "grid_1/16_0", + "grid_1/16_1", + "grid_1/16_2", + "grid_1/16_3", + "grid_1/16_4", + "grid_1/17_0", + "grid_1/17_1" ], "geoLocations": [ { @@ -79,41 +38,41 @@ } ], "dates": [ - "2022-04" + "2022-05" ], "propVals": { "area": { "vals": [ - "SquareKilometer71911.76059289702" + "SquareKilometer250168.38146" ] }, "endDate": { "vals": [ - "2022-04" + "2022-06" ] }, "geoJsonCoordinatesDP1": { "vals": [ - "{\\\"type\\\": \\\"Polygon\\\", \\\"coordinates\\\": [[[1.5, 11.5], [1.5, 14.5], [4.5, 14.5], [4.5, 13.5], [3.5, 13.5], [3.5, 12.5], [2.5, 12.5], [2.5, 11.5], [1.5, 11.5]]]}" + "{\"type\": \"Polygon\", \"coordinates\": [[[3.5, 13.5], [3.5, 12.5], [2.5, 12.5], [2.5, 11.5], [1.5, 11.5], [1.5, 12.5], [-0.5, 12.5], [-0.5, 13.5], [0.5, 13.5], [0.5, 15.5], [-0.5, 15.5], [-0.5, 17.5], [1.5, 17.5], [1.5, 16.5], [4.5, 16.5], [4.5, 13.5], [3.5, 13.5]]]}" ] }, "name": { "vals": [ - "DroughtEvent at LatLong(12.00000:2.00000) on 2022-04" + "DroughtEvent at LatLong(12.00000:2.00000) on 2022-05" ] }, "observationPeriod": { "vals": [ - "P1D" + "P32D" ] }, "standardizedPrecipitationIndex": { "vals": [ - "-2.524597" + "-3.09" ] } }, - "dcid": "droughtEvent/2022-04_grid_1/13_3", + "dcid": "droughtEvent/2022-05_grid_1/12_2", "provenanceId": "dc/8cj6de2" } ], diff --git a/internal/server/v1/event/golden/event_collection/FireEvent_CA_202210.json b/internal/server/v1/event/golden/event_collection/FireEvent_CA_202210.json index 2a9f72470..d3aa6ccda 100644 --- a/internal/server/v1/event/golden/event_collection/FireEvent_CA_202210.json +++ b/internal/server/v1/event/golden/event_collection/FireEvent_CA_202210.json @@ -2,196 +2,288 @@ "eventCollection": { "events": [ { + "places": [ + "country/USA", + "geoId/06", + "geoId/06111" + ], "geoLocations": [ { "point": { - "latitude": 40.78254, - "longitude": -120.7644 + "latitude": 34.67173, + "longitude": -119.1083 } } ], "dates": [ - "2022-10-05" + "2022-10-08" ], "propVals": { "area": { "vals": [ - "SquareKilometer5.981286" + "SquareKilometer 0.343173728" ] }, - "endDate": { + "containmentDate": { "vals": [ - "2022-10-06" + "2022-10-18" + ] + }, + "controlledDate": { + "vals": [ + "2022-10-21" + ] + }, + "initialResponseArea": { + "vals": [ + "SquareKilometer 0.060702900000000004" ] }, "name": { "vals": [ - "FireEvent that started on 2022-10-05 within Level 10 S2 cell 0x54cccf0000000000" + "Howard 2 Fire" ] }, - "observationPeriod": { + "wfigsFireID": { "vals": [ - "P2D" + "2022-CALPF-002477" ] } }, - "dcid": "fireEvent/2022-10-05_0x54cccf0000000000", - "provenanceId": "dc/heq8pk3" + "dcid": "fire/irwinId/04745f7c-3f8b-47a4-8efe-c8f3c84742d9", + "provenanceId": "dc/pnrt4b1" }, { + "places": [ + "country/USA", + "geoId/06", + "geoId/06099" + ], "geoLocations": [ { "point": { - "latitude": 38.05234, - "longitude": -120.57396 + "latitude": 37.5885, + "longitude": -121.1755 } } ], "dates": [ - "2022-10-17" + "2022-10-26" ], "propVals": { "area": { "vals": [ - "SquareKilometer5.3891800000000005" + "SquareKilometer 0.3035145" ] }, - "endDate": { + "name": { "vals": [ - "2022-10-17" + "River Fire" + ] + }, + "wfigsFireID": { + "vals": [ + "2022-CALUR-001562" + ] + } + }, + "dcid": "fire/irwinId/a3353676-95d4-4415-a30b-402f6999188c", + "provenanceId": "dc/pnrt4b1" + }, + { + "places": [ + "country/USA", + "geoId/06", + "geoId/06007" + ], + "geoLocations": [ + { + "point": { + "latitude": 39.57643, + "longitude": -121.74195 + } + } + ], + "dates": [ + "2022-10-05" + ], + "propVals": { + "area": { + "vals": [ + "SquareKilometer 0.24337816040000002" + ] + }, + "containmentDate": { + "vals": [ + "2022-10-05" + ] + }, + "controlledDate": { + "vals": [ + "2022-10-06" ] }, "name": { "vals": [ - "FireEvent that started on 2022-10-17 within Level 10 S2 cell 0x8090950000000000" + "Nelson Fire" ] }, - "observationPeriod": { + "wfigsFireID": { "vals": [ - "P1D" + "2022-CABTU-018021" ] } }, - "dcid": "fireEvent/2022-10-17_0x8090950000000000", - "provenanceId": "dc/heq8pk3" + "dcid": "fire/irwinId/ccc40d03-00ec-418a-9c51-4ce25152fcbb", + "provenanceId": "dc/pnrt4b1" }, { + "places": [ + "country/USA", + "geoId/06", + "geoId/06027" + ], "geoLocations": [ { "point": { - "latitude": 40.32975, - "longitude": -122.72976 + "latitude": 37.38966, + "longitude": -118.50092 } } ], "dates": [ - "2022-10-24" + "2022-10-23" ], "propVals": { "area": { "vals": [ - "SquareKilometer5.945159" + "SquareKilometer 0.20234300000000002" + ] + }, + "containmentDate": { + "vals": [ + "2022-10-23" ] }, - "endDate": { + "controlledDate": { "vals": [ - "2022-10-26" + "2022-10-25" ] }, "name": { "vals": [ - "FireEvent that started on 2022-10-24 within Level 10 S2 cell 0x54d3230000000000" + "Pleasant Fire" ] }, - "observationPeriod": { + "wfigsFireID": { "vals": [ - "P3D" + "2022-CABDU-015212" ] } }, - "dcid": "fireEvent/2022-10-24_0x54d3230000000000", - "provenanceId": "dc/heq8pk3" + "dcid": "fire/irwinId/cea4951c-23a4-4ac2-98f3-715e531a4862", + "provenanceId": "dc/pnrt4b1" }, { + "places": [ + "country/USA", + "geoId/06", + "geoId/06061" + ], "geoLocations": [ { "point": { - "latitude": 37.09133, - "longitude": -119.27856 + "latitude": 38.73611, + "longitude": -121.39253 } } ], "dates": [ - "2022-10-24" + "2022-10-15" ], "propVals": { "area": { "vals": [ - "SquareKilometer5.630388" + "SquareKilometer 0.17077749200000003" + ] + }, + "containmentDate": { + "vals": [ + "2022-10-15" ] }, - "endDate": { + "controlledDate": { "vals": [ - "2022-11-05" + "2022-10-21" ] }, "name": { "vals": [ - "FireEvent that started on 2022-10-24 within Level 10 S2 cell 0x8095b70000000000" + "Watt Fire" ] }, - "observationPeriod": { + "wfigsFireID": { "vals": [ - "P13D" + "2022-CANEU-028369" ] } }, - "dcid": "fireEvent/2022-10-24_0x8095b70000000000", - "provenanceId": "dc/heq8pk3" + "dcid": "fire/irwinId/9cd579d3-d5f7-4bf0-b328-a7f1a665a730", + "provenanceId": "dc/pnrt4b1" }, { + "places": [ + "country/USA", + "geoId/06", + "geoId/06007" + ], "geoLocations": [ { "point": { - "latitude": 40.00767, - "longitude": -122.58252 + "latitude": 39.50208, + "longitude": -121.85133 } } ], "dates": [ - "2022-10-28" + "2022-10-08" ], "propVals": { "area": { "vals": [ - "SquareKilometer5.913976" + "SquareKilometer 0.12140580000000001" + ] + }, + "containmentDate": { + "vals": [ + "2022-10-08" ] }, - "endDate": { + "controlledDate": { "vals": [ - "2022-10-30" + "2022-10-08" ] }, "name": { "vals": [ - "FireEvent that started on 2022-10-28 within Level 10 S2 cell 0x8082710000000000" + "Vale Fire" ] }, - "observationPeriod": { + "wfigsFireID": { "vals": [ - "P3D" + "2022-CABTU-018201" ] } }, - "dcid": "fireEvent/2022-10-28_0x8082710000000000", - "provenanceId": "dc/heq8pk3" + "dcid": "fire/irwinId/347bb8de-0ee8-445f-9b96-7fb7f1968c53", + "provenanceId": "dc/pnrt4b1" } ], "provenanceInfo": { - "dc/heq8pk3": { - "importName": "NASA_VIIRSActiveFiresEvents", - "provenanceUrl": "https://www.earthdata.nasa.gov/learn/find-data/near-real-time/firms/vnp14imgtdlnrt", - "domain": "nasa.gov" + "dc/pnrt4b1": { + "importName": "FireWFIGS", + "provenanceUrl": "https://data-nifc.opendata.arcgis.com/", + "domain": "arcgis.com" } } } diff --git a/internal/server/v1/event/golden/event_collection/WildlandFireEvent_CA_202210.json b/internal/server/v1/event/golden/event_collection/WildlandFireEvent_CA_202210.json deleted file mode 100644 index c2fb6d979..000000000 --- a/internal/server/v1/event/golden/event_collection/WildlandFireEvent_CA_202210.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "eventCollection": {} -} \ No newline at end of file diff --git a/internal/server/v1/event/golden/event_collection_test.go b/internal/server/v1/event/golden/event_collection_test.go index 69fbea24a..fc23bbbca 100644 --- a/internal/server/v1/event/golden/event_collection_test.go +++ b/internal/server/v1/event/golden/event_collection_test.go @@ -65,24 +65,14 @@ func TestEventCollection(t *testing.T) { "EarthquakeEvent_Earth_202001.json", }, { - "FireEvent", + "WildlandFireEvent", "geoId/06", "2022-10", "area", "SquareKilometer", - 5, - 8, - "FireEvent_CA_202210.json", - }, - { - "WildlandFireEvent", - "geoId/06", - "2022-10", - "burnedArea", - "Acre", + 0.1, 10, - 1000, - "WildlandFireEvent_CA_202210.json", + "FireEvent_CA_202210.json", }, { "CycloneEvent", @@ -97,11 +87,11 @@ func TestEventCollection(t *testing.T) { { "DroughtEvent", "country/BFA", - "2022-04", + "2022-05", "area", "SquareKilometer", 10, - 100000, + 300000, "DroughtEvent_BFA_202204.json", }, } { diff --git a/internal/server/v1/variables/golden/bulk_variables/california_and_santa_clara.json b/internal/server/v1/variables/golden/bulk_variables/california_and_santa_clara.json index 3cf0db190..239662a5f 100644 --- a/internal/server/v1/variables/golden/bulk_variables/california_and_santa_clara.json +++ b/internal/server/v1/variables/golden/bulk_variables/california_and_santa_clara.json @@ -55143,7 +55143,6 @@ "dc/skgcegwq5m8d1", "dc/skgj72e2knfb3", "dc/skhmftd9szpqd", - "dc/skhpd3d006m38", "dc/skhwy1cwt5y99", "dc/skjbebke7hlk2", "dc/skjmed9kk5kj8", diff --git a/internal/server/v1/variables/golden/bulk_variables/california_and_santa_clara_union.json b/internal/server/v1/variables/golden/bulk_variables/california_and_santa_clara_union.json index b0039abb7..4e01643e0 100644 --- a/internal/server/v1/variables/golden/bulk_variables/california_and_santa_clara_union.json +++ b/internal/server/v1/variables/golden/bulk_variables/california_and_santa_clara_union.json @@ -73315,7 +73315,6 @@ "dc/skgcegwq5m8d1", "dc/skgj72e2knfb3", "dc/skhmftd9szpqd", - "dc/skhpd3d006m38", "dc/skhwy1cwt5y99", "dc/skjbebke7hlk2", "dc/skjmed9kk5kj8", diff --git a/internal/server/v1/variables/golden/variables/california.json b/internal/server/v1/variables/golden/variables/california.json index b0376b919..85437971d 100644 --- a/internal/server/v1/variables/golden/variables/california.json +++ b/internal/server/v1/variables/golden/variables/california.json @@ -55138,7 +55138,6 @@ "dc/skgcegwq5m8d1", "dc/skgj72e2knfb3", "dc/skhmftd9szpqd", - "dc/skhpd3d006m38", "dc/skhwy1cwt5y99", "dc/skjbebke7hlk2", "dc/skjmed9kk5kj8",