Merge branch 'trial/dragging' into develop

Conflicts:
	WebContent/OSRM.JSONP.js
	WebContent/OSRM.debug.js
	WebContent/main.html

README.md

@@ -0,0 +1,54 @@
+Overview
+--------
+The repository provides a Leaflet [(1)] based web frontend to the Open Source Routing Machine (Project-OSRM [(2)]).
+The frontend is implemented in Javascript.
+Data is fetched from routing and geocoding servers using JSONP queries.
+The website is XHTML 1.0 Strict compliant.
+A deployed version of the the web frontend can be seen at [(3)].
+
+
+Setup
+-----
+The frontend should work directly as provided.
+Several settings - including the URL for the routing server and the geocoder server - can be specified in `OSRM.config.js`.
+Different tile servers can be specified in `OSRM.Map.js`.
+Note that the URL shortener used for generating route links only works with URLs pointing to the official Project-OSRM website.
+
+
+Branches
+--------
+* The `master` branch will always point to the latest released version of the frontend.
+* The `develop` branch should always point to a working version with new features and bugfixes (think of it as a nightly-build).
+* Other branches contain various work in progress.
+
+
+Bugtracking
+-----------
+Please use the OSRM-Project bug tracker for submitting any bug reports or feature requests.
+
+Integration into Project-OSRM repository
+----------------------------------------
+The Project-OSRM repository already contains the frontend repository as a submodule.
+It will always point to the latest deployed version.
+To successfully work a repository that contains submodules, use the following git commands (available in git 1.7.1+):
+
+* `git clone --recursive`  
+	to clone a repository and the contained submodules
+
+* `git pull && git submodule update`  
+	to pull the latest version of the repository and update its submodules if required
+
+Note that the frontend can also be checked out independently of the Project-OSRM repository.
+
+
+References
+----------
+[(1)] Cloudmade Leaflet: http://leaflet.cloudmade.com/  
+[(2)] Project OSRM: http://project-osrm.org/  
+[(3)] Project OSRM Frontend: http://map.project-osrm.org/
+
+
+
+[(1)]: http://leaflet.cloudmade.com/ "Cloudmade Leaflet"
+[(2)]: http://project-osrm.org/ "Project OSRM"
+[(3)]: http://map.project-osrm.org/ "Project-OSRM Frontend" 

WebContent/L.Bugfixes.js

@@ -0,0 +1,80 @@
+/*
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU AFFERO General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+or see http://www.gnu.org/licenses/agpl.txt.
+*/
+
+// Leaflet bugfixes
+// [assorted bugfixes to Leaflet functions we use]
+
+
+// return closest point on segment or distance to that point
+L.LineUtil._sqClosestPointOnSegment = function (p, p1, p2, sqDist) {
+	var x = p1.x,
+		y = p1.y,
+		dx = p2.x - x,
+		dy = p2.y - y,
+		dot = dx * dx + dy * dy,
+		t;
+
+	if (dot > 0) {
+		t = ((p.x - x) * dx + (p.y - y) * dy) / dot;
+
+		if (t > 1) {
+			x = p2.x;
+			y = p2.y;
+		} else if (t > 0) {
+			x += dx * t;
+			y += dy * t;
+		}
+	}
+
+	dx = p.x - x;
+	dy = p.y - y;
+		
+	// DS_CHANGE: modified return values
+	if(sqDist)
+		return dx*dx + dy*dy;
+	else {
+		var p = new L.Point(x,y);
+		p._sqDist = dx*dx + dy*dy;
+		return p;
+	}
+};
+
+
+// makes requestAnimFrame respect the immediate paramter -> prevents drag events after dragend events
+// (alternatively: add if(!this.dragging ) return to L.Draggable._updatePosition, but must be done in leaflet.js!)
+// [TODO: In Leaflet 0.4 use L.Util.cancelAnimFrame(this._animRequest) in L.Draggable._onUp() instead, also has to be done in leaflet.js!]
+L.Util.requestAnimFrame = (function () {
+	function timeoutDefer(callback) {
+		window.setTimeout(callback, 1000 / 60);
+	}
+
+	var requestFn = window.requestAnimationFrame ||
+		window.webkitRequestAnimationFrame ||
+		window.mozRequestAnimationFrame ||
+		window.oRequestAnimationFrame ||
+		window.msRequestAnimationFrame ||
+		timeoutDefer;
+
+	return function (callback, context, immediate, contextEl) {
+		callback = context ? L.Util.bind(callback, context) : callback;
+		if (immediate ) {		// DS_CHANGE: removed additional condition requestFn === timeoutDefer
+			callback();
+		} else {
+			requestFn(callback, contextEl);
+		}
+	};
+}());	

WebContent/L.DashedPolyline.js

@@ -1,4 +1,25 @@
-// dashed polyline
+/*
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU AFFERO General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+or see http://www.gnu.org/licenses/agpl.txt.
+*/
+
+// Leaflet extension: Dashed Polyline
+// [adds dashed optionally dashed lines when using SVG or VML rendering]
+
+
+// dashed polyline class
 L.DashedPolyline = L.Polyline.extend({
 	initialize: function(latlngs, options) {
 		L.Polyline.prototype.initialize.call(this, latlngs, options);
@@ -6,7 +27,7 @@ L.DashedPolyline = L.Polyline.extend({
 	
 	options: {
 		dashed: true
-	},
+	}
 });
 
 
@@ -20,7 +41,7 @@ L.DashedPolyline = !L.Browser.svg ? L.DashedPolyline : L.DashedPolyline.extend({
 			else
 				this._path.setAttribute('stroke-dasharray', '');
 		}
-	},
+	}
 });
 
 
@@ -34,6 +55,6 @@ L.DashedPolyline = L.Browser.svg || !L.Browser.vml ? L.DashedPolyline : L.Dashed
 			else
 				this._stroke.dashstyle = "solid";
 		}
-	},
+	}
 	
 });

WebContent/L.MouseMarker.js

@@ -1,22 +1,56 @@
+/*
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU AFFERO General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+or see http://www.gnu.org/licenses/agpl.txt.
+*/
+
+// Leaflet extension: MouseMarker
+// [marker class that propagates modifier and button presses in mouse click events and allows for changing icons]
+
+
+// extended marker class
 L.MouseMarker = L.Marker.extend({
 	initialize: function (latlng, options) {
 		L.Marker.prototype.initialize.apply(this, arguments);
 	},
-
-//	_initInteraction: function (){
-//		L.Marker.prototype._initInteraction.apply(this, arguments);
-// 		if (this.options.clickable)
-//			L.DomEvent.addListener(this._icon, 'mousemove', this._fireMouseEvent, this);
-//	},
-
-//	_fireMouseEvent: function (e) {
-//		this.fire(e.type, {
-//			latlng: this._map.mouseEventToLatLng(e),
-//			layerPoint: this._map.mouseEventToLayerPoint(e)
-//		});		
-//		L.DomEvent.stopPropagation(e);
-//	},
 	
+	switchIcon: function( icon ) {
+		this.options.icon = icon;
+
+		if (this._map) {
+			this._changeIcon();
+			this._reset();
+		}
+	},
+	
+	_changeIcon: function () {
+		var options = this.options;
+
+		if (this._icon) {
+			this._icon = options.icon.switchIcon( this._icon );
+			this._icon.title = options.title;
+		}
+		
+		var panes = this._map._panes;
+		
+		if (this._shadow)
+			panes.shadowPane.removeChild(this._shadow);
+		this._shadow = options.icon.createShadow();
+		if (this._shadow)
+			panes.shadowPane.appendChild(this._shadow);
+	},	
+
 	_onMouseClick: function (e) {
 		L.DomEvent.stopPropagation(e);
 		if (this.dragging && this.dragging.moved()) { return; }
@@ -26,5 +60,5 @@ L.MouseMarker = L.Marker.extend({
 			shiftKey: e.shiftKey,
 			button: e.button
 		});
-	},	
+	}
 });

WebContent/L.SwitchableIcon.js

@@ -0,0 +1,115 @@
+/*
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU AFFERO General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+or see http://www.gnu.org/licenses/agpl.txt.
+*/
+
+// Leaflet extension: SwitchableIcon
+// [will be an extension of L.Icon in Leaflet 0.4, for now it is a copy with added functionality]
+
+
+// icon class with functions to simply switch the icon images
+L.SwitchableIcon = L.Class.extend({
+	options: {
+		/*
+		iconUrl: (String) (required)
+		iconSize: (Point) (can be set through CSS)
+		iconAnchor: (Point) (centered by default if size is specified, can be set in CSS with negative margins)
+		popupAnchor: (Point) (if not specified, popup opens in the anchor point)
+		shadowUrl: (Point) (no shadow by default)
+		shadowSize: (Point)
+		*/
+		className: ''
+	},
+
+	initialize: function (options) {
+		L.Util.setOptions(this, options);
+	},
+
+	createIcon: function () {
+		return this._createIcon('icon');
+	},
+
+	createShadow: function () {
+		return this.options.shadowUrl ? this._createIcon('shadow') : null;
+	},
+
+	_createIcon: function (name) {
+		var img = this._createImg(this.options[name + 'Url']);
+		this._setIconStyles(img, name);
+		return img;
+	},
+
+	_setIconStyles: function (img, name) {
+		var options = this.options,
+			size = options[name + 'Size'],
+			anchor = options.iconAnchor;
+
+		if (!anchor && size) {
+			anchor = size.divideBy(2, true);
+		}
+
+		if (name === 'shadow' && anchor && options.shadowOffset) {
+			anchor._add(options.shadowOffset);
+		}
+
+		img.className = 'leaflet-marker-' + name + ' ' + options.className;
+
+		if (anchor) {
+			img.style.marginLeft = (-anchor.x) + 'px';
+			img.style.marginTop  = (-anchor.y) + 'px';
+		}
+
+		if (size) {
+			img.style.width  = size.x + 'px';
+			img.style.height = size.y + 'px';
+		}
+	},
+
+	_createImg: function (src) {
+		var el;
+		if (!L.Browser.ie6) {
+			el = document.createElement('img');
+			el.src = src;
+		} else {
+			el = document.createElement('div');
+			el.style.filter = 'progid:DXImageTransform.Microsoft.AlphaImageLoader(src="' + src + '")';
+		}
+		return el;
+	},
+
+	// new functions start here
+	switchIcon: function (el) {
+		return this._switchIcon('icon', el);
+	},
+
+	switchShadow: function (el) {
+		return this.options.shadowUrl ? this._switchIcon('shadow', el) : null;
+	},
+
+	_switchIcon: function (name, el) {
+		var img = this._switchImg(this.options[name + 'Url'], el);
+		this._setIconStyles(img, name);
+		return img;
+	},	
+	
+	_switchImg: function (src, el) {
+		if (!L.Browser.ie6) {
+			el.src = src;
+		} else {
+			el.style.filter = 'progid:DXImageTransform.Microsoft.AlphaImageLoader(src="' + src + '")';
+		}
+		return el;
+	}	
+});

WebContent/OSRM.Browser.js

@@ -1,13 +1,42 @@
-// OSRM browser detection
+/*
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU AFFERO General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+or see http://www.gnu.org/licenses/agpl.txt.
+*/
+
+// OSRM old browser support
+// [simple browser detection and routines to support some old browsers] 
 
 
+// browser detection (runs anonymous function to prevent local variables cluttering global namespace)
 (function() {
 	var useragent = navigator.userAgent;
 	
 	OSRM.Browser = {
  		FF3:	useragent.search(/Firefox\/3/),
-		IE6_9:	useragent.search(/MSIE (6|7|8|9)/),
+		IE6_9:	useragent.search(/MSIE (6|7|8|9)/)
 	};
 }());
 
-// (runs anonymous function to prevent local variables cluttering global namespace)
+
+// compatibility tools for old browsers
+function getElementsByClassName(node, classname) {
+    var a = [];
+    var re = new RegExp('(^| )'+classname+'( |$)');
+    var els = node.getElementsByTagName("*");
+    for(var i=0,j=els.length; i<j; i++)
+        if(re.test(els[i].className))a.push(els[i]);
+    return a;
+}
+document.head = document.head || document.getElementsByTagName('head')[0];

WebContent/OSRM.EventHandler.js

@@ -0,0 +1,61 @@
+/*
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU AFFERO General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+or see http://www.gnu.org/licenses/agpl.txt.
+*/
+
+// OSRM EventHandler
+// [adds simple event handling: other classes can derive from this class to acquire custom event handling]
+
+
+OSRM.EventHandler = function() {
+	this._listeners = {};
+};
+
+OSRM.extend( OSRM.EventHandler, {
+	
+	// add listener
+	addListener: function(type, listener) {
+		if( this._listeners[type] == undefined)
+			this._listeners[type] = [];
+		this._listeners[type].push(listener);
+	},
+	
+	//remove event listener
+	removeListener: function(type, listener) {
+		if( this._listeners[type] != undefined) {
+			for(var i=0; i<this._listeners[type].length; i++)
+				if( this._listeners[type][i] == listener) {
+					this._listeners[type].splice(i,1);
+					break;
+				}
+		}
+	},
+	
+	// fire event
+	fire: function(event) {
+		if( typeof event == "string")
+			event = {type:event};
+		if( !event.target )
+			event.target = this;
+		
+		if( !event.type )
+			throw new Error("event object missing type property!");
+		
+		if( this._listeners[type] != undefined)
+			for(var listener in this._listeners[event.type])
+				listener.call(this, event);
+	}
+	
+});

WebContent/OSRM.GUI.js

@@ -1,32 +1,69 @@
-// GUI functionality
+/*
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU AFFERO General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+or see http://www.gnu.org/licenses/agpl.txt.
+*/
+
+// OSRM GUI functionality
+// [responsible for all non-routing related GUI behaviour]
 
 
 OSRM.GUI = {
 		
+// defaults
+visible: null,
+width: null,
+
+// init GUI
+init: function() {
+	OSRM.GUI.visible = true;
+	OSRM.GUI.width = document.getElementById("main-wrapper").clientWidth;
+	
+	// translate
+	document.getElementById("open-josm").innerHTML = OSRM.loc("OPEN_JOSM");
+	document.getElementById("open-osmbugs").innerHTML = OSRM.loc("OPEN_OSMBUGS");	
+	document.getElementById("gui-reset").innerHTML = OSRM.loc("GUI_RESET");
+	document.getElementById("gui-reverse").innerHTML = OSRM.loc("GUI_REVERSE");
+	document.getElementById("gui-option-highlight-nonames-label").innerHTML = OSRM.loc("GUI_HIGHLIGHT_UNNAMED_ROADS");
+	document.getElementById("options-toggle").innerHTML = OSRM.loc("GUI_OPTIONS");
+	document.getElementById("gui-search-source").innerHTML = OSRM.loc("GUI_SEARCH");
+	document.getElementById("gui-search-target").innerHTML = OSRM.loc("GUI_SEARCH");
+	document.getElementById("gui-search-source-label").innerHTML = OSRM.loc("GUI_START")+":";
+	document.getElementById("gui-search-target-label").innerHTML = OSRM.loc("GUI_END")+":";
+	document.getElementById("input-source-name").title = OSRM.loc("GUI_START_TOOLTIP");
+	document.getElementById("input-target-name").title = OSRM.loc("GUI_END_TOOLTIP");
+	document.getElementById("legal-notice").innerHTML = OSRM.loc("GUI_LEGAL_NOTICE");
+	
+	document.getElementById('input-source-name').value = OSRM.DEFAULTS.ONLOAD_SOURCE;
+	document.getElementById('input-target-name').value = OSRM.DEFAULTS.ONLOAD_TARGET;	
+},
+		
 // show/hide main-gui
 toggleMain: function() {
 	// show main-gui
-	if( document.getElementById('main-wrapper').style.left == "-410px" ) {
+	if( OSRM.GUI.visible == false ) {
 		getElementsByClassName(document,'leaflet-control-zoom')[0].style.visibility="hidden";
-		getElementsByClassName(document,'leaflet-control-zoom')[0].style.left="420px";
-		getElementsByClassName(document,'leaflet-control-zoom')[0].style.top="5px";
+		getElementsByClassName(document,'leaflet-control-zoom')[0].style.left=(OSRM.GUI.width+10)+"px";;
 		
-		document.getElementById('blob-wrapper').style.visibility="hidden";			
+		document.getElementById('blob-wrapper').style.visibility="hidden";
 		document.getElementById('main-wrapper').style.left="5px";
-		if( OSRM.Browser.FF3!=-1 || OSRM.Browser.IE6_9!=-1 ) {
-			getElementsByClassName(document,'leaflet-control-zoom')[0].style.visibility="visible";
-		}
 	// hide main-gui
 	} else {
 		getElementsByClassName(document,'leaflet-control-zoom')[0].style.visibility="hidden";
 		getElementsByClassName(document,'leaflet-control-zoom')[0].style.left="30px";
-		getElementsByClassName(document,'leaflet-control-zoom')[0].style.top="5px";
 			
-		document.getElementById('main-wrapper').style.left="-410px";
- 		if( OSRM.Browser.FF3!=-1 || OSRM.Browser.IE6_9!=-1 ) {
- 			document.getElementById('blob-wrapper').style.visibility="visible";
-			getElementsByClassName(document,'leaflet-control-zoom')[0].style.visibility="visible";		
- 		}
+		document.getElementById('main-wrapper').style.left=-OSRM.GUI.width+"px";
 	}
 
 	// execute after animation
@@ -35,18 +72,22 @@ toggleMain: function() {
 		document.getElementById('main-wrapper').addEventListener("webkitTransitionEnd", OSRM.GUI.onMainTransitionEnd, false);
 		document.getElementById('main-wrapper').addEventListener("oTransitionEnd", OSRM.GUI.onMainTransitionEnd, false);
 		document.getElementById('main-wrapper').addEventListener("MSTransitionEnd", OSRM.GUI.onMainTransitionEnd, false);
+	} else {
+		OSRM.GUI.onMainTransitionEnd();		
 	}
 },
 
 // do stuff after main-gui animation finished
 onMainTransitionEnd: function() {
 	// after hiding main-gui
-	if( document.getElementById('main-wrapper').style.left == "-410px" ) {
+	if( OSRM.GUI.visible == true ) {
 		document.getElementById('blob-wrapper').style.visibility="visible";
 		getElementsByClassName(document,'leaflet-control-zoom')[0].style.visibility="visible";
+		OSRM.GUI.visible = false;		
 	// after showing main-gui
 	} else {
 		getElementsByClassName(document,'leaflet-control-zoom')[0].style.visibility="visible";
+ 		OSRM.GUI.visible = true;		
 	}
 },
 
@@ -57,6 +98,6 @@ toggleOptions: function() {
 	} else {
 		document.getElementById('options-box').style.visibility="visible";
 	}
-},
+}
 
 };

WebContent/OSRM.Geocoder.js

