From e0018d6895dfb6fb57e7d7e653d54b361037c5f6 Mon Sep 17 00:00:00 2001
From: Michael Hackstein <michael@arangodb.com>
Date: Sun, 26 Apr 2015 15:08:37 -0700
Subject: [PATCH 01/20] Added fixes for the flights demo

---
 .../js/collections/airportCollection.js       |  33 +++++-
 .../APP/frontend/js/routers/router.js         |  13 ++-
 .../APP/frontend/js/templates/demoView.ejs    |   1 +
 .../APP/frontend/js/views/demoView.js         | 110 ++++++++++++++++--
 .../aardvark/APP/frontend/scss/_demo.scss     |  11 ++
 .../aardvark/APP/frontend/scss/style.scss     |   2 +-
 6 files changed, 149 insertions(+), 21 deletions(-)
 create mode 100644 js/apps/system/_admin/aardvark/APP/frontend/scss/_demo.scss

diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/collections/airportCollection.js b/js/apps/system/_admin/aardvark/APP/frontend/js/collections/airportCollection.js
index f9b95f4ff2..6ce69d49ea 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/collections/airportCollection.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/collections/airportCollection.js
@@ -7,7 +7,8 @@
 
   window.Airports = Backbone.Collection.extend({
 
-    initialize: function() {
+    initialize: function(options) {
+      this.collectionName = options.collectionName;
     },
 
     getAirports: function(callback) {
@@ -35,6 +36,27 @@
       });
     },
 
+    getFlightDistribution: function(callback) {
+      $.ajax({
+        type: "POST",
+        url: "/_api/cursor",
+        data: JSON.stringify({
+          query: "FOR f IN @@flights COLLECT dest = f._to " + 
+            "WITH COUNT INTO n SORT n RETURN {Dest: SPLIT(dest, '/')[1], count: n}",
+          bindVars: {
+            "@flights": this.collectionName
+          }
+        }),
+        contentType: "application/json",
+        processData: false,
+        success: function (data) {
+          callback(data.result);
+        },
+        error: function (data) {
+        }
+      });
+    },
+
     getFlightsForAirport: function(airport, callback) {
       var self = this;
 
@@ -42,9 +64,12 @@
         type: "POST",
         url: "/_api/cursor",
         data: JSON.stringify({
-          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}
+          query: "for f in @@flights filter f._from == @airport COLLECT dest = f._to " + 
+            "WITH COUNT INTO n SORT n RETURN {Dest: SPLIT(dest, '/')[1], count: n}",
+          bindVars: {
+            "airport": "airports/" + airport,
+            "@flights": this.collectionName
+          }
         }),
         contentType: "application/json",
         processData: false,
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/routers/router.js b/js/apps/system/_admin/aardvark/APP/frontend/js/routers/router.js
index 04d5092b62..59fd1b064b 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/routers/router.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/routers/router.js
@@ -26,13 +26,18 @@
       "userManagement": "userManagement",
       "userProfile": "userProfile",
       "logs": "logs",
-      "demo": "demo"
+      "demo": "demo",
+      "demo/:collection": "demo"
     },
 
-    demo: function () {
-
+    demo: function (collection) {
+      if (!collection) {
+        collection = "flights";
+      }
       if (!this.demoView) {
-        this.demoView = new window.DemoView({});
+        this.demoView = new window.DemoView({
+          collectionName: collection
+        });
       }
 
       this.demoView.render();
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/demoView.ejs b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/demoView.ejs
index 03da9831ce..540c92c9be 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/demoView.ejs
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/demoView.ejs
@@ -5,6 +5,7 @@
     </div>
     <div class="search-field">
       <input type="text" id="demoSearchInput" class="search-input" placeholder="Search..."><img id="demoSearchSubmit" class="search-submit-icon">
+      <div id="searchResults" class="demo-dropdown-menu"><ul></ul></div>
     </div>
     <div class="styled-select">
       <select id="flightQuerySelect" class="query-select" style="margin-top: 5px; height: 25px">
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js
index 26f7705260..d0d0092ea2 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js
@@ -73,19 +73,32 @@
       },
       {
         name: "All Flights from CWA"
+      },
+      {
+        name: "Flight distribution"
       }
     ],
 
     el: '#content',
 
-    initialize: function () {
-      this.airportCollection = new window.Airports();
-      window.HASS = this; // <--- BITTE ?!? ;) <-- zu viel Kontakt mit Jan
+    initialize: function (options) {
+      var collectionName = options.collectionName;
+      this.airportCollection = new window.Airports({
+        collectionName: collectionName
+      });
     },
 
     events: {
       "change #flightQuerySelect" : "runSelectedQuery",
-      "keyup #demoSearchInput"   : "searchInput"
+      "keyup #demoSearchInput"   : "searchInput",
+      "click #searchResults ul li": "selectAirport"
+    },
+
+    selectAirport: function (e) {
+      this.showAirportBalloon(e.currentTarget.id);
+      $("#searchResults").slideUp(function() {
+        $("#searchResults ul").html("");
+      });
     },
 
     template: templateEngine.createTemplate("demoView.ejs"),
@@ -164,13 +177,21 @@
         //self.zoomToAirport(airports[0].ref);
         self.showAirportBalloon(airports[0].ref); // <-- only works with single map object, not multiple :(
       }
-
-      //if (airports.length <= 10) {
-      //}
-
+      if (airports.length < 6 && airports.length > 1) {
+        self.insertAirportSelection(airports);
+      } else {
+        $("#searchResults").slideUp();
+      }
       self.map.validateData();
+    },
 
-
+    insertAirportSelection: function (list) {
+      $("#searchResults ul").html("");
+      var i = 0;
+      for (i = 0; i < list.length; ++i) {
+        $("#searchResults ul").append("<li id='" + list[i].ref + "'>" + list[i].ref + "</li>");
+      }
+      $("#searchResults").slideDown();
     },
 
     runSelectedQuery: function() {
@@ -190,6 +211,9 @@
       if (currentQueryPos === "4") {
         this.loadAirportData("CWA");
       }
+      if (currentQueryPos === "5") {
+        this.loadFlightDistData();
+      }
     },
 
     calculateAirportSize: function(airport, airports) {
@@ -239,6 +263,67 @@
 
     },
 
