Update everything

.gitignore

+/vendor/
+/node_modules/

app.js

@@ -11,7 +11,7 @@ app.all('/', function(req, res, next) {
   res.header("Access-Control-Allow-Headers", "X-Requested-With");
   next();
  });
-app.use(express.static('js'))
+app.use(express.static('assets'));
 app.get('/', function(req,res) {
   res.sendFile(path.join(__dirname+'/index.html'));
 });

assets/js/google.js

+
+function initMap() {
+
+    var promises = [];
+    var jsons = [];
+
+    var data = [
+      {
+          DEV_EUI: "0004a30b001a9867",
+          location: "Radlická 180/50, Smíchov, Prague"
+      },        {
+                  //DEV_EUI: "0004a30b001a9867",
+                  location: "Radlická 180/49, Smíchov, Prague"
+              },
+    ];
+
+/*
+    const urls = [
+        'https://maps.googleapis.com/maps/api/geocode/json?address=Radlická+180/50,+Smíchov,+Prague&key=AIzaSyCE4hiDmVxNukCcYOFSYoUX2-lEpPmwDSI',
+        'https://maps.googleapis.com/maps/api/geocode/json?address=Radlick%C3%A1+180/49,+Sm%C3%ADchov,+Prague&key=AIzaSyCE4hiDmVxNukCcYOFSYoUX2-lEpPmwDSI'
+    ];
+
+*/
+    for(var i = 0; i < data.length; i++)
+    {
+        promises.push(
+            fetch('https://maps.googleapis.com/maps/api/geocode/json?address=' + data[i].location.replace(" ", "+") + '&key=AIzaSyCE4hiDmVxNukCcYOFSYoUX2-lEpPmwDSI')
+        );
+    }
+
+    Promise
+        .all(promises)
+        .then(function(response) {
+
+            //console.log(response[0].json());
+            for(var j = 0; j < response.length; j++) {
+
+                jsons.push(response[j].json());
+            }
+
+            return Promise.all(jsons);
+        })
+        .then(function(json) {
+
+            for(jsi = 0; jsi < json.length; jsi++) {
+                data[jsi].cords = [json[jsi].results[0].geometry.location.lat, json[jsi].results[0].geometry.location.lng];
+            }
+
+        })
+        .then(function (/*locations*/) {
+
+            const iconBase = './imgs/icons/';
+
+            var icons = {
+                emptycan: {
+                    icon: iconBase + 'emptycan.png'
+                },
+                almostemptycan: {
+                    icon: iconBase + 'almostemptycan.png'
+                },
+                almostfullcan: {
+                    icon: iconBase + 'almostfullcan.png'
+                },
+                fullcan: {
+                    icon: iconBase + 'fullcan.png'
+                }
+            };
+
+            function addMarker(feature) {
+                var marker = new google.maps.Marker({
+                    position: feature.position,
+                    icon: icons[feature.type].icon,
+                    map: map
+                });
+            }
+
+            var uluru = {lat: data[0].cords[0], lng: data[0].cords[1]};
+            var map = new google.maps.Map(document.getElementById('app'), {
+                zoom: 16,
+                center: uluru
+            });
+
+            var features = [];
+var dataPromises = [];
+
+            for(loc = 0; loc < data.length; loc++){
+                features.push(
+                    {
+                        position: new google.maps.LatLng(data[loc].cords[0], data[loc].cords[1]),
+                        //tresh: send.getPayload(data[loc].DEV_EUI)
+                    }
+                );
+                dataPromises.push(send.getPayload(data[loc].DEV_EUI));
+
+            }
+
+            Promise
+            .all(dataPromises)
+            .then(function(response){
+
+              var results = [];
+              for(var ar = 0; ar < response.length-1; ar++){
+
+                var icon;
+                switch (response[ar].payloadHex){
+                    case "00":
+                        icon = "emptycan";
+                        break;
+                    case "01":
+                        icon = "almostemptycan";
+                        break;
+                    case "02":
+                        icon = "almostfullcan";
+                        break;
+                    case "03":
+                        icon = "fullcan";
+                        break;
+              }
+              features[ar].type = icon;
+
+              addMarker(features[ar]);
+              }
+            })
+            features[1].type = "emptycan";
+            addMarker(features[1]);
+
+
+
+        })
+
+}

js/pripojme.js → assets/js/pripojme.js

@@ -4,11 +4,11 @@ send.config = {
   mode: 'cors'
 };
 send.getPayload = function (eui) {
-  fetch('/api/0004A30B001A9867', send.config)
+
+  return fetch('/api/0004A30B001A9867', send.config)
     .then(function (response) {
         return response.json();
     })
-    .then(json => console.log(json));
 };
 send.getDeviceData = function (devideEUI) {
   fetch('')

assets/js/utils.js

+function getUrl(api, command, token) {
+    return api + command + '?token' + token;
+}

index.html

@@ -17,9 +17,9 @@
   <body>
 
     <div id='app'></div>
-    <script src='utils.js'></script>
-    <script src='google.js'></script>
-    <script src='pripojme.js'></script>
+    <script src='js/utils.js'></script>
+    <script src='js/google.js'></script>
+    <script src='js/pripojme.js'></script>
     <script async defer
             src="https://maps.googleapis.com/maps/api/js?key=AIzaSyCE4hiDmVxNukCcYOFSYoUX2-lEpPmwDSI&callback=initMap">
     </script>

js/google.js

 
 function initMap() {
 
+
     var promises = [];
     var jsons = [];
 
     var data = [
-        {
-            DEV_EUI: "0004a30b001a9867",
-            location: "Radlická 180/50, Smíchov, Prague"
-        },
-        {
-            //DEV_EUI: "0004a30b001a9867",
-            location: "Radlická 180/49, Smíchov, Prague"
-        }
+      {
+          DEV_EUI: "0004a30b001a9867",
+          location: "Radlická 180/50, Smíchov, Prague"
+      },        {
+                  //DEV_EUI: "0004a30b001a9867",
+                  location: "Radlická 180/50, Smíchov, Prague"
+              },
+
     ];
 
 /*
@@ -82,45 +83,48 @@ function initMap() {
             });
 
             var features = [];
+var dataPromises = [];
 
             for(loc = 0; loc < data.length; loc++){
                 features.push(
                     {
                         position: new google.maps.LatLng(data[loc].cords[0], data[loc].cords[1]),
+                        //tresh: send.getPayload(data[loc].DEV_EUI)
                     }
                 );
-            }
+            dataPromises.push(send.getPayload(data[loc].DEV_EUI));
 
-            var icon;
-
-            for (var i = 0, feature; feature = features[i]; i++) {
-
-                var tresh = ...;
+            }
 
-                switch (tresh){
-                    case 00:
+            Promise
+            .all(dataPromises)
+            .then(function(response){
+              var results = [];
+              for(var ar = 0; ar < response.length; ar++){
+                console.log(response[ar]);
+                var icon;
+                switch (response[ar].payloadHex){
+                    case "00":
                         icon = "emptycan";
                         break;
-                    case 01:
+                    case "01":
                         icon = "almostemptycan";
                         break;
-                    case 02:
+                    case "02":
                         icon = "almostfullcan";
                         break;
-                    case 03:
+                    case "03":
                         icon = "fullcan";
                         break;
+              }
+              features[ar].type = icon;
 
+              addMarker(features[ar]);
+              }
+            })
 
-                }
-                feature.type = "fullcan";
-
-                addMarker(feature);
-
-            }
 
 
         })
 
 }
-