@@ -0,0 +1,206 @@
+/*
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU AFFERO General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+or see http://www.gnu.org/licenses/agpl.txt.
+*/
+
+// OSRM geocoding routines
+// [geocoder query, management and display of geocoder results]
+
+// some constants
+OSRM.CONSTANTS.SOURCE_LABEL = "source";
+OSRM.CONSTANTS.TARGET_LABEL = "target";
+OSRM.CONSTANTS.VIA_LABEL = "via";
+OSRM.CONSTANTS.DO_FALLBACK_TO_LAT_LNG = true;
+
+
+OSRM.Geocoder = {
+
+//[normal geocoding]
+
+// process input request and call geocoder if needed
+call: function(marker_id, query) {
+	if(query=="")
+		return;
+	
+	//geo coordinates given -> directly draw results
+	if(query.match(/^\s*[-+]?[0-9]*\.?[0-9]+\s*[,;]\s*[-+]?[0-9]*\.?[0-9]+\s*$/)){
+		var coord = query.split(/[,;]/);
+		OSRM.Geocoder._onclickResult(marker_id, coord[0], coord[1]);
+		OSRM.Geocoder.updateAddress( marker_id );
+		return;
+	}
+	
+	//build request for geocoder
+	var call = OSRM.DEFAULTS.HOST_GEOCODER_URL + "?format=json" + OSRM.DEFAULTS.GEOCODER_BOUNDS + "&q=" + query;
+	OSRM.JSONP.call( call, OSRM.Geocoder._showResults, OSRM.Geocoder._showResults_Timeout, OSRM.DEFAULTS.JSONP_TIMEOUT, "geocoder_"+marker_id, {marker_id:marker_id,query:query} );
+},
+
+
+// helper function for clicks on geocoder search results
+_onclickResult: function(marker_id, lat, lon) {
+	var index;
+	if( marker_id == OSRM.C.SOURCE_LABEL )
+		index = OSRM.G.markers.setSource( new L.LatLng(lat, lon) );
+	else if( marker_id == OSRM.C.TARGET_LABEL )
+		index = OSRM.G.markers.setTarget( new L.LatLng(lat, lon) );
+	else
+		return;
+	
+	OSRM.G.markers.route[index].show();
+	OSRM.G.markers.route[index].centerView();	
+	OSRM.Routing.getRoute();
+},
+
+
+// process geocoder response
+_showResults: function(response, parameters) {
+	if(!response){
+		OSRM.Geocoder._showResults_Empty(parameters);
+		return;
+	}
+	
+	if(response.length == 0) {
+		OSRM.Geocoder._showResults_Empty(parameters);
+		return;
+	}
+	
+	// show possible results for input
+	var html = "";
+	html += '<table class="results-table">';	
+	for(var i=0; i < response.length; i++){
+		var result = response[i];
+
+		//odd or even ?
+		var rowstyle='results-odd';
+		if(i%2==0) { rowstyle='results-even'; }
+ 
+		html += '<tr class="'+rowstyle+'">';
+		html += '<td class="result-counter"><span">'+(i+1)+'.</span></td>';
+		html += '<td class="result-items">';
+
+		if(result.display_name){
+			html += '<div class="result-item" onclick="OSRM.Geocoder._onclickResult(\''+parameters.marker_id+'\', '+result.lat+', '+result.lon+');">'+result.display_name+'</div>';
+		}
+		html += "</td></tr>";
+	}
+	html += '</table>';
+		
+	document.getElementById('information-box-headline').innerHTML = OSRM.loc("SEARCH_RESULTS")+":";
+	document.getElementById('information-box').innerHTML = html;
+
+	OSRM.Geocoder._onclickResult(parameters.marker_id, response[0].lat, response[0].lon);
+},
+_showResults_Empty: function(parameters) {
+	document.getElementById('information-box-headline').innerHTML = OSRM.loc("SEARCH_RESULTS")+":";
+	if(parameters.marker_id == OSRM.C.SOURCE_LABEL)
+		document.getElementById('information-box').innerHTML = "<br><p style='font-size:14px;font-weight:bold;text-align:center;'>"+OSRM.loc("NO_RESULTS_FOUND_SOURCE")+": "+parameters.query +".<p>";
+	else if(parameters.marker_id == OSRM.C.TARGET_LABEL)
+		document.getElementById('information-box').innerHTML = "<br><p style='font-size:14px;font-weight:bold;text-align:center;'>"+OSRM.loc("NO_RESULTS_FOUND_TARGET")+": "+parameters.query +".<p>";
+	else
+		document.getElementById('information-box').innerHTML = "<br><p style='font-size:14px;font-weight:bold;text-align:center;'>"+OSRM.loc("NO_RESULTS_FOUND")+": "+parameters.query +".<p>";
+},
+_showResults_Timeout: function() {
+	document.getElementById('information-box-headline').innerHTML = OSRM.loc("SEARCH_RESULTS")+":";
+	document.getElementById('information-box').innerHTML = "<br><p style='font-size:14px;font-weight:bold;text-align:center;'>"+OSRM.loc("TIMED_OUT")+".<p>";	
+},
+
+
+// [reverse geocoding]
+
+//update geo coordinates in input boxes
+updateLocation: function(marker_id) {
+	if (marker_id == OSRM.C.SOURCE_LABEL && OSRM.G.markers.hasSource()) {
+		document.getElementById("input-source-name").value = OSRM.G.markers.route[0].getLat().toFixed(6) + ", " + OSRM.G.markers.route[0].getLng().toFixed(6);
+	} else if (marker_id == OSRM.C.TARGET_LABEL && OSRM.G.markers.hasTarget()) {
+		document.getElementById("input-target-name").value = OSRM.G.markers.route[OSRM.G.markers.route.length-1].getLat().toFixed(6) + ", " + OSRM.G.markers.route[OSRM.G.markers.route.length-1].getLng().toFixed(6);		
+	}
+},
+
+
+// update address in input boxes
+updateAddress: function(marker_id, do_fallback_to_lat_lng) {
+	// build request for reverse geocoder
+	var lat = null;
+	var lng = null;
+	
+	if(marker_id == OSRM.C.SOURCE_LABEL && OSRM.G.markers.hasSource()) {
+		lat = OSRM.G.markers.route[0].getLat();
+		lng = OSRM.G.markers.route[0].getLng();		
+	} else if(marker_id == OSRM.C.TARGET_LABEL && OSRM.G.markers.hasTarget() ) {
+		lat = OSRM.G.markers.route[OSRM.G.markers.route.length-1].getLat();
+		lng = OSRM.G.markers.route[OSRM.G.markers.route.length-1].getLng();		
+	} else
+		return;
+	
+	var call = OSRM.DEFAULTS.HOST_REVERSE_GEOCODER_URL + "?format=json" + "&lat=" + lat + "&lon=" + lng;
+	OSRM.JSONP.call( call, OSRM.Geocoder._showReverseResults, OSRM.Geocoder._showReverseResults_Timeout, OSRM.DEFAULTS.JSONP_TIMEOUT, "reverse_geocoder_"+marker_id, {marker_id:marker_id, do_fallback: do_fallback_to_lat_lng} );
+},
+
+
+// processing JSONP response of reverse geocoder
+_showReverseResults: function(response, parameters) {
+ 	if(!response) {
+ 		OSRM.Geocoder._showReverseResults_Timeout(response, parameters);
+		return;
+	}
+ 	
+	if(response.address == undefined) {
+		OSRM.Geocoder._showReverseResults_Timeout(response, parameters);
+		return;
+	}
+
+	// build reverse geocoding address
+	var used_address_data = 0;
+	var address = "";
+	if( response.address.road) {
+		address += response.address.road;
+		used_address_data++;
+	}
+	if( response.address.city ) {
+		if( used_address_data > 0 )
+			address += ", ";
+		address += response.address.city;
+		used_address_data++;
+	} else if( response.address.village ) {
+		if( used_address_data > 0 )
+			address += ", ";
+		address += response.address.village;
+		used_address_data++;
+	}
+	if( used_address_data < 2 && response.address.country ) {
+		if( used_address_data > 0 )
+			address += ", ";
+		address += response.address.country;
+		used_address_data++;
+	}
+	if( used_address_data == 0 ) {
+		OSRM.Geocoder._showReverseResults_Timeout(response, parameters);
+		return;
+	}
+		
+	// add result to DOM
+	if(parameters.marker_id == OSRM.C.SOURCE_LABEL && OSRM.G.markers.hasSource() )
+		document.getElementById("input-source-name").value = address;
+	else if(parameters.marker_id == OSRM.C.TARGET_LABEL && OSRM.G.markers.hasTarget() )
+		document.getElementById("input-target-name").value = address;
+},
+_showReverseResults_Timeout: function(response, parameters) {
+	if(!parameters.do_fallback)
+		return;
+		
+	updateLocation(parameters.marker_id);
+}
+
+};

WebContent/OSRM.JSONP.js

@@ -1,66 +1,79 @@
+/*
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU AFFERO General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+or see http://www.gnu.org/licenses/agpl.txt.
+*/
+
 // OSRM JSONP call wrapper 
-// w/ DOM cleaning, fencing, timout handling
+// [wrapper for JSONP calls with DOM cleaning, fencing, timout handling]
+
 
 OSRM.JSONP = {
+		
+	// storage to keep track of unfinished JSONP calls
 	fences: {},
 	callbacks: {},
 	timeouts: {},
 	timers: {},
 	
-	TIMEOUT: OSRM.DEFAULTS.JSONP_TIMEOUT,
 	
-	late: function() { },//console.log("reply too late");},
-	empty: function() { },//console.log("empty callback");},
-		
-	call: function(source, callback_function, timeout_function, timeout, id) {
+	// default callback routines
+	late: function() { /*OSRM.debug.log("[jsonp] reply too late");*/ },	
+	empty: function() { /*OSRM.debug.log("[jsonp] empty callback");*/ },
+	
+	
+	// init JSONP call
+	call: function(source, callback_function, timeout_function, timeout, id, parameters) {
 		// only one active JSONP call per id
 		if (OSRM.JSONP.fences[id] == true)
 			return false;
 		OSRM.JSONP.fences[id] = true;
 		
-//		console.log("[status] jsonp init for "+id);
-//		console.log("[status] jsonp request ",source);		
-				
 		// wrap timeout function
 		OSRM.JSONP.timeouts[id] = function(response) {
-			timeout_function(response);
+			try {
+				timeout_function(response, parameters);
+			} finally {
+				OSRM.JSONP.callbacks[id] = OSRM.JSONP.late;				// clean functions
+				OSRM.JSONP.timeouts[id] = OSRM.JSONP.empty;
+				OSRM.JSONP.fences[id] = undefined;						// clean fence
+			}
 			
-//			var jsonp = document.getElementById('jsonp_'+id);		// clean DOM
-//			if(jsonp)
-//				jsonp.parentNode.removeChild(jsonp);
-			OSRM.JSONP.callbacks[id] = OSRM.JSONP.late;				// clean functions
-			OSRM.JSONP.timeouts[id] = OSRM.JSONP.late;
-			OSRM.JSONP.fences[id] = undefined;						// clean fence
-			
-//			console.log("timeout: "+id); 							// at the end - otherwise racing conditions may happen
-//			document.getElementById('information-box').innerHTML += "timeout:" + id + "<br>";			
+//			OSRM.debug.log("[jsonp] timout handling: "+id);
 		};
 		
 		// wrap callback function
 		OSRM.JSONP.callbacks[id] = function(response) {
-			clearTimeout(OSRM.JSONP.timers[id]);					// clear timeout timer
+			clearTimeout(OSRM.JSONP.timers[id]);						// clear timeout timer
 			OSRM.JSONP.timers[id] = undefined;
 			
-			if( OSRM.JSONP.fences[id] == undefined )				// fence to prevent execution after timeout function (when precompiled!)
-				return;		
-
-			callback_function(response);							// actual wrapped callback 
+			try {
+				callback_function(response, parameters);				// actual wrapped callback 
+			} finally {
+				OSRM.JSONP.callbacks[id] = OSRM.JSONP.empty;			// clean functions
+				OSRM.JSONP.timeouts[id] = OSRM.JSONP.late;
+				OSRM.JSONP.fences[id] = undefined;						// clean fence
+			}
 			
-//			var jsonp = document.getElementById('jsonp_'+id);		// clean DOM
-//			if(jsonp)
-//				jsonp.parentNode.removeChild(jsonp);
-			OSRM.JSONP.callbacks[id] = OSRM.JSONP.late;				// clean functions
-			OSRM.JSONP.timeouts[id] = OSRM.JSONP.late;
-			OSRM.JSONP.fences[id] = undefined;						// clean fence
-			
-//			console.log("[status] jsonp response for "+id);			// at the end - otherwise racing conditions may happen
-//			document.getElementById('information-box').innerHTML += "callback:" + id + "<br>";
+//			OSRM.JSONP.sum[id] += new Number( new Date() - OSRM.JSONP.durations[id] );
+//			OSRM.debug.log("[jsonp] response handling: "+id+" "+ (OSRM.JSONP.sum[id]/OSRM.JSONP.counter[id]).toFixed(2) );
 		};
 		
-		// clean DOM (cannot reuse script element with all browsers, unfortunately)
+		// clean DOM (unfortunately, script elements cannot be reused by all browsers)
 		var jsonp = document.getElementById('jsonp_'+id);
 		if(jsonp)
-			jsonp.parentNode.removeChild(jsonp);		
+			jsonp.parentNode.removeChild(jsonp);
 		
 		// add script to DOM
 		var script = document.createElement('script');
@@ -72,6 +85,19 @@ OSRM.JSONP = {
 		// start timeout timer
 		OSRM.JSONP.timers[id] = setTimeout(OSRM.JSONP.timeouts[id], timeout);
 		
+//		if(!OSRM.JSONP.durations) { OSRM.JSONP.durations = {}; OSRM.JSONP.counter = {}; OSRM.JSONP.sum = {}; }
+//		if(OSRM.JSONP.counter[id]) OSRM.JSONP.counter[id]++; else {OSRM.JSONP.counter[id] = 1;OSRM.JSONP.sum[id] = 0;}
+//		OSRM.JSONP.durations[id] = new Date();		
+//		OSRM.debug.log("[jsonp] init: "+id);
+		
 		return true;
+	},
+	
+	// reset all data
+	reset: function() {
+		OSRM.JSONP.fences = {};
+		OSRM.JSONP.callbacks = {};
+		OSRM.JSONP.timeouts = {};
+		OSRM.JSONP.timers = {};
 	}
-};
+};

WebContent/OSRM.Localization.js

@@ -1,73 +1,122 @@
-// localization
+/*
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU AFFERO General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+or see http://www.gnu.org/licenses/agpl.txt.
+*/
+
+// OSRM localization
+// [basic localization options]
+
 
 OSRM.Localization = {
-language: "en",
-
+		
+// if existing, return localized string -> English string -> input string
 translate: function(text) {
-	if( OSRM.Localization[OSRM.Localization.language][text] )
-		return OSRM.Localization[OSRM.Localization.language][text];
-	else if( OSRM.Localization[OSRM.Localization.language][text] )
-		return OSRM.Localization[OSRM.Localization.language][text];
+	if( OSRM.Localization[OSRM.DEFAULTS.LANGUAGE][text] )
+		return OSRM.Localization[OSRM.DEFAULTS.LANGUAGE][text];
+	else if( OSRM.Localization["en"][text] )
+		return OSRM.Localization["en"][text];
 	else
 		return text;
-},
+}
 };
+
+// shorter call to translate function
 OSRM.loc = OSRM.Localization.translate;
 
+
+// German language support
 OSRM.Localization["de"] = {
 //gui
+"OPEN_JOSM": "JOSM",
+"OPEN_OSMBUGS": "OSM Bugs",
 "GUI_START": "Start",
-"GUI_END": "Ende",
+"GUI_END": "Ziel",
 "GUI_RESET": "Reset",
-"GUI_SEARCH": "Suchen",
-"GUI_ROUTE": "Route",
+"GUI_SEARCH": "Zeigen",
 "GUI_REVERSE": "Umdrehen",
-"GUI_OPTIONS": "Optionen",
-"GUI_HIGHLIGHT_UNNAMED_ROADS": "Unbenannte Stra�en hervorheben",
+"GUI_OPTIONS": "Kartenwerkzeuge",
+"GUI_HIGHLIGHT_UNNAMED_ROADS": "Unbenannte Straßen hervorheben",
 "GUI_START_TOOLTIP": "Startposition eingeben",
 "GUI_END_TOOLTIP": "Zielposition eingeben",
-"GUI_LEGAL_NOTICE": "GUI2 v0.1 120313 - OSRM hosting by <a href='http://algo2.iti.kit.edu/'>KIT</a> - Geocoder by <a href='http://www.osm.org/'>OSM</a>",
+"GUI_LEGAL_NOTICE": "GUI2 v"+OSRM.VERSION+" "+OSRM.DATE+" - OSRM hosting by <a href='http://algo2.iti.kit.edu/'>KIT</a> - Geocoder by <a href='http://www.osm.org/'>OSM</a>",
 // geocoder
 "SEARCH_RESULTS": "Suchergebnisse",
-"TIMED_OUT": "Zeit�berschreitung",
+"TIMED_OUT": "Zeitüberschreitung",
 "NO_RESULTS_FOUND": "Keine Ergebnisse gefunden",
+"NO_RESULTS_FOUND_SOURCE": "Keine Ergebnisse gefunden für Start",
+"NO_RESULTS_FOUND_TARGET": "Keine Ergebnisse gefunden für Ziel",
 // routing
 "ROUTE_DESCRIPTION": "Routenbeschreibung",
-"GET_LINK": "Generiere Link",
-"LINK_TO_ROUTE": "Link zur Route",
+"GET_LINK_TO_ROUTE": "Generiere Link",
+"GENERATE_LINK_TO_ROUTE": "Warte auf Antwort",
 "LINK_TO_ROUTE_TIMEOUT": "nicht möglich",
 "GPX_FILE": "GPX Datei",
 "DISTANCE": "Distanz",
 "DURATION": "Dauer",
 "YOUR_ROUTE_IS_BEING_COMPUTED": "Ihre Route wird berechnet",
-"NO_ROUTE_FOUND": "Keine Route hierher m�glich",
+"NO_ROUTE_FOUND": "Keine Route hierher möglich",
+// directions
+"N": "Norden",
+"O": "Ost",
+"S": "Süden",
+"W": "Westen",
+"NO": "Nordost",
+"SO": "Südost",
+"SW": "Südwest",
+"NW": "Nordwest"
 };
 
+
+// English language support
 OSRM.Localization["en"] = {
 //gui
+"OPEN_JOSM": "JOSM",
+"OPEN_OSMBUGS": "OSM Bugs",
 "GUI_START": "Start",
 "GUI_END": "End",
-"GUI_RESET": "Reset",
-"GUI_SEARCH": "Search",
-"GUI_ROUTE": "Route",
+"GUI_RESET": "&nbsp;&nbsp;Reset&nbsp;&nbsp;",
+"GUI_SEARCH": "&nbsp;&nbsp;Show&nbsp;&nbsp;",
 "GUI_REVERSE": "Reverse",
-"GUI_OPTIONS": "Options",
+"GUI_OPTIONS": "Mapping Tools",
 "GUI_HIGHLIGHT_UNNAMED_ROADS": "Highlight unnamed streets",
 "GUI_START_TOOLTIP": "Enter start",
 "GUI_END_TOOLTIP": "Enter destination",
-"GUI_LEGAL_NOTICE": "GUI2 v0.1 120313 - OSRM hosting by <a href='http://algo2.iti.kit.edu/'>KIT</a> - Geocoder by <a href='http://www.osm.org/'>OSM</a>",
+"GUI_LEGAL_NOTICE": "GUI2 v"+OSRM.VERSION+" "+OSRM.DATE+" - OSRM hosting by <a href='http://algo2.iti.kit.edu/'>KIT</a> - Geocoder by <a href='http://www.osm.org/'>OSM</a>",
 // geocoder
 "SEARCH_RESULTS": "Search Results",
 "TIMED_OUT": "Timed Out",
 "NO_RESULTS_FOUND": "No results found",
+"NO_RESULTS_FOUND_SOURCE": "No results found for start",
+"NO_RESULTS_FOUND_TARGET": "No results found for end",
 //routing
 "ROUTE_DESCRIPTION": "Route Description",
-"GET_LINK": "Generate Link",
-"LINK_TO_ROUTE": "Route Link",
+"GET_LINK_TO_ROUTE": "Generate Link",
+"GENERATE_LINK_TO_ROUTE": "waiting for link",
 "LINK_TO_ROUTE_TIMEOUT": "not available",
 "GPX_FILE": "GPX File",
 "DISTANCE": "Distance",
 "DURATION": "Duration",
 "YOUR_ROUTE_IS_BEING_COMPUTED": "Your route is being computed",
 "NO_ROUTE_FOUND": "No route possible",
+// directions
+"N": "north",
+"E": "east",
+"S": "south",
+"W": "west",
+"NE": "northeast",
+"SE": "southeast",
+"SW": "southwest",
+"NW": "northwest"
 };