+    loadFlightDistData: function() {
+      var self = this;
+      var timer = new Date();
+
+      this.airportCollection.getFlightDistribution(function(list) {
+
+        var timeTaken = new Date() - timer;
+
+        self.removeFlightLines(false);
+
+        var allFlights = 0;
+
+        var i = 0;
+
+        self.resetDataHighlighting();
+        var least = Math.log(list[0].count);
+        var best = Math.log(list[list.length - 1].count);
+        var m = 2 /(best - least);
+        var distribute = function(x) {
+          return m * x - m * least;
+        };
+
+        for (i = 0; i < list.length; ++i) {
+          var to = list[i].Dest;
+          var count = Math.log(list[i].count);
+          self.setAirportColor(to, self.airportHighlightColor);
+
+          var toSize = distribute(count);
+          console.log(toSize);
+          if (toSize <= 0.25) {
+            toSize = 0.25;
+          }
+
+          self.setAirportSize(to, toSize);
+        }
+
+        if ($("#demo-mapdiv-info").length === 0) {
+          $("#demo-mapdiv").append("<div id='demo-mapdiv-info'></div>");
+        }
+
+        var tempHTML = "";
+        tempHTML = "<b>Aggregation</b> - Flight distribution<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) {
+          var 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();
+      });
+    },
+
     loadAirportData: function(airport) {
       var self = this;
       var timer = new Date();
@@ -309,6 +394,7 @@
     },
 
     showAirportBalloon: function (id) {
+      this.map.allowMultipleDescriptionWindows = true;
       var mapObject = this.map.getObjectById(id);
       this.map.rollOverMapObject(mapObject);
     },
@@ -368,7 +454,7 @@
           svgPath: self.MAPtarget,
           color: self.airportColor,
           scale: self.airportScale,
-          selectedScale: 2.5,
+          selectedScale: 1.5,
           title: airport.City + " [" + airport._key + "]<br>" + airport.Name,
           rollOverColor: self.airportHoverColor,
           selectable: true
@@ -469,7 +555,6 @@
     },
 
     addFlightLine: function(from, to, count, lineColor, lineWidth, shouldRender) {
-      //console.log("Adding", from, to, count, lineColor, lineWidth);
 
       this.lines.push(this.createFlightEntry(from, to, count, lineColor, lineWidth));
 
@@ -477,7 +562,8 @@
       this.setAirportColor(to, this.airportHighlightColor);
       this.setAirportSize(from, 1.5);
 
-      var toSize = count * 0.001;
+      // var toSize = count * 0.001;
+      var toSize = Math.sqrt(count * 0.001);
       if (toSize <= 0.25) {
         toSize = 0.25;
       }
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/scss/_demo.scss b/js/apps/system/_admin/aardvark/APP/frontend/scss/_demo.scss
new file mode 100644
index 0000000000..95b66e319b
--- /dev/null
+++ b/js/apps/system/_admin/aardvark/APP/frontend/scss/_demo.scss
@@ -0,0 +1,11 @@
+div.demo-dropdown-menu {
+  @extend %clickable;
+  @include border-radius(0 0 5px 5px);
+  background-color: $c-bar-bg;
+  margin-bottom: 5px;
+  margin-left: 5px;
+  position: absolute;
+  top: 32px;
+  width: 222px;
+  z-index: 100;
+}
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/scss/style.scss b/js/apps/system/_admin/aardvark/APP/frontend/scss/style.scss
index 1e619d5695..2e808b9a71 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/scss/style.scss
+++ b/js/apps/system/_admin/aardvark/APP/frontend/scss/style.scss
@@ -87,4 +87,4 @@
 @import 'uploadfile';
 
 // Demo
-//@import 'demo';
+@import 'demo';

From 67b348c7d6dd1619dc2322a4789335280e2cc2cf Mon Sep 17 00:00:00 2001
From: Claudius Weinberger <claudius@arangodb.com>
Date: Sun, 26 Apr 2015 16:58:20 -0700
Subject: [PATCH 03/20] Added definition for demo overlay window

---
 .../aardvark/APP/frontend/scss/_demo.scss     | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/js/apps/system/_admin/aardvark/APP/frontend/scss/_demo.scss b/js/apps/system/_admin/aardvark/APP/frontend/scss/_demo.scss
index 95b66e319b..449079e0a2 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/scss/_demo.scss
+++ b/js/apps/system/_admin/aardvark/APP/frontend/scss/_demo.scss
@@ -9,3 +9,34 @@ div.demo-dropdown-menu {
   width: 222px;
   z-index: 100;
 }
+
+#flightQuerySelect.query-select {
+  height: 25px;
+  margin-top: 6px;
+  font-size: 13px;
+  line-height: 1.1em;
+}
+
+#demo-mapdiv {
+  position: relative;
+}
+
+#demo-mapdiv-info {
+  position: absolute;
+  right: 20px;
+  width: 225px;
+  height: 150px;
+  bottom: 20px;
+  border: 1.5px solid #222;
+  border-radius: 4px;
+  background-color: rgba(255,255,255, 0.75);
+  padding: 6px 6px 3px 6px;
+  font-size: 11px;
+  line-height: 1.3em;
+}
+
+.amcharts-balloon-div {
+  line-height: 1.1em;
+}
+
+

From 346048cb4d65e16fe38325611953364b681b170d Mon Sep 17 00:00:00 2001
From: Michael Hackstein <michael@arangodb.com>
Date: Sun, 26 Apr 2015 17:32:58 -0700
Subject: [PATCH 05/20] Added shortest path call in Demo and improved style for
 flight distribution

---
 .../js/collections/airportCollection.js       | 28 ++++++++++++++++
 .../APP/frontend/js/views/demoView.js         | 32 +++++++------------
 .../aardvark/APP/frontend/scss/_resizing.scss |  4 +--
 3 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/collections/airportCollection.js b/js/apps/system/_admin/aardvark/APP/frontend/js/collections/airportCollection.js
index 6ce69d49ea..707daa8acf 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/collections/airportCollection.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/collections/airportCollection.js
@@ -36,6 +36,34 @@
       });
     },
 
