filter slider works for way-detail but uses previous state when filte…

…ring the waymap
remilonwheels · May 1, 2017 · d9d79ff · d9d79ff
1 parent 4fc3bc1
commit d9d79ff
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 9 deletions.
diff --git a/app/component/way/waymap/waymap.js b/app/component/way/waymap/waymap.js
@@ -29,7 +29,7 @@ function WayMapController($log, $http, $interval, NgMap, wayService, $mdMedia, $
     this.googlePaths = [];
 
     const drawWays = () => {
-      console.log('in draw ways');
+      console.log('this in draw ways', this);
       NgMap.getMap().then( map => {
 
         this.startMarkers.forEach( marker => marker.setMap(null));
@@ -138,8 +138,8 @@ function WayMapController($log, $http, $interval, NgMap, wayService, $mdMedia, $
       NgMap.getMap().then( map => {
         this.isMapInitialized = true;
         this.map = map;
-        drawWays();
 
+        drawWays();
       });
     };
 

diff --git a/app/directive/radius-change/radius-change.js b/app/directive/radius-change/radius-change.js
@@ -0,0 +1,13 @@
+'use strict';
+
+module.exports = function() {
+  return {
+    restrict: 'A',
+    link: function(scope, element, attrs) {
+      element.on('$md.dragend', function() {
+        console.info('Drag Ended');
+        console.log('this is radius directive', this);
+      });
+    }
+  };
+};
diff --git a/app/entry.js b/app/entry.js
@@ -58,9 +58,9 @@ context.keys().forEach( key => {
   ways2go.filter(name, module);
 });
 
-// context = require.context('./directive/', true, /\.js$/);
-// context.keys().forEach( key => {
-//   let name = camelcase(path.basename(key, '.js'));
-//   let module = context(key);
-//   ways2go.directive(name, module);
-// });
+context = require.context('./directive/', true, /\.js$/);
+context.keys().forEach( key => {
+  let name = camelcase(path.basename(key, '.js'));
+  let module = context(key);
+  ways2go.directive(name, module);
+});
diff --git a/app/view/way/way-controller.js b/app/view/way/way-controller.js
@@ -26,7 +26,9 @@ function WayController($log, $rootScope, $mdDialog, wayService, $http, $interval
     const meterToMile = 0.000621371;
     this.distanceWays = this.ways
       .map( way => Object.assign(way, {distance: this.computeWayDistance(way) * meterToMile}))
-      .filter( way => way.distance < this.searchRadius);
+      .filter( way => way.distance <= this.searchRadius);
+
+    $scope.$broadcast('wayChange');
   };
 
   this.computeWayDistance = (way) => {

diff --git a/app/view/way/way.html b/app/view/way/way.html
@@ -14,7 +14,11 @@
   </md-input-container>
 
   <div class="map-action">
+    <md-slider flex md-discrete ng-model="wayCtrl.searchRadius" step="5" min="0" max="50" aria-label="search-radius" ng-change="wayCtrl.createDistanceWays()">
+    </md-slider>
+
     <md-button ng-click="wayCtrl.createWay($event, true)" class="md-raised md-warn md-hue-2">Create Way</md-button>
+
     <md-button ng-click="wayCtrl.toggleView()" class="md-raised md-warn md-hue-2">Toggle View</md-button>
   </div>