From 053a57b32a2f4ce8b9f1e58f3cba00fd49fea109 Mon Sep 17 00:00:00 2001
From: origamium <onoueorigami@gmail.com>
Date: Sun, 5 Apr 2020 23:59:22 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20metro=E3=82=92=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/cards/MetroCard.vue | 111 ---------------------------------
 data/metro.json                |  75 ----------------------
 pages/about.vue                |  19 +-----
 pages/cards/_card.vue          |   7 ---
 pages/index.vue                |   7 +--
 5 files changed, 3 insertions(+), 216 deletions(-)
 delete mode 100644 components/cards/MetroCard.vue
 delete mode 100755 data/metro.json

diff --git a/components/cards/MetroCard.vue b/components/cards/MetroCard.vue
deleted file mode 100644
index a0fbf2c6..00000000
--- a/components/cards/MetroCard.vue
+++ /dev/null
@@ -1,111 +0,0 @@
-<template>
-  <v-col cols="12" md="6" class="DataCard">
-    <metro-bar-chart
-      :title="$t('都営地下鉄の利用者数の推移')"
-      :title-id="'predicted-number-of-toei-subway-passengers'"
-      :chart-id="'metro-bar-chart'"
-      :chart-data="metroGraph"
-      :date="metroGraph.date"
-      :tooltips-title="metroGraphTooltipTitle"
-      :tooltips-label="metroGraphTooltipLabel"
-      unit="%"
-    >
-      <template v-slot:description>
-        {{
-          $t('{range}の利用者数*の平均値を基準としたときの相対値', {
-            range: metroGraph.base_period
-          })
-        }}
-        <br />
-        *{{ $t('都営地下鉄4路線の自動改札出場数') }}
-        <br />
-        {{
-          $t(
-            '（注）速報値として公開するものであり、後日確定データとして修正される場合あり'
-          )
-        }}
-      </template>
-    </metro-bar-chart>
-  </v-col>
-</template>
-
-<script>
-import Data from '@/data/data.json'
-import MetroData from '@/data/metro.json'
-import MetroBarChart from '@/components/MetroBarChart.vue'
-
-export default {
-  components: {
-    MetroBarChart
-  },
-  data() {
-    // 都営地下鉄の利用者数の推移
-    const metroGraph = MetroData
-    for (const dataset of metroGraph.datasets) {
-      dataset.label = this.getWeekLabel(dataset.label)
-    }
-
-    // metroGraph ツールチップ title文字列
-    // this.$t を使うため metroGraphOption の外側へ
-    const metroGraphTooltipTitle = (tooltipItems, _) => {
-      const label = this.getWeekLabel(tooltipItems[0].label)
-      return this.$t('期間: {duration}', {
-        // duration = label = '2月10日~14日' | '2月17日~21日' | '2月25日~28日'
-        duration: this.$t(label)
-      })
-    }
-    // metroGraph ツールチップ label文字列
-    // this.$t を使うため metroGraphOption の外側へ
-    const metroGraphTooltipLabel = (tooltipItem, data) => {
-      const currentData = data.datasets[tooltipItem.datasetIndex]
-      const percentage = `${currentData.data[tooltipItem.index]}%`
-
-      return this.$t('{duration}の利用者数との相対値: {percentage}', {
-        // duration = metroGraph.base_period = '1月20日~1月24日'
-        duration: this.$t(metroGraph.base_period),
-        percentage
-      })
-    }
-
-    const data = {
-      Data,
-      metroGraph,
-      metroGraphTooltipTitle,
-      metroGraphTooltipLabel
-    }
-    return data
-  },
-  methods: {
-    /**
-     * 表の横軸に表示する、「MM/DD~MM/DD」形式のラベルを取得する
-     */
-    getWeekLabel(label) {
-      const slashCount = label.split('/').length - 1
-      if (slashCount === 1) {
-        // MM/DD~DD形式だったので、「~」の後に「MM/」を追加する
-        let month = label.substr(0, label.indexOf('/'))
-
-        const startDate = Number(
-          label.substr(
-            label.indexOf('/') + 1,
-            label.indexOf('~') - label.indexOf('/') - 1
-          )
-        )
-        const endDate = Number(label.substr(label.indexOf('~') + 1))
-        if (startDate > endDate) {
-          const date = new Date()
-          date.setMonth(Number(month) + 1)
-          month = date.getMonth().toString()
-        }
-
-        label = label.replace('~', `~${month}/`)
-      }
-
-      // 日は、0埋めしない
-      label = label.replace('/0', '/')
-
-      return label
-    }
-  }
-}
-</script>
diff --git a/data/metro.json b/data/metro.json
deleted file mode 100755
index 8cddf0db..00000000
--- a/data/metro.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-    "date": "2020\/4\/3 9:00",
-    "datasets": [
-        {
-            "label": "2\/10~14",
-            "data": [
-                -0.96,
-                -2.94,
-                -7.48
-            ]
-        },
-        {
-            "label": "2\/17~21",
-            "data": [
-                -0.36,
-                -4.11,
-                -6.95
-            ]
-        },
-        {
-            "label": "2\/25~28",
-            "data": [
-                3.06,
-                -9.47,
-                -7.31
-            ]
-        },
-        {
-            "label": "3\/2~06",
-            "data": [
-                0.47,
-                -22.36,
-                -10.16
-            ]
-        },
-        {
-            "label": "3\/9~13",
-            "data": [
-                -1.22,
-                -24.87,
-                -12.05
-            ]
-        },
-        {
-            "label": "3\/16~19",
-            "data": [
-                -1.36,
-                -23.98,
-                -11.22
-            ]
-        },
-        {
-            "label": "3\/23~26",
-            "data": [
-                -2.45,
-                -24.41,
-                -12.17
-            ]
-        },
-        {
-            "label": "3\/30~02",
-            "data": [
-                -8.93,
-                -33.49,
-                -30.75
-            ]
-        }
-    ],
-    "labels": [
-        "6:30~7:30",
-        "7:30~9:30",
-        "9:30~10:30"
-    ],
-    "base_period": "1\/20~1\/24"
-}
\ No newline at end of file
diff --git a/pages/about.vue b/pages/about.vue
index 274b196a..a4d81b71 100644
--- a/pages/about.vue
+++ b/pages/about.vue
@@ -184,23 +184,6 @@
         }}
       </p>
     </StaticCard>
