Skip to content

Commit 2b2d0e5

Browse files
committed
Merge remote-tracking branch 'upstream/main' into main
2 parents c9eb974 + 9ca09e3 commit 2b2d0e5

38 files changed

+423
-398
lines changed

deploy.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,15 @@
230230
"add-header-comment": true
231231
},
232232

233+
"// acquisition - covidcast_nowcast",
234+
{
235+
"type": "move",
236+
"src": "src/acquisition/covidcast_nowcast/",
237+
"dst": "[[package]]/acquisition/covidcast_nowcast/",
238+
"match": "^.*\\.(py)$",
239+
"add-header-comment": true
240+
},
241+
233242
"// run unit and coverage tests",
234243
{"type": "py3test"}
235244

docs/Gemfile.lock

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,21 +201,23 @@ GEM
201201
rb-fsevent (~> 0.10, >= 0.10.3)
202202
rb-inotify (~> 0.9, >= 0.9.10)
203203
mercenary (0.3.6)
204-
mini_portile2 (2.4.0)
204+
mini_portile2 (2.5.0)
205205
minima (2.5.1)
206206
jekyll (>= 3.5, < 5.0)
207207
jekyll-feed (~> 0.9)
208208
jekyll-seo-tag (~> 2.1)
209209
minitest (5.14.1)
210210
multipart-post (2.1.1)
211-
nokogiri (1.10.10)
212-
mini_portile2 (~> 2.4.0)
211+
nokogiri (1.11.1)
212+
mini_portile2 (~> 2.5.0)
213+
racc (~> 1.4)
213214
octokit (4.18.0)
214215
faraday (>= 0.9)
215216
sawyer (~> 0.8.0, >= 0.5.3)
216217
pathutil (0.16.2)
217218
forwardable-extended (~> 2.6)
218219
public_suffix (3.1.1)
220+
racc (1.5.2)
219221
rb-fsevent (0.10.4)
220222
rb-inotify (0.10.1)
221223
ffi (~> 1.0)

docs/api/README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ wholly or partially serve data under this license include:
6464

