memelyfe · Zeromark30 · Jul 17, 2016 · Jul 17, 2016 · Jul 17, 2016 · Jul 17, 2016
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
-data.json
 config.json
-
+data.json
 
 # Byte-compiled / optimized / DLL files
 __pycache__/
@@ -91,3 +90,4 @@ ENV/
 
 # Rope project settings
 .ropeproject
+run_private.bat
diff --git a/data.json b/data.json
@@ -1,3 +1,3 @@
-[
+{
 
-]
+}
diff --git a/favicon.png b/favicon.png
diff --git a/index.html b/index.html
@@ -1,9 +1,10 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>PokeScanner</title>
+    <title>PokéScanner</title>
     <meta name="viewport" content="initial-scale=1.0, user-scalable=no">
     <meta charset="utf-8">
+    <link rel="icon" type="image/png" href="favicon.png" sizes="192x192">
     <style>
       html, body {
         height: 100%;
@@ -19,11 +20,11 @@
         margin: 5px;
         font-size: 12px;
         font-family: Arial, sans-serif;
-        height: 255px;
-        width: 150px;
+        height: 28em;
+        width: 28ex;
       }
       #legend div {
-       height: 210px;
+       height: 24em;
        overflow: auto;
       }
       #legend li {
@@ -72,100 +73,160 @@
         return (date.getUTCMinutes() > 0 ? date.getUTCMinutes() + "m " : "") + date.getUTCSeconds() + "s";
       }
 
-      function getImage(p) {
-        var name = p.name;
-        if (p.name == "Nidoran F") {
-          name = "Nidoran";
-        }
-        else if (name == "Nidoran M") {
-          name = "Nidorano";
-        }
-        return "http://icons.iconarchive.com/icons/hektakun/pokemon/72/" + pad(p.id, 3) + "-" + cap(name) + "-icon.png";
-      }
-
       function toggleLayer(checked, pkmn) {
         if (checked) {
-            hidden_layers.push(pkmn);
+            hidden_layers[pkmn] = 1;
         } else {
-            var index = hidden_layers.indexOf(pkmn);
-            if(index > -1){
-              hidden_layers.splice(index,1);
-            }
+            delete hidden_layers[pkmn];
         }
         refreshData();
       };
