From 7febdd792729adbb5d42da26d0b42d4ac8c5e488 Mon Sep 17 00:00:00 2001
From: macropygia <3162324+macropygia@users.noreply.github.com>
Date: Fri, 27 Mar 2020 02:21:59 +0900
Subject: [PATCH] =?UTF-8?q?TokyoCityMapCard=20=E3=82=92=20largemap.vue=20?=
 =?UTF-8?q?=E3=81=8B=E3=82=89=E5=88=86=E9=9B=A2=E3=81=97=E5=8D=98=E7=8B=AC?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E7=94=A8=E3=81=AE=E8=A8=AD=E5=AE=9A=E3=82=92?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/cards/TokyoCityMapCard.vue | 33 +++++++++++++++++++++++++++
 nuxt.config.ts                        |  3 ++-
 pages/cards/_card.vue                 |  7 +++++-
 pages/largemap.vue                    | 28 +++--------------------
 4 files changed, 44 insertions(+), 27 deletions(-)
 create mode 100644 components/cards/TokyoCityMapCard.vue

diff --git a/components/cards/TokyoCityMapCard.vue b/components/cards/TokyoCityMapCard.vue
new file mode 100644
index 00000000..e62016c0
--- /dev/null
+++ b/components/cards/TokyoCityMapCard.vue
@@ -0,0 +1,33 @@
+<template>
+  <v-col cols="12" md="12" class="DataCard">
+    <map-card
+      :title="''"
+      :caption="$t('※7:30〜8:30の平均値')"
+      :title-id="'tokyo-city-heatmap'"
+      :chart-id="'tokyo-city-chart'"
+      :map-id="'tokyo-city-map'"
+      :initial-bounds="[
+        [139.695239, 35.676437],
+        [139.773774, 35.694493]
+      ]"
+      :map-height="640"
+      :map-options="{ interactive: true }"
+      :unit="'人'"
+      :url="'https://ds.yahoo.co.jp/datapolicy/'"
+      :source-link-header="$t('※本データは2020年3月31日までの掲載となります')"
+      :heatmap-legend="[20000, 40000, 60000]"
+      :link-string="$t('ヤフー・データソリューション')"
+      :date="''"
+    />
+  </v-col>
+</template>
+
+<script>
+import MapCard from '@/components/MapCard.vue'
+
+export default {
+  components: {
+    MapCard
+  }
+}
+</script>
diff --git a/nuxt.config.ts b/nuxt.config.ts
index f741ede1..77132906 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -175,7 +175,8 @@ const config: Configuration = {
         '/cards/shinjuku-visitors',
         '/cards/chiyoda-visitors',
         '/cards/shinjuku-st-heatmap',
-        '/cards/tokyo-st-heatmap'
+        '/cards/tokyo-st-heatmap',
+        '/cards/tokyo-city-heatmap'
       ]
 
       const routes: string[] = []
diff --git a/pages/cards/_card.vue b/pages/cards/_card.vue
index 68860ac3..96064db6 100644
--- a/pages/cards/_card.vue
+++ b/pages/cards/_card.vue
@@ -48,6 +48,9 @@
     <tokyo-st-map-card
       v-else-if="this.$route.params.card == 'tokyo-st-heatmap'"
     />
+    <tokyo-city-map-card
+      v-else-if="this.$route.params.card == 'tokyo-city-heatmap'"
+    />
   </div>
 </template>
 
@@ -71,6 +74,7 @@ import ShinjukuVisitorsCard from '@/components/cards/ShinjukuVisitorsCard.vue'
 import ChiyodaVisitorsCard from '@/components/cards/ChiyodaVisitorsCard.vue'
 import ShinjukuStMapCard from '@/components/cards/ShinjukuStMapCard.vue'
 import TokyoStMapCard from '@/components/cards/TokyoStMapCard.vue'
+import TokyoCityMapCard from '@/components/cards/TokyoCityMapCard.vue'
 
 export default {
   components: {
@@ -87,7 +91,8 @@ export default {
     ShinjukuVisitorsCard,
     ChiyodaVisitorsCard,
     ShinjukuStMapCard,
-    TokyoStMapCard
+    TokyoStMapCard,
+    TokyoCityMapCard
   },
   data() {
     let title, updatedAt
diff --git a/pages/largemap.vue b/pages/largemap.vue
index ee782fd2..5affab6b 100644
--- a/pages/largemap.vue
+++ b/pages/largemap.vue
@@ -4,29 +4,7 @@
       {{ headerItem.title }}
     </page-header>
     <v-row class="DataBlock">
-      <v-col cols="12" md="12" class="DataCard">
-        <map-card
-          :title="''"
-          :caption="$t('※7:30〜8:30の平均値')"
-          :title-id="'tokyo-city-title'"
-          :chart-id="'tokyo-city-chart'"
-          :map-id="'tokyo-city-map'"
-          :initial-bounds="[
-            [139.695239, 35.676437],
-            [139.773774, 35.694493]
-          ]"
-          :map-height="640"
-          :map-options="{ interactive: true }"
-          :unit="'人'"
-          :url="'https://ds.yahoo.co.jp/datapolicy/'"
-          :source-link-header="
-            $t('※本データは2020年3月31日までの掲載となります')
-          "
-          :heatmap-legend="[20000, 40000, 60000]"
-          :link-string="$t('ヤフー・データソリューション')"
-          :date="''"
-        />
-      </v-col>
+      <tokyo-city-map-card />
     </v-row>
   </div>
 </template>
@@ -37,12 +15,12 @@ import { MetaInfo } from 'vue-meta'
 import PageHeader from '@/components/PageHeader.vue'
 import Data from '@/data/data.json'
 import News from '@/data/news.json'
-import MapCard from '@/components/MapCard.vue'
+import TokyoCityMapCard from '@/components/cards/TokyoCityMapCard.vue'
 
 export default Vue.extend({
   components: {
     PageHeader,
-    MapCard
+    TokyoCityMapCard
   },
   data() {
     const data = {