1.5.1 - fix filter bug for search feature

earthchie · Jul 14, 2017 · 4e5f496 · 4e5f496
1 parent 62cd637
commit 4e5f496
Show file tree

Hide file tree

Showing 21 changed files with 17 additions and 16 deletions.
diff --git a/.editorconfig b/.editorconfig
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/README.md b/README.md
diff --git a/index.html b/index.html
@@ -110,7 +110,7 @@ <h2>ใหม่! โหมดค้นหา</h2>
     <script type="text/javascript" src="./jquery.Thailand.js/dependencies/JQL.min.js"></script>
     <script type="text/javascript" src="./jquery.Thailand.js/dependencies/typeahead.bundle.js"></script>
 
-    <script type="text/javascript" src="./jquery.Thailand.js/dist/jquery.Thailand.min.js"></script>
+    <script type="text/javascript" src="./jquery.Thailand.js/src/jquery.Thailand.js"></script>
 
     <script type="text/javascript">
         /******************\

diff --git a/jquery.Thailand.js/database/db.json b/jquery.Thailand.js/database/db.json
diff --git a/jquery.Thailand.js/database/db.zip b/jquery.Thailand.js/database/db.zip
diff --git a/jquery.Thailand.js/database/geodb.json b/jquery.Thailand.js/database/geodb.json
diff --git a/jquery.Thailand.js/database/geodb.zip b/jquery.Thailand.js/database/geodb.zip
diff --git a/jquery.Thailand.js/database/raw_database/database.json b/jquery.Thailand.js/database/raw_database/database.json
diff --git a/jquery.Thailand.js/database/raw_database/database.xls b/jquery.Thailand.js/database/raw_database/database.xls
diff --git a/jquery.Thailand.js/database/tools/convert.js b/jquery.Thailand.js/database/tools/convert.js
diff --git a/jquery.Thailand.js/database/tools/words.txt b/jquery.Thailand.js/database/tools/words.txt
diff --git a/jquery.Thailand.js/dependencies/JQL.min.js b/jquery.Thailand.js/dependencies/JQL.min.js
diff --git a/jquery.Thailand.js/dependencies/typeahead.bundle.js b/jquery.Thailand.js/dependencies/typeahead.bundle.js
diff --git a/jquery.Thailand.js/dependencies/zip.js/inflate.js b/jquery.Thailand.js/dependencies/zip.js/inflate.js
diff --git a/jquery.Thailand.js/dependencies/zip.js/z-worker.js b/jquery.Thailand.js/dependencies/zip.js/z-worker.js
diff --git a/jquery.Thailand.js/dependencies/zip.js/zip.js b/jquery.Thailand.js/dependencies/zip.js/zip.js
diff --git a/jquery.Thailand.js/dist/jquery.Thailand.min.css b/jquery.Thailand.js/dist/jquery.Thailand.min.css
diff --git a/jquery.Thailand.js/dist/jquery.Thailand.min.js b/jquery.Thailand.js/dist/jquery.Thailand.min.js
diff --git a/jquery.Thailand.js/src/jquery.Thailand.js b/jquery.Thailand.js/src/jquery.Thailand.js
@@ -1,7 +1,7 @@
 /**
  * @name jquery.Thailand.js
- * @version 1.5.0
- * @update Apr 20, 2017
+ * @version 1.5.1
+ * @update Jul 14, 2017
  * @website https://github.com/earthchie/jquery.Thailand.js
  * @license WTFPL v.2 - http://www.wtfpl.net/
  *
@@ -285,18 +285,17 @@ $.Thailand = function (options) {
                         i;
                     try {
                         possibles = new JQL(possibles
-                            .concat(DB.select('*').where('district').match(str).fetch())
-                            .concat(DB.select('*').where('amphoe').match(str).fetch())
-                            .concat(DB.select('*').where('province').match(str).fetch())
                             .concat(DB.select('*').where('zipcode').match(str).fetch())
-                            .filter(function (self, index, parent) { // remove duplicated data
-                                for (i = 0; i < parent.length; i = i + 1) {
-                                    if (index !== i && parent[i].amphoe === self.amphoe && parent[i].district === self.district) {
-                                        return false;
-                                    }
-                                }
-                                return true;
+                            .concat(DB.select('*').where('province').match(str).fetch())
+                            .concat(DB.select('*').where('amphoe').match(str).fetch())
+                            .concat(DB.select('*').where('district').match(str).fetch())
+                            .map(function(item){
+                                return JSON.stringify(item);
+                            }).filter(function(item, pos, self){
+                                return self.indexOf(item) == pos;
                             }).map(function (self) { // give a likely score, will use to sort data later
+
+                                self = JSON.parse(self);
                                 self.likely = [
                                     similar_text(str, self.district) * 5,
                                     similar_text(str, self.amphoe.replace(/^เมือง/, '')) * 3,
@@ -305,7 +304,9 @@ $.Thailand = function (options) {
                                 ].reduce(function (a, b) {
                                     return Math.max(a, b);
                                 });
+
                                 return self;
+
                             })).select('*').orderBy('likely desc').fetch();
                     } catch (e) {}
 

diff --git a/jquery.Thailand.js/src/jquery.Thailand.less b/jquery.Thailand.js/src/jquery.Thailand.less