diff --git a/WebContent/base/OSRM.Map.js b/WebContent/base/OSRM.Map.js index d36dae720..1e1f47158 100644 --- a/WebContent/base/OSRM.Map.js +++ b/WebContent/base/OSRM.Map.js @@ -80,13 +80,13 @@ initPosition: function() { // map event handlers zoomed: function(e) { - /*if(OSRM.G.dragging) + if(OSRM.G.dragging) OSRM.Routing.getRoute_Dragging(); else - OSRM.Routing.getRoute_Redraw({keepAlternative:true});*/ + OSRM.Routing.getRoute_Redraw({keepAlternative:true}); }, contextmenu: function(e) {;}, -mousemove: function(e) { },//OSRM.Via.drawDragMarker(e); }, +mousemove: function(e) { OSRM.Via.drawDragMarker(e); }, click: function(e) { OSRM.GUI.deactivateTooltip( "CLICKING" ); if( !OSRM.G.markers.hasSource() ) { diff --git a/WebContent/base/leaflet/L.Control.QueryableLayers.js b/WebContent/base/leaflet/L.Control.QueryableLayers.js index 43f557b08..3ebd40571 100644 --- a/WebContent/base/leaflet/L.Control.QueryableLayers.js +++ b/WebContent/base/leaflet/L.Control.QueryableLayers.js @@ -16,45 +16,9 @@ or see http://www.gnu.org/licenses/agpl.txt. */ // queryable Layers control -// [simply Control.Layers extended by query functions and some fixes for touch screens] +// [simply Control.Layers extended by query functions] L.Control.QueryableLayers = L.Control.Layers.extend({ -// changes to leaflet behaviour -_initLayout: function () { - this._container = L.DomUtil.create('div', 'leaflet-control-layers'); - L.DomEvent.disableClickPropagation(this._container); // change to Leaflet: always disable click propagation - - this._form = L.DomUtil.create('form', 'leaflet-control-layers-list'); - - if (this.options.collapsed) { - L.DomEvent.addListener(this._container, 'mouseover', this._expand, this); - L.DomEvent.addListener(this._container, 'mouseout', this._collapse, this); - - var link = this._layersLink = L.DomUtil.create('a', 'leaflet-control-layers-toggle'); - link.href = '#'; - link.title = 'Layers'; - - if (L.Browser.touch) { - L.DomEvent.addListener(link, 'click', this._expand, this); - L.DomEvent.disableClickPropagation(link); // change to Leaflet: disable click propagation - } else { - L.DomEvent.addListener(link, 'focus', this._expand, this); - } - this._map.on('movestart', this._collapse, this); - // TODO keyboard accessibility - - this._container.appendChild(link); - } else { - this._expand(); - } - - this._baseLayersList = L.DomUtil.create('div', 'leaflet-control-layers-base', this._form); - this._separator = L.DomUtil.create('div', 'leaflet-control-layers-separator', this._form); - this._overlaysList = L.DomUtil.create('div', 'leaflet-control-layers-overlays', this._form); - - this._container.appendChild(this._form); -}, - // new query functionality getActiveLayerName: function () { var i, input, obj, diff --git a/WebContent/main.js b/WebContent/main.js index 7e90575e0..7e7d230f4 100644 --- a/WebContent/main.js +++ b/WebContent/main.js @@ -28,7 +28,7 @@ OSRM.init = function() { OSRM.GUI.init(); OSRM.Map.init(); OSRM.Printing.init(); -// OSRM.Routing.init(); + OSRM.Routing.init(); // OSRM.RoutingAlternatives.init(); OSRM.Localization.init();