WebContent/OSRM.Map.js

@@ -0,0 +1,151 @@
+/*
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU AFFERO General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+or see http://www.gnu.org/licenses/agpl.txt.
+*/
+
+// OSRM map handling
+// [initialization, event handling, centering relative to UI]
+
+// will hold the map object
+OSRM.GLOBALS.map = null;
+
+
+// map view/model
+// [extending Leaflet L.Map with setView/fitBounds methods that respect UI visibility] 
+OSRM.MapView = L.Map.extend({
+	setViewUI: function(position, zoom) {
+		if( OSRM.GUI.visible == true ) {
+			var point = OSRM.G.map.project( position, zoom);
+			point.x-=OSRM.GUI.width/2;
+			position = OSRM.G.map.unproject(point,zoom);		
+		}
+		this.setView( position, zoom);	
+	},
+	fitBoundsUI: function(bounds) {
+		var southwest = bounds.getSouthWest();
+		var northeast = bounds.getNorthEast();
+		var zoom = OSRM.G.map.getBoundsZoom(bounds);
+		var sw_point = OSRM.G.map.project( southwest, zoom);
+		if( OSRM.GUI.visible == true )
+			sw_point.x-=OSRM.GUI.width/2;
+		else
+			sw_point.x-=10;
+		sw_point.y+=10;
+		var ne_point = OSRM.G.map.project( northeast, zoom);
+		ne_point.y-=10;
+		sw_point.x+=10;
+		bounds.extend( OSRM.G.map.unproject(sw_point,zoom) );
+		bounds.extend( OSRM.G.map.unproject(ne_point,zoom) );
+		this.fitBounds( bounds );	
+	},
+	getCenterUI: function(unbounded) {
+		var viewHalf = this.getSize();
+		if( OSRM.GUI.visible == true )
+			viewHalf.x += OSRM.GUI.width;
+		var centerPoint = this._getTopLeftPoint().add(viewHalf.divideBy(2));
+		
+		return this.unproject(centerPoint, this._zoom, unbounded);
+	}
+});
+
+
+// map controller
+// [map initialization, event handling]
+OSRM.Map = {
+
+// map initialization
+init: function() {
+	// check if GUI is initialized!
+	if(OSRM.GUI.visible == null)
+		OSRM.GUI.init();
+	
+	// setup tile servers
+	var osmorgURL = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+		osmorgAttribution = 'Map data © 2011 OpenStreetMap contributors, Imagery © 2011 Mapnik',
+		osmorgOptions = {maxZoom: 18, attribution: osmorgAttribution};
+
+	var osmdeURL = 'http://{s}.tile.openstreetmap.de/tiles/osmde/{z}/{x}/{y}.png',
+		osmdeAttribution = 'Map data © 2011 OpenStreetMap contributors, Imagery © 2011 Mapnik',
+		osmdeOptions = {maxZoom: 18, attribution: osmdeAttribution};
+	
+	var mapquestURL = 'http://otile{s}.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png',
+		mapquestAttribution = 'Map data © 2011 OpenStreetMap contributors, Imagery © 2011 MapQuest',
+		mapquestOptions = {maxZoom: 18, attribution: mapquestAttribution, subdomains: '1234'};	
+	
+	var cloudmadeURL = 'http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/997/256/{z}/{x}/{y}.png',
+    	cloudmadeAttribution = 'Map data © 2011 OpenStreetMap contributors, Imagery © 2011 CloudMade',
+	    cloudmadeOptions = {maxZoom: 18, attribution: cloudmadeAttribution};
+
+	var osmorg = new L.TileLayer(osmorgURL, osmorgOptions),
+    	osmde = new L.TileLayer(osmdeURL, osmdeOptions),
+    	mapquest = new L.TileLayer(mapquestURL, mapquestOptions),
+	    cloudmade = new L.TileLayer(cloudmadeURL, cloudmadeOptions);
+
+	// setup map
+	OSRM.G.map = new OSRM.MapView('map', {
+    	center: new L.LatLng(51.505, -0.09),
+	    zoom: 13,
+	    zoomAnimation: false,					// false: removes animations and hiding of routes during zoom
+	    fadeAnimation: false,
+	    layers: [osmorg]
+	});
+
+	// add tileservers
+	var baseMaps = {
+		"osm.org": osmorg,
+		"osm.de": osmde,
+		"MapQuest": mapquest,
+		"CloudMade": cloudmade
+	};
+
+	var overlayMaps = {};
+	var layersControl = new L.Control.Layers(baseMaps, overlayMaps);
+	OSRM.G.map.addControl(layersControl);
+
+    // move zoom markers
+	getElementsByClassName(document,'leaflet-control-zoom')[0].style.left=(OSRM.GUI.width+10)+"px";
+	getElementsByClassName(document,'leaflet-control-zoom')[0].style.top="5px";
+
+	// initial map position and zoom
+	var position = new L.LatLng( OSRM.DEFAULTS.ONLOAD_LATITUDE, OSRM.DEFAULTS.ONLOAD_LONGITUDE);
+	OSRM.G.map.setViewUI( position, OSRM.DEFAULTS.ZOOM_LEVEL);
+
+	// map events
+	OSRM.G.map.on('zoomend', OSRM.Map.zoomed );
+	OSRM.G.map.on('click', OSRM.Map.click );
+	OSRM.G.map.on('contextmenu', OSRM.Map.contextmenu );
+	OSRM.G.map.on('mousemove', OSRM.Map.mousemove );
+},
+
+// map event handlers
+zoomed: function(e) { OSRM.Routing.getRoute(); },
+contextmenu: function(e) {;},
+mousemove: function(e) { OSRM.Via.drawDragMarker(e); },
+click: function(e) {
+	if( !OSRM.G.markers.hasSource() ) {
+		var index = OSRM.G.markers.setSource( e.latlng );
+		OSRM.Geocoder.updateAddress( OSRM.C.SOURCE_LABEL, OSRM.C.DO_FALLBACK_TO_LAT_LNG );
+		OSRM.G.markers.route[index].show();
+		OSRM.G.markers.route[index].centerView( OSRM.G.map.getZoom() );
+		OSRM.Routing.getRoute();
+	} else if( !OSRM.G.markers.hasTarget() ) {
+		var index = OSRM.G.markers.setTarget( e.latlng );
+		OSRM.Geocoder.updateAddress( OSRM.C.TARGET_LABEL, OSRM.C.DO_FALLBACK_TO_LAT_LNG );
+		OSRM.G.markers.route[index].show();
+		OSRM.G.markers.route[index].centerView( OSRM.G.map.getZoom() );
+		OSRM.Routing.getRoute();
+	}	
+}
+};

WebContent/OSRM.Markers.js

