Merge pull request #1 from tokyo-metropolitan-gov/development

catch up from forked origin
ohyama · Jan 25, 2021 · 179c91e · 179c91e
2 parents 87c7964 + da90494
commit 179c91e
Show file tree

Hide file tree

Showing 17 changed files with 5,192 additions and 1,801 deletions.
diff --git a/assets/locales/en.json b/assets/locales/en.json
@@ -688,5 +688,18 @@
   "新型コロナウイルス感染拡大防止のため、特別区及び多摩地域の各市町村の飲食店等に営業時間の短縮要請が行われることに伴い、要請に全面的にご協力いただける中小の事業者の皆様に対し、協力金を支給します。": "Payments will be provided to small and medium-sized businesses that cooperated fully with the request made by the Tokyo Metropolitan Government to restaurants and other establishments in the 23-ward area and municipalities of the Tama area to shorten their business hours in order to help prevent the spread of COVID-19.",
   "営業時間短縮に係る感染拡大防止協力金（11/28～12/17実施分）": "Infection Spread Prevention Support Fund (for shortened business hours from Nov. 28 to Dec. 17)",
   "65歳以上の新規陽性者数の推移及び届出保健所別の内訳": "Change in the number of new positive cases among the 65+ age group and breakdown by public health center",
-  "新型コロナウイルス感染症都民向け感染予防ハンドブック": "COVID-19 Infection Prevention Handbook for Tokyo Residents"
+  "新型コロナウイルス感染症都民向け感染予防ハンドブック": "COVID-19 Infection Prevention Handbook for Tokyo Residents",
+  "武蔵村山2": "Musashimurayama 2",
+  "このサイトの内容物は{creativeCommons}の下に提供されています（ただし商標等の他団体が権利を持つものは除く）。": "Content on this site is provided under {creativeCommons} (unless other organizations own trademarks or other rights).",
+  "Gマーク（グッドデザイン賞受賞マーク）": "G Mark (proof of winning the Good Design Award)",
+  "ただし商標等の他団体が権利を持つ以下のものは除きます。": "Except for following trademarks and other properties owned by other organizations:",
+  "コンテンツについて": "About content",
+  "各SNS（LINE、Twitter、Facebook、GitHub、YouTube）ロゴマーク": "Logos of social networking services (LINE, Twitter, Facebook, GitHub and YouTube)",
+  "このサイトの内容物はクリエイティブ・コモンズ 表示 4.0 ライセンスの下に提供されています。": "Content on this site is provided under a Creative Commons Attribution 4.0 International License.",
+  "新型コロナウイルス感染拡大防止のため、特別区及び多摩地域の各市町村の飲食店等に営業時間の短縮要請が行われることに伴い、要請に全面的にご協力いただいた中小の事業者の皆様に対し、協力金を支給します。": "Payments will be provided to small and medium-sized businesses that cooperate fully with the request made by the Tokyo Metropolitan Government to restaurants and other establishments in the 23-wards area and municipalities of the Tama area to shorten their business hours in order to help prevent the spread of COVID-19.",
+  "営業時間短縮に係る感染拡大防止協力金（1/8～2/7実施分）": "Infection Spread Prevention Support Fund (for shortened business hours from Jan. 8 to Feb. 7)",
+  "新型コロナウイルス感染拡大防止のため、緊急事態宣言が発令され、営業時間短縮が強化されることに伴い、要請に全面的にご協力いただける中小の飲食事業者等に対し、新たに協力金を支給いたします。": "New funds will be given to small and medium-sized restaurants and other establishments that cooperate fully with the request made by the Tokyo Metropolitan Government to further shorten their business hours in order to help prevent the spread of COVID-19 under the Emergency Declaration.",
+  "営業時間短縮に係る感染拡大防止協力金（12/18～1/7実施分）": "Infection Spread Prevention Support Fund (for shortened business hours from Dec. 18 to Jan. 7)",
+  "東京都緊急事態措置等・感染拡大防止協力金等に関すること": "About Tokyo Metropolis Emergency Measures and Infection Spread Prevention Support Fund",
+  "新型コロナウイルス感染拡大防止のため、緊急事態宣言が発令され、営業時間短縮が強化されることに伴い、要請に全面的にご協力いただける飲食事業者等に対し、新たに協力金を支給いたします。": "New funds will be given to restaurants and other establishments that cooperate fully with the request made by the Tokyo Metropolitan Government to further shorten their business hours in order to help prevent the spread of COVID-19 under the Emergency Declaration."
 }
