Refactoring

yubinbango · Jun 30, 2016 · d30bcd1 · d30bcd1
1 parent ae4d13f
commit d30bcd1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 23 deletions.
diff --git a/yubinbango-core.js b/yubinbango-core.js
diff --git a/yubinbango-core.js.map b/yubinbango-core.js.map
diff --git a/yubinbango-core.ts b/yubinbango-core.ts
@@ -25,13 +25,7 @@ module YubinBango {
         if (yubin7) {
           this.getAddr(yubin7, callback);
         } else {
-          callback({
-            'region_id': '',
-            'region': '',
-            'locality': '',
-            'street': '',
-            'extended': ''
-          });
+          callback(this.addrDic());
         }
       }
     }
@@ -40,23 +34,20 @@ module YubinBango {
         return val;
       }
     }
+    addrDic(region_id = '', region = '', locality = '', street = '', extended = ''):{[key:string]: string} {
+      return {
+        'region_id': region_id,
+        'region': region,
+        'locality': locality,
+        'street': street,
+        'extended': extended
+      };
+    }
     selectAddr(addr: string[]):{[key:string]: string} {
       if (addr && addr[0] && addr[1]) {
-        return {
-          'region_id': addr[0],
-          'region': this.REGION[addr[0]],
-          'locality': addr[1],
-          'street': addr[2],
-          'extended': addr[3]
-        };
+        return this.addrDic(addr[0],this.REGION[addr[0]],addr[1],addr[2],addr[3])
       } else {
-        return {
-          'region_id': '',
-          'region': '',
-          'locality': '',
-          'street': '',
-          'extended': ''
-        };
+        return this.addrDic()
       }
     }
     jsonp(url: string, fn) {