6565
[![Creative Commons License](https://i.creativecommons.org/l/by/4.0/88x31.png)](https://creativecommons.org/licenses/by/4.0/)
6666

67+
Please note that our `endpoint` parameters were previously referenced as `source` in our API. New users will now use the `endpoint` parameter when accessing our data. If you are a returning or continuous user you do not have to make any changes, as the parameter `source` still works as usual.
68+
6769
---
6870

6971
# The API
@@ -152,7 +154,7 @@ The parameters available for each source are documented in each linked source-sp
152154
# Example URLs
153155

154156
### FluView on 2015w01 (national)
155-
https://delphi.cmu.edu/epidata/api.php?source=fluview&regions=nat&epiweeks=201501
157+
https://delphi.cmu.edu/epidata/api.php?endpoint=fluview&regions=nat&epiweeks=201501
156158

157159
```json
158160
{
@@ -182,7 +184,7 @@ https://delphi.cmu.edu/epidata/api.php?source=fluview&regions=nat&epiweeks=20150
182184
```
183185

184186
### Wikipedia Access article "influenza" on 2020w01
185-
https://delphi.cmu.edu/epidata/api.php?source=wiki&language=en&articles=influenza&epiweeks=202001
187+
https://delphi.cmu.edu/epidata/api.php?endpoint=wiki&language=en&articles=influenza&epiweeks=202001
186188

187189
```json
188190
{

docs/api/covid_hosp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ If `issues` is not specified, then the most recent issue is used by default.
6767
# Example URLs
6868

6969
### MA on 2020-05-10 (per most recent issue)
70-
https://delphi.cmu.edu/epidata/api.php?source=covid_hosp&states=MA&dates=20200510
70+
https://delphi.cmu.edu/epidata/api.php?endpoint=covid_hosp&states=MA&dates=20200510
7171

7272
```json
7373
{

docs/api/covid_hosp_facility_lookup.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: COVID-19 Reported Patient Impact and Hospital Capacity: Facility lookup
2+
title: COVID-19 Reported Patient Impact and Hospital Capacity - Facility lookup
33
parent: Epidata API (Other Diseases)
44
---
55

@@ -31,7 +31,7 @@ This data source provides metadata about healthcare facilities in the US.
3131

3232
# The API
3333

34-
The base URL is: https://delphi.cmu.edu/epidata/api.php
34+
The base URL is: https://delphi.cmu.edu/epidata/api.php?source=covid_hosp_facility_lookup
3535

3636
See [this documentation](README.md) for details on specifying locations and dates.
3737

docs/api/covidcast-signals/fb-survey.md

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ grand_parent: COVIDcast Epidata API
1010
* **Source name:** `fb-survey`
1111
* **Number of data revisions since 19 May 2020:** 1
1212
* **Date of last change:** [3 June 2020](../covidcast_changelog.md#fb-survey)
13-
* **Available for:** county, hrr, msa, state (see [geography coding docs](../covidcast_geography.md))
13+
* **Available for:** county, hrr, msa, state, nation (see [geography coding docs](../covidcast_geography.md))
1414
* **Time type:** day (see [date format docs](../covidcast_times.md))
1515
* **License:** [CC BY](../covidcast_licensing.md#creative-commons-attribution)
1616

@@ -324,16 +324,19 @@ also available. These have names beginning `smoothed_w`, such as
324324
| Signal | Description | Survey Item |
325325
| --- | --- | --- |
326326
| `smoothed_accept_covid_vaccine` | Estimated percentage of respondents who would definitely or probably choose to get vaccinated, if a COVID-19 vaccine were offered to them today. **Note:** Until January 6, 2021, all respondents answered this question; beginning on that date, only respondents who said they have not received a COVID vaccine are asked this question. | V3 |
327+
| `smoothed_covid_vaccinated` | Estimated percentage of respondents who have already received a vaccine for COVID-19. **Note:** The Centers for Disease Control compiles data on vaccine administration across the United States. This signal may differ from CDC data because of survey biases and should not be treated as authoritative. However, the survey signal is not subject to the lags and reporting problems in official vaccination data. | V1 |
327328

328-
This indicator is based on questions added in Wave 6 of the survey, introduced
329-
on December 19, 2020. **Note:** As of January 2021, vaccination items on the
330-
survey are being revised in preparation for Wave 7. We may replace the signal
331-
above with a new signal (with a different name) if the underlying survey item
332-
changes significantly.
329+
These indicators are based on questions added in Wave 6 of the survey,
330+
introduced on December 19, 2020; however, Delphi only enabled item V1 beginning
331+
January 6, 2021. **Note:** As of January 2021, vaccination items on the survey
332+
are being revised in preparation for Wave 7. We may replace the signals above
333+
with new signals (with different names) if the underlying survey items change
334+
significantly.
333335

334-
A weighted version of this signal, using the [survey weighting described
335-
below](#survey-weighting) to be more representative of state demographics, is
336-
also available. It is `smoothed_waccept_covid_vaccine`.
336+
Weighted versions of these signals, using the [survey weighting described
337+
below](#survey-weighting) to be more representative of state demographics, are
338+
also available. They have names beginning with `smoothed_w`, such as
339+
`smoothed_waccept_covid_vaccine`.
337340

338341

339342
## Mental Health Indicators

docs/api/covidcast.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ sources and signals.
9393

9494
The COVIDcast API is based on HTTP GET queries and returns data in JSON form.
9595
The base URL is `https://api.covidcast.cmu.edu/epidata/api.php`. The covidcast
96-
endpoint is `https://api.covidcast.cmu.edu/epidata/api.php?source=covidcast`.
96+
endpoint is `https://api.covidcast.cmu.edu/epidata/api.php?endpoint=covidcast`.
9797

9898
See [this documentation](README.md) for details on specifying epiweeks, dates,
9999
and lists.
@@ -180,7 +180,7 @@ API calls.
180180

181181
### Facebook Survey CLI on 2020-04-06 to 2010-04-10 (county 06001)
182182

183-
https://api.covidcast.cmu.edu/epidata/api.php?source=covidcast&data_source=fb-survey&signal=smoothed_cli&time_type=day&geo_type=county&time_values=20200406-20200410&geo_value=06001
183+
https://api.covidcast.cmu.edu/epidata/api.php?endpoint=covidcast&data_source=fb-survey&signal=smoothed_cli&time_type=day&geo_type=county&time_values=20200406-20200410&geo_value=06001
184184

185185
```json
186186
{
@@ -202,7 +202,7 @@ https://api.covidcast.cmu.edu/epidata/api.php?source=covidcast&data_source=fb-su
202202

203203
### Facebook Survey CLI on 2020-04-06 (all counties)
204204

205-
https://api.covidcast.cmu.edu/epidata/api.php?source=covidcast&data_source=fb-survey&signal=smoothed_cli&time_type=day&geo_type=county&time_values=20200406&geo_value=*
205+
https://api.covidcast.cmu.edu/epidata/api.php?endpoint=covidcast&data_source=fb-survey&signal=smoothed_cli&time_type=day&geo_type=county&time_values=20200406&geo_value=*
206206

207207
```json
208208
{

docs/api/covidcast_geography.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ whose estimate is being reported. Estimates are available for several possible
3434
* `state`: The 50 states, identified by their two-digit postal abbreviation (in
3535
lower case). Estimates for Puerto Rico are available as state `pr`;
3636
Washington, D.C. is available as state `dc`.
37-
* `nation`: accepted values are the ISO 3166-1 alpha-2 [country codes](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2). Currently the only nation we have data on is `us`.
37+
* `nation`: accepted values are the ISO 3166-1 alpha-2 [country codes](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2). Currently the only nation we have data on is `us`.
3838

3939
Some signals are not available for all `geo_type`s since they may be reported
4040
by their original sources at geographic resolutions which are too coarse.

docs/api/covidcast_meta.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ nav_order: 6
66

77
# COVIDcast Metadata
88

9-
The COVIDcast metadata endpoint (source `covidcast_meta`) provides a list of all
9+
The COVIDcast metadata endpoint (endpoint `covidcast_meta`) provides a list of all
1010
sources and signals available in the API, along with basic summary statistics
1111
such as the dates they are available, their minimum and maximum values, and the
1212
geographic levels at which they are reported.
@@ -45,7 +45,7 @@ None required.
4545

4646
## Example URLs
4747

48-
https://api.covidcast.cmu.edu/epidata/api.php?source=covidcast_meta
48+
https://api.covidcast.cmu.edu/epidata/api.php?endpoint=covidcast_meta
4949

5050
```json
5151
{

docs/api/delphi.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ See [this documentation](README.md) for details on specifying epiweeks, dates, a
5858
# Example URLs
5959

6060
### Delphi on 2020w01 (EC)
61-
https://delphi.cmu.edu/epidata/api.php?source=delphi&system=ec&epiweek=202001
61+
https://delphi.cmu.edu/epidata/api.php?endpoint=delphi&system=ec&epiweek=202001
6262

6363
```json
6464
{

0 commit comments

Comments
 (0)