Design modifications Demo

js/apps/system/_admin/aardvark/APP/frontend/js/collections/airportCollection.js

@@ -41,8 +41,7 @@
         type: "POST",
         url: "/_api/cursor",
         data: JSON.stringify({
-          query: "for f in flights2 filter f.Origin == @airport COLLECT dest = f.Dest WITH COUNT INTO n SORT n RETURN {Dest: dest, count: n}",
-          // query: "for f in flights2 filter f.Origin == @airport COLLECT dest = f.Dest RETURN dest",
+          query: "for f in flights12 filter f.Origin == @airport COLLECT dest = f.Dest WITH COUNT INTO n SORT n RETURN {Dest: dest, count: n}",
           bindVars: {"airport": airport}
         }),
         contentType: "application/json",

js/apps/system/_admin/aardvark/APP/frontend/js/templates/demoView.ejs

@@ -10,6 +10,6 @@
   </div>
 
   <div id="demoContent" class="innerContent">
-    <div id="demo-mapdiv" style="width: 100%; height: 500px;"></div>
+    <div id="demo-mapdiv" style="width: 100%; height: 490px;"><div id="demo-mapdiv-info"></div></div>
   </div>
 </script>

js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js

@@ -133,10 +133,18 @@
 
     loadAirportData: function(airport) {
       var self = this;
+      var timer = new Date();
+      
+      var airportData = this.airportCollection.findWhere({_key: airport});
+      console.log(airportData);
       this.airportCollection.getFlightsForAirport(airport, function(list) {
 
+        var timeTaken = new Date() - timer;
+
         self.removeFlightLines(false);
 
+        var allFlights = 0;
+
         var i = 0;
         for (i = 0; i < list.length; ++i) {
           self.addFlightLine(
@@ -146,7 +154,30 @@
             self.calculateFlightColor(list.length, i),
             self.calculateFlightWidth(list.length, i)
           );
+          allFlights += list[i].count;
         }
+        
+        if ($("#demo-mapdiv-info").length === 0) {
+          $("#demo-mapdiv").append("<div id='demo-mapdiv-info'></div>");
+        }
+        
+        var tempHTML = "";
+        tempHTML = "<b>" + airportData.get("Name") + "</b> - " + airport + "<br>" + 
+          "Query needed: <b>" + (timeTaken/1000) + "sec" + "</b><br>" +
+          "Number destinations: <b>" + list.length + "</b><br>" + 
+          "Number flights: <b>" + allFlights + "</b><br>" +
+          "Top 5:<br>";
+
+        for (i = (list.length - 1); i > Math.max(list.length - 6, 0); --i) {
+          airportData = self.airportCollection.findWhere({_key: list[i].Dest})
+          tempHTML += airportData.get("Name") + " - " + airportData.get("_key") + ": <b>" + list[i].count + "</b>";
+          if (i > (list.length - 5)) {
+            tempHTML += "<br>";
+          }
+        }
+
+        $("#demo-mapdiv-info").html(tempHTML);
+
         self.map.validateData();
       });
     },
@@ -154,7 +185,7 @@
     calculateFlightWidth: function(length, pos) {
       var intervallWidth = length/2;
       // return Math.floor(pos/intervallWidth) + 2;
-      return 1;
+      return 1.5;
     },
     
     calculateFlightColor: function(length, pos) {
@@ -226,8 +257,9 @@
           images: imageData, 
           getAreasFromMap: true
         }, 
-        clickMapObject: function(mapObject){
+        clickMapObject: function(mapObject) {
           console.log(mapObject);
+          self.loadAirportData(mapObject.id);
         },
       	balloon: {
           adjustBorderColor: true,
@@ -253,7 +285,7 @@
           alpha: 0.75,
           thickness: 2
         },
-        linesAboveImages: true,
+        linesAboveImages: false,
       });
     },