From ce32c0da71a7cdca7cbc1fe8371a75d6beb07cbc Mon Sep 17 00:00:00 2001 From: Norbert Renner Date: Wed, 27 Jun 2018 09:17:45 +0200 Subject: [PATCH] Add nogo button to routing bar --- js/index.js | 3 +-- js/plugin/NogoAreas.js | 12 ++++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/js/index.js b/js/index.js index bd73df9..5fb7218 100644 --- a/js/index.js +++ b/js/index.js @@ -89,8 +89,6 @@ 'Clear route' ); - drawToolbar = L.easyBar([drawButton, deleteButton]).addTo(map); - function updateRoute(evt) { router.setOptions(evt.options); @@ -233,6 +231,7 @@ } nogos.addTo(map); + drawToolbar = L.easyBar([drawButton, nogos.getButton(), deleteButton]).addTo(map); nogos.preventRoutePointOnCreate(routing); map.addControl(new BR.OpacitySlider({ diff --git a/js/plugin/NogoAreas.js b/js/plugin/NogoAreas.js index c231019..5c86455 100644 --- a/js/plugin/NogoAreas.js +++ b/js/plugin/NogoAreas.js @@ -45,7 +45,7 @@ BR.NogoAreas = L.Control.extend({ featuresLayer: this.drawnItems }); - var button = L.easyButton({ + this.button = L.easyButton({ states: [{ stateName: BR.NogoAreas.STATE_CREATE, icon: 'fa-ban', @@ -66,10 +66,10 @@ BR.NogoAreas = L.Control.extend({ control.state('no-go-create'); } }] - }).addTo(map); + }); this.editTools.on('editable:drawing:end', function (e) { - button.state(BR.NogoAreas.STATE_CREATE); + self.button.state(BR.NogoAreas.STATE_CREATE); setTimeout(L.bind(function () { // turn editing off after create; async to still fire 'editable:vertex:dragend' @@ -88,7 +88,7 @@ BR.NogoAreas = L.Control.extend({ e.layer.setStyle(this.style); }, this); - this.tooltip = new BR.EditingTooltip(map, editTools, button); + this.tooltip = new BR.EditingTooltip(map, editTools, this.button); this.tooltip.enable(); // dummy, no own representation, delegating to EasyButton @@ -148,6 +148,10 @@ BR.NogoAreas = L.Control.extend({ getEditGroup: function() { return this.editTools.editLayer; + }, + + getButton: function() { + return this.button; } });