WEBUI: adding delete API

bower.json

@@ -8,6 +8,7 @@
     "ol3": "ol3-bower#^3.14.2",
     "jquery-ui": "^1.11.4",
     "jquery": "^2.2.3",
-    "angular-chart.js": "^0.10.2"
+    "angular-chart.js": "^0.10.2",
+    "font-awesome": "fontawesome#^4.6.3"
   }
 }

scanmap.py

@@ -625,6 +625,14 @@ def update_bt_station(self, station):
         return True
       return False
 
+    def delete(self, bssid):
+      q = 'delete from wifis where bssid = "%s"'%bssid
+      self.query(q)
+      q = 'delete from stations where bssid = "%s"'%bssid
+      self.query(q)
+      q = 'delete from bt_stations where bssid = "%s"'%bssid
+      self.query(q)
+
     def update(self, wifi):
         if  wifi['essid'] == 'encoding_error':
           return False
@@ -637,7 +645,7 @@ def update(self, wifi):
         if(wifi.has_key('date')):
           date_str = '"%s"'%wifi['date']
 
-        q = '''select * from wifis where bssid="%s" and essid="%s"'''%(wifi["bssid"], wifi["essid"])
+        q = '''select * from wifis where bssid="%s" and ( essid="%s" or bssid == "" )'''%(wifi["bssid"], wifi["essid"])
         res = self.fetchone(q)
         if res is None:
             gps = 0
@@ -783,12 +791,12 @@ def parseIwlistOutput(self, data):
 
 
     def getWifiPosition(self, wifis):
-      bssid = []
+      where = []
       if len(wifis) < 3:
         return None
       for n in wifis:
-        bssid.append("\"%s\""%n["bssid"])
-      q = "select sum(-signal*latitude)/sum(-signal), sum(-signal*longitude)/sum(-signal), max(latitude)-min(latitude), max(longitude)-min(longitude) from wifis where bssid in ( %s )"%(','.join(bssid))
+        where.append('( bssid = "%s" and essid = "%s")'%(n["bssid"],n["essid"]))
+      q = "select sum(-signal*latitude)/sum(-signal), sum(-signal*longitude)/sum(-signal), max(latitude)-min(latitude), max(longitude)-min(longitude) from wifis where %s"%(' or '.join(where))
       res = self.fetchone(q)
       if res is not None:
         if res[0] is None:

src/WebUi.py

@@ -274,7 +274,13 @@ def _get_sync(self, hostname):
       sync = self.server.app.synchronizer.get_sync(hostname)
       self.wfile.write(json.dumps(sync, ensure_ascii=False))
 
-
+    def _get_delete(self, bssid):
+      self.send_response(200)
+      self.send_header('Content-type','application/json')
+      self.send_header('Access-Control-Allow-Origin','*')
+      self.end_headers()
+      delete = self.server.app.delete(bssid)
+      self.wfile.write(json.dumps(delete, ensure_ascii=False))
 
     def do_GET(self):
         path,params,args = self._parse_url()
@@ -323,6 +329,10 @@ def do_GET(self):
           if params is not None:
               params = params.split('hostname=')[1]
           return self._get_sync(params)
+        elif len(args) == 1 and args[0] == 'delete.json':
+          if params is not None:
+              params = params.split('bssid=')[1]
+          return self._get_delete(params)
         else:
             return self._get_file(path)
 

www/index.html

@@ -12,6 +12,7 @@
 <script src="/js/app.js"></script>
 <script src="/js/index/controller.js"></script>
 <link rel="stylesheet" href="/js/components/bootstrap/dist/css/bootstrap.min.css" />
+<link rel="stylesheet" href="/js/components/font-awesome/css/font-awesome.min.css" />
 <link rel="stylesheet" href="/css/main.css" />
 <link rel="stylesheet" href="/css/index.css" />
 </head> 

www/js/index/controller.js

@@ -249,7 +249,7 @@
               if(wifis[i]["encryption"] == 0) {
                 encryption = "open";
               }
-              html += "<li class="+encryption+" >"+ wifis[i]["essid"] +"</li>";
+              html += '<li class="'+encryption+'" >'+ wifis[i]["essid"] + ' ' + wifis[i]["bssid"] +' <a class="fa fa-minus-circle" href="#"  onclick="delete(\"'+wifis[i]["bssid"]+'\",\"'+wifis[i]["essid"]+'\")" ></a><hr/></li>';
             }
           } else {
             if ('station' in feature.getProperties()) {