+    getShortestFlight: function(from, to, callback) {
+      $.ajax({
+        type: "POST",
+        url: "/_api/cursor",
+        data: JSON.stringify({
+          query: "RETURN SHORTEST_PATH(@@flights,@@airports,@start,@dest,'outbound', {distance: 'Dist'})",
+          bindVars: {
+            "@flights": this.collectionName,
+            "@airports": "airports",
+            "start": "airports/" + from,
+            "dest": "airports/" + to
+          }
+        }),
+        contentType: "application/json",
+        processData: false,
+        success: function (data) {
+          _.each(data.result, function(airport) {
+            self.add(airport);
+          });
+          if (callback) {
+            callback();
+          }
+        },
+        error: function (data) {
+        }
+      });
+    },
+
     getFlightDistribution: function(callback) {
       $.ajax({
         type: "POST",
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js
index d0d0092ea2..ab750ac5a6 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js
@@ -35,15 +35,7 @@
     */
 
     lineColors: [
-      'rgb(255,255,229)',
-      'rgb(255,247,188)',
-      'rgb(254,227,145)',
-      'rgb(254,196,79)',
-      'rgb(254,153,41)',
-      'rgb(236,112,20)',
-      'rgb(204,76,2)',
-      'rgb(153,52,4)',
-      'rgb(102,37,6)'
+      'rgb(255,255,229)'
     ],
 
     airportColor: "#222222",
@@ -278,25 +270,26 @@
         var i = 0;
 
         self.resetDataHighlighting();
-        var least = Math.log(list[0].count);
-        var best = Math.log(list[list.length - 1].count);
-        var m = 2 /(best - least);
+        var least = list[0].count^3;
+        var best = list[list.length - 1].count^3;
+        var m = 2.5 /(best - least);
         var distribute = function(x) {
           return m * x - m * least;
         };
 
         for (i = 0; i < list.length; ++i) {
           var to = list[i].Dest;
-          var count = Math.log(list[i].count);
+          var count = list[i].count^3;
           self.setAirportColor(to, self.airportHighlightColor);
 
           var toSize = distribute(count);
-          console.log(toSize);
-          if (toSize <= 0.25) {
-            toSize = 0.25;
-          }
+          toSize += 0.5;
 
           self.setAirportSize(to, toSize);
+          if (i > list.length - 11) {
+            // Top 10 Color
+            self.setAirportColor(to, "rgb(236,112,20)");
+          }
         }
 
         if ($("#demo-mapdiv-info").length === 0) {
@@ -385,8 +378,7 @@
     },
 
     calculateFlightColor: function(length, pos) {
-      var intervallColor = length/this.lineColors.length;
-      return this.lineColors[Math.floor(pos/intervallColor)];
+      return this.lineColors[0];
     },
 
     zoomToAirport: function (id) {
@@ -454,7 +446,7 @@
           svgPath: self.MAPtarget,
           color: self.airportColor,
           scale: self.airportScale,
-          selectedScale: 1.5,
+          selectedScale: 1,
           title: airport.City + " [" + airport._key + "]<br>" + airport.Name,
           rollOverColor: self.airportHoverColor,
           selectable: true
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/scss/_resizing.scss b/js/apps/system/_admin/aardvark/APP/frontend/scss/_resizing.scss
index 95f2025ed1..00a767f53f 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/scss/_resizing.scss
+++ b/js/apps/system/_admin/aardvark/APP/frontend/scss/_resizing.scss
@@ -504,8 +504,8 @@ div.resizecontainer {
 
 div.centralRow {
   margin: {
-    top: 65px;
-    bottom: 65px;
+    top: 40px;
+    bottom: 40px;
   }
 }
 

From 90dbd678bb59aa3133735b9eebf44aaf2e191ca8 Mon Sep 17 00:00:00 2001
From: Michael Hackstein <michael@arangodb.com>
Date: Sun, 26 Apr 2015 17:33:21 -0700
Subject: [PATCH 06/20] Added generated files

---
 .../_admin/aardvark/APP/clusterFrontend/build/style.css       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/apps/system/_admin/aardvark/APP/clusterFrontend/build/style.css b/js/apps/system/_admin/aardvark/APP/clusterFrontend/build/style.css
index 0afa95a0c9..b0adfaca5b 100644
--- a/js/apps/system/_admin/aardvark/APP/clusterFrontend/build/style.css
+++ b/js/apps/system/_admin/aardvark/APP/clusterFrontend/build/style.css
@@ -4328,8 +4328,8 @@ div.resizecontainer {
       width: 2258px; } }
 
 div.centralRow {
-  margin-top: 65px;
-  margin-bottom: 65px; }
+  margin-top: 40px;
+  margin-bottom: 40px; }
 
 div.centralContent {
   background-color: rgba(0, 0, 0, 0.0675);

From 9c40c69c727f4a15f52e5de016eab815432eec8e Mon Sep 17 00:00:00 2001
From: Michael Hackstein <michael@arangodb.com>
Date: Sun, 26 Apr 2015 22:15:53 -0700
Subject: [PATCH 07/20] Final fixed for YC demo

---
 .../APP/frontend/js/templates/demoView.ejs    |  2 +-
 .../APP/frontend/js/views/demoView.js         | 98 +++++++++++++------
 2 files changed, 67 insertions(+), 33 deletions(-)

diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/demoView.ejs b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/demoView.ejs
index 540c92c9be..abdbc3708f 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/demoView.ejs
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/demoView.ejs
@@ -5,7 +5,7 @@
     </div>
     <div class="search-field">
       <input type="text" id="demoSearchInput" class="search-input" placeholder="Search..."><img id="demoSearchSubmit" class="search-submit-icon">
-      <div id="searchResults" class="demo-dropdown-menu"><ul></ul></div>
+      <!--<div id="searchResults" class="demo-dropdown-menu"><ul></ul></div>-->
     </div>
     <div class="styled-select">
       <select id="flightQuerySelect" class="query-select" style="margin-top: 5px; height: 25px">
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js
index ab750ac5a6..4b2cd91582 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js
@@ -36,6 +36,17 @@
 
     lineColors: [
       'rgb(255,255,229)'
+      /*
+       -      'rgb(255,255,229)',
+       -      'rgb(255,247,188)',
+       -      'rgb(254,227,145)',
+       -      'rgb(254,196,79)',
+       -      'rgb(254,153,41)',
+       -      'rgb(236,112,20)',
+       -      'rgb(204,76,2)',
+       -      'rgb(153,52,4)',
+       -      'rgb(102,37,6)'
+       */
     ],
 
     airportColor: "#222222",
@@ -82,8 +93,8 @@
 
     events: {
       "change #flightQuerySelect" : "runSelectedQuery",
-      "keyup #demoSearchInput"   : "searchInput",
-      "click #searchResults ul li": "selectAirport"
+      "keyup #demoSearchInput"   : "searchInput"
+      // "click #searchResults ul li": "selectAirport"
     },
 
     selectAirport: function (e) {
@@ -157,7 +168,7 @@
       var self = this, airports = this.index.search($(e.currentTarget).val());
 
       self.resetDataHighlighting();
-      self.removeFlightLines(false);
+      self.removeFlightLines(true);
 
       _.each(airports, function(airport) {
         self.setAirportColor(airport.ref, self.airportHighlightColor, false);
@@ -169,24 +180,32 @@
         //self.zoomToAirport(airports[0].ref);
         self.showAirportBalloon(airports[0].ref); // <-- only works with single map object, not multiple :(
       }
+      /*
       if (airports.length < 6 && airports.length > 1) {
         self.insertAirportSelection(airports);
       } else {
         $("#searchResults").slideUp();
       }
+      */
       self.map.validateData();
     },
 
     insertAirportSelection: function (list) {
+      return;
+      /*
       $("#searchResults ul").html("");
       var i = 0;
       for (i = 0; i < list.length; ++i) {
         $("#searchResults ul").append("<li id='" + list[i].ref + "'>" + list[i].ref + "</li>");
       }
       $("#searchResults").slideDown();
+      */
     },
 
     runSelectedQuery: function() {
+      this.resetDataHighlighting();
+      this.removeFlightLines(true);
+
       var currentQueryPos = $( "#flightQuerySelect option:selected" ).attr('position');
       if (currentQueryPos === "0") {
         this.loadAirportData("SFO");
@@ -286,9 +305,9 @@
           toSize += 0.5;
 
           self.setAirportSize(to, toSize);
-          if (i > list.length - 11) {
+          if (i > list.length - 6) {
             // Top 10 Color
-            self.setAirportColor(to, "rgb(236,112,20)");
+            self.setAirportColor(to,'rgb(153,52,4)');
           }
         }
 
@@ -318,6 +337,7 @@
     },
 
     loadAirportData: function(airport) {
+      $("#flightQuerySelect :nth-child(1)").prop("selected", true);
       var self = this;
       var timer = new Date();
 
@@ -334,13 +354,25 @@
 
         self.resetDataHighlighting();
 
+        var least = list[0].count^3;
+        var best = list[list.length - 1].count^3;
+        var m = 2.5 /(best - least);
+        var distribute = function(x) {
+          return m * x - m * least;
+        };
+
         for (i = 0; i < list.length; ++i) {
+          var count = list[i].count^3;
+          var toSize = distribute(count);
+          toSize += 0.5;
           self.addFlightLine(
             airport,
             list[i].Dest,
             list[i].count,
             self.calculateFlightColor(list.length, i),
-            self.calculateFlightWidth(list.length, i)
+            self.calculateFlightWidth(list.length, i),
+            toSize,
+            (i > list.length - 6)
           );
           allFlights += list[i].count;
         }
@@ -350,7 +382,7 @@
         }
 
         var tempHTML = "";
-        tempHTML = "<b>" + airportData.get("Name") + "</b> - " + airport + "<br>" + 
+        tempHTML = "<b>" + airportData.get("Name").substr(0,25) + "</b> - " + airport + "<br>" + 
           "Query needed: <b>" + (timeTaken/1000) + "sec" + "</b><br>" +
           "Number destinations: <b>" + list.length + "</b><br>" + 
           "Number flights: <b>" + allFlights + "</b><br>" +
@@ -358,7 +390,7 @@
 
         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>";
+          tempHTML += airportData.get("Name").substr(0, 25) + " - " + airportData.get("_key") + ": <b>" + list[i].count + "</b>";
           if (i > (list.length - 5)) {
             tempHTML += "<br>";
           }
@@ -432,6 +464,7 @@
           airport.color = self.airportColor;
           airport.scale = self.airportScale;
       });
+      $("#demo-mapdiv-info").html("");
     },
 
     prepareData: function (data) {
@@ -467,19 +500,23 @@
     },
 
     createFlightEntry: function(from, to, weight, lineColor, lineWidth) {
-      return {
-        longitudes: [
-          this.keyToLongLat[from].lon,
-          this.keyToLongLat[to].lon,
-        ],
-        latitudes: [
-          this.keyToLongLat[from].lat,
-          this.keyToLongLat[to].lat
-        ],
-        title: from + " - " + to + "<br>" + weight,
-        color: lineColor,
-        thickness: lineWidth
-      };
+      if (this.keyToLongLat.hasOwnProperty(from)
+        && this.keyToLongLat.hasOwnProperty(to)) {
+        return {
+          longitudes: [
+            this.keyToLongLat[from].lon,
+            this.keyToLongLat[to].lon,
+          ],
+            latitudes: [
+              this.keyToLongLat[from].lat,
+              this.keyToLongLat[to].lat
+            ],
+            title: from + " - " + to + "<br>" + weight,
+            color: lineColor,
+            thickness: lineWidth
+          };
+      }
+      return undefined;
     },
 
     renderMap: function() {
@@ -501,7 +538,6 @@
           getAreasFromMap: true
         },
         clickMapObject: function(mapObject) {
-          //console.log(mapObject);
           self.loadAirportData(mapObject.id);
         },
         balloon: {
@@ -546,21 +582,19 @@
       });
     },
 
-    addFlightLine: function(from, to, count, lineColor, lineWidth, shouldRender) {
-
-      this.lines.push(this.createFlightEntry(from, to, count, lineColor, lineWidth));
+    addFlightLine: function(from, to, count, lineColor, lineWidth, toSize, highlight, shouldRender) {
+      var f = this.createFlightEntry(from, to, count, lineColor, lineWidth);
+      if (f !== undefined) {
+        this.lines.push(f);
+      }
 
       this.setAirportColor(from, "#FFFFFF");
       this.setAirportColor(to, this.airportHighlightColor);
       this.setAirportSize(from, 1.5);
-
-      // var toSize = count * 0.001;
-      var toSize = Math.sqrt(count * 0.001);
-      if (toSize <= 0.25) {
-        toSize = 0.25;
-      }
-
       this.setAirportSize(to, toSize);
+      if (highlight) {
+        this.setAirportColor(to, 'rgb(153,52,4)');
+      }
     }
 
   });