diff --git a/data/consultation_about_fever.json b/data/consultation_about_fever.json
@@ -1,5 +1,5 @@
 {
-    "date": "2021\/1\/21 20:00",
+    "date": "2021\/1\/22 20:00",
     "data": [
         {
             "date": "2020-03-01",
@@ -1630,6 +1630,11 @@
             "date": "2021-01-20",
             "count": 56,
             "weekly_average_count": 68
+        },
+        {
+            "date": "2021-01-21",
+            "count": 59,
+            "weekly_average_count": 66.3
         }
     ]
 }
diff --git a/data/daily_positive_detail.json b/data/daily_positive_detail.json
@@ -1,5 +1,5 @@
 {
-    "date": "2021\/1\/21 20:00",
+    "date": "2021\/1\/24 20:00",
     "data": [
         {
             "diagnosed_date": "2020-01-20",
@@ -4048,6 +4048,39 @@
             "weekly_average_count": 1513,
             "weekly_average_untracked_count": 876.9,
             "weekly_average_untracked_increse_percent": 85.1
+        },
+        {
+            "diagnosed_date": "2021-01-22",
+            "count": 1175,
+            "missing_count": 635,
+            "reported_count": 540,
+            "weekly_gain_ratio": 0.9,
+            "untracked_percent": 57.8,
+            "weekly_average_count": 1395,
+            "weekly_average_untracked_count": 806.4,
+            "weekly_average_untracked_increse_percent": 84.3
+        },
+        {
+            "diagnosed_date": "2021-01-23",
+            "count": 1070,
+            "missing_count": 561,
+            "reported_count": 509,
+            "weekly_gain_ratio": 0.87,
+            "untracked_percent": 56.5,
+            "weekly_average_count": 1289.4,
+            "weekly_average_untracked_count": 729.1,
+            "weekly_average_untracked_increse_percent": 80.5
+        },
+        {
+            "diagnosed_date": "2021-01-24",
+            "count": 986,
+            "missing_count": 506,
+            "reported_count": 480,
+            "weekly_gain_ratio": 0.8,
+            "untracked_percent": 55.7,
+            "weekly_average_count": 1202.9,
+            "weekly_average_untracked_count": 670.6,
+            "weekly_average_untracked_increse_percent": 74
         }
     ]
 }
