From bac79dfdfcdb149d798630755d8716fa9aaa0ff2 Mon Sep 17 00:00:00 2001
From: Brian Leung <brianleung1017@gmail.com>
Date: Thu, 27 Jun 2019 01:16:07 +0800
Subject: [PATCH] update frontend to show 15 and 19 dc lookup result

---
 web/src/components/ResultCard.vue      | 12 ++++++------
 web/src/pages/TableAddressSearcher.vue | 23 +++++++++++++----------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/web/src/components/ResultCard.vue b/web/src/components/ResultCard.vue
index 3e9c42c..fa0ec51 100644
--- a/web/src/components/ResultCard.vue
+++ b/web/src/components/ResultCard.vue
@@ -36,19 +36,19 @@
                 <span>地區</span>
               </v-list-tile-content>
               <v-list-tile-content class="align-end">
-                <span>{{ district.esubdistrict }}</span>
-                <span>{{ district.csubdistrict }}</span>
+                <span>{{ district['2015'].esubdistrict }}</span>
+                <span>{{ district['2015'].csubdistrict }}</span>
               </v-list-tile-content>
             </v-list-tile>
             <v-divider></v-divider>
             <v-list-tile>
               <v-list-tile-content>
-                <span>District Council Constituency Area</span>
-                <span>區議會選區</span>
+                <span>District Council Constituency Area (2019)</span>
+                <span>區議會選區 (2019)</span>
               </v-list-tile-content>
               <v-list-tile-content class="align-end">
-                <span>{{ district.ename }}</span>
-                <span>{{ district.cname }}</span>
+                <span>{{ district['2019'].ename }}</span>
+                <span>{{ district['2019'].cname }} ({{ district['2019'].code }})</span>
               </v-list-tile-content>
             </v-list-tile>
             <v-divider></v-divider>
diff --git a/web/src/pages/TableAddressSearcher.vue b/web/src/pages/TableAddressSearcher.vue
index dfc4b35..d112fbc 100644
--- a/web/src/pages/TableAddressSearcher.vue
+++ b/web/src/pages/TableAddressSearcher.vue
@@ -113,8 +113,12 @@ export default {
           value: "subdistrict_name"
         },
         {
-          text: "區議會選區",
-          value: "dc_name"
+          text: "區議會選區(2015)",
+          value: "dc_name_15"
+        },
+        {
+          text: "區議會選區(2019)",
+          value: "dc_name_19"
         },
         {
           text: "緯度",
@@ -146,17 +150,16 @@ export default {
       // TODO: english address
       const results = this.results.map((searchResults, index) => {
         const result = searchResults[0];
+        const dcLookupResult = dclookup.dcNameFromCoordinates(
+            result.coordinate().lat,
+            result.coordinate().lng
+          )
         let json = {
           address: this.addressesToSearch[index],
           full_address: result.fullAddress("chi"),
-          subdistrict_name: dclookup.dcNameFromCoordinates(
-            result.coordinate().lat,
-            result.coordinate().lng
-          ).csubdistrict,
-          dc_name: dclookup.dcNameFromCoordinates(
-            result.coordinate().lat,
-            result.coordinate().lng
-          ).cname,
+          subdistrict_name: dcLookupResult['2015'].csubdistrict,
+          dc_name_15: `${dcLookupResult['2015'].cname} (${dcLookupResult['2015'].code})`,
+          dc_name_19: `${dcLookupResult['2019'].cname} (${dcLookupResult['2019'].code})`,
           lat: result.coordinate().lat,
           lng: result.coordinate().lng
         };