From 7f3a9fbcaed29ff4e298bd16a7ca66e850b53851 Mon Sep 17 00:00:00 2001
From: Michael Hackstein <michael@arangodb.com>
Date: Sun, 26 Apr 2015 22:17:23 -0700
Subject: [PATCH 09/20] Included the CPP Shortest path into AQL. Only under
 certain conditions

---
 arangod/V8Server/V8Traverser.cpp      |  4 ++--
 arangod/V8Server/v8-vocbase.cpp       |  2 +-
 js/server/modules/org/arangodb/aql.js | 11 +++++++++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/arangod/V8Server/V8Traverser.cpp b/arangod/V8Server/V8Traverser.cpp
index d9c7586583..20290e3548 100644
--- a/arangod/V8Server/V8Traverser.cpp
+++ b/arangod/V8Server/V8Traverser.cpp
@@ -179,7 +179,7 @@ class SimpleEdgeExpander {
             auto cand = candidates.find(from);
             if (cand == candidates.end()) {
               // Add weight
-              result.emplace_back(to, from, currentWeight, extractEdgeId(edges[j]));
+              result.emplace_back(from, to, currentWeight, extractEdgeId(edges[j]));
               candidates.emplace(from, result.size() - 1);
             } else {
               // Compare weight
@@ -283,7 +283,7 @@ void TRI_RunDijkstraSearch (const v8::FunctionCallbackInfo<v8::Value>& args) {
   vector<string> writeCollections;
 
   double lockTimeout = (double) (TRI_TRANSACTION_DEFAULT_LOCK_TIMEOUT / 1000000ULL);
-  bool embed = false;
+  bool embed = true;
   bool waitForSync = false;
 
   // get the vertex collection
diff --git a/arangod/V8Server/v8-vocbase.cpp b/arangod/V8Server/v8-vocbase.cpp
index abe69ce860..bef3e4d857 100644
--- a/arangod/V8Server/v8-vocbase.cpp
+++ b/arangod/V8Server/v8-vocbase.cpp
@@ -2806,7 +2806,7 @@ void TRI_InitV8VocBridge (v8::Isolate* isolate,
   TRI_AddGlobalFunctionVocbase(isolate, context, TRI_V8_ASCII_STRING("AQL_QUERY_SLEEP"), JS_QuerySleepAql, true);
   TRI_AddGlobalFunctionVocbase(isolate, context, TRI_V8_ASCII_STRING("AQL_QUERY_IS_KILLED"), JS_QueryIsKilledAql, true);
 
-  TRI_AddGlobalFunctionVocbase(isolate, context, TRI_V8_ASCII_STRING("AQL_SHORTEST_PATH"), JS_QueryShortestPath, true);
+  TRI_AddGlobalFunctionVocbase(isolate, context, TRI_V8_ASCII_STRING("CPP_SHORTEST_PATH"), JS_QueryShortestPath, true);
 
 
 
diff --git a/js/server/modules/org/arangodb/aql.js b/js/server/modules/org/arangodb/aql.js
index 8ab1bb9876..3a4d75c4ba 100644
--- a/js/server/modules/org/arangodb/aql.js
+++ b/js/server/modules/org/arangodb/aql.js
@@ -5598,6 +5598,17 @@ function AQL_SHORTEST_PATH (vertexCollection,
                             params) {
   'use strict';
 
+  if (typeof startVertex === "string" && typeof endVertex === "string") {
+    var opts = {
+      direction: direction
+    };
+    if (params.hasOwnProperty("distance") && params.hasOwnProperty("defaultDistance")) {
+      opts.distance = params.distance;
+      opts.defaultDistance = params.defaultDistance;
+    }
+    return CPP_SHORTEST_PATH(vertexCollection, edgeCollection, startVertex, endVertex, opts);
+  }
+
   params = SHORTEST_PATH_PARAMS(params);
 
   return TRAVERSAL_FUNC("SHORTEST_PATH",

From 828bc0000d2e063b114ce76caa92584f5e7d6948 Mon Sep 17 00:00:00 2001
From: Michael Hackstein <michael@arangodb.com>
Date: Mon, 27 Apr 2015 09:30:20 -0700
Subject: [PATCH 10/20] Added shortest path to the demo interface

---
 .../js/collections/airportCollection.js       |  9 +----
 .../APP/frontend/js/views/demoView.js         | 37 ++++++++++++++++++-
 2 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/collections/airportCollection.js b/js/apps/system/_admin/aardvark/APP/frontend/js/collections/airportCollection.js
index 707daa8acf..ffc3b22dd5 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/collections/airportCollection.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/collections/airportCollection.js
@@ -41,7 +41,7 @@
         type: "POST",
         url: "/_api/cursor",
         data: JSON.stringify({
-          query: "RETURN SHORTEST_PATH(@@flights,@@airports,@start,@dest,'outbound', {distance: 'Dist'})",
+          query: "RETURN SHORTEST_PATH(@@airports,@@flights,@start,@dest,'outbound',{})",
           bindVars: {
             "@flights": this.collectionName,
             "@airports": "airports",
@@ -52,12 +52,7 @@
         contentType: "application/json",
         processData: false,
         success: function (data) {
-          _.each(data.result, function(airport) {
-            self.add(airport);
-          });
-          if (callback) {
-            callback();
-          }
+          callback(data.result[0]);
         },
         error: function (data) {
         }
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js
index 4b2cd91582..8ea49a73be 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js
@@ -223,6 +223,7 @@
         this.loadAirportData("CWA");
       }
       if (currentQueryPos === "5") {
+        delete this.startPoint;
         this.loadFlightDistData();
       }
     },
@@ -519,6 +520,29 @@
       return undefined;
     },
 
+    loadShortestPath: function(from, to) {
+      var self = this;
+      this.airportCollection.getShortestFlight(from, to, function(list) {
+        console.log(list);
+        if (!list.vertices) {
+          alert("Sorry there is no flight");
+        }
+        var vertices = list.vertices;
+        for (var i = 0; i < vertices.length - 1; ++i) {
+          var from = vertices[i].split("/")[1];
+          var to = vertices[i+1].split("/")[1];
+          self.addFlightLine(from, to, 1,
+            self.calculateFlightColor(vertices.length, i),
+            self.calculateFlightWidth(vertices.length, i),
+            2,
+            true,
+            false
+          );
+        }
+        self.map.validateData();
+      });
+    },
+
     renderMap: function() {
 
       var self = this;
@@ -537,8 +561,17 @@
           images: self.imageData,
           getAreasFromMap: true
         },
-        clickMapObject: function(mapObject) {
-          self.loadAirportData(mapObject.id);
+        clickMapObject: function(mapObject, event) {
+          if (mapObject.id !== undefined) {
+            if (event.shiftKey && self.hasOwnProperty("startPoint")) {
+              self.resetDataHighlighting();
+              self.removeFlightLines(true);
+              self.loadShortestPath(self.startPoint, mapObject.id);
+            } else {
+              self.startPoint = mapObject.id;
+              self.loadAirportData(mapObject.id);
+            }
+          }
         },
         balloon: {
           adjustBorderColor: true,

From 86a1bde6744f1f0fa9a0bf1f2cea77718f3162a6 Mon Sep 17 00:00:00 2001
From: Michael Hackstein <michael@arangodb.com>
Date: Mon, 27 Apr 2015 11:30:38 -0700
Subject: [PATCH 12/20] Printed the query information for shortest path

---
 .../aardvark/APP/frontend/js/views/demoView.js    | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js
index 8ea49a73be..066fb29f6c 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js
@@ -522,8 +522,9 @@
 
     loadShortestPath: function(from, to) {
       var self = this;
+      var timer = new Date();
       this.airportCollection.getShortestFlight(from, to, function(list) {
-        console.log(list);
+        var timeTaken = new Date() - timer;
         if (!list.vertices) {
           alert("Sorry there is no flight");
         }
@@ -539,6 +540,18 @@
             false
           );
         }
+        var tempHTML = "";
+        tempHTML = "<b>Path</b> - Shortest Flight<br>" + 
+          "Query needed: <b>" + (timeTaken/1000) + "sec" + "</b><br>" +
+          "Number switches: <b>" + (vertices.length - 2) + "</b><br>" + 
+          "Number flights: <b>" + list.edges.length + "</b><br>" +
+          "Airports:<br>";
+        for (i = 0; i < vertices.length; ++i) {
+          var airportData = self.airportCollection.findWhere({_key: vertices[i].split("/")[1]});
+          tempHTML += airportData.get("Name") + " - " + airportData.get("_key") + "<br>";
+        }
+
+        $("#demo-mapdiv-info").html(tempHTML);
         self.map.validateData();
       });
     },

From efac24f464e4929c112ff17ae55c43b5effd68c3 Mon Sep 17 00:00:00 2001
From: Michael Hackstein <michael@arangodb.com>
Date: Mon, 27 Apr 2015 11:42:13 -0700
Subject: [PATCH 14/20] Fixed size for airports

---
 .../aardvark/APP/frontend/js/views/demoView.js     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js
index 066fb29f6c..400908360d 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js
@@ -53,7 +53,7 @@
     airportHighlightColor: "#FF4E4E",
     airportHoverColor: "#ff8f35",
 
-    airportScale: 0.5,
+    airportScale: 0.7,
     airportHighligthScale: 0.95,
 
     imageData: [],
@@ -251,7 +251,7 @@
     },
 
     getMinMax: function(array) {
-    var min = 0, max = 0;
+      var min = 0, max = 0;
 
       _.each(array, function(object) {
         if (min === 0) {
@@ -292,7 +292,7 @@
         self.resetDataHighlighting();
         var least = list[0].count^3;
         var best = list[list.length - 1].count^3;
-        var m = 2.5 /(best - least);
+        var m = 2.625 /(best - least);
         var distribute = function(x) {
           return m * x - m * least;
         };
@@ -303,7 +303,7 @@
           self.setAirportColor(to, self.airportHighlightColor);
 
           var toSize = distribute(count);
-          toSize += 0.5;
+          toSize += 0.625;
 
           self.setAirportSize(to, toSize);
           if (i > list.length - 6) {
@@ -357,7 +357,7 @@
 
         var least = list[0].count^3;
         var best = list[list.length - 1].count^3;
-        var m = 2.5 /(best - least);
+        var m = 2.625 /(best - least);
         var distribute = function(x) {
           return m * x - m * least;
         };
@@ -365,7 +365,7 @@
         for (i = 0; i < list.length; ++i) {
           var count = list[i].count^3;
           var toSize = distribute(count);
-          toSize += 0.5;
+          toSize += 0.625;
           self.addFlightLine(
             airport,
             list[i].Dest,
@@ -575,7 +575,7 @@
           getAreasFromMap: true
         },
         clickMapObject: function(mapObject, event) {
-          if (mapObject.id !== undefined) {
+          if (mapObject.id !== undefined && mapObject.id.length === 3) {
             if (event.shiftKey && self.hasOwnProperty("startPoint")) {
               self.resetDataHighlighting();
               self.removeFlightLines(true);

From 997248d6d0d545784ba42802dd2ae9fef04bb581 Mon Sep 17 00:00:00 2001
From: Michael Hackstein <michael@arangodb.com>
Date: Mon, 27 Apr 2015 11:48:15 -0700
Subject: [PATCH 16/20] Added print of Top 1 list

---
 .../system/_admin/aardvark/APP/frontend/js/views/demoView.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js
index 400908360d..040e71370f 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js
@@ -389,7 +389,7 @@
           "Number flights: <b>" + allFlights + "</b><br>" +
           "Top 5:<br>";
 
-        for (i = (list.length - 1); i > Math.max(list.length - 6, 0); --i) {
+        for (i = (list.length - 1); i >= Math.max(list.length - 5, 0); --i) {
           airportData = self.airportCollection.findWhere({_key: list[i].Dest});
           tempHTML += airportData.get("Name").substr(0, 25) + " - " + airportData.get("_key") + ": <b>" + list[i].count + "</b>";
           if (i > (list.length - 5)) {

From a045cce27a7aadb50a4a31d500e57eb7f34153fd Mon Sep 17 00:00:00 2001
From: Michael Hackstein <michael@arangodb.com>
Date: Mon, 27 Apr 2015 11:58:33 -0700
Subject: [PATCH 18/20] Improved line width and time is always tp precission 3.

---
 .../_admin/aardvark/APP/frontend/js/views/demoView.js     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js
index 040e71370f..b195319f3d 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js
@@ -318,7 +318,7 @@
 
         var tempHTML = "";
         tempHTML = "<b>Aggregation</b> - Flight distribution<br>" + 
-          "Query needed: <b>" + (timeTaken/1000) + "sec" + "</b><br>" +
+          "Query needed: <b>" + (timeTaken/1000).toFixed(3) + " sec" + "</b><br>" +
           "Number destinations: <b>" + list.length + "</b><br>" + 
           "Number flights: <b>" + allFlights + "</b><br>" +
           "Top 5:<br>";
@@ -384,7 +384,7 @@
 
         var tempHTML = "";
         tempHTML = "<b>" + airportData.get("Name").substr(0,25) + "</b> - " + airport + "<br>" + 
-          "Query needed: <b>" + (timeTaken/1000) + "sec" + "</b><br>" +
+          "Query needed: <b>" + (timeTaken/1000).toFixed(3) + " sec" + "</b><br>" +
           "Number destinations: <b>" + list.length + "</b><br>" + 
           "Number flights: <b>" + allFlights + "</b><br>" +
           "Top 5:<br>";
@@ -407,7 +407,7 @@
       //var intervallWidth = length/2;
       // return Math.floor(pos/intervallWidth) + 2;
       //TODO: no custom width for lines wanted?
-      return 1.5;
+      return 2;
     },
 
     calculateFlightColor: function(length, pos) {
@@ -542,7 +542,7 @@
         }
         var tempHTML = "";
         tempHTML = "<b>Path</b> - Shortest Flight<br>" + 
-          "Query needed: <b>" + (timeTaken/1000) + "sec" + "</b><br>" +
+          "Query needed: <b>" + (timeTaken/1000).toFixed(3) + " sec" + "</b><br>" +
           "Number switches: <b>" + (vertices.length - 2) + "</b><br>" + 
           "Number flights: <b>" + list.edges.length + "</b><br>" +
           "Airports:<br>";

From ed7666e81e988ec6febe97c92280a5c0c275cbb1 Mon Sep 17 00:00:00 2001
From: Michael Hackstein <michael@arangodb.com>
Date: Mon, 27 Apr 2015 23:58:07 -0700
Subject: [PATCH 20/20] Improved code readablity and implemented a distance
 attribute based weighting function

---
 arangod/V8Server/V8Traverser.cpp | 186 ++++++++++++++++---------------
 1 file changed, 99 insertions(+), 87 deletions(-)

diff --git a/arangod/V8Server/V8Traverser.cpp b/arangod/V8Server/V8Traverser.cpp
index 20290e3548..0c86e8f8e0 100644
--- a/arangod/V8Server/V8Traverser.cpp
+++ b/arangod/V8Server/V8Traverser.cpp
@@ -45,22 +45,75 @@ using namespace std;
 using namespace triagens::basics;
 using namespace triagens::arango;
 
-struct WeightInfo {
-  string keyWeight;
-  double defaultWeight; 
-  bool usesWeight;
+////////////////////////////////////////////////////////////////////////////////
+/// @brief callback to weight an edge
+////////////////////////////////////////////////////////////////////////////////
 
-  WeightInfo(
-    string keyWeight,
-    double defaultWeight
-  ) :
-    keyWeight(keyWeight), defaultWeight(defaultWeight), usesWeight(true)
-  {
-  };
+typedef function<double(TRI_doc_mptr_copy_t& edge)> WeightCalculatorFunction;
 
-  WeightInfo() : usesWeight(false) {
-  };
 
+////////////////////////////////////////////////////////////////////////////////
+/// @brief Define edge weight by the number of hops.
+///        Respectively 1 for any edge.
+////////////////////////////////////////////////////////////////////////////////
+class HopWeightCalculator {
+  public: 
+    HopWeightCalculator() {};
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief Callable weight calculator for edge
+////////////////////////////////////////////////////////////////////////////////
+    double operator() (TRI_doc_mptr_copy_t& edge) {
+      return 1;
+    };
+};
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief Define edge weight by ony special attribute.
+///        Respectively 1 for any edge.
+////////////////////////////////////////////////////////////////////////////////
+class AttributeWeightCalculator {
+
+  TRI_shape_pid_t _shape_pid;
+  double _defaultWeight;
+  TRI_shaper_t* _shaper;
+
+  public: 
+    AttributeWeightCalculator(
+      string keyWeight,
+      double defaultWeight,
+      TRI_shaper_t* shaper
+    ) : _defaultWeight(defaultWeight),
+        _shaper(shaper)
+    {
+      _shape_pid = _shaper->lookupAttributePathByName(_shaper, keyWeight.c_str());
+    };
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief Callable weight calculator for edge
+////////////////////////////////////////////////////////////////////////////////
+    double operator() (TRI_doc_mptr_copy_t& edge) {
+      if (_shape_pid == 0) {
+        return _defaultWeight;
+      }
+      TRI_shape_sid_t sid;
+      TRI_EXTRACT_SHAPE_IDENTIFIER_MARKER(sid, edge.getDataPtr());
+      TRI_shape_access_t const* accessor = TRI_FindAccessorVocShaper(_shaper, sid, _shape_pid);
+      TRI_shaped_json_t shapedJson;
+      TRI_EXTRACT_SHAPED_JSON_MARKER(shapedJson, edge.getDataPtr());
+      TRI_shaped_json_t resultJson;
+      TRI_ExecuteShapeAccessor(accessor, &shapedJson, &resultJson);
+      if (resultJson._sid != TRI_SHAPE_NUMBER) {
+        return _defaultWeight;
+      }
+      TRI_json_t* json = TRI_JsonShapedJson(_shaper, &resultJson);
+      if (json == nullptr) {
+        return _defaultWeight;
+      }
+      double realResult = json->_value._number;
+      TRI_FreeJson(_shaper->_memoryZone, json);
+      return realResult ;
+    };
 };
 
 class SimpleEdgeExpander {
@@ -90,33 +143,20 @@ class SimpleEdgeExpander {
     CollectionNameResolver* resolver;
 
 ////////////////////////////////////////////////////////////////////////////////
-/// @brief this is the information required to compute weight by a given
-///        attribute. It contains an indicator if weight should be used.
-///        Also it includes a default weight and the name of the weight
-///        attribute.
+/// @brief the weight calculation function
 ////////////////////////////////////////////////////////////////////////////////
 
-    WeightInfo weightInfo;
+    WeightCalculatorFunction weighter;
 
   public: 
 
-    SimpleEdgeExpander(TRI_edge_direction_e direction,
-                       TRI_document_collection_t* edgeCollection,
-                       string edgeCollectionName,
-                       CollectionNameResolver* resolver)
-      : direction(direction), edgeCollection(edgeCollection),
-        resolver(resolver)
-    {
-      edgeIdPrefix = edgeCollectionName + "/";
-    };
-
     SimpleEdgeExpander(TRI_edge_direction_e direction,
                        TRI_document_collection_t* edgeCollection,
                        string edgeCollectionName,
                        CollectionNameResolver* resolver,
-                       WeightInfo weightInfo)
+                       WeightCalculatorFunction weighter)
       : direction(direction), edgeCollection(edgeCollection),
-        resolver(resolver), weightInfo(weightInfo)
+        resolver(resolver), weighter(weighter)
     {
       edgeIdPrefix = edgeCollectionName + "/";
     };
@@ -170,61 +210,32 @@ class SimpleEdgeExpander {
       unordered_map<Traverser::VertexId, size_t> candidates;
       Traverser::VertexId from;
       Traverser::VertexId to;
-      if (weightInfo.usesWeight) {
-        for (size_t j = 0;  j < edges.size(); ++j) {
-          from = extractFromId(edges[j]);
-          to = extractToId(edges[j]);
-          double currentWeight = weightInfo.defaultWeight;
-          if (from != source) {
-            auto cand = candidates.find(from);
-            if (cand == candidates.end()) {
-              // Add weight
-              result.emplace_back(from, to, currentWeight, extractEdgeId(edges[j]));
-              candidates.emplace(from, result.size() - 1);
-            } else {
-              // Compare weight
-              auto oldWeight = result[cand->second].weight();
-              if (currentWeight < oldWeight) {
-                result[cand->second].setWeight(currentWeight);
-              }
-            }
-          } 
-          else if (to != source) {
-            auto cand = candidates.find(to);
-            if (cand == candidates.end()) {
-              // Add weight
-              result.emplace_back(to, from, currentWeight, extractEdgeId(edges[j]));
-              candidates.emplace(to, result.size() - 1);
-            } else {
-              auto oldWeight = result[cand->second].weight();
-              if (currentWeight < oldWeight) {
-                result[cand->second].setWeight(currentWeight);
-              }
-            }
-          }
-        }
-      } 
-      else {
-        for (size_t j = 0;  j < edges.size();  ++j) {
-          from = extractFromId(edges[j]);
-          to = extractToId(edges[j]);
-          if (from != source) {
-            auto cand = candidates.find(from);
-            if (cand == candidates.end()) {
-              result.emplace_back(from, to, 1, extractEdgeId(edges[j]));
-              candidates.emplace(from, result.size()-1);
-            }
-          } 
-          else if (to != source) {
-            auto cand = candidates.find(to);
-            if (cand == candidates.end()) {
-              result.emplace_back(to, from, 1, extractEdgeId(edges[j]));
-              candidates.emplace(to, result.size()-1);
+      for (size_t j = 0;  j < edges.size(); ++j) {
+        from = extractFromId(edges[j]);
+        to = extractToId(edges[j]);
+        double currentWeight = weighter(edges[j]);
+        auto inserter = [&](Traverser::VertexId s, Traverser::VertexId t) {
+          auto cand = candidates.find(t);
+          if (cand == candidates.end()) {
+            // Add weight
+            result.emplace_back(t, s, currentWeight, extractEdgeId(edges[j]));
+            candidates.emplace(t, result.size() - 1);
+          } else {
+            // Compare weight
+            auto oldWeight = result[cand->second].weight();
+            if (currentWeight < oldWeight) {
+              result[cand->second].setWeight(currentWeight);
             }
           }
+        };
+        if (from != source) {
+          inserter(to, from);
+        } 
+        else if (to != source) {
+          inserter(from, to);
         }
       }
-    }
+    } 
 };
 
 static v8::Handle<v8::Value> pathIdsToV8(v8::Isolate* isolate, Traverser::Path& p) {
@@ -409,15 +420,16 @@ void TRI_RunDijkstraSearch (const v8::FunctionCallbackInfo<v8::Value>& args) {
 
   unique_ptr<SimpleEdgeExpander> forwardExpander;
   unique_ptr<SimpleEdgeExpander> backwardExpander;
+  WeightCalculatorFunction weighter;
   if (useWeight) {
-    forwardExpander.reset(new SimpleEdgeExpander(forward, ecol, edgeCollectionName,
-                                                 &resolver1, WeightInfo(weightAttribute, defaultWeight)));
-    backwardExpander.reset(new SimpleEdgeExpander(backward, ecol, edgeCollectionName,
-                                                 &resolver2, WeightInfo(weightAttribute, defaultWeight)));
+    weighter = AttributeWeightCalculator(
+      weightAttribute, defaultWeight, ecol->getShaper()
+    );
   } else {
-    forwardExpander.reset(new SimpleEdgeExpander(forward, ecol, edgeCollectionName, &resolver1));
-    backwardExpander.reset(new SimpleEdgeExpander(backward, ecol, edgeCollectionName, &resolver2));
+    weighter = HopWeightCalculator();
   }
+  forwardExpander.reset(new SimpleEdgeExpander(forward, ecol, edgeCollectionName, &resolver1, weighter));
+  backwardExpander.reset(new SimpleEdgeExpander(backward, ecol, edgeCollectionName, &resolver2, weighter));
 
 
   Traverser traverser(*forwardExpander, *backwardExpander, bidirectional);