@@ -1,8 +1,25 @@
-// OSRM.Marker class 
-// + sub-classes
+/*
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU AFFERO General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+or see http://www.gnu.org/licenses/agpl.txt.
+*/
+
+// OSRM markers 
+// [base marker class, derived highlight marker and route marker classes, marker management]  
 
 
-// base class
+// base marker class (wraps Leaflet markers)
 OSRM.Marker = function( label, style, position ) {
 	this.label = label ? label : "marker";
 	this.position = position ? position : new L.LatLng(0,0);
@@ -11,21 +28,21 @@ OSRM.Marker = function( label, style, position ) {
 	this.marker.parent = this;
 	
 	this.shown = false;
-	this.hint = undefined;
+	this.hint = null;
 };
 OSRM.extend( OSRM.Marker,{
 show: function() {
-	map.addLayer(this.marker);
+	OSRM.G.map.addLayer(this.marker);
 	this.shown = true;
 },
 hide: function() {
-	map.removeLayer(this.marker);
+	OSRM.G.map.removeLayer(this.marker);
 	this.shown = false;
 },
 setPosition: function( position ) {
 	this.position = position;
 	this.marker.setLatLng( position );
-	this.hint = undefined;	
+	this.hint = null;	
 },
 getPosition: function() {
 	return this.position;
@@ -39,34 +56,20 @@ getLng: function() {
 isShown: function() {
 	return this.shown;
 },
-centerView: function(zooming) {
-	var zoom = OSRM.DEFAULTS.ZOOM_LEVEL;
-	if( zooming == false )
-		zoom = map.getZoom();
-	//map.setView( new L.LatLng( this.position.lat, this.position.lng-0.02), zoom);		// dirty hack
-	map.setView( new L.LatLng( this.position.lat, this.position.lng), zoom);
+centerView: function(zoom) {
+	if( zoom == undefined )
+		zoom = OSRM.DEFAULTS.ZOOM_LEVEL;
+	OSRM.G.map.setViewUI( this.position, zoom );
 },
 toString: function() {
 	return "OSRM.Marker: \""+this.label+"\", "+this.position+")";
-},
+}
 });
 
 
-// highlight marker
-OSRM.HighlightMarker = function( label, style, position) {
-	OSRM.HighlightMarker.prototype.base.constructor.apply( this, arguments );
-	this.label = label ? label : "highlight_marker";
-};
-OSRM.inheritFrom( OSRM.HighlightMarker, OSRM.Marker );
-OSRM.extend( OSRM.HighlightMarker, {
-toString: function() {
-	return "OSRM.HighlightMarker: \""+this.label+"\", "+this.position+")";
-},
-});
-
-
-// route marker
+// route marker class (draggable, invokes route drawing routines) 
 OSRM.RouteMarker = function ( label, style, position ) {
+	style.baseicon = style.icon;
 	OSRM.RouteMarker.prototype.base.constructor.apply( this, arguments );
 	this.label = label ? label : "route_marker";
 
@@ -78,73 +81,101 @@ OSRM.RouteMarker = function ( label, style, position ) {
 OSRM.inheritFrom( OSRM.RouteMarker, OSRM.Marker );
 OSRM.extend( OSRM.RouteMarker, {
 onClick: function(e) {
-//	if(!e.ctrlKey)
-//		return;
-	for( var i=0; i<my_markers.route.length; i++) {
-		if( my_markers.route[i].marker === this ) {
-			my_markers.removeMarker( i );
+	for( var i=0; i<OSRM.G.markers.route.length; i++) {
+		if( OSRM.G.markers.route[i].marker === this ) {
+			OSRM.G.markers.removeMarker( i );
 			break;
 		}
 	}
 	
-	getRoute(OSRM.FULL_DESCRIPTION);
-	my_markers.highlight.hide();
+	OSRM.Routing.getRoute();
+	OSRM.G.markers.highlight.hide();
 },
 onDrag: function(e) {
-//	OSRM.debug.log("[event] drag event");
 	this.parent.setPosition( e.target.getLatLng() );
-	if(OSRM.dragging == true)								// TODO: hack to deal with drag events after dragend event
-		getRoute(OSRM.NO_DESCRIPTION);
-	else
-		getRoute(OSRM.FULL_DESCRIPTION);
-	
-	updateLocation( this.parent.label );
+	if(OSRM.G.markers.route.length>1)
+		OSRM.Routing.getDragRoute();
+	OSRM.Geocoder.updateLocation( this.parent.label );
 },
 onDragStart: function(e) {
-//	OSRM.debug.log("[event] dragstart event");
-	OSRM.dragging = true;
+	OSRM.G.dragging = true;
+	this.switchIcon(this.options.dragicon);
 	
-	// hack to store id of dragged marker
-	for( var i=0; i<my_markers.route.length; i++)
-		if( my_markers.route[i].marker === this ) {
-			OSRM.dragid = i;
+	// store id of dragged marker
+	for( var i=0; i<OSRM.G.markers.route.length; i++)
+		if( OSRM.G.markers.route[i].marker === this ) {
+			OSRM.G.dragid = i;
 			break;
-		}			
+		}
 	
-	my_markers.highlight.hide();	
-	if (my_route.isShown()) {
-		my_route.showOldRoute();
-	}
-	
-	updateLocation( this.parent.label );	
+	if( this.parent != OSRM.G.markers.highlight)
+		OSRM.G.markers.highlight.hide();	
+	if (OSRM.G.route.isShown())
+		OSRM.G.route.showOldRoute();
 },
 onDragEnd: function(e) {
-//	OSRM.debug.log("[event] dragend event");
-	getRoute(OSRM.FULL_DESCRIPTION);
-	if (my_route.isShown()) {
-		my_route.hideOldRoute();
-		my_route.hideUnnamedRoute();						// provides better visuals
-	}
-	OSRM.dragging = false;
+	OSRM.G.dragging = false;
+	this.switchIcon(this.options.baseicon);
 	
-	updateLocation( this.parent.label );
+	this.parent.setPosition( e.target.getLatLng() );	
+	OSRM.Routing.getRoute();
+	if (OSRM.G.route.isShown()) {
+		OSRM.G.route.hideOldRoute();
+		OSRM.G.route.hideUnnamedRoute();
+	}
+	
+	if(OSRM.G.route.isShown()==false)
+		OSRM.Geocoder.updateAddress(this.parent.label);
 },
 toString: function() {
 	return "OSRM.RouteMarker: \""+this.label+"\", "+this.position+")";
-},
+}
 });
 
 
-//marker array class
+//drag marker class (draggable, invokes route drawing routines) 
+OSRM.DragMarker = function ( label, style, position ) {
+	OSRM.DragMarker.prototype.base.constructor.apply( this, arguments );
+	this.label = label ? label : "drag_marker";
+};
+OSRM.inheritFrom( OSRM.DragMarker, OSRM.RouteMarker );
+OSRM.extend( OSRM.DragMarker, {
+onClick: function(e) {
+	this.parent.hide();
+},
+onDragStart: function(e) {
+	var new_via_index = OSRM.Via.findViaIndex( e.target.getLatLng() );
+	OSRM.G.markers.route.splice(new_via_index+1,0, this.parent );
+
+	OSRM.RouteMarker.prototype.onDragStart.call(this,e);
+},
+onDragEnd: function(e) {
+	OSRM.G.markers.route[OSRM.G.dragid] = new OSRM.RouteMarker(OSRM.C.VIA_LABEL, {draggable:true,icon:OSRM.G.icons['marker-via'],dragicon:OSRM.G.icons['marker-via-drag']}, e.target.getLatLng() );
+	OSRM.G.markers.route[OSRM.G.dragid].show();
+	
+	OSRM.RouteMarker.prototype.onDragEnd.call(this,e);
+	this.parent.hide();
+},
+toString: function() {
+	return "OSRM.DragMarker: \""+this.label+"\", "+this.position+")";
+}
+});
+
+
+// marker management class (all route markers should only be set and deleted with these routines!)
+// [this holds the vital information of the route]
 OSRM.Markers = function() {
 	this.route = new Array();
-	this.highlight = new OSRM.HighlightMarker("highlight", {draggable:false,icon:OSRM.icons['marker-highlight']});;
+	this.highlight = new OSRM.DragMarker("highlight", {draggable:true,icon:OSRM.G.icons['marker-highlight'],dragicon:OSRM.G.icons['marker-highlight-drag']});;
+	this.dragger = new OSRM.DragMarker("drag", {draggable:true,icon:OSRM.G.icons['marker-drag'],dragicon:OSRM.G.icons['marker-drag']});;
 };
 OSRM.extend( OSRM.Markers,{
 removeAll: function() {
 	for(var i=0; i<this.route.length;i++)
 		this.route[i].hide();
 	this.route.splice(0, this.route.length);
+	document.getElementById('delete-source-marker').style.visibility = "hidden";
+	document.getElementById('delete-target-marker').style.visibility = "hidden";
 },
 removeVias: function() {
 	// assert correct route array s - v - t
@@ -154,18 +185,20 @@ removeVias: function() {
 },
 setSource: function(position) {
 	// source node is always first node
-	if( this.route[0] && this.route[0].label == OSRM.SOURCE_MARKER_LABEL )
+	if( this.route[0] && this.route[0].label == OSRM.C.SOURCE_LABEL )
 		this.route[0].setPosition(position);
 	else
-		this.route.splice(0,0, new OSRM.RouteMarker("source", {draggable:true,icon:OSRM.icons['marker-source']}, position));
+		this.route.splice(0,0, new OSRM.RouteMarker(OSRM.C.SOURCE_LABEL, {draggable:true,icon:OSRM.G.icons['marker-source'],dragicon:OSRM.G.icons['marker-source-drag']}, position));
+	document.getElementById('delete-source-marker').style.visibility = "visible";
 	return 0;	
 },
 setTarget: function(position) {
 	// target node is always last node
-	if( this.route[this.route.length-1] && this.route[ this.route.length-1 ].label == OSRM.TARGET_MARKER_LABEL )
+	if( this.route[this.route.length-1] && this.route[ this.route.length-1 ].label == OSRM.C.TARGET_LABEL )
 		this.route[this.route.length-1].setPosition(position);
 	else
-		this.route.splice( this.route.length,0, new OSRM.RouteMarker("target", {draggable:true,icon:OSRM.icons['marker-target']}, position));
+		this.route.splice( this.route.length,0, new OSRM.RouteMarker(OSRM.C.TARGET_LABEL, {draggable:true,icon:OSRM.G.icons['marker-target'],dragicon:OSRM.G.icons['marker-target-drag']}, position));
+	document.getElementById('delete-target-marker').style.visibility = "visible";
 	return this.route.length-1;
 },
 setVia: function(id, position) {
@@ -173,7 +206,7 @@ setVia: function(id, position) {
 	if( this.route.length<2 || id > this.route.length-2 )
 		return -1;
 	
-	this.route.splice(id+1,0, new OSRM.RouteMarker("via", {draggable:true,icon:OSRM.icons['marker-via']}, position));
+	this.route.splice(id+1,0, new OSRM.RouteMarker(OSRM.C.VIA_LABEL, {draggable:true,icon:OSRM.G.icons['marker-via'],dragicon:OSRM.G.icons['marker-via-drag']}, position));
 	return id+1;
 },
 removeMarker: function(id) {
@@ -181,14 +214,32 @@ removeMarker: function(id) {
 		return;
 	
 	// also remove vias if source or target are removed
-	if( id==0 && this.route[0].label == OSRM.SOURCE_MARKER_LABEL )
+	if( id==0 && this.route[0].label == OSRM.C.SOURCE_LABEL ) {
 		this.removeVias();
-	else if( id == this.route.length-1 && this.route[ this.route.length-1 ].label == OSRM.TARGET_MARKER_LABEL ) {
+		document.getElementById('input-source-name').value = "";
+		document.getElementById('information-box').innerHTML = "";
+		document.getElementById('information-box-headline').innerHTML = "";
+		document.getElementById('delete-source-marker').style.visibility = "hidden";
+	} else if( id == this.route.length-1 && this.route[ this.route.length-1 ].label == OSRM.C.TARGET_LABEL ) {
 		this.removeVias();
 		id = this.route.length-1;
+		document.getElementById('input-target-name').value = "";
+		document.getElementById('information-box').innerHTML = "";
+		document.getElementById('information-box-headline').innerHTML = "";
+		document.getElementById('delete-target-marker').style.visibility = "hidden";
 	}
 	
 	this.route[id].hide();
 	this.route.splice(id, 1);
+},
+hasSource: function() {
+	if( OSRM.G.markers.route[0] && OSRM.G.markers.route[0].label == OSRM.C.SOURCE_LABEL )
+		return true;
+	return false;
+},
+hasTarget: function() {
+	if( OSRM.G.markers.route[OSRM.G.markers.route.length-1] && OSRM.G.markers.route[OSRM.G.markers.route.length-1].label == OSRM.C.TARGET_LABEL )
+		return true;
+	return false;
 }
-});
+});

WebContent/OSRM.Route.js

@@ -1,7 +1,25 @@
-// OSRM route classes
+/*
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU AFFERO General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+or see http://www.gnu.org/licenses/agpl.txt.
+*/
+
+// OSRM routes
+// [drawing of all types of route geometry] 
 
 
-// base route class
+// simple route class (wraps Leaflet Polyline)
 OSRM.SimpleRoute = function (label, style) {
 	this.label = (label ? label : "route");
 	this.route = new L.DashedPolyline();
@@ -9,24 +27,25 @@ OSRM.SimpleRoute = function (label, style) {
 	if(style) this.route.setStyle( style );
 
 	this.shown = false;
-	
- 	this.route.on('click', this.onClick); 	
 };
 OSRM.extend( OSRM.SimpleRoute,{
 show: function() {
-	map.addLayer(this.route);
+	OSRM.G.map.addLayer(this.route);
 	this.shown = true;
 },
 hide: function() {
-	map.removeLayer(this.route);
+	OSRM.G.map.removeLayer(this.route);
 	this.shown = false;
 },
 isShown: function() {
 	return this.shown;
 },
+getPoints: function() {
+	return this.route._originalPoints;
+},
 getPositions: function() {
 	return this.route.getLatLngs();
-},	
+},
 setPositions: function(positions) {
 	this.route.setLatLngs( positions );
 },
@@ -35,20 +54,15 @@ setStyle: function(style) {
 },
 centerView: function() {
 	var bounds = new L.LatLngBounds( this.getPositions() );
-	bounds._southWest.lng-=1.02;																// dirty hack
-	map.fitBounds( bounds );
-},
-onClick: function(e) {
-	if(my_route.isRoute())
-		findViaPosition( e.latlng );
+	OSRM.g.map.fitBoundsUI( bounds );
 },
 toString: function() {
 	return "OSRM.Route("+ this.label + ", " + this.route.getLatLngs().length + " points)";
-},
+}
 });
 
 
-// multiroute class (several separate route parts)
+// multiroute class (wraps Leaflet LayerGroup to hold several disjoint routes)
 OSRM.MultiRoute = function (label) {
 	this.label = (label ? label : "multiroute");
 	this.route = new L.LayerGroup();
@@ -57,11 +71,11 @@ OSRM.MultiRoute = function (label) {
 };
 OSRM.extend( OSRM.MultiRoute,{
 show: function() {
-	map.addLayer(this.route);
+	OSRM.G.map.addLayer(this.route);
 	this.shown = true;
 },
 hide: function() {
-	map.removeLayer(this.route);
+	OSRM.G.map.removeLayer(this.route);
 	this.shown = false;
 },
 isShown: function() {
@@ -69,7 +83,7 @@ isShown: function() {
 },
 addRoute: function(positions) {
 	var line = new L.DashedPolyline( positions );
-	line.on('click', function(e) { my_route.fire('click',e); });
+	line.on('click', function(e) { OSRM.G.route.fire('click',e); });
 	this.route.addLayer( line );
 },
 clearRoutes: function() {
@@ -84,7 +98,8 @@ toString: function() {
 });
 
 
-// main route class
+// route management (handles drawing of route geometry - current route, old route, unnamed route, highlight unnamed streets) 
+// [this holds the route geometry]
 OSRM.Route = function() {
 	this._current_route	= new OSRM.SimpleRoute("current" , {dashed:false} );
 	this._old_route		= new OSRM.SimpleRoute("old", {dashed:false,color:"#123"} );
@@ -117,6 +132,12 @@ OSRM.extend( OSRM.Route,{
 		this._current_route.hide();
 		this._unnamed_route.hide();
 	},
+	hideAll: function() {
+		this._current_route.hide();
+		this._unnamed_route.hide();
+		this._old_route.hide();
+		this._noroute = OSRM.Route.ROUTE;
+	},	
 	
 	showUnnamedRoute: function(positions) {
 		this._unnamed_route.clearRoutes();
@@ -129,7 +150,7 @@ OSRM.extend( OSRM.Route,{
 	hideUnnamedRoute: function() {
 		this._unnamed_route.hide();
 	},
-	// TODO: hack to put unnamed_route above old_route -> easier way in Leaglet 0.4+	
+	// TODO: hack to put unnamed_route above old_route -> easier way in will be available Leaflet 0.4	
 	_raiseUnnamedRoute: function() {
 		if(this._unnamed_route.isShown()) {
 			this._unnamed_route.hide();
@@ -160,6 +181,9 @@ OSRM.extend( OSRM.Route,{
 	getPositions: function() {
 		return this._current_route.getPositions();
 	},
+	getPoints: function() {
+		return this._current_route.getPoints();
+	},	
 	fire: function(type,event) {
 		this._current_route.route.fire(type,event);
 	},

WebContent/OSRM.Routing.js

@@ -1,12 +0,0 @@
-// OSRM route class
-
-
-OSRM.TheRoute = {
-	
-};
-OSRM.extend( OSRM.TheRoute, {
-
-show: function() {},
-hide: function() {},
-
-});

WebContent/OSRM.Utils.js

@@ -0,0 +1,67 @@
+/*
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU AFFERO General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+or see http://www.gnu.org/licenses/agpl.txt.
+*/
+
+// OSRM utility functions
+// [mixed functions]
+
+
+OSRM.Utils = {
+		
+// [human readabilty functions]
+
+// human readable time
+secondsToTime: function(seconds){
+   seconds = parseInt(seconds);
+   minutes = parseInt(seconds/60);
+   seconds = seconds%60;
+   hours = parseInt(minutes/60);
+   minutes = minutes%60;
+   if(hours==0){
+   	return minutes + ' ' + 'min';
+   }
+   else{
+   	return hours + ' ' + 'h' + ' ' + minutes + ' ' + 'min';
+   }
+},
+//human readable distance
+metersToDistance: function(distance){
+	distance = parseInt(distance);
+	
+	if(distance >= 100000){ return (parseInt(distance/1000))+' ' + 'km'; }
+	else if(distance >= 10000){ return (parseInt(distance/1000).toFixed(1))+' ' + 'km'; }
+	else if(distance >= 1000){ return (parseFloat(distance/1000).toFixed(2))+' ' + 'km'; }
+	else{ return distance+' ' + 'm'; }
+},
+
+
+// [verification routines]
+
+// verify angles
+isLatitude: function(value) {
+	if( value >=-90 && value <=90)
+		return true;
+	else
+		return false;
+},
+isLongitude: function(value) {
+	if( value >=-180 && value <=180)
+		return true;
+	else
+		return false;
+}
+
+};

WebContent/OSRM.Via.js

@@ -0,0 +1,121 @@
+/*
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU AFFERO General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+or see http://www.gnu.org/licenses/agpl.txt.
+*/
+
+// OSRM via marker routines
+// [find correct position for a via marker]
+
+// store location of via points returned by server
+OSRM.GLOBALS.via_points = null;
+
+
+OSRM.Via = {
+		
+// find route segment of current route geometry that is closest to the new via node (marked by index of its endpoint)
+_findNearestRouteSegment: function( new_via ) {
+	var min_dist = Number.MAX_VALUE;
+	var min_index = undefined;
+
+	var p = OSRM.G.map.latLngToLayerPoint( new_via );
+	var positions = OSRM.G.route.getPoints();
+	for(var i=1; i<positions.length; i++) {
+		var _sqDist = L.LineUtil._sqClosestPointOnSegment(p, positions[i-1], positions[i], true);
+		if( _sqDist < min_dist) {
+			min_dist = _sqDist;
+			min_index = i;
+		}
+	}
+
+	return min_index;
+},
+
+
+// find the correct index among all via nodes to insert the new via node, and insert it  
+findViaIndex: function( new_via_position ) {
+	// find route segment that is closest to click position (marked by last index)
+	var nearest_index = OSRM.Via._findNearestRouteSegment( new_via_position );
+
+	// find correct index to insert new via node
+	var new_via_index = OSRM.G.via_points.length;
+	var via_index = Array();
+	for(var i=0; i<OSRM.G.via_points.length; i++) {
+		via_index[i] = OSRM.Via._findNearestRouteSegment( new L.LatLng(OSRM.G.via_points[i][0], OSRM.G.via_points[i][1]) );
+		if(via_index[i] > nearest_index) {
+			new_via_index = i;
+			break;
+		}
+	}
+
+	// add via node
+	return new_via_index;
+},
+
+
+//function that draws a drag marker
+dragTimer: new Date(),
+
+drawDragMarker: function(event) {
+	if( OSRM.G.route.isShown() == false)
+		return;
+	if( OSRM.G.dragging == true )
+		return;
+	
+	// throttle computation
+	if( (new Date() - OSRM.Via.dragTimer) < 25 )
+		return;
+	OSRM.Via.dragTimer = new Date();
+	
+	// get distance to route
+	var minpoint = OSRM.G.route._current_route.route.closestLayerPoint( event.layerPoint );
+	var min_dist = minpoint._sqDist;
+	
+	// get distance to markers
+	var mouse = event.latlng;
+	for(var i=0, size=OSRM.G.markers.route.length; i<size; i++) {
+		if(OSRM.G.markers.route[i].label=='drag')
+			continue;
+		var position = OSRM.G.markers.route[i].getPosition();
+		var dist = OSRM.G.map.project(mouse).distanceTo(OSRM.G.map.project(position));
+		if( dist < 20 )
+			min_dist = 1000;
+	}
+	
+	// check whether mouse is over another marker
+	var pos = OSRM.G.map.layerPointToContainerPoint(event.layerPoint);
+	var obj = document.elementFromPoint(pos.x,pos.y);
+	for(var i=0, size=OSRM.G.markers.route.length; i<size; i++) {
+		if(OSRM.G.markers.route[i].label=='drag')
+			continue;
+		if( obj == OSRM.G.markers.route[i].marker._icon)
+			min_dist = 1000;
+	}
+	
+	// special care for highlight marker
+	if( OSRM.G.markers.highlight.isShown() ) {
+		if( OSRM.G.map.project(mouse).distanceTo(OSRM.G.map.project( OSRM.G.markers.highlight.getPosition() ) ) < 20 )
+			min_dist = 1000;
+		else if( obj == OSRM.G.markers.highlight.marker._icon)
+			min_dist = 1000;
+	}
+	
+	if( min_dist < 400) {
+		OSRM.G.markers.dragger.setPosition( OSRM.G.map.layerPointToLatLng(minpoint) );
+		OSRM.G.markers.dragger.show();
+	} else
+		OSRM.G.markers.dragger.hide();
+}
+
+};

WebContent/OSRM.base.js

@@ -1,25 +1,55 @@
+/*
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU AFFERO General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+or see http://www.gnu.org/licenses/agpl.txt.
+*/
+
 // OSRM base class
+// [has to be loaded before all other OSRM classes]
 
-OSRM = {};
-OSRM.VERSION = '0.1';
+var OSRM = {};
+OSRM.VERSION = '0.1.3';
+OSRM.DATE = '120402';
+OSRM.CONSTANTS = {};
+OSRM.DEFAULTS = {};
+OSRM.GLOBALS = {};
+OSRM.G = OSRM.GLOBALS;		// abbreviations
+OSRM.C = OSRM.CONSTANTS;
 
-// inheritance helper function (convenience function)
-OSRM._inheritFromHelper = function() {};
+
+// declare one class to be a subclass of another class
+// (runs anonymous function to prevent local functions cluttering global namespace)
+(function() {
+var _inheritFromHelper = function() {};
 OSRM.inheritFrom = function( sub_class, base_class ) {
-	OSRM._inheritFromHelper.prototype = base_class.prototype;
-	sub_class.prototype = new OSRM._inheritFromHelper();
+	_inheritFromHelper.prototype = base_class.prototype;
+	sub_class.prototype = new _inheritFromHelper();
 	sub_class.prototype.constructor = sub_class;
 	sub_class.prototype.base = base_class.prototype;
 };
+}());
 
-// class prototype extending helper function (convenience function)
+
+// extend prototypes of a class -> used to add member values and functions
 OSRM.extend = function( target_class, properties ) {
 	for( property in properties ) {
 		target_class.prototype[property] = properties[property];
 	}
 };
 
-// usage:
+
+// [usage of convenience functions]
 // SubClass = function() {
 // 	SubClass.prototype.base.constructor.apply(this, arguments);
 // }

WebContent/OSRM.config.js

@@ -1,14 +1,36 @@
+/*
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU AFFERO General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+or see http://www.gnu.org/licenses/agpl.txt.
+*/
+
 // OSRM config file
-// (has to be loaded directly after OSRM.base!)
+// [has to be loaded directly after OSRM.base]
 
 OSRM.DEFAULTS = {
 	HOST_ROUTING_URL: 'http://router.project-osrm.org/viaroute',
 	HOST_SHORTENER_URL: 'http://map.project-osrm.org/shorten/',
-	WEBSITE_URL: 'http://map.project-osrm.org/',
-	JSONP_TIMEOUT: 2000,
+	HOST_GEOCODER_URL: 'http://nominatim.openstreetmap.org/search',
+	HOST_REVERSE_GEOCODER_URL: 'http://nominatim.openstreetmap.org/reverse',
+	WEBSITE_URL: document.URL.replace(/#*(\?.*|$)/i,""),					// truncates URL before first ?, and removes tailing #
+	JSONP_TIMEOUT: 5000,
 	ZOOM_LEVEL: 14,
 	ONLOAD_LATITUDE: 48.84,
 	ONLOAD_LONGITUDE: 10.10,
 	ONLOAD_SOURCE: "",
 	ONLOAD_TARGET: "",
-};
+	HIGHLIGHT_ZOOM_LEVEL: 16,
+	LANGUAGE: "en",
+	GEOCODER_BOUNDS: '&bounded=1&viewbox=-27.0,72.0,46.0,36.0'
+};

WebContent/OSRM.debug.js

@@ -1,9 +1,36 @@
+/*
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU AFFERO General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+or see http://www.gnu.org/licenses/agpl.txt.
+*/
+
 // debug code for OSRM
-// (works faster than console.log in time-critical events)
+// [works better than console.log in older browsers and for logging event handling]
 
 OSRM.debug = {};
 
 
+// access functions
+OSRM.debug.log = function(text) {
+	OSRM.debug.content.innerHTML += text + "<hr style='border:none; margin:2px; height:1px; color:#F0F0F0; background:#F0F0F0;'/>";
+	OSRM.debug.content.scrollTop = OSRM.debug.content.scrollHeight; 
+};
+OSRM.debug.clear = function() {
+	OSRM.debug.content.innerHTML = "";
+};	
+
+
 // add elements to DOM
 OSRM.debug.init = function() {
 	//create DOM objects for debug output
@@ -37,13 +64,3 @@ if(document.addEventListener)	// FF, CH
 	document.addEventListener("DOMContentLoaded", OSRM.debug.init, false);
 else	// IE
 	OSRM.debug.init();
-
-
-// working functions
-OSRM.debug.log = function(text) {
-	OSRM.debug.content.innerHTML += text + "<hr style='border:none; margin:2px; height:1px; color:#F0F0F0; background:#F0F0F0;'/>";
-	OSRM.debug.content.scrollTop = OSRM.debug.content.scrollHeight; 
-};
-OSRM.debug.clear = function() {
-	OSRM.debug.content.innerHTML = "";
-};	

WebContent/geocoder.js

@@ -1,164 +0,0 @@
-// some constants
-OSRM.GEOCODE_POST = 'http://nominatim.openstreetmap.org/search?format=json';
-OSRM.REVERSE_GEOCODE_POST = 'http://nominatim.openstreetmap.org/reverse?format=json';
-OSRM.SOURCE_MARKER_LABEL = "source";
-OSRM.TARGET_MARKER_LABEL = "target";
-
-
-// update locations in input boxes
-function updateLocation(marker_id) {
-	if (marker_id == OSRM.SOURCE_MARKER_LABEL) {
-		document.getElementById("input-source-name").value = my_markers.route[0].getPosition().lat.toFixed(6) + ", " + my_markers.route[0].getPosition().lng.toFixed(6);
-	} else if (marker_id == OSRM.TARGET_MARKER_LABEL) {
-		document.getElementById("input-target-name").value = my_markers.route[my_markers.route.length-1].getPosition().lat.toFixed(6) + ", " + my_markers.route[my_markers.route.length-1].getPosition().lng.toFixed(6);		
-	}
-}
-function updateReverseGeocoder(marker_id) {
-	if (marker_id == OSRM.SOURCE_MARKER_LABEL) {
-		document.getElementById("input-source-name").value = my_markers.route[0].getPosition().lat.toFixed(6) + ", " + my_markers.route[0].getPosition().lng.toFixed(6);
-		callReverseGeocoder("source", my_markers.route[0].getPosition().lat, my_markers.route[0].getPosition().lng);
-	} else if (marker_id == OSRM.TARGET_MARKER_LABEL) {
-		document.getElementById("input-target-name").value = my_markers.route[my_markers.route.length-1].getPosition().lat.toFixed(6) + ", " + my_markers.route[my_markers.route.length-1].getPosition().lng.toFixed(6);
-		callReverseGeocoder("target", my_markers.route[my_markers.route.length-1].getPosition().lat, my_markers.route[my_markers.route.length-1].getPosition().lng);
-	}
-}
-function updateLocations() {
-	if( my_markers.route[0] && my_markers.route[0].label == OSRM.SOURCE_MARKER_LABEL) {
-		document.getElementById("input-source-name").value = my_markers.route[0].getPosition().lat.toFixed(6) + ", " + my_markers.route[0].getPosition().lng.toFixed(6);
-		callReverseGeocoder("source", my_markers.route[0].getPosition().lat, my_markers.route[0].getPosition().lng);
-		//OSRM.debug.log("[call1] reverse geocoder");
-	}
-	
-	if( my_markers.route[my_markers.route.length-1] && my_markers.route[ my_markers.route.length-1 ].label == OSRM.TARGET_MARKER_LABEL) {
-		document.getElementById("input-target-name").value = my_markers.route[my_markers.route.length-1].getPosition().lat.toFixed(6) + ", " + my_markers.route[my_markers.route.length-1].getPosition().lng.toFixed(6);
-		callReverseGeocoder("target", my_markers.route[my_markers.route.length-1].getPosition().lat, my_markers.route[my_markers.route.length-1].getPosition().lng);
-	}
-}
-
-
-function timeout_ReverseGeocoder() {
-	//OSRM.debug.log("[timeout] reverse geocoder");
-}
-
-//prepare request and call reverse geocoder
-function callReverseGeocoder(marker_id, lat, lon) {
-	//build request
-	if (marker_id == OSRM.SOURCE_MARKER_LABEL) {
-		var src= OSRM.REVERSE_GEOCODE_POST + "&lat=" + lat + "&lon=" + lon;
-		OSRM.JSONP.call( src, showReverseGeocoderResults_Source, timeout_ReverseGeocoder, OSRM.JSONP.TIMEOUT, "reverse_geocoder_source" );
-		//OSRM.debug.log("[call2] reverse geocoder");
-	} else if (marker_id == OSRM.TARGET_MARKER_LABEL) {
-		var src = OSRM.REVERSE_GEOCODE_POST + "&lat=" + lat + "&lon=" + lon;
-		OSRM.JSONP.call( src, showReverseGeocoderResults_Target, timeout_ReverseGeocoder, OSRM.JSONP.TIMEOUT, "reverse_geocoder_target" );
-	}
-}
-//processing JSONP response of reverse geocoder
-//(with wrapper functions for source/target jsonp)
-function showReverseGeocoderResults_Source(response) {	showReverseGeocoderResults(OSRM.SOURCE_MARKER_LABEL, response); }
-function showReverseGeocoderResults_Target(response) {	showReverseGeocoderResults(OSRM.TARGET_MARKER_LABEL, response); }
-function showReverseGeocoderResults(marker_id, response) {
-	//OSRM.debug.log("[inner] reverse geocoder");
-	if(response){
-		if(response.address == undefined)
-			return;
-
-		var address = "";
-		if( response.address.road)
-			address += response.address.road;	
-		if( response.address.city) {
-			if( response.address.road)
-				address += ", ";
-			address += response.address.city;
-		}
-		if( address == "" )
-			return;
-		
-		if(marker_id == OSRM.SOURCE_MARKER_LABEL)
-			document.getElementById("input-source-name").value = address;
-		else if(marker_id == OSRM.TARGET_MARKER_LABEL)
-			document.getElementById("input-target-name").value = address;
-	}
-}
-
-
-// prepare request and call geocoder
-function callGeocoder(marker_id, query) {
-	//geo coordinate given?
-	if(query.match(/^\s*[-+]?[0-9]*\.?[0-9]+\s*[,;]\s*[-+]?[0-9]*\.?[0-9]+\s*$/)){
-		var coord = query.split(/[,;]/);
-		onclickGeocoderResult(marker_id, coord[0], coord[1]);
-//		updateReverseGeocoder(marker_id);
-		return;
-	}
-	
-	//build request
-	if (marker_id == OSRM.SOURCE_MARKER_LABEL) {
-		var src= OSRM.GEOCODE_POST + "&q=" + query;
-		OSRM.JSONP.call( src, showGeocoderResults_Source, showGeocoderResults_Timeout, OSRM.JSONP.TIMEOUT, "geocoder_source" );
-	} else if (marker_id == OSRM.TARGET_MARKER_LABEL) {
-		var src = OSRM.GEOCODE_POST + "&q=" + query; 
-		OSRM.JSONP.call( src, showGeocoderResults_Target, showGeocoderResults_Timeout, OSRM.JSONP.TIMEOUT, "geocoder_target" );		
-	}
-}
-
-
-// helper function for clicks on geocoder search results
-function onclickGeocoderResult(marker_id, lat, lon) {
-	var index;
-	if( marker_id == OSRM.SOURCE_MARKER_LABEL )
-		index = my_markers.setSource( new L.LatLng(lat, lon) );
-	else if( marker_id == OSRM.TARGET_MARKER_LABEL )
-		index = my_markers.setTarget( new L.LatLng(lat, lon) );
-	else
-		index = -1;													// search via positions not yet implemented
-	
-	my_markers.route[index].show();
-	my_markers.route[index].centerView();	
-	getRoute(OSRM.FULL_DESCRIPTION);
-}
-
-// processing JSONP response of geocoder
-// (with wrapper functions for source/target jsonp)
-function showGeocoderResults_Source(response) {	showGeocoderResults(OSRM.SOURCE_MARKER_LABEL, response); }
-function showGeocoderResults_Target(response) {	showGeocoderResults(OSRM.TARGET_MARKER_LABEL, response); }
-function showGeocoderResults(marker_id, response) {
-	if(response){
-		if(response.length == 0) {
-			showGeocoderResults_Empty();
-			return;
-		}
-	
-		var html = "";
-		html += '<table class="results-table">';	
-		for(var i=0; i < response.length; i++){
-			var result = response[i];
-
-			//odd or even ?
-			var rowstyle='results-odd';
-			if(i%2==0) { rowstyle='results-even'; }
- 
-			html += '<tr class="'+rowstyle+'">';
-			html += '<td class="result-counter"><span">'+(i+1)+'.</span></td>';
-			html += '<td class="result-items">';
-
-			if(result.display_name){
-				html += '<div class="result-item" onclick="onclickGeocoderResult(\''+marker_id+'\', '+result.lat+', '+result.lon+');">'+result.display_name+'</div>';
-			}
-			html += "</td></tr>";
-		}
-		html += '</table>';
-		
-		document.getElementById('information-box-headline').innerHTML = OSRM.loc("SEARCH_RESULTS")+":";
-		document.getElementById('information-box').innerHTML = html;
-
-		onclickGeocoderResult(marker_id, response[0].lat, response[0].lon);
-	}
-}
-function showGeocoderResults_Empty() {
-	document.getElementById('information-box-headline').innerHTML = OSRM.loc("SEARCH_RESULTS")+":";
-	document.getElementById('information-box').innerHTML = "<br><p style='font-size:14px;font-weight:bold;text-align:center;'>"+OSRM.loc("NO_RESULTS_FOUND")+".<p>";	
-}
-function showGeocoderResults_Timeout() {
-	document.getElementById('information-box-headline').innerHTML = OSRM.loc("SEARCH_RESULTS")+":";
-	document.getElementById('information-box').innerHTML = "<br><p style='font-size:14px;font-weight:bold;text-align:center;'>"+OSRM.loc("TIMED_OUT")+".<p>";	
-}

WebContent/main.css

@@ -1,4 +1,24 @@
-/* styles for map */
+/*
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU AFFERO General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+or see http://www.gnu.org/licenses/agpl.txt.
+*/
+
+/* OSRM CSS styles */
+
+
+/* map -> fullscreen */
 body {
     padding: 0;
     margin: 0;
@@ -89,7 +109,7 @@ html, body, #map {
 	padding:0px;
 }
 
-.main-toggle
+.main-toggle-out
 {
 	cursor:pointer;
 	position:absolute;
@@ -99,19 +119,50 @@ html, body, #map {
 	height:16px;
 	background-image:url("images/cancel.png");	
 }
-.main-toggle:hover
+.main-toggle-out:hover
 {
 	background-image:url("images/cancel_hover.png");
 }
-.main-toggle:active
+.main-toggle-out:active
 {
 	background-image:url("images/cancel_active.png");
 }
+.main-toggle-in
+{
+	cursor:pointer;
+	position:absolute;
+	right:5px;
+	top:5px;
+	width:16px;
+	height:16px;
+	background-image:url("images/restore.png");	
+}
+.main-toggle-in:hover
+{
+	background-image:url("images/restore_hover.png");
+}
+.main-toggle-in:active
+{
+	background-image:url("images/restore_active.png");
+}
 
 .main-options
 {
+	position:relative;
 	font-size:10px;
 }
+.main-options-left-box
+{
+	position:absolute;
+	left:5px;
+	top:0px;
+}
+.main-options-right-box
+{
+	position:absolute;
+	right:5px;
+	top:5px;
+}
 #options-toggle
 {
 	cursor:pointer;
@@ -131,7 +182,7 @@ html, body, #map {
     display: block;
     margin-left: auto;
     margin-right: auto;
-    width: 200px;
+    width: 192px;
     height: 50px;
 	text-align:center;
 	vertical-align: middle;    
@@ -222,6 +273,16 @@ html, body, #map {
 	padding-top:1px;
 	padding-bottom:1px;	
 }
+.result-distance
+{
+	text-align:right;
+	vertical-align: middle;	
+	width:30px;
+	padding-left:1px;
+	padding-right:1px;
+	padding-top:1px;
+	padding-bottom:1px;	
+}
 .result-item
 {
 	cursor:pointer;
@@ -241,7 +302,8 @@ html, body, #map {
 	font-size:10px;
 }
 
-/* generally useful styles (above buttons, so that they get their special cursor!)*/
+
+/* utility styles (defined above buttons, so that buttons retain cursor:pointer)*/
 .not-selectable
 {
 	cursor:default;
@@ -260,6 +322,7 @@ html, body, #map {
 	user-select: text;
 }
 
+
 /* buttons */
 .button
 {
@@ -283,4 +346,25 @@ html, body, #map {
 {
 	background-color:#F4F4F4;
 	color:#FF0000;
+}
+
+
+.delete-marker
+{
+	cursor:pointer;
+	position:absolute;
+	right:5px;
+	top:3px;
+	width:16px;
+	height:16px;
+	background-image:url("images/cancel.png");
+	visibility:hidden;	
+}
+.delete-marker:hover
+{
+	background-image:url("images/cancel_hover.png");
+}
+.delete-marker:active
+{
+	background-image:url("images/cancel_active.png");
 }

WebContent/main.html

@@ -1,5 +1,23 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<!--
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU AFFERO General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+or see http://www.gnu.org/licenses/agpl.txt.
+-->
+
+<html xmlns="http://www.w3.org/1999/xhtml">
 
 
 <!-- head -->
@@ -11,39 +29,48 @@
 <meta name="description" content="OSRM Website"/>
 <meta name="author" content="Dennis Schieferdecker" />
 
+<!--  favicon -->
+<link rel="shortcut icon" href="images/osrm-favicon.ico" type="image/x-icon" />
+
 <!-- stylesheets -->
 <link rel="stylesheet" href="leaflet/leaflet.css" type="text/css"/>
+<!--[if lte IE 8]><link rel="stylesheet" href="leaflet/leaflet.ie.css" type="text/css"/><![endif]-->
 <link rel="stylesheet" href="main.css" type="text/css"/>
 
 <!-- scripts -->
 <script src="leaflet/leaflet-src.js" type="text/javascript"></script>
-<!--[if lte IE 8]><link rel="stylesheet" href="leaflet/leaflet.ie.css" type="text/css"/><![endif]-->
+<script src="L.Bugfixes.js" type="text/javascript"></script>
 <script src="L.DashedPolyline.js" type="text/javascript"></script>
 <script src="L.MouseMarker.js" type="text/javascript"></script>
+<script src="L.SwitchableIcon.js" type="text/javascript"></script>
 
 <script src="OSRM.base.js" type="text/javascript"></script>
 <script src="OSRM.config.js" type="text/javascript"></script>
 <!-- <script defer="defer" src="OSRM.debug.js" type="text/javascript"></script> -->
+<script src="main.js" type="text/javascript"></script>
 
-<script src="OSRM.Browser.js" type="text/javascript"></script>
-<script src="OSRM.GUI.js" type="text/javascript"></script>
-<script src="OSRM.JSONP.js" type="text/javascript"></script>
 <script src="OSRM.Markers.js" type="text/javascript"></script>
 <script src="OSRM.Route.js" type="text/javascript"></script>
+
+<script src="OSRM.Map.js" type="text/javascript"></script>
+<script src="OSRM.GUI.js" type="text/javascript"></script>
+<script src="routing/OSRM.Routing.js" type="text/javascript"></script>
+<script src="routing/OSRM.RoutingDescription.js" type="text/javascript"></script>
+<script src="routing/OSRM.RoutingGeometry.js" type="text/javascript"></script>
+<script src="routing/OSRM.RoutingGUI.js" type="text/javascript"></script>
+<script src="routing/OSRM.RoutingNoNames.js" type="text/javascript"></script>
+<script src="OSRM.Via.js" type="text/javascript"></script>
+<script src="OSRM.Geocoder.js" type="text/javascript"></script>
+
+<script src="OSRM.Browser.js" type="text/javascript"></script>
+<script src="OSRM.JSONP.js" type="text/javascript"></script>
 <script src="OSRM.Localization.js" type="text/javascript"></script>
-
-<script src="main.js" type="text/javascript"></script>
-<script src="routing.js" type="text/javascript"></script>
-
-<script src="geocoder.js" type="text/javascript"></script>
-<script src="via.js" type="text/javascript"></script>
-
-<script src="utils.js" type="text/javascript"></script>
+<script src="OSRM.Utils.js" type="text/javascript"></script>
 </head>
 
 
 <!-- body -->
-<body onload="init();">
+<body onload="OSRM.init();">
 
 <!--map-->
 <div id="map"></div>
@@ -51,7 +78,7 @@
 <!-- show ui blob -->
 <div id="blob-wrapper" class="gui-wrapper">
 <div id="blob-input" class="gui-box">
-   	<div class="main-toggle" onclick="OSRM.GUI.toggleMain()"></div>
+   	<div class="main-toggle-in" onclick="OSRM.GUI.toggleMain()"></div>
 </div>
 </div>
 
@@ -60,23 +87,25 @@
 
 <!-- input box -->
 <div class="gui-box not-selectable" id="main-input">
-	<div class="main-toggle" onclick="OSRM.GUI.toggleMain()"></div>
+	<div class="main-toggle-out" onclick="OSRM.GUI.toggleMain()"></div>
 	<img id="osrm-logo" alt="OSRM Logo" src="images/osrm-logo.png" />
 
 	<!-- source/target input -->
     <table class="full">
     <tr>
     <td id="gui-search-source-label">Start:</td>
-    <td><input id="input-source-name" class="input-box" type="text" value="" title="Startposition eingeben" onkeypress="if(event.keyCode==13) {callGeocoder(OSRM.SOURCE_MARKER_LABEL, document.getElementById('input-source-name').value);}" /></td>
-    <!-- <td class="right"><a class="button not-selectable" id="gui-here-target" onclick="">i</a></td> -->
-    <td class="right"><a class="button not-selectable" id="gui-search-source" onclick="callGeocoder(OSRM.SOURCE_MARKER_LABEL, document.getElementById('input-source-name').value);">Suchen</a></td>
+    <td><div  style="position:relative;">
+    <input id="input-source-name" class="input-box" type="text" maxlength="200" value="" title="Startposition eingeben" onchange="OSRM.RoutingGUI.inputChanged(OSRM.C.SOURCE_LABEL);" />
+    <div id="delete-source-marker" class="delete-marker" onclick="OSRM.RoutingGUI.deleteMarker('source')"></div></div></td>
+    <td class="right"><a class="button not-selectable" id="gui-search-source" onclick="OSRM.RoutingGUI.showMarker('source')">Zeigen</a></td>
     </tr>
     
     <tr>
     <td id="gui-search-target-label">Ende:</td>
-    <td><input id="input-target-name" class="input-box" type="text" value="" title="Zielposition eingeben" onkeypress="if(event.keyCode==13) {callGeocoder(OSRM.TARGET_MARKER_LABEL, document.getElementById('input-target-name').value);}" /></td>
-    <!-- <td class="right"><a class="button not-selectable" id="gui-here-target" onclick="">i</a></td> -->
-    <td class="right"><a class="button not-selectable" id="gui-search-target" onclick="callGeocoder(OSRM.TARGET_MARKER_LABEL, document.getElementById('input-target-name').value);">Suchen</a></td>
+    <td><div  style="position:relative;">
+    <input id="input-target-name" class="input-box" type="text" maxlength="200" value="" title="Zielposition eingeben" onchange="OSRM.RoutingGUI.inputChanged(OSRM.C.TARGET_LABEL);" />
+    <div id="delete-target-marker" class="delete-marker" onclick="OSRM.RoutingGUI.deleteMarker('target')"></div></div></td>
+	<td class="right"><a class="button not-selectable" id="gui-search-target" onclick="OSRM.RoutingGUI.showMarker('target');">Zeigen</a></td>	
     </tr>
     </table>
     
@@ -84,25 +113,29 @@
     <div class="vquad"></div>
     <table style="width:100%">
     <tr>
-    <td>				<a class="button not-selectable" id="gui-reset" onclick="resetRouting();">Reset</a></td>
-    <td class="center">	<a class="button not-selectable" id="gui-reverse" onclick="reverseRouting();">Reverse</a></td>
-    <td class="right">	<a class="button not-selectable" id="gui-route" onclick="startRouting();">Route</a></td>
+    <td>				<a class="button not-selectable" id="gui-reset" onclick="OSRM.RoutingGUI.resetRouting();">Reset</a></td>
+	<td class="right">	<a class="button not-selectable" id="gui-reverse" onclick="OSRM.RoutingGUI.reverseRouting();">Umdrehen</a></td>
     </tr>
     </table>
     
 	<!-- options -->
-    <div class="vquad"></div>
-    <div class="main-options not-selectable" id="options-toggle" onclick="OSRM.GUI.toggleOptions()">Options</div>
-    <div class="main-options not-selectable" id="options-box">
-    <input type="checkbox" id="option-highlight-nonames" name="main-options" value="highlight-nonames" onclick="getRoute(OSRM.FULL_DESCRIPTION)" /><span id="gui-option-highlight-nonames-label">Unbenannte Straßen hervorheben</span>
-    </div>
+	<span class="main-options" id="options-toggle" onclick="OSRM.GUI.toggleOptions()">Kartenwerkzeuge</span>
+	<div class="main-options" id="options-box">
+	<span class="main-options-left-box">
+	<input type="checkbox" id="option-highlight-nonames" name="main-options" value="highlight-nonames" onclick="OSRM.Routing.getRoute();" /><span id="gui-option-highlight-nonames-label">Unbenannte Straßen hervorheben</span>
+	</span>
+	<span class="main-options-right-box">
+	<a class="button not-selectable" id="open-josm" onclick="OSRM.RoutingGUI.openJOSM();">JOSM</a>
+	<a class="button not-selectable" id="open-osmbugs" onclick="OSRM.RoutingGUI.openOSMBugs();">OSM Bugs</a>
+	</span>
+	</div>
 </div>
 
 <!-- output box -->
 <div class="gui-box not-selectable" id="main-output">
 	<div id="information-box-headline"></div>
 	<div id="information-box"></div>
-	<div id="legal-notice">GUI2 v0.1 120313 - OSRM hosting by <a href='http://algo2.iti.kit.edu/'>KIT</a> - Geocoder by <a href='http://www.osm.org/'>OSM</a></div>
+	<div id="legal-notice">GUI2 v0.1.1 120316 - OSRM hosting by <a href='http://algo2.iti.kit.edu/'>KIT</a> - Geocoder by <a href='http://www.osm.org/'>OSM</a></div>
 </div>
 
 </div>

WebContent/main.js

@@ -1,214 +1,183 @@
-var map;
+/*
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU AFFERO General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+or see http://www.gnu.org/licenses/agpl.txt.
+*/
+
+// OSRM initialization
+// [initialization, image prefetching]
+
+// will hold the Leaflet map object
+OSRM.GLOBALS.map = null;
 
 
-function init() {
-	prefetchImages();
-	prefetchIcons();
+// onload initialization routine
+OSRM.init = function() {
+	OSRM.prefetchImages();
+	OSRM.prefetchIcons();
 	
-	initLocale();
-	initMap();
-	initRouting();
-
- 	// check if the URL contains some GET parameter, e.g. for the route
- 	checkURL();	
-}
+	OSRM.GUI.init();
+	OSRM.Map.init();
+	OSRM.Routing.init();	
+	
+ 	// check if the URL contains some GET parameter, e.g. for showing a route
+ 	OSRM.checkURL();
+};
 
 
 // prefetch images
-OSRM.images = Array();
-function prefetchImages() {
+OSRM.GLOBALS.images = Array();
+OSRM.prefetchImages = function() {
 	var images = [	'images/marker-source.png',
 	              	'images/marker-target.png',
 	              	'images/marker-via.png',
-	              	'images/marker-highlight.png'
+	              	'images/marker-highlight.png',
+	              	'images/marker-source-drag.png',
+	              	'images/marker-target-drag.png',
+	              	'images/marker-via-drag.png',
+	              	'images/marker-highlight-drag.png',
+	              	'images/marker-drag.png',
+	              	'images/cancel.png',
+	              	'images/cancel_active.png',
+	              	'images/cancel_hover.png',
+	              	'images/restore.png',
+	              	'images/restore_active.png',
+	              	'images/restore_hover.png'
 	              ];
-	
+
 	for(var i=0; i<images.length; i++) {
-		OSRM.images[i] = new Image();
-		OSRM.images[i].src = images[i];
+		OSRM.G.images[i] = new Image();
+		OSRM.G.images[i].src = images[i];
 	}
-}
+};
 
 
 // prefetch icons
-OSRM.icons = Array();
-function prefetchIcons() {
+OSRM.GLOBALS.icons = Array();
+OSRM.prefetchIcons = function() {
 	var images = [	'marker-source',
 	              	'marker-target',
 	              	'marker-via',
 	              	'marker-highlight',
+	              	'marker-source-drag',
+	              	'marker-target-drag',
+	              	'marker-via-drag',
+	              	'marker-highlight-drag',
+	              	'marker-drag'
 	              ];
 
-	for(var i=0; i<images.length; i++)
-		OSRM.icons[images[i]] = new L.Icon('images/'+images[i]+'.png');
-}
-
-
-// init localization
-function initLocale() {
-	document.getElementById("gui-route").innerHTML = OSRM.loc("GUI_ROUTE");
-	document.getElementById("gui-reset").innerHTML = OSRM.loc("GUI_RESET");
-	document.getElementById("gui-reverse").innerHTML = OSRM.loc("GUI_REVERSE");
-	document.getElementById("gui-option-highlight-nonames-label").innerHTML = OSRM.loc("GUI_HIGHLIGHT_UNNAMED_ROADS");
-	document.getElementById("options-toggle").innerHTML = OSRM.loc("GUI_OPTIONS");
-	document.getElementById("gui-search-source").innerHTML = OSRM.loc("GUI_SEARCH");
-	document.getElementById("gui-search-target").innerHTML = OSRM.loc("GUI_SEARCH");
-	document.getElementById("gui-search-source-label").innerHTML = OSRM.loc("GUI_START")+":";
-	document.getElementById("gui-search-target-label").innerHTML = OSRM.loc("GUI_END")+":";
-	document.getElementById("input-source-name").title = OSRM.loc("GUI_START_TOOLTIP");
-	document.getElementById("input-target-name").title = OSRM.loc("GUI_END_TOOLTIP");
-	document.getElementById("legal-notice").innerHTML = OSRM.loc("GUI_LEGAL_NOTICE");
-	
-	document.getElementById('input-source-name').value = OSRM.DEFAULTS.ONLOAD_SOURCE;
-	document.getElementById('input-target-name').value = OSRM.DEFAULTS.ONLOAD_TARGET;
-}
-
-
-// centering on geolocation
-function callbak_centerOnGeolocation( position ) {
-	map.setView( new L.LatLng( position.coords.latitude, position.coords.longitude-0.02), OSRM.DEFAULTS.ZOOM_LEVEL);
-}
-function centerOnGeolocation() {
-	if (navigator.geolocation)
-		navigator.geolocation.getCurrentPosition( callbak_centerOnGeolocation );
-}
-
-
-// init map
-function initMap() {
-	var osmorgURL = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
-		osmorgAttribution = 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 Mapnik',
-		osmorgOptions = {maxZoom: 18, attribution: osmorgAttribution};
-
-	var osmdeURL = 'http://{s}.tile.openstreetmap.de/tiles/osmde/{z}/{x}/{y}.png',
-		osmdeAttribution = 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 Mapnik',
-		osmdeOptions = {maxZoom: 18, attribution: osmdeAttribution};
-	
-	var mapquestURL = 'http://otile{s}.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png',
-		mapquestAttribution = 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 MapQuest',
-		mapquestOptions = {maxZoom: 18, attribution: mapquestAttribution, subdomains: '1234'};	
-	
-	var cloudmadeURL = 'http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/997/256/{z}/{x}/{y}.png',
-    	cloudmadeAttribution = 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 CloudMade',
-	    cloudmadeOptions = {maxZoom: 18, attribution: cloudmadeAttribution};
-
-	var osmorg = new L.TileLayer(osmorgURL, osmorgOptions),
-    	osmde = new L.TileLayer(osmdeURL, osmdeOptions),
-    	mapquest = new L.TileLayer(mapquestURL, mapquestOptions),
-	    cloudmade = new L.TileLayer(cloudmadeURL, cloudmadeOptions);
-
-	map = new L.Map('map', {
-    	center: new L.LatLng(51.505, -0.09),
-	    zoom: 13,
-	    zoomAnimation: false,					// uncomment to remove animations and hiding of routes during zoom
-	    fadeAnimation: false,
-	    layers: [osmorg]
-	});
-
-	var baseMaps = {
-		"osm.org": osmorg,
-		"osm.de": osmde,
-		"MapQuest": mapquest,
-		"CloudMade": cloudmade
-	};
-
-	var overlayMaps = {};
-	var layersControl = new L.Control.Layers(baseMaps, overlayMaps);
-    map.addControl(layersControl);
-
-	getElementsByClassName(document,'leaflet-control-zoom')[0].style.left="420px";
-	getElementsByClassName(document,'leaflet-control-zoom')[0].style.top="5px";
-
-	map.setView( new L.LatLng( OSRM.DEFAULTS.ONLOAD_LATITUDE, OSRM.DEFAULTS.ONLOAD_LONGITUDE-0.02), OSRM.DEFAULTS.ZOOM_LEVEL);
-	map.on('zoomend', function(e) { getRoute(OSRM.FULL_DESCRIPTION); });	
-
-	map.on('click', function(e) {
-		if( !my_markers.route[0] || my_markers.route[0].label != OSRM.SOURCE_MARKER_LABEL) {
-			index = my_markers.setSource( e.latlng );
-			my_markers.route[index].show();
-			my_markers.route[index].centerView(false);	
-			getRoute(OSRM.FULL_DESCRIPTION);
-			updateLocation("source");
-//			updateReverseGeocoder("source");
-		}
-		else if( !my_markers.route[my_markers.route.length-1] || my_markers.route[ my_markers.route.length-1 ].label != OSRM.TARGET_MARKER_LABEL) {
-			index = my_markers.setTarget( e.latlng );
-			my_markers.route[index].show();
-			my_markers.route[index].centerView(false);	
-			getRoute(OSRM.FULL_DESCRIPTION);
-			updateLocation("target");
-//			updateReverseGeocoder("target");
-		}		
-	} );
-	// onmousemove test
-//	map.on('mousemove', function(e) { console.log("pos: " + e.latlng); });
-//	map.on('mousemove', function(e) {
-//		var objs = new Array;
-//		var obj = null;
-//		do {
-//			obj = document.elementFromPoint(e.layerPoint.x, e.layerPoint.y);
-//			
-//			if (obj == null)
-//				break;			
-//			if (obj == document.body)
-//				break;
-//			if (obj instanceof SVGPathElement)
-//				break;			
-//		
-//			objs.push(obj);
-//			obj.style.display = 'none';
-//		} while(true);
-//		for(var i=0; i<objs.length; ++i)
-//			objs[i].style.display ='';
-//		
-//		if (obj == null)
-//			return;
-//		
-//		if (obj instanceof SVGPathElement)
-//			xroute.route.fire('mousemove',e);
-//		else
-//			xroute.route.fire('mouseout',e);
-//	});
-}
-
-
-// parse URL GET parameters if existing
-function checkURL(){
-	var called_url = document.location.search.substr(1,document.location.search.length);
-	if( called_url != '') {
-		var positions = [];
-
-		// parse input (currently only parses start, dest, via)
-		var splitted_url = called_url.split('&');
-		for(var i=0; i<splitted_url.length; i++) {
-			var name_val = splitted_url[i].split('=');
-			if(name_val.length!=2)
-				continue;
-				
-			var coordinates = unescape(name_val[1]).split(',');
-			if(coordinates.length!=2)
-				continue;
-				
-			if(name_val[0] == 'loc')
-				positions.push ( new L.LatLng( coordinates[0], coordinates[1]) );
-		}
-
-		// draw via points
-		if( positions.length > 0)
-			my_markers.setSource( positions[0] );
-		for(var i=1; i<positions.length-1;i++)
-			my_markers.setVia( i-1, positions[i] );
-		if(positions.length > 1)
-			my_markers.setTarget( positions[positions.length-1] );
-		for(var i=0; i<my_markers.route.length;i++)
-			my_markers.route[i].show();
-		
-		// compute route
-		getRoute(OSRM.FULL_DESCRIPTION);
-		
-		var bounds = new L.LatLngBounds( positions );
-		//bounds._southWest.lng-=1.02;																// dirty hacks
-		map.fitBounds( bounds );
-		//my_route.centerView();
+	for(var i=0; i<images.length; i++) {
+		var icon = {
+				iconUrl: 'images/'+images[i]+'.png', iconSize: new L.Point(25, 41), iconAnchor: new L.Point(13, 41),
+				shadowUrl: L.ROOT_URL + 'images/marker-shadow.png',	shadowSize: new L.Point(41, 41),
+				popupAnchor: new L.Point(0, -33)
+			};
+		OSRM.G.icons[images[i]] = new L.SwitchableIcon(icon);
 	}
-}
+	
+	// special values for drag marker
+	OSRM.G.icons['marker-drag'] = new L.SwitchableIcon( {iconUrl: 'images/marker-drag.png', iconSize: new L.Point(18, 18) } );	
+};
+
+
+// parse URL GET parameters if any exist
+OSRM.checkURL = function(){
+	var called_url = document.location.search.substr(1,document.location.search.length);
+	
+	// reject messages that are clearly too long or too small 
+	if( called_url.length > 1000 || called_url.length == 0)
+		return;
+	
+	// storage for parameter values
+	var positions = [];
+	var zoom = null;
+	var center = null;
+	var destination = null;
+	var destination_name = null;
+
+	// parse input
+	var splitted_url = called_url.split('&');
+	for(var i=0; i<splitted_url.length; i++) {
+		var name_val = splitted_url[i].split('=');
+		if(name_val.length!=2)
+			continue;
+			
+		if(name_val[0] == 'loc') {
+			var coordinates = unescape(name_val[1]).split(',');
+			if(coordinates.length!=2 || !OSRM.Utils.isLatitude(coordinates[0]) || !OSRM.Utils.isLongitude(coordinates[1]) )
+				return;
+			positions.push ( new L.LatLng( coordinates[0], coordinates[1]) );
+		}
+		else if(name_val[0] == 'dest') {
+			var coordinates = unescape(name_val[1]).split(',');
+			if(coordinates.length!=2 || !OSRM.Utils.isLatitude(coordinates[0]) || !OSRM.Utils.isLongitude(coordinates[1]) )
+				return;				
+			destination = new L.LatLng( coordinates[0], coordinates[1]);
+		}
+		else if(name_val[0] == 'destname') {
+			destination_name = decodeURI(name_val[1]).replace(/<\/?[^>]+(>|$)/g ,"");	// discard tags	
+		}
+		else if(name_val[0] == 'z') {
+			zoom = name_val[1];
+			if( zoom<0 || zoom > 18)
+				return;
+		}
+		else if(name_val[0] == 'center') {
+			var coordinates = unescape(name_val[1]).split(',');
+			if(coordinates.length!=2 || !OSRM.Utils.isLatitude(coordinates[0]) || !OSRM.Utils.isLongitude(coordinates[1]) )
+				return;				
+			center = new L.LatLng( coordinates[0], coordinates[1]);			
+		}		
+	}
+		
+	// case 1: destination given
+	if( destination != undefined ) {
+		var index = OSRM.G.markers.setTarget( e.latlng );
+		if( destination_name == null )
+			OSRM.Geocoder.updateAddress( OSRM.C.TARGET_LABEL, OSRM.C.DO_FALLBACK_TO_LAT_LNG );
+		else 
+			document.getElementById("input-target-name").value = destination_name;
+		OSRM.G.markers.route[index].show();
+		OSRM.G.markers.route[index].centerView();
+		return;
+	}
+
+	// case 2: locations given
+	if( positions != []) {
+		// draw via points
+		if( positions.length > 0) {
+			OSRM.G.markers.setSource( positions[0] );
+			OSRM.Geocoder.updateAddress( OSRM.C.SOURCE_LABEL, OSRM.C.DO_FALLBACK_TO_LAT_LNG );
+		}
+		if(positions.length > 1) {
+			OSRM.G.markers.setTarget( positions[positions.length-1] );
+			OSRM.Geocoder.updateAddress( OSRM.C.TARGET_LABEL, OSRM.C.DO_FALLBACK_TO_LAT_LNG );
+		}
+		for(var i=1; i<positions.length-1;i++)
+			OSRM.G.markers.setVia( i-1, positions[i] );
+		for(var i=0; i<OSRM.G.markers.route.length;i++)
+			OSRM.G.markers.route[i].show();
+		
+		// center on route (support for old links) / move to given view (new behaviour)
+		if(zoom == null || center == null) {
+			var bounds = new L.LatLngBounds( positions );
+			OSRM.G.map.fitBoundsUI( bounds );
+		} else {
+			OSRM.G.map.setView(center, zoom);
+		}
+			
+		// compute route
+		OSRM.Routing.getRoute();
+	}
+};

WebContent/routing.js

@@ -1,423 +0,0 @@
-var my_route = undefined;
-var my_markers = undefined;
-
-OSRM.NO_DESCRIPTION = 0;
-OSRM.FULL_DESCRIPTION = 1;
-OSRM.dragging = false;
-OSRM.pending = false;
-OSRM.pendingTimer = undefined;
-
-// init data
-function initRouting() {
-	my_route = new OSRM.Route();
-	my_markers = new OSRM.Markers();
-}
-
-// decode compressed route geometry
-function decodeRouteGeometry(encoded, precision) {
-	precision = Math.pow(10, -precision);
-	var len = encoded.length, index=0, lat=0, lng = 0, array = [];
-	while (index < len) {
-		var b, shift = 0, result = 0;
-		do {
-			b = encoded.charCodeAt(index++) - 63;
-			result |= (b & 0x1f) << shift;
-			shift += 5;
-		} while (b >= 0x20);
-		var dlat = ((result & 1) ? ~(result >> 1) : (result >> 1));
-		lat += dlat;
-		shift = 0;
-		result = 0;
-		do {
-			b = encoded.charCodeAt(index++) - 63;
-			result |= (b & 0x1f) << shift;
-			shift += 5;
-		} while (b >= 0x20);
-		var dlng = ((result & 1) ? ~(result >> 1) : (result >> 1));
-		lng += dlng;
-		array.push([lat * precision, lng * precision]);
-	}
-	return array;
-}
-
-// display a transmitted route
-function timeoutRouteSimple() {
-	showNoRouteGeometry();
-	showNoRouteDescription();
-	document.getElementById('information-box').innerHTML = "<br><p style='font-size:14px;font-weight:bold;text-align:center;'>"+OSRM.loc("TIMED_OUT")+".<p>";
-}
-function timeoutRoute() {
-	showNoRouteGeometry();
-	my_route.hideUnnamedRoute();
-	showNoRouteDescription();
-	document.getElementById('information-box').innerHTML = "<br><p style='font-size:14px;font-weight:bold;text-align:center;'>"+OSRM.loc("TIMED_OUT")+".<p>";	
-}
-function showRouteSimple(response) {
- 	if(!response)
- 		return;
- 	
- 	if (OSRM.JSONP.fences.route)			// prevent simple routing when real routing is done!
- 		return;
- 	
-	if( response.status == 207) {
-		showNoRouteGeometry();
-		showNoRouteDescription();
-		document.getElementById('information-box').innerHTML = "<br><p style='font-size:14px;font-weight:bold;text-align:center;'>"+OSRM.loc("YOUR_ROUTE_IS_BEING_COMPUTED")+".<p>";
-	} else {
-		showRouteGeometry(response);
-		showRouteDescriptionSimple(response);
-	}
-	updateHints(response);
-	
-//	if(OSRM.pending) {
-//		clearTimeout(OSRM.pendingTimer);
-//		OSRM.pendingTimer = setTimeout(timeoutDrag,100);	// dirty dirty!		
-//	}
-}
-function showRoute(response) {
-	if(!response)
-		return;
-	
-	if(response.status == 207) {
-		showNoRouteGeometry();
-		my_route.hideUnnamedRoute();
-		showNoRouteDescription();
-		document.getElementById('information-box').innerHTML = "<br><p style='font-size:14px;font-weight:bold;text-align:center;'>"+OSRM.loc("NO_ROUTE_FOUND")+".<p>";
-	} else {
-		showRouteGeometry(response);
-		showRouteNonames(response);
-		showRouteDescription(response);
-		snapRoute();
-	}
-	updateHints(response);
-}
-
-function showNoRouteGeometry() {
-	var positions = [];
-	for(var i=0; i<my_markers.route.length;i++)
-			positions.push( my_markers.route[i].getPosition() );
-
-	my_route.showRoute(positions, OSRM.Route.NOROUTE);
-}
-function showRouteGeometry(response) {
-	via_points = response.via_points.slice(0);
-
-	var geometry = decodeRouteGeometry(response.route_geometry, 5);
-
-	var points = [];
-	for( var i=0; i < geometry.length; i++) {
-		points.push( new L.LatLng(geometry[i][0], geometry[i][1]) );
-	}
-	my_route.showRoute(points, OSRM.Route.ROUTE);
-}
-
-function onClickRouteDescription(geometry_index) {
-	var positions = my_route.getPositions();
-
-	my_markers.highlight.setPosition( positions[geometry_index] );
-	my_markers.highlight.show();
-	my_markers.highlight.centerView();	
-}
-function onClickCreateShortcut(src){
-	OSRM.JSONP.call(OSRM.DEFAULTS.HOST_SHORTENER_URL+src+'&jsonp=showRouteLink', showRouteLink, showRouteLink_TimeOut, 2000, 'shortener');
-}
-function showRouteLink(response){
-	document.getElementById('route-link').innerHTML = '[<a id="gpx-link" href="' +response.ShortURL+ '">'+OSRM.loc("LINK_TO_ROUTE")+'</a>]';
-}
-function showRouteLink_TimeOut(){
-	document.getElementById('route-link').innerHTML = '['+OSRM.loc("LINK_TO_ROUTE_TIMEOUT")+']';
-}
-function showRouteDescription(response) {
-	// compute query string
-	var query_string = '?z='+ map.getZoom();
-	for(var i=0; i<my_markers.route.length; i++)
-		query_string += '&loc=' + my_markers.route[i].getLat() + ',' + my_markers.route[i].getLng(); 
- 						
-	// create link to the route
-	var route_link ='<span class="route-summary" id="route-link">[<a id="gpx-link" onclick="onClickCreateShortcut(\'' + OSRM.DEFAULTS.WEBSITE_URL + query_string + '\')">'+OSRM.loc("GET_LINK")+'</a>]</span>';
-	//var route_link ='<span class="route-summary" id="route-link">[<a id="gpx-link" href="#" onclick="onClickCreateShortcut(\'' + document.URL + query_string + '\')">'+OSRM.loc("GET_LINK")+'</a>]</span>';
-
-	// create GPX link
-	var gpx_link = '<span class="route-summary">[<a id="gpx-link" onClick="javascript: document.location.href=\'' + OSRM.DEFAULTS.HOST_ROUTING_URL + query_string + '&output=gpx\';">'+OSRM.loc("GPX_FILE")+'</a>]</span>';
-		
-	// create route description
-	var route_desc = "";
-	route_desc += '<table class="results-table">';
-
-	for(var i=0; i < response.route_instructions.length; i++){
-		//odd or even ?
-		var rowstyle='results-odd';
-		if(i%2==0) { rowstyle='results-even'; }
-
-		route_desc += '<tr class="'+rowstyle+'">';
-		
-		route_desc += '<td class="result-directions">';
-		route_desc += '<img width="18px" src="images/'+getDirectionIcon(response.route_instructions[i][0])+'"/>';
-		route_desc += "</td>";		
-		
-		//route_desc += '<td class="result-counter"><span">'+(i+1)+'.</span></td>';
-				
-		route_desc += '<td class="result-items">';
-		route_desc += '<span class="result-item" onclick="onClickRouteDescription('+response.route_instructions[i][3]+')">'
-						+ response.route_instructions[i][0] + ' on ';
-		if( response.route_instructions[i][2] > 0 )
-			route_desc += response.route_instructions[i][1] + ' for '
-						+ getDistanceWithUnit(response.route_instructions[i][2])
-						+ '</span>';
-		route_desc += "</td>";
-		
-		route_desc += "</tr>";
-	}
-		
-	route_desc += '</table>';		
-	headline = "";
-	headline += OSRM.loc("ROUTE_DESCRIPTION")+":<br>";
-	headline += '<div style="float:left;width:70%">';
-	headline += "<span class='route-summary'>"
-		+ OSRM.loc("DISTANCE")+": " + getDistanceWithUnit(response.route_summary.total_distance)
-		+ " - "
-		+ OSRM.loc("DURATION")+": " + secondsToTime(response.route_summary.total_time)
-		+ "</span>";		
-	headline +=	'</div>';
-	headline += '<div style="float:left;text-align:right;width:30%;">'+route_link+'<br>'+gpx_link+'</div>';
-
-	var output = "";
-	output += route_desc;
-
-	document.getElementById('information-box-headline').innerHTML = headline;
-	document.getElementById('information-box').innerHTML = output;
-}
-function showRouteDescriptionSimple(response) {
-	headline = OSRM.loc("ROUTE_DESCRIPTION")+":<br>";
-	headline += "<span class='route-summary'>"
-			+ OSRM.loc("DISTANCE")+": " + getDistanceWithUnit(response.route_summary.total_distance)
-			+ " - "
-			+ OSRM.loc("DURATION")+": " + secondsToTime(response.route_summary.total_time)
-			+ "</span>";
-	headline += '<br><br>';
-
-	document.getElementById('information-box-headline').innerHTML = headline;
-	document.getElementById('information-box').innerHTML = "<br><p style='font-size:14px;font-weight:bold;text-align:center;'>"+OSRM.loc("YOUR_ROUTE_IS_BEING_COMPUTED")+".<p>";	
-}
-function showNoRouteDescription() {
-	headline = OSRM.loc("ROUTE_DESCRIPTION")+":<br>";
-	headline += "<span class='route-summary'>"
-			+ OSRM.loc("DISTANCE")+": N/A"
-			+ " - "
-			+ OSRM.loc("DURATION")+": N/A"
-			+ "</span>";
-	headline += '<br><br>';
-
-	document.getElementById('information-box-headline').innerHTML = headline;
-	document.getElementById('information-box').innerHTML = "<br><p style='font-size:14px;font-weight:bold;text-align:center;'>"+OSRM.loc("YOUR_ROUTE_IS_BEING_COMPUTED")+".<p>";	
-}
-
-function showRouteNonames(response) {
-	// do not display unnamed streets?
-	if( document.getElementById('option-highlight-nonames').checked == false) {
-		my_route.hideUnnamedRoute();
-		return;
-	}
-		
-	// mark geometry positions where unnamed/named streets switch
-	var named = [];
-	for (var i = 0; i < response.route_instructions.length; i++) {
-		if( response.route_instructions[i][1] == '' )
-			named[ response.route_instructions[i][3] ] = false;		// no street name
-		else
-			named[ response.route_instructions[i][3] ] = true;		// yes street name
-	}
-
-	// aggregate geometry for unnamed streets
-	var geometry = decodeRouteGeometry(response.route_geometry, 5);
-	var is_named = true;
-	var current_positions = [];
-	var all_positions = [];
-	for( var i=0; i < geometry.length; i++) {
-		current_positions.push( new L.LatLng(geometry[i][0], geometry[i][1]) );
-
-		// still named/unnamed?
-		if( (named[i] == is_named || named[i] == undefined) && i != geometry.length-1 )
-			continue;
-
-		// switch between named/unnamed!
-		if(is_named == false)
-			all_positions.push( current_positions );
-		current_positions = [];
-		current_positions.push( new L.LatLng(geometry[i][0], geometry[i][1]) );
-		is_named = named[i];
-	}
-	
-	// display unnamed streets
-	my_route.showUnnamedRoute(all_positions);
-}
-
-// function for dragging and drawing routes
-function getRoute(do_description) {
-	
-	// if source or target are not set -> hide route
-	if( my_markers.route.length < 2 ) {
-		my_route.hideRoute();
-		//my_markers.removeVias();			// TODO: do I need this?
-		//my_markers.highlight.hide();
-		return;
-	}
-	
-	// prepare JSONP call
-	var type = undefined;
-	var callback = undefined;
-	var timeout = undefined;
-	
-	var source = OSRM.DEFAULTS.HOST_ROUTING_URL;
-	source += '?z=' + map.getZoom() + '&output=json' + '&geomformat=cmp';	
-	if(my_markers.checksum)
-		source += '&checksum=' + my_markers.checksum;
-	for(var i=0; i<my_markers.route.length; i++) {
-		source += '&loc='  + my_markers.route[i].getLat() + ',' + my_markers.route[i].getLng();
-		if( my_markers.route[i].hint)
-			source += '&hint=' + my_markers.route[i].hint;
-	}
-	
-	// decide whether it is a dragging call or a normal one
-	if (do_description) {
-		callback = showRoute;
-		timeout = timeoutRoute;
-		source +='&instructions=true';
-		type = 'route';
-	} else {
-		callback = showRouteSimple;
-		timeout = timeoutRouteSimple;
-		source +='&instructions=false';
-		type = 'dragging';
-	}
-	
-	// do call
-	var called = OSRM.JSONP.call(source, callback, timeout, OSRM.JSONP.TIMEOUT, type);
-
-	// TODO: guarantee to do last drag
-	if(called == false && !do_description) {
-		clearTimeout(OSRM.pendingTimer);
-		OSRM.pendingTimer = setTimeout(timeoutDrag,OSRM.JSONP.TIMEOUT);
-	}
-	else {
-		clearTimeout(OSRM.pendingTimer);
-	}
-//	if(called == false && !do_description) {
-//		OSRM.pending = true;
-//	} else {
-//		clearTimeout(OSRM.pendingTimer);
-//		OSRM.pending = false;
-//	}
-}
-
-function timeoutDrag() {
-	my_markers.route[OSRM.dragid].hint = undefined;
-	getRoute(OSRM.NO_DESCRIPTION);
-}
-
-function startRouting() {
-	getRoute(OSRM.FULL_DESCRIPTION);
-}
-
-function resetRouting() {
-	document.getElementById('input-source-name').value = "";
-	document.getElementById('input-target-name').value = "";
-	
-	my_route.hideRoute();
-	my_markers.removeAll();
-	my_markers.highlight.hide();
-	
-	document.getElementById('information-box').innerHTML = "";
-	document.getElementById('information-box-headline').innerHTML = "";
-}
-
-function updateHints(response) {
-	var hint_locations = response.hint_data.locations;
-	my_markers.checksum = response.hint_data.checksum;
-	for(var i=0; i<hint_locations.length; i++)
-		my_markers.route[i].hint = hint_locations[i];
-}
-
-function snapRoute() {
-	var positions = my_route.getPositions();
- 	
- 	my_markers.route[0].setPosition( positions[0] );
- 	my_markers.route[my_markers.route.length-1].setPosition( positions[positions.length-1] );
- 	for(var i=0; i<via_points.length; i++)
-		my_markers.route[i+1].setPosition( new L.LatLng(via_points[i][0], via_points[i][1]) );
-
- 	updateLocation( "source" );
- 	updateLocation( "target" );
-}
-
-function positionsToInput() {
-	if(my_markers.route[0].label == OSRM.SOURCE_MARKER_LABEL) {
-		document.getElementById('input-source-name').value = my_markers.route[0].getPosition().lat.toFixed(6)+","+my_markers.route[0].getPosition().lng.toFixed(6);		
-	}
-	if(my_markers.route[my_markers.route.length-1].label == OSRM.TARGET_MARKER_LABEL) {
-		document.getElementById('input-target-name').value = my_markers.route[my_markers.route.length-1].getPosition().lat.toFixed(6)+","+my_markers.route[my_markers.route.length-1].getPosition().lng.toFixed(6);		
-	}	
-}
-
-function reverseRouting() {
-	// invert input boxes
-	var tmp = document.getElementById("input-source-name").value;
-	document.getElementById("input-source-name").value = document.getElementById("input-target-name").value;
-	document.getElementById("input-target-name").value = tmp;
-	
-	// invert route
-	my_markers.route.reverse();
-	if(my_markers.route.length == 1) {
-		if(my_markers.route[0].label == OSRM.TARGET_MARKER_LABEL) {
-			my_markers.route[0].label = OSRM.SOURCE_MARKER_LABEL;
-			my_markers.route[0].marker.setIcon( new L.Icon('images/marker-source.png') );
-		} else if(my_markers.route[0].label == OSRM.SOURCE_MARKER_LABEL) {
-			my_markers.route[0].label = OSRM.TARGET_MARKER_LABEL;
-			my_markers.route[0].marker.setIcon( new L.Icon('images/marker-target.png') );
-		}
-	} else if(my_markers.route.length > 1){
-		my_markers.route[0].label = OSRM.SOURCE_MARKER_LABEL;
-		my_markers.route[0].marker.setIcon( new L.Icon('images/marker-source.png') );
-		
-		my_markers.route[my_markers.route.length-1].label = OSRM.TARGET_MARKER_LABEL;
-		my_markers.route[my_markers.route.length-1].marker.setIcon( new L.Icon('images/marker-target.png') );		
-	}
-	
-	// recompute route
-	getRoute(OSRM.FULL_DESCRIPTION);
-	my_markers.highlight.hide();
-}
-
-
-
-
-//--------------------
-function getDirectionIcon(name) {
-	var directions = {
-		"Turn left":"turn-left.png",
-		"Turn right":"turn-right.png",
-		"U-Turn":"u-turn.png",
-		"Head":"continue.png",
-		"Continue":"continue.png",
-		"Turn slight left":"slight-left.png",
-		"Turn slight right":"slight-right.png",
-		"Turn sharp left":"sharp-left.png",
-		"Turn sharp right":"sharp-right.png",
-		"Enter round-about and leave at first exit":"round-about.png",
-		"Enter round-about and leave at second exit":"round-about.png",
-		"Enter round-about and leave at third exit":"round-about.png",
-		"Enter round-about and leave at forth exit":"round-about.png",
-		"Enter round-about and leave at fifth exit":"round-about.png",
-		"Enter round-about and leave at sixth exit":"round-about.png",
-		"Enter round-about and leave at seventh exit":"round-about.png",
-		"Enter round-about and leave at eighth exit":"round-about.png",
-		"Enter round-about and leave at nineth exit":"round-about.png",
-		"Enter round-about and leave at tenth exit":"round-about.png",
-		"Enter round-about and leave at one of the too many exit":"round-about.png",
-	};
-	
-	if( directions[name] )
-		return directions[name];
-	else
-		return "default.png";
-}

WebContent/routing/OSRM.Routing.js

@@ -0,0 +1,148 @@
+/*
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU AFFERO General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+or see http://www.gnu.org/licenses/agpl.txt.
+*/
+
+// OSRM routing
+// [management of routing requests and processing of responses]
+
+// some variables
+OSRM.GLOBALS.route = null;
+OSRM.GLOBALS.markers = null;
+
+OSRM.GLOBALS.dragging = null;
+OSRM.GLOBALS.dragid = null;
+OSRM.GLOBALS.pending = false;
+OSRM.GLOBALS.pendingTimer = null;
+
+
+OSRM.Routing = {
+		
+// init routing data structures
+init: function() {
+	OSRM.G.route = new OSRM.Route();
+	OSRM.G.markers = new OSRM.Markers();
+},
+
+
+// -- JSONP processing -- 
+
+// process JSONP response of routing server
+timeoutRouteSimple: function() {
+	OSRM.RoutingGeometry.showNA();
+	OSRM.RoutingDescription.showNA( OSRM.loc("TIMED_OUT") );
+},
+timeoutRoute: function() {
+	OSRM.RoutingGeometry.showNA();
+	OSRM.RoutingNoNames.showNA();
+	OSRM.RoutingDescription.showNA( OSRM.loc("TIMED_OUT") );
+},
+showRouteSimple: function(response) {
+ 	if(!response)
+ 		return;
+ 	if( !OSRM.G.dragging )		// prevent simple routing when no longer dragging
+ 		return;
+ 	
+	if( response.status == 207) {
+		OSRM.RoutingGeometry.showNA();
+		OSRM.RoutingDescription.showNA( OSRM.loc("YOUR_ROUTE_IS_BEING_COMPUTED") );
+	} else {
+		OSRM.RoutingGeometry.show(response);
+		OSRM.RoutingDescription.showSimple(response);
+	}
+	OSRM.Routing._updateHints(response);
+
+	if(OSRM.G.pending)
+		OSRM.G.pendingTimer = setTimeout(OSRM.Routing.draggingTimeout,1);		
+},
+showRoute: function(response) {
+	if(!response)
+		return;
+	
+	OSRM.G.via_points = response.via_points.slice(0);
+	if(response.status == 207) {
+		OSRM.RoutingGeometry.showNA();
+		OSRM.RoutingNoNames.showNA();
+		OSRM.RoutingDescription.showNA( OSRM.loc("NO_ROUTE_FOUND") );
+	} else {
+		OSRM.RoutingGeometry.show(response);
+		OSRM.RoutingNoNames.show(response);
+		OSRM.RoutingDescription.show(response);
+		OSRM.Routing._snapRoute();
+	}
+	OSRM.Routing._updateHints(response);
+},
+
+
+
+//-- main function --
+
+//generate server calls to query routes
+getRoute: function() {
+	
+	// if source or target are not set -> hide route
+	if( OSRM.G.markers.route.length < 2 ) {
+		OSRM.G.route.hideRoute();
+		return;
+	}
+	
+	OSRM.JSONP.call(OSRM.Routing._buildCall()+'&instructions=true', OSRM.Routing.showRoute, OSRM.Routing.timeoutRoute, OSRM.DEFAULTS.JSONP_TIMEOUT, 'route');
+},
+getDragRoute: function() {
+	OSRM.G.pending = !OSRM.JSONP.call(OSRM.Routing._buildCall()+'&instructions=false', OSRM.Routing.showRouteSimple, OSRM.Routing.timeoutRouteSimple, OSRM.DEFAULTS.JSONP_TIMEOUT, 'dragging');;
+},
+draggingTimeout: function() {
+	OSRM.G.markers.route[OSRM.G.dragid].hint = null;
+	OSRM.Routing.getDragRoute();
+},
+
+_buildCall: function() {
+	var source = OSRM.DEFAULTS.HOST_ROUTING_URL;
+	source += '?z=' + OSRM.G.map.getZoom() + '&output=json&geomformat=cmp';	
+	if(OSRM.G.markers.checksum)
+		source += '&checksum=' + OSRM.G.markers.checksum;
+	for(var i=0,size=OSRM.G.markers.route.length; i<size; i++) {
+		source += '&loc='  + OSRM.G.markers.route[i].getLat() + ',' + OSRM.G.markers.route[i].getLng();
+		if( OSRM.G.markers.route[i].hint)
+			source += '&hint=' + OSRM.G.markers.route[i].hint;
+	}
+	return source;
+},
+
+
+//-- helper functions --
+
+// update hints of all markers
+_updateHints: function(response) {
+	var hint_locations = response.hint_data.locations;
+	OSRM.G.markers.checksum = response.hint_data.checksum;
+	for(var i=0; i<hint_locations.length; i++)
+		OSRM.G.markers.route[i].hint = hint_locations[i];
+},
+
+// snap all markers to the received route
+_snapRoute: function() {
+	var positions = OSRM.G.route.getPositions();
+ 	
+ 	OSRM.G.markers.route[0].setPosition( positions[0] );
+ 	OSRM.G.markers.route[OSRM.G.markers.route.length-1].setPosition( positions[positions.length-1] );
+ 	for(var i=0; i<OSRM.G.via_points.length; i++)
+		OSRM.G.markers.route[i+1].setPosition( new L.LatLng(OSRM.G.via_points[i][0], OSRM.G.via_points[i][1]) );
+
+ 	OSRM.Geocoder.updateAddress(OSRM.C.SOURCE_LABEL);
+ 	OSRM.Geocoder.updateAddress(OSRM.C.TARGET_LABEL);
+}
+
+};

WebContent/routing/OSRM.RoutingDescription.js

@@ -0,0 +1,174 @@
+/*
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU AFFERO General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+or see http://www.gnu.org/licenses/agpl.txt.
+*/
+
+// OSRM routing description
+// [renders routing description and manages events]
+
+
+OSRM.RoutingDescription = {
+		
+// route description events
+onClickRouteDescription: function(geometry_index) {
+	var positions = OSRM.G.route.getPositions();
+
+	OSRM.G.markers.highlight.setPosition( positions[geometry_index] );
+	OSRM.G.markers.highlight.show();
+	OSRM.G.markers.highlight.centerView(OSRM.DEFAULTS.HIGHLIGHT_ZOOM_LEVEL);	
+},
+onClickCreateShortcut: function(src){
+	src += '&z='+ OSRM.G.map.getZoom() + '&center=' + OSRM.G.map.getCenter().lat + ',' + OSRM.G.map.getCenter().lng;
+	OSRM.JSONP.call(OSRM.DEFAULTS.HOST_SHORTENER_URL+src, OSRM.RoutingDescription.showRouteLink, OSRM.RoutingDescription.showRouteLink_TimeOut, OSRM.DEFAULTS.JSONP_TIMEOUT, 'shortener');
+	document.getElementById('route-prelink').innerHTML = '['+OSRM.loc("GENERATE_LINK_TO_ROUTE")+']';
+},
+showRouteLink: function(response){
+	document.getElementById('route-prelink').innerHTML = '[<a id="gpx-link" class = "text-selectable" href="' +response.ShortURL+ '">'+response.ShortURL+'</a>]';
+// 	document.getElementById('route-prelink').innerHTML = '[<input class="text-selectable output-box" style="border:none" value="'+response.ShortURL+'" type="text" onfocus="this.select()" readonly="readonly"/>]';
+},
+showRouteLink_TimeOut: function(){
+	document.getElementById('route-prelink').innerHTML = '['+OSRM.loc("LINK_TO_ROUTE_TIMEOUT")+']';
+},
+
+// handling of routing description
+show: function(response) {
+	// compute query string
+	var query_string = '?rebuild=1';
+	for(var i=0; i<OSRM.G.markers.route.length; i++)
+		query_string += '&loc=' + OSRM.G.markers.route[i].getLat() + ',' + OSRM.G.markers.route[i].getLng(); 
+ 						
+	// create link to the route
+	var route_link ='<span class="route-summary" id="route-prelink">[<a id="gpx-link" onclick="OSRM.RoutingDescription.onClickCreateShortcut(\'' + OSRM.DEFAULTS.WEBSITE_URL + query_string + '\')">'+OSRM.loc("GET_LINK_TO_ROUTE")+'</a>]</span>';
+
+	// create GPX link
+	var gpx_link = '<span class="route-summary">[<a id="gpx-link" onClick="document.location.href=\'' + OSRM.DEFAULTS.HOST_ROUTING_URL + query_string + '&output=gpx\';">'+OSRM.loc("GPX_FILE")+'</a>]</span>';
+		
+	// create route description
+	var route_desc = "";
+	route_desc += '<table class="results-table">';
+
+	for(var i=0; i < response.route_instructions.length; i++){
+		//odd or even ?
+		var rowstyle='results-odd';
+		if(i%2==0) { rowstyle='results-even'; }
+
+		route_desc += '<tr class="'+rowstyle+'">';
+		
+		route_desc += '<td class="result-directions">';
+		route_desc += '<img width="18px" src="images/'+OSRM.RoutingDescription.getDirectionIcon(response.route_instructions[i][0])+'" alt="" />';
+		route_desc += "</td>";		
+		
+		route_desc += '<td class="result-items">';
+		route_desc += '<span class="result-item" onclick="OSRM.RoutingDescription.onClickRouteDescription('+response.route_instructions[i][3]+')">';
+		route_desc += response.route_instructions[i][0];
+		if( i == 0 )
+			route_desc += ' ' + OSRM.loc( response.route_instructions[i][6] );		
+		if( response.route_instructions[i][1] != "" ) {
+			route_desc += ' on ';
+			route_desc += '<b>' + response.route_instructions[i][1] + '</b>';
+		}
+		//route_desc += ' for ';
+		route_desc += '</span>';
+		route_desc += "</td>";
+		
+		route_desc += '<td class="result-distance">';
+		if( i != response.route_instructions.length-1 )
+		route_desc += '<b>'+OSRM.Utils.metersToDistance(response.route_instructions[i][2])+'</b>';
+		route_desc += "</td>";
+		
+		route_desc += "</tr>";
+	}	
+		
+	route_desc += '</table>';		
+	headline = "";
+	headline += OSRM.loc("ROUTE_DESCRIPTION")+":<br>";
+	headline += '<div style="float:left;width:40%">';
+	headline += "<span class='route-summary'>"
+		+ OSRM.loc("DISTANCE")+": " + OSRM.Utils.metersToDistance(response.route_summary.total_distance)
+		+ "<br>"
+		+ OSRM.loc("DURATION")+": " + OSRM.Utils.secondsToTime(response.route_summary.total_time)
+		+ "</span>";		
+	headline +=	'</div>';
+	headline += '<div style="float:left;text-align:right;width:60%;">'+route_link+'<br>'+gpx_link+'</div>';
+
+	var output = "";
+	output += route_desc;
+
+	document.getElementById('information-box-headline').innerHTML = headline;
+	document.getElementById('information-box').innerHTML = output;
+},
+
+// simple description
+showSimple: function(response) {
+	headline = OSRM.loc("ROUTE_DESCRIPTION")+":<br>";
+	headline += "<span class='route-summary'>"
+			+ OSRM.loc("DISTANCE")+": " + OSRM.Utils.metersToDistance(response.route_summary.total_distance)
+			+ "<br>"
+			+ OSRM.loc("DURATION")+": " + OSRM.Utils.secondsToTime(response.route_summary.total_time)
+			+ "</span>";
+	headline += '<br><br>';
+
+	document.getElementById('information-box-headline').innerHTML = headline;
+	document.getElementById('information-box').innerHTML = "<br><p style='font-size:14px;font-weight:bold;text-align:center;'>"+OSRM.loc("YOUR_ROUTE_IS_BEING_COMPUTED")+".<p>";	
+},
+
+// no description
+showNA: function( display_text ) {
+	headline = OSRM.loc("ROUTE_DESCRIPTION")+":<br>";
+	headline += "<span class='route-summary'>"
+			+ OSRM.loc("DISTANCE")+": N/A"
+			+ "<br>"
+			+ OSRM.loc("DURATION")+": N/A"
+			+ "</span>";
+	headline += '<br><br>';
+
+	document.getElementById('information-box-headline').innerHTML = headline;
+	document.getElementById('information-box').innerHTML = "<br><p style='font-size:14px;font-weight:bold;text-align:center;'>"+display_text+".<p>";	
+},
+
+// map driving instructions to icons
+// [TODO: language-safe implementation]
+getDirectionIcon: function(name) {
+	var directions = {
+		"Turn left":"turn-left.png",
+		"Turn right":"turn-right.png",
+		"U-Turn":"u-turn.png",
+		"Head":"continue.png",
+		"Continue":"continue.png",
+		"Turn slight left":"slight-left.png",
+		"Turn slight right":"slight-right.png",
+		"Turn sharp left":"sharp-left.png",
+		"Turn sharp right":"sharp-right.png",
+		"Enter roundabout and leave at first exit":"round-about.png",
+		"Enter roundabout and leave at second exit":"round-about.png",
+		"Enter roundabout and leave at third exit":"round-about.png",
+		"Enter roundabout and leave at fourth exit":"round-about.png",
+		"Enter roundabout and leave at fifth exit":"round-about.png",
+		"Enter roundabout and leave at sixth exit":"round-about.png",
+		"Enter roundabout and leave at seventh exit":"round-about.png",
+		"Enter roundabout and leave at eighth exit":"round-about.png",
+		"Enter roundabout and leave at nineth exit":"round-about.png",
+		"Enter roundabout and leave at tenth exit":"round-about.png",
+		"Enter roundabout and leave at one of the too many exit":"round-about.png",
+		"You have reached your destination":"target.png"
+	};
+	
+	if( directions[name] )
+		return directions[name];
+	else
+		return "default.png";
+}
+
+};

WebContent/routing/OSRM.RoutingGUI.js

@@ -0,0 +1,129 @@
+/*
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU AFFERO General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+or see http://www.gnu.org/licenses/agpl.txt.
+*/
+
+// OSRM routing
+// [handles GUI events]
+
+
+OSRM.RoutingGUI = {
+
+// click: button "reset"
+resetRouting: function() {
+	document.getElementById('input-source-name').value = "";
+	document.getElementById('input-target-name').value = "";
+	
+	OSRM.G.route.hideAll();
+	OSRM.G.markers.removeAll();
+	OSRM.G.markers.highlight.hide();
+	
+	document.getElementById('information-box').innerHTML = "";
+	document.getElementById('information-box-headline').innerHTML = "";
+	
+	OSRM.JSONP.reset();	
+},
+
+// click: button "reverse"
+reverseRouting: function() {
+	// invert input boxes
+	var tmp = document.getElementById("input-source-name").value;
+	document.getElementById("input-source-name").value = document.getElementById("input-target-name").value;
+	document.getElementById("input-target-name").value = tmp;
+	
+	// invert route
+	OSRM.G.markers.route.reverse();
+	if(OSRM.G.markers.route.length == 1) {
+		if(OSRM.G.markers.route[0].label == OSRM.C.TARGET_LABEL) {
+			OSRM.G.markers.route[0].label = OSRM.C.SOURCE_LABEL;
+			OSRM.G.markers.route[0].marker.setIcon( new L.Icon('images/marker-source.png') );
+		} else if(OSRM.G.markers.route[0].label == OSRM.C.SOURCE_LABEL) {
+			OSRM.G.markers.route[0].label = OSRM.C.TARGET_LABEL;
+			OSRM.G.markers.route[0].marker.setIcon( new L.Icon('images/marker-target.png') );
+		}
+	} else if(OSRM.G.markers.route.length > 1){
+		OSRM.G.markers.route[0].label = OSRM.C.SOURCE_LABEL;
+		OSRM.G.markers.route[0].marker.setIcon( new L.Icon('images/marker-source.png') );
+		
+		OSRM.G.markers.route[OSRM.G.markers.route.length-1].label = OSRM.C.TARGET_LABEL;
+		OSRM.G.markers.route[OSRM.G.markers.route.length-1].marker.setIcon( new L.Icon('images/marker-target.png') );		
+	}
+	
+	// recompute route
+	if( OSRM.G.route.isShown() ) {
+		OSRM.Routing.getRoute();
+		OSRM.G.markers.highlight.hide();
+	} else {
+		document.getElementById('information-box').innerHTML = "";
+		document.getElementById('information-box-headline').innerHTML = "";		
+	}
+},
+
+// click: button "show"
+showMarker: function(marker_id) {
+	if( OSRM.JSONP.fences["geocoder_source"] || OSRM.JSONP.fences["geocoder_target"] )
+		return;
+	
+	if( marker_id == OSRM.C.SOURCE_LABEL && OSRM.G.markers.hasSource() )
+		OSRM.G.markers.route[0].centerView();
+	else if( marker_id == OSRM.C.TARGET_LABEL && OSRM.G.markers.hasTarget() )
+		OSRM.G.markers.route[OSRM.G.markers.route.length-1].centerView();
+},
+
+
+// changed: any inputbox (is called when return is pressed [after] or focus is lost [before])
+inputChanged: function(marker_id) {
+	if( marker_id == OSRM.C.SOURCE_LABEL)	
+		OSRM.Geocoder.call(OSRM.C.SOURCE_LABEL, document.getElementById('input-source-name').value);
+	else if( marker_id == OSRM.C.TARGET_LABEL)
+		OSRM.Geocoder.call(OSRM.C.TARGET_LABEL, document.getElementById('input-target-name').value);
+},
+
+// click: button "open JOSM"
+openJOSM: function() {
+	var x = OSRM.G.map.getCenterUI();
+	var ydelta = 0.01;
+	var xdelta = ydelta * 2;
+	var p = [ 'left='  + (x.lng - xdelta), 'bottom=' + (x.lat - ydelta), 'right=' + (x.lng + xdelta), 'top='    + (x.lat + ydelta)];
+	var url = 'http://localhost:8111/load_and_zoom?' + p.join('&');
+	
+	var frame = L.DomUtil.create('iframe', null, document.body);
+	frame.style.width = frame.style.height = "0px";
+	frame.src = url;
+	frame.onload = function(e) { document.body.removeChild(frame); };
+},
+
+//click: button "open OSM Bugs"
+openOSMBugs: function() {
+	var position = OSRM.G.map.getCenterUI();
+	window.open( "http://osmbugs.org/?lat="+position.lat.toFixed(6)+"&lon="+position.lng.toFixed(6)+"&zoom="+OSRM.G.map.getZoom() );
+},
+
+//click: button "delete marker"
+deleteMarker: function(marker_id) {
+	var id = null;
+	if(marker_id == 'source' && OSRM.G.markers.hasSource() )
+		id = 0;
+	else if(marker_id == 'target' && OSRM.G.markers.hasTarget() )
+		id = OSRM.G.markers.route.length-1;
+	if( id == null)
+		return;
+	
+	OSRM.G.markers.removeMarker( id );
+	OSRM.Routing.getRoute();
+	OSRM.G.markers.highlight.hide();	
+}
+
+};

WebContent/routing/OSRM.RoutingGeometry.js

@@ -0,0 +1,71 @@
+/*
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU AFFERO General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+or see http://www.gnu.org/licenses/agpl.txt.
+*/
+
+// OSRM routing geometry
+// [renders routing geometry]
+
+
+OSRM.RoutingGeometry = {
+
+// show route geometry - if there is a route
+show: function(response) {
+	var geometry = OSRM.RoutingGeometry._decode(response.route_geometry, 5);
+
+	var positions = [];
+	for( var i=0, size=geometry.length; i < size; i++)
+		positions.push( new L.LatLng(geometry[i][0], geometry[i][1]) );
+	
+	OSRM.G.route.showRoute(positions, OSRM.Route.ROUTE);
+},
+
+//show route geometry - if there is no route
+showNA: function() {
+	var positions = [];
+	for(var i=0, size=OSRM.G.markers.route.length; i<size; i++)
+			positions.push( OSRM.G.markers.route[i].getPosition() );
+
+	OSRM.G.route.showRoute(positions, OSRM.Route.NOROUTE);
+},
+
+//decode compressed route geometry
+_decode: function(encoded, precision) {
+	precision = Math.pow(10, -precision);
+	var len = encoded.length, index=0, lat=0, lng = 0, array = [];
+	while (index < len) {
+		var b, shift = 0, result = 0;
+		do {
+			b = encoded.charCodeAt(index++) - 63;
+			result |= (b & 0x1f) << shift;
+			shift += 5;
+		} while (b >= 0x20);
+		var dlat = ((result & 1) ? ~(result >> 1) : (result >> 1));
+		lat += dlat;
+		shift = 0;
+		result = 0;
+		do {
+			b = encoded.charCodeAt(index++) - 63;
+			result |= (b & 0x1f) << shift;
+			shift += 5;
+		} while (b >= 0x20);
+		var dlng = ((result & 1) ? ~(result >> 1) : (result >> 1));
+		lng += dlng;
+		array.push([lat * precision, lng * precision]);
+	}
+	return array;
+}
+
+};

WebContent/routing/OSRM.RoutingNoNames.js

@@ -0,0 +1,68 @@
+/*
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU AFFERO General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+or see http://www.gnu.org/licenses/agpl.txt.
+*/
+
+// OSRM routing
+// [renders route segments that are unnamed streets]
+
+
+OSRM.RoutingNoNames = {
+		
+// displays route segments that are unnamed streets
+show: function(response) {
+	// do not display unnamed streets?
+	if( document.getElementById('option-highlight-nonames').checked == false) {
+		OSRM.G.route.hideUnnamedRoute();
+		return;
+	}
+		
+	// mark geometry positions where unnamed/named streets switch
+	var named = [];
+	for (var i = 0; i < response.route_instructions.length; i++) {
+		if( response.route_instructions[i][1] == '' )
+			named[ response.route_instructions[i][3] ] = false;		// no street name
+		else
+			named[ response.route_instructions[i][3] ] = true;		// yes street name
+	}
+
+	// aggregate geometry for unnamed streets
+	var geometry = OSRM.RoutingGeometry._decode(response.route_geometry, 5);
+	var is_named = true;
+	var current_positions = [];
+	var all_positions = [];
+	for( var i=0; i < geometry.length; i++) {
+		current_positions.push( new L.LatLng(geometry[i][0], geometry[i][1]) );
+
+		// still named/unnamed?
+		if( (named[i] == is_named || named[i] == undefined) && i != geometry.length-1 )
+			continue;
+
+		// switch between named/unnamed!
+		if(is_named == false)
+			all_positions.push( current_positions );
+		current_positions = [];
+		current_positions.push( new L.LatLng(geometry[i][0], geometry[i][1]) );
+		is_named = named[i];
+	}
+	
+	// display unnamed streets
+	OSRM.G.route.showUnnamedRoute(all_positions);
+},
+
+showNA: function() {
+	OSRM.G.route.hideUnnamedRoute();	
+}
+};

WebContent/test.html

@@ -1,27 +0,0 @@
-<html> 
-<head>
-
-<script src="leaflet/leaflet-src.js"></script>
-<script src="OSRM.js"></script>
-<script src="OSRM.Markers.js"></script>
-
-<script type="text/javascript">
-function testSnippet()
-{
-	var marker = new OSRM.RouteMarker("source",undefined,new L.Icon('images/marker-source.png'));
-	marker.yyy();
-	for(a in marker)
-		alert(a);
-	alert(marker);
-}
-</script>
-</head>
-<body>
-
-<h1>Test Javascript Snippets</h1>
-<p id="output">This could be your output.</p>
-
-<button type="button" onclick="testSnippet()">Run Snippet</button>
-
-</body>
-</html> 

WebContent/utils.js

@@ -1,69 +0,0 @@
-// compatibility mode for old browser
-function getElementsByClassName(node, classname) {
-    var a = [];
-    var re = new RegExp('(^| )'+classname+'( |$)');
-    var els = node.getElementsByTagName("*");
-    for(var i=0,j=els.length; i<j; i++)
-        if(re.test(els[i].className))a.push(els[i]);
-    return a;
-}
-document.head = document.head || document.getElementsByTagName('head')[0];
-
-// ------------------------------------------------------
-
-// human readable time
-function secondsToTime(seconds){
-   seconds = parseInt(seconds);
-   minutes = parseInt(seconds/60);
-   seconds = seconds%60;
-   hours = parseInt(minutes/60);
-   minutes = minutes%60;
-   if(hours==0){
-   	return minutes+' min';
-   }
-   else{
-   	return hours+' h '+minutes+' min';
-   }
-}
-
-// human readable distance
-function getDistanceWithUnit(distance){
-	distance = parseInt(distance);
-	if(distance >= 1000){ return (parseInt(distance/1000))+' km'; }
-	else{ return distance+' m'; }
-}
-
-// ------------------------------------------------------
-
-// distance between two points
-function distanceBetweenPoint(x1, y1, x2, y2) {
-	var a = x1 - x2;
-	var b = y1 - y2;
-	return Math.sqrt(a*a + b*b);
-}
-
-// distance from a point to a line or segment
-// (x,y)   point
-// (x0,y0) line point A
-// (x1,y1) line point B
-// o       specifies if the distance should respect the limits of the segment (overLine = true)
-//         or if it should consider the segment as an infinite line (overLine = false);
-//         if false returns the distance from the point to the line,
-//         otherwise the distance from the point to the segment
-function dotLineLength(x, y, x0, y0, x1, y1, o){
-	function lineLength(x, y, x0, y0){return Math.sqrt((x -= x0) * x + (y -= y0) * y);}
-
-	if(o && !(o = function(x, y, x0, y0, x1, y1){
-		if(!(x1 - x0)) return {x: x0, y: y};
-		else if(!(y1 - y0)) return {x: x, y: y0};
-		var left, tg = -1 / ((y1 - y0) / (x1 - x0));
-		return {x: left = (x1 * (x * tg - y + y0) + x0 * (x * - tg + y - y1)) / (tg * (x1 - x0) + y0 - y1), y: tg * left - tg * x + y};
-    }(x, y, x0, y0, x1, y1) && o.x >= Math.min(x0, x1) && o.x <= Math.max(x0, x1) && o.y >= Math.min(y0, y1) && o.y <= Math.max(y0, y1))){
-		var l1 = lineLength(x, y, x0, y0), l2 = lineLength(x, y, x1, y1);
-		return l1 > l2 ? l2 : l1;
-    }
-    else {
-    	var a = y0 - y1, b = x1 - x0, c = x0 * y1 - y0 * x1;
-        return Math.abs(a * x + b * y + c) / Math.sqrt(a * a + b * b);
-    }
-};

WebContent/via.js

@@ -1,42 +0,0 @@
-var via_points;
-
-function findNearestRouteSegment( new_via ) {
-	var min_dist = Number.MAX_VALUE;
-	var min_index = undefined;
-
-	var positions = my_route.getPositions();
-	for(var i=0; i<positions.length-1; i++) {
-		var dist = dotLineLength( new_via.lng, new_via.lat, positions[i].lng, positions[i].lat, positions[i+1].lng, positions[i+1].lat, true);
-		if( dist < min_dist) {
-			min_dist = dist;
-			min_index = i+1;
-		}
-	}
-
-	return min_index;
-}
-
-
-function findViaPosition( new_via_position ) {
-	// find route segment that is closest to click position (marked by last index)
-	var nearest_index = findNearestRouteSegment( new_via_position );
-
-	// find correct index to insert new via node
-	var new_via_index = via_points.length;
-	var via_index = Array();
-	for(var i=0; i<via_points.length; i++) {
-		via_index[i] = findNearestRouteSegment( new L.LatLng(via_points[i][0], via_points[i][1]) );
-		if(via_index[i] > nearest_index) {
-			new_via_index = i;
-			break;
-		}
-	}
-
-	// add via node
-	var index = my_markers.setVia(new_via_index, new_via_position);
-	my_markers.route[index].show();
-	
-	getRoute(OSRM.FULL_DESCRIPTION);
-
-	return new_via_index;
-}