Clear button for routes and markers #26 - added.

IsraelHikingMap · Jul 28, 2015 · 23051b1 · 23051b1
1 parent ec3668b
commit 23051b1
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 4 deletions.
diff --git a/controllers/DrawingController.ts b/controllers/DrawingController.ts
@@ -1,5 +1,6 @@
 module IsraelHiking.Controllers {
     export interface IDrawingScope extends angular.IScope {
+        clear(e: Event): void;
         toggleDrawing(e: Event): void;
         toggleRouting(routingType: string, e: Event): void;
         undo(e: Event): void;
@@ -24,6 +25,11 @@
                 this.selectedDrawing = this.layersService.getSelectedDrawing();
             });
 
+            $scope.clear = (e: Event) => {
+                this.selectedDrawing.clear();
+                this.suppressEvents(e);
+            }
+
             $scope.toggleDrawing = (e: Event) => {
                 if (this.selectedDrawing.isEnabled()) {
                     this.selectedDrawing.enable(false);

diff --git a/services/drawing/BaseDrawing.ts b/services/drawing/BaseDrawing.ts
@@ -5,8 +5,9 @@
         activate: () => void;
         deactivate: () => void;
         undo: () => void;
-        isEnabled: () => boolean;
         enable(enable: boolean): void;
+        isEnabled: () => boolean;
+        clear() => void;
         getRoutingType: () => string;
         setRoutingType: (routingType: string) => void;
         isUndoDisbaled: () => boolean;
@@ -43,6 +44,8 @@
         }
         // should be override in derived
         public enable = (enable: boolean): void => { }
+        // should be override in derived
+        public clear = () => { }
 
         // should be override in derived
         public getRoutingType = (): string => {

diff --git a/services/drawing/DrawingMarker.ts b/services/drawing/DrawingMarker.ts
@@ -121,6 +121,11 @@
             this.setData(data);
         }
 
+        public clear = () => {
+            this.internalClear();
+            this.updateDataLayer();
+        }
+
         public deactivate = () => {
             this.active = false;
 			this.enabled = false;

diff --git a/services/drawing/DrawingRoute.ts b/services/drawing/DrawingRoute.ts
@@ -87,6 +87,11 @@
             return this.enabled && this.active;
         }
 
+        public clear = () => {
+            this.internalClear();
+            this.updateDataLayer();
+        }
+
         public getRoutingType = (): string => {
             return this.currentRoutingType;
         }
@@ -97,7 +102,7 @@
 
         public reroute = (): angular.IPromise<void> => {
             var data = this.getData();
-            this.internalclear();
+            this.internalClear();
             var promises = [];
             for (var pointIndex = 0; pointIndex < data.segments.length; pointIndex++) {
                 var segmentData = data.segments[pointIndex];
@@ -357,7 +362,7 @@
         }
 
         public setData = (data: Common.RouteData) => {
-            this.internalclear();
+            this.internalClear();
             data.name = this.name;
             for (var pointIndex = 0; pointIndex < data.segments.length; pointIndex++) {
                 var segment = data.segments[pointIndex];
@@ -367,7 +372,7 @@
             this.hashService.updateRoute(this.getData());
         }
 
-        private internalclear = () => {
+        private internalClear = () => {
             for (var segmentIndex = this.routeSegments.length - 1; segmentIndex >= 0; segmentIndex--) {
                 this.removeSegmentByIndex(segmentIndex);
             }

diff --git a/views/drawing.html b/views/drawing.html
@@ -1,4 +1,5 @@
 <div class="leaflet-bar">
+    <a class="cursor-pointer" ng-click="clear($event)" title="Clear"><i class="fa fa-remove fa-lg"></i></a>
     <a class="cursor-pointer" ng-click="toggleDrawing($event)" ng-class="{'leaflet-active' : isDrawingEnabled()}" title="Toggle drawing mode"><i class="fa fa-pencil fa-lg"></i></a>
     <a class="cursor-pointer" ng-show="showRouting()" ng-click="toggleRouting('h', $event)" ng-class="{'leaflet-active' : getRoutingType() == 'h'}" title="Hike routing"><i class="fa fa-level-up fa-lg"></i></a>
     <!--