Fix mapnificent map integration

sibbl · Apr 13, 2019 · d62ce89 · d62ce89
1 parent 1d20d31
commit d62ce89
Show file tree

Hide file tree

Showing 6 changed files with 1,051 additions and 695 deletions.
diff --git a/app/public/controller.js b/app/public/controller.js
@@ -602,27 +602,20 @@ angular.module('dataVis')
 
   var mapnificent;
   var initMapnificent = function() {
-    var city = {
-      cityid: "berlin",
-      cityname: "Berlin",
-      lat: 52.525592,
-      lng: 13.369545,
-      northwest: {"lat":52.755362,"lng":12.901471},
-      southeast: {"lat":52.295934,"lng":13.909891},
-      options: {"estimatedMaxCalculateCalls":2100000} || {},
-      zoom: 11,
-      dataPath: "http://www.mapnificent.net/data/berlin/"
-    };
-    mapnificent = new Mapnificent(map, city, {
-      baseurl: '/lib/mapnificent/'
+    mapnificent = new Mapnificent(map, config.transportTimeMapnificentConfig, {
+      dataPath: `https://cdn.jsdelivr.net/gh/mapnificent/mapnificent_cities/${config.transportTimeMapnificentConfig.cityid}/`,
+      baseurl: './lib/mapnificent/'
     });
     mapnificent.init();
   }
 
   $scope.showTransportOverlay = function(flat) {
     var marker = markers[flat.id];
     $scope.transport.visible = flat.id;
-    currentTransportPos = mapnificent.addPosition(marker, $scope.transport.minutes * 60);
+    if(currentTransportPos) {
+      mapnificent.removePosition(currentTransportPos);
+    }
+    currentTransportPos = mapnificent.addPosition(marker._latlng, $scope.transport.minutes * 60);
     currentTransportPos.setProgressCallback(function(percent) {
       $timeout(function() {
         $scope.transportLoadingPercentage = percent;

diff --git a/app/public/index.html b/app/public/index.html
@@ -20,8 +20,10 @@
   <script src="bower_components/angularjs-slider/dist/rzslider.min.js"></script>
   <link rel="stylesheet" href="bower_components/angularjs-slider/dist/rzslider.min.css" type="text/css" media="screen" />
   <script src="bower_components/moment/min/moment.min.js"></script>
-  <script src="lib/mapnificent/quadtree.js"></script>
-  <script src="lib/mapnificent/mapnificent.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/protobufjs@6.8.8/dist/protobuf.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/gh/mapnificent/mapnificent@84ce41ced097e01ddc73f24ba95bfd9afb68020e/static/js/quadtree.js"></script>
+  <script src="./lib/mapnificent/quadtree.js"></script>
+  <script src="./lib/mapnificent/mapnificent.js"></script>
 
   <script src="/config"></script>
   <script src="app.js"></script>