+
+      function pkmn_label(pkmn) {
+        var elemname = "#" + pkmn.id + ". " + pkmn.name;
+        if (pkmn.id == -1) {
+          elemname = "(player)";
+        }
+        return elemname;
+      }
 
 
+      var preLength = -1;
+      var pkmn_size, pkmn_anchor;
       function refreshData() {
-        getFile("data.json", true, function(response) {
+        getFile("data.json?t=" + (new Date()).getTime(), true, function(response) {
+          if ('undefined' == typeof pkmn_size) {
+            // Maps API might not be loaded before the first refresh
+            pkmn_size = new google.maps.Size(30, 30);
+            pkmn_anchor = new google.maps.Point(15, 15);
+          }
+
           console.log("Refreshing data...");
-          var preLength = data.length;
           data = JSON.parse(response);
 
-          if (preLength != data.length) {
+          if (preLength != response.length) {
+            preLength = response.length;
             // Clear markers
-            for (var i = 0; i < markers.length; i++) {
-              listeners[i].a.remove();
-              listeners[i].b.remove();
-              markers[i].setMap(null);
+            for (var pokehash in markers) {
+              if (!markers.hasOwnProperty(pokehash)) {
+                continue;
+              }
+              if (data.hasOwnProperty(pokehash) && hidden_layers[data[pokehash].id] != 1) {
+                continue;
+              }
+              var marker = markers[pokehash];
+              marker.listeners[0].remove();
+              marker.listeners[1].remove();
+              marker.setMap(null);
+
+              delete markers[pokehash];
             }
-            listeners = [];
-            markers = [];
 
             // Add updated markers
-            for (var i = 0; i < data.length; i++) {
-              var p = data[i];
+            var numPkmnType = {};
+            for (var pokehash in data) {
+              if (!data.hasOwnProperty(pokehash)) {
+                // inherited, not interesting to us
+                continue;
+              }
+              var p = data[pokehash];
+              if (numPkmnType.hasOwnProperty(p.id)) {
+                numPkmnType[p.id] += 1;
+              } else {
+                numPkmnType[p.id] = 1;
+              }
               if (!updated) {
                 map.setZoom(16);
                 map.panTo({lat: p.lat, lng: p.lng});
                 updated = true;
               }
 
-              if(hidden_layers.indexOf(p.name) == -1){
+              if (layers.findIndex(function(v){ return v.id == p.id; }) == -1) {
+                console.log("Adding layer " + pkmn_label(p));
+                layers.push(p);
+                layers.sort(function(a, b){ return a.id - b.id; });
+                document.getElementById('pknum').innerHTML = " (" + (layers.length - 1) + ")";
+              }
+
+              if (hidden_layers[p.id] != 1) {
                 // Pokemon not hidden
-                if(layers.indexOf(p.name) == -1){
-                  layers.push(p.name);
+
+                p.timeleft = p.expiry - p.timestamp;
+                timeleft_strify = p.timeleft
+                p.timeleft_str = ''
+                if (timeleft_strify > 86400) {
+                    p.timeleft_str += Math.floor(timeleft_strify / 86400) + " days, ";
+                    timeleft_strify %= 86400;
+                }
+                if (timeleft_strify > 3600) {
+                    p.timeleft_str += Math.floor(timeleft_strify / 3600) + "h";
+                    timeleft_strify %= 3600;
+                }
+                if (timeleft_strify > 60) {
+                    p.timeleft_str += Math.floor(timeleft_strify / 60) + "m";
+                    timeleft_strify %= 60;
                 }
-                console.log("Adding marker " + p.name);
+                p.timeleft_str += Math.floor(timeleft_strify) + "s";
+
+                detail_str = "<b>" + pkmn_label(p) + "</b><br>Time left: " + p.timeleft_str + "<br>Lat: " + p.lat + "<br>Long: " + p.lng;
+
+                if (markers.hasOwnProperty(pokehash)) {
+                  markers[pokehash].details = detail_str;
+                  continue;
+                }
+
+                console.log("Adding marker " + pkmn_label(p));
 
                 var infowindow = new google.maps.InfoWindow({
                 });
 
-                var image = getImage(p);
+                var image = "https://raw.githubusercontent.com/AHAAAAAAA/PokemonGo-Map/master/static/icons/" + p.id + ".png";
+                if (p.id == -1) {
+                    //image = 'https://agents.farmers.com/images/walking.png';
+                    image = null;
+                }
 
                 var marker = new google.maps.Marker({
                   map: map,
                   position: {lat: p.lat, lng: p.lng},
                   label: "",
-                  title: "<b>"+p.name+"</b><br>Time left: " + formatSeconds(p.timeleft) + "<br>Lat: "+p.lat+"<br>Long: "+p.lng,
-                  icon: image
+                  details: detail_str,
+                  icon: {
+                    scaledSize: pkmn_size,
+                    anchor: pkmn_anchor,
+                    url: image
+                  }
                 });
 
-                var listenerPair = {
-                  a: google.maps.event.addListener(marker, 'mouseover', function() {
-                    infowindow.setContent(this.title);
+                var listenerPair = [
+                  google.maps.event.addListener(marker, 'mouseover', function() {
+                    infowindow.setContent(this.details);
                     infowindow.open(map, this);
                   }),
 
-                  b: google.maps.event.addListener(marker, 'mouseout', function() {
+                  google.maps.event.addListener(marker, 'mouseout', function() {
                     infowindow.close(map, this);
                   })
-                };
+                ];
 
-                listeners.push(listenerPair);
-                markers.push(marker);
+                marker.listeners = listenerPair;
+                markers[pokehash] = marker;
               }
             }
 
             // Draw layer manager
             var list = document.getElementById('legend-list');
             var content = [];
-            for (var id in layers) {
-              var pkmn = layers[id];
-              var checked = hidden_layers.indexOf(pkmn) != -1 ? "checked": "";
-              content.push("<li><input type='checkbox' id='" + pkmn +  "'" +
-              " onclick='toggleLayer(this.checked, this.id)' "+checked+"\/>" +
-              pkmn + "<\/li>");
+            for (var i = 0; i < layers.length; ++i) {
+              var pkmn = layers[i];
+              if (!numPkmnType.hasOwnProperty(pkmn.id)) {
+                numPkmnType[pkmn.id] = 0;
+              }
+              var checked = hidden_layers[pkmn.id] == 1 ? "checked": "";
+              var elemname = pkmn_label(pkmn);
+              content.push("<li><input type='checkbox' id='hide_" + pkmn.id +  "'" +
+              " onclick='toggleLayer(this.checked, this.id.substr(5))' "+checked+"\/>" +
+              elemname + " (" + numPkmnType[pkmn.id] + ")" + "<\/li>");
             }
             list.innerHTML = content.join('');
           }
@@ -174,17 +235,19 @@
 
       data = {};
       map = null;
-      markers = [];
-      listeners = [];
-      hidden_layers = [];
+      markers = {};
+      hidden_layers = {};
       layers = [];
       updated = false;
 
 
       getFile("config.json", false, function(configData) {
-        config = JSON.parse(configData)
+        config = JSON.parse(configData);
         console.log("Using api key: " + config.GOOGLE_MAPS_API_KEY);
         loadScript("https://maps.googleapis.com/maps/api/js?key=" + config.GOOGLE_MAPS_API_KEY + "&libraries=drawing&callback=initMap");
+        for (var i = 0; i < config.hidden_pkmn.length; ++i) {
+          hidden_layers[config.hidden_pkmn[i]] = 1;
+        }
       });
 
       function initMap() {
@@ -198,7 +261,7 @@
         var legend = document.createElement('div');
         legend.id = 'legend';
         var content = [];
-        content.push('<h3>Hide Pokemon</h3>');
+        content.push('<h3>Hide Pokemon<span id="pknum"></span></h3>');
         content.push('<div id="legend-list"></div>');
         legend.innerHTML = content.join('');
         legend.index = 1;
-Original file line number
+Diff line change
@@ -1,3 +1,3 @@
-    [
+    {
-    ]
+    }