-    <StaticCard>
-      <h3>{{ $t('データについて') }}</h3>
-      <i18n
-        tag="p"
-        path="本サイトで公表しているデータは、{catalogWebsite}より誰でも自由にダウンロードが可能です。（データは順次追加予定です）"
-      >
-        <template v-slot:catalogWebsite>
-          <a
-            href="https://portal.data.metro.tokyo.lg.jp/"
-            target="_blank"
-            rel="noopener noreferrer"
-          >
-            {{ $t('東京都オープンデータカタログサイト') }}
-          </a>
-        </template>
-      </i18n>
-    </StaticCard>
     <StaticCard>
       <h3>{{ $t('ソースコードについて') }}</h3>
       <p>
@@ -212,7 +195,7 @@
         <i18n path="詳しくは、{githubRepo}をご確認ください。">
           <template v-slot:githubRepo>
             <a
-              href="https://github.com/tokyo-metropolitan-gov/covid19"
+              href="https://github.com/origamium/covid19"
               target="_blank"
               rel="noopener noreferrer"
             >
diff --git a/pages/cards/_card.vue b/pages/cards/_card.vue
index 2c0b5eb4..1b85323a 100644
--- a/pages/cards/_card.vue
+++ b/pages/cards/_card.vue
@@ -41,7 +41,6 @@
 
 <script>
 import Data from '@/data/data.json'
-import MetroData from '@/data/metro.json'
 import agencyData from '@/data/agency.json'
 import ConfirmedCasesDetailsCard from '@/components/cards/ConfirmedCasesDetailsCard.vue'
 import TestedCasesDetailsCard from '@/components/cards/TestedCasesDetailsCard.vue'
@@ -51,7 +50,6 @@ import TestedNumberCard from '@/components/cards/TestedNumberCard.vue'
 import InspectionPersonsNumberCard from '@/components/cards/InspectionPersonsNumberCard.vue'
 import TelephoneAdvisoryReportsNumberCard from '@/components/cards/TelephoneAdvisoryReportsNumberCard.vue'
 import ConsultationDeskReportsNumberCard from '@/components/cards/ConsultationDeskReportsNumberCard.vue'
-import MetroCard from '@/components/cards/MetroCard.vue'
 import AgencyCard from '@/components/cards/AgencyCard.vue'
 
 export default {
@@ -64,7 +62,6 @@ export default {
     InspectionPersonsNumberCard,
     TelephoneAdvisoryReportsNumberCard,
     ConsultationDeskReportsNumberCard,
-    MetroCard,
     AgencyCard
   },
   data() {
@@ -102,10 +99,6 @@ export default {
         title = this.$t('新型コロナ受診相談窓口相談件数')
         updatedAt = Data.querents.date
         break
-      case 'predicted-number-of-toei-subway-passengers':
-        title = this.$t('都営地下鉄の利用者数の推移')
-        updatedAt = MetroData.date
-        break
       case 'agency':
         title = this.$t('都庁来庁者数の推移')
         updatedAt = agencyData.date
diff --git a/pages/index.vue b/pages/index.vue
index 1ae226f8..108bd645 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -31,7 +31,6 @@
       <tested-number-card />
       <telephone-advisory-reports-number-card />
       <consultation-desk-reports-number-card />
-      <metro-card />
       <agency-card />
     </v-row>
     <v-divider />
@@ -54,7 +53,6 @@ import TestedNumberCard from '@/components/cards/TestedNumberCard.vue'
 import InspectionPersonsNumberCard from '@/components/cards/InspectionPersonsNumberCard.vue'
 import TelephoneAdvisoryReportsNumberCard from '@/components/cards/TelephoneAdvisoryReportsNumberCard.vue'
 import ConsultationDeskReportsNumberCard from '@/components/cards/ConsultationDeskReportsNumberCard.vue'
-import MetroCard from '@/components/cards/MetroCard.vue'
 import AgencyCard from '@/components/cards/AgencyCard.vue'
 import { convertDatetimeToISO8601Format } from '@/utils/formatDate'
 
@@ -71,7 +69,6 @@ export default Vue.extend({
     InspectionPersonsNumberCard,
     TelephoneAdvisoryReportsNumberCard,
     ConsultationDeskReportsNumberCard,
-    MetroCard,
     AgencyCard
   },
   data() {
@@ -79,7 +76,7 @@ export default Vue.extend({
       Data,
       headerItem: {
         icon: 'mdi-chart-timeline-variant',
-        title: this.$t('都内の最新感染動向')
+        title: this.$t('県内の最新感染動向')
       },
       newsItems: News.newsItems
     }
@@ -92,7 +89,7 @@ export default Vue.extend({
   },
   head(): MetaInfo {
     return {
-      title: this.$t('都内の最新感染動向') as string
+      title: this.$t('県内の最新感染動向') as string
     }
   }
 })