diff --git a/data/data.json b/data/data.json
@@ -1,6 +1,6 @@
 {
     "contacts": {
-        "date": "2021\/01\/21 20:00",
+        "date": "2021\/01\/22 20:00",
         "data": [
             {
                 "日付": "2020-01-29T08:00:00.000Z",
@@ -3581,6 +3581,16 @@
                 "date": "2021-01-20",
                 "w": 3,
                 "小計": 594
+            },
+            {
+                "日付": "2021-01-21T08:00:00.000Z",
+                "曜日": "木",
+                "9-13時": 202,
+                "13-17時": 153,
+                "17-21時": 190,
+                "date": "2021-01-21",
+                "w": 4,
+                "小計": 545
             }
         ]
     },
@@ -6260,7 +6270,7 @@
         ]
     },
     "patients_summary": {
-        "date": "2021\/01\/21 20:00",
+        "date": "2021\/01\/24 20:00",
         "data": [
             {
                 "日付": "2020-01-24T08:00:00.000Z",
@@ -7717,11 +7727,23 @@
             {
                 "日付": "2021-01-21T08:00:00.000Z",
                 "小計": 1471
+            },
+            {
+                "日付": "2021-01-22T08:00:00.000Z",
+                "小計": 1175
+            },
+            {
+                "日付": "2021-01-23T08:00:00.000Z",
+                "小計": 1070
+            },
+            {
+                "日付": "2021-01-24T08:00:00.000Z",
+                "小計": 986
             }
         ]
     },
     "inspections_summary": {
-        "date": "2021\/01\/21 20:00",
+        "date": "2021\/01\/22 20:00",
         "data": {
             "都内": [
                 0,
@@ -8086,7 +8108,8 @@
                 372,
                 210,
                 1071,
-                910
+                910,
+                744
             ],
             "その他": [
                 0,
@@ -8451,6 +8474,7 @@
                 0,
                 0,
                 0,
+                0,
                 0
             ],
             "保険適用分": [
@@ -8798,25 +8822,26 @@
                 6149,
                 4536,
                 3572,
-                6055,
+                6065,
                 4645,
-                15345,
-                14880,
-                14000,
-                13681,
-                15177,
-                9172,
-                3216,
+                15346,
+                14889,
+                14007,
+                13683,
+                15182,
+                9174,
+                3217,
                 4044,
-                17623,
-                13955,
-                12816,
-                13039,
-                6787,
-                2383,
-                15033,
-                11126,
-                9055
+                17632,
+                13962,
+                12833,
+                13178,
+                7096,
+                2650,
+                15343,
+                11782,
+                10192,
+                9018
             ]
         },
         "labels": [
@@ -9182,50 +9207,51 @@
             "2021-01-17",
             "2021-01-18",
             "2021-01-19",
-            "2021-01-20"
+            "2021-01-20",
+            "2021-01-21"
         ]
     },
-    "lastUpdate": "2021\/01\/22 11:00",
+    "lastUpdate": "2021\/01\/24 20:00",
     "main_summary": {
         "children": [
             {
                 "attr": "陽性患者数",
-                "date": "2021\/1\/21 20:00",
-                "value": 90659,
+                "date": "2021\/1\/24 20:00",
+                "value": 93890,
                 "children": [
                     {
                         "attr": "入院中",
-                        "value": 2820,
+                        "value": 2798,
                         "children": [
                             {
                                 "attr": "軽症・中等症",
-                                "value": 2661
+                                "value": 2642
                             },
                             {
                                 "attr": "重症",
-                                "value": 159
+                                "value": 156
                             }
                         ]
                     },
                     {
                         "attr": "退院",
-                        "value": 70417
+                        "value": 74881
                     },
                     {
                         "attr": "死亡",
-                        "value": 761
+                        "value": 782
                     },
                     {
                         "attr": "宿泊療養",
-                        "value": 860
+                        "value": 882
                     },
                     {
                         "attr": "自宅療養",
-                        "value": 8927
+                        "value": 8474
                     },
                     {
                         "attr": "調査中",
-                        "value": 6874
+                        "value": 6073
                     }
                 ]
             }

diff --git a/data/fever_consultation_center.json b/data/fever_consultation_center.json
@@ -1,5 +1,5 @@
 {
-    "date": "2021\/1\/21 20:00",
+    "date": "2021\/1\/22 20:00",
     "data": [
         {
             "date": "2020-10-30",
@@ -747,6 +747,15 @@
                 "total": 1487,
                 "weekly_average_total": 1845
             }
+        },
+        {
+            "date": "2021-01-21",
+            "count": {
+                "fever_consultation_center": 1363,
+                "cocoa_dial": 53,
+                "total": 1416,
+                "weekly_average_total": 1776
+            }
         }
     ]
 }
diff --git a/data/monitoring_items.json b/data/monitoring_items.json
@@ -1,16 +1,16 @@
 {
-    "date": "2021\/1\/21 20:00",
+    "date": "2021\/1\/24 20:00",
     "data": {
-        "(1)新規陽性者数": 1513,
-        "(2)#7119（東京消防庁救急相談センター）における発熱等相談件数 ": 68,
-        "(3)新規陽性者における接触歴等不明者（人数）": 876.9,
-        "(3)新規陽性者における接触歴等不明者（増加比）": 85.1,
-        "(4)PCR・抗原検査（陽性率）": 10.5,
-        "(4)PCR・抗原検査（検査人数）": 10712.6,
-        "(5)救急医療の東京ルールの適用件数": 118.3,
-        "(6)入院患者数": 2820,
+        "(1)新規陽性者数": 1202.9,
+        "(2)#7119（東京消防庁救急相談センター）における発熱等相談件数 ": 66.3,
+        "(3)新規陽性者における接触歴等不明者（人数）": 670.6,
+        "(3)新規陽性者における接触歴等不明者（増加比）": 74,
+        "(4)PCR・抗原検査（陽性率）": 9.8,
+        "(4)PCR・抗原検査（検査人数）": 9701.1,
+        "(5)救急医療の東京ルールの適用件数": 116.7,
+        "(6)入院患者数": 2798,
         "(6)入院患者確保病床数": "4000床",
-        "(7)重症患者数": 159,
+        "(7)重症患者数": 156,
         "(7)重症患者確保病床数": "250床",
         "総括コメント-感染状況": {
             "level": 4,

diff --git a/data/news.json b/data/news.json
@@ -1,29 +1,29 @@
 {
     "newsItems": [
         {
-            "date": "2021\/01\/21",
+            "date": "2021\/01\/24",
             "url": "https:\/\/stopcovid19.metro.tokyo.lg.jp\/cards\/details-of-confirmed-cases",
-            "text": "【1\/21時点の都内患者数】入院数2,820人（確保病床数4,000床）、うち重症者数159人（うち重症病床数250床）"
+            "text": "【1\/24時点の都内患者数】入院数2,798人（確保病床数4,000床）、うち重症者数156人（うち重症病床数250床）"
         },
         {
-            "date": "2021\/01\/21",
+            "date": "2021\/01\/24",
             "url": "https:\/\/www.fukushihoken.metro.tokyo.lg.jp\/hodo\/saishin\/hassei.html",
-            "text": "【1\/21の状況】新規陽性者1,471人、うち65歳以上の高齢者数290人、死亡者数7人、検査数15,243件（1\/18参考値）、都外からの持込検体による陽性数36"
+            "text": "【1\/24の状況】新規陽性者986人、うち65歳以上の高齢者数260人、死亡者数3人、検査数10,796件（1\/21参考値）、都外からの持込検体による陽性数40"
         },
         {
-            "date": "2021\/01\/21",
+            "date": "2021\/01\/24",
             "url": "https:\/\/www.metro.tokyo.lg.jp\/tosei\/governor\/governor\/katsudo\/2021\/01\/08_00.html",
             "text": "緊急事態宣言発令に伴う知事からのメッセージ"
         },
         {
-            "date": "2021\/01\/21",
+            "date": "2021\/01\/24",
             "url": "https:\/\/www.bousai.metro.tokyo.lg.jp\/1007617\/index.html",
             "text": "東京都緊急事態措置等に関する情報"
         },
         {
-            "date": "2021\/01\/22",
+            "date": "2021\/01\/24",
             "url": "https:\/\/www.seisakukikaku.metro.tokyo.lg.jp\/information\/corona-people-flow-analysis.html",
-            "text": "【1\/21の滞在人口の増減状況】銀座は昨年12月比37％減、昨年1月比61％減。詳細はこちらをご覧ください。"
+            "text": "【1\/23の滞在人口の増減状況】銀座は昨年12月比37％減、昨年1月比54％減。詳細はこちらをご覧ください。"
         }
     ]
 }