From 74211172788f69d28ed64a2e13a6498cf0dae19e Mon Sep 17 00:00:00 2001
From: shiin <shiin@T42>
Date: Tue, 24 Apr 2012 00:56:41 +0200
Subject: [PATCH] extended mapview to give information about the current
 visible tile layer, continued work on printing

---
 WebContent/base/OSRM.Map.js                   | 21 +---------
 .../base/leaflet/L.Control.QueryableLayers.js | 34 +++++++++++++++
 WebContent/base/osrm/OSRM.MapView.js          | 22 +++++++++-
 WebContent/main.html                          |  1 +
 WebContent/printing/OSRM.Printing.js          | 42 +++++++------------
 WebContent/printing/printing.css              |  8 ++++
 6 files changed, 81 insertions(+), 47 deletions(-)
 create mode 100644 WebContent/base/leaflet/L.Control.QueryableLayers.js

diff --git a/WebContent/base/OSRM.Map.js b/WebContent/base/OSRM.Map.js
index b84309612..e26edb31c 100644
--- a/WebContent/base/OSRM.Map.js
+++ b/WebContent/base/OSRM.Map.js
@@ -22,22 +22,6 @@ or see http://www.gnu.org/licenses/agpl.txt.
 OSRM.GLOBALS.map = null;
 
 
-L.MyLayers = L.Control.Layers.extend({
-getActive: function () {
-	var i, input, obj,
-	inputs = this._form.getElementsByTagName('input'),
-	inputsLen = inputs.length;
-
-	for (i = 0; i < inputsLen; i++) {
-		input = inputs[i];
-		obj = this._layers[input.layerId];
-		if (input.checked && !obj.overlay) {
-			return obj.name;
-		}
-	}
-}
-});
-
 // map controller
 // [map initialization, event handling]
 OSRM.Map = {
@@ -66,9 +50,8 @@ init: function() {
 	});
 
 	// add layer control
-	var layersControl = new L.MyLayers(base_maps, {});
-	OSRM.G.map.layerControl = layersControl;
-	OSRM.G.map.addControl(layersControl);
+	var layerControl = new L.Control.QueryableLayers(base_maps, {});
+	OSRM.G.map.addLayerControl(layerControl);
 
     // move zoom markers
 	OSRM.Browser.getElementsByClassName(document,'leaflet-control-zoom')[0].style.left=(OSRM.GUI.width+10)+"px";
diff --git a/WebContent/base/leaflet/L.Control.QueryableLayers.js b/WebContent/base/leaflet/L.Control.QueryableLayers.js
new file mode 100644
index 000000000..973884591
--- /dev/null
+++ b/WebContent/base/leaflet/L.Control.QueryableLayers.js
@@ -0,0 +1,34 @@
+/*
+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.
+*/
+
+// queryable Layers control
+// [simply Control.Layers extended by query functions]
+L.Control.QueryableLayers = L.Control.Layers.extend({
+getActiveLayerName: function () {
+	var i, input, obj,
+	inputs = this._form.getElementsByTagName('input'),
+	inputsLen = inputs.length;
+
+	for (i = 0; i < inputsLen; i++) {
+		input = inputs[i];
+		obj = this._layers[input.layerId];
+		if (input.checked && !obj.overlay) {
+			return obj.name;
+		}
+	}
+}
+});
diff --git a/WebContent/base/osrm/OSRM.MapView.js b/WebContent/base/osrm/OSRM.MapView.js
index a48a67075..89a114a97 100644
--- a/WebContent/base/osrm/OSRM.MapView.js
+++ b/WebContent/base/osrm/OSRM.MapView.js
@@ -16,7 +16,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
 */
 
 // map view/model
-// [extending Leaflet L.Map with setView/fitBounds methods that respect UI visibility] 
+// [extending Leaflet L.Map with setView/fitBounds methods that respect UI visibility, better layerControl] 
 OSRM.MapView = L.Map.extend({
 	setViewUI: function(position, zoom, no_animation) {
 		if( OSRM.GUI.visible == true ) {
@@ -50,5 +50,25 @@ OSRM.MapView = L.Map.extend({
 		var centerPoint = this._getTopLeftPoint().add(viewHalf.divideBy(2));
 		
 		return this.unproject(centerPoint, this._zoom, unbounded);
+	},
+	addLayerControl: function( layerControl ) {
+		if( this.layerControl )
+			return;
+		
+		this.layerControl = layerControl;
+		this.addControl(this.layerControl);
+	},
+	getActiveLayerId: function() {
+		var tile_server_id = 0;
+		
+		var tile_servers = OSRM.DEFAULTS.TILE_SERVERS;
+		var tile_server_name = this.layerControl.getActiveLayerName();
+		for(var i=0, size=tile_servers.length; i<size; i++)
+			if( tile_servers[tile_server_id].display_name == tile_server_name ) {
+				tile_server_id = i;
+				break;
+			}
+		
+		return tile_server_id;
 	}
 });
diff --git a/WebContent/main.html b/WebContent/main.html
index 6d680a223..6d16a2d80 100644
--- a/WebContent/main.html
+++ b/WebContent/main.html
@@ -37,6 +37,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
 <!-- scripts -->
 <script src="leaflet/leaflet-src.js" type="text/javascript"></script>
 <script src="base/leaflet/L.Bugfixes.js" type="text/javascript"></script>
+<script src="base/leaflet/L.Control.QueryableLayers.js" type="text/javascript"></script>
 <script src="base/leaflet/L.DashedPolyline.js" type="text/javascript"></script>
 <script src="base/leaflet/L.MouseMarker.js" type="text/javascript"></script>
 <script src="base/leaflet/L.SwitchableIcon.js" type="text/javascript"></script>
diff --git a/WebContent/printing/OSRM.Printing.js b/WebContent/printing/OSRM.Printing.js
index e746bdc12..1551a637e 100644
--- a/WebContent/printing/OSRM.Printing.js
+++ b/WebContent/printing/OSRM.Printing.js
@@ -41,7 +41,9 @@ init: function() {
 // create UI in printwindow
 show: function(response) {
 	// create header
-	header = 
+	var header = 
+		'<thead class="header-group"><tr><td colspan="3">' +
+		
 		'<div class="full">' +
 		'<div style="display:table-row">' +
 		
@@ -67,14 +69,12 @@ show: function(response) {
 		
 		'</div>' +
 		'</div>' +
-		'<div class="quad"></div>';	
+		
+		'<div class="quad"></div>' + 
+		'</td></tr></thead>';	
 	
 	// create route description
-	var route_desc = '';
-	route_desc += '<table id="thetable" class="results-table medium-font">';
-	route_desc += '<thead style="display:table-header-group;"><tr><td colspan="3">'+header+'</td></tr></thead>';
-	route_desc += '<tbody stlye="display:table-row-group">';
-
+	var route_desc = '<tbody class="row-group">';
 	for(var i=0; i < response.route_instructions.length; i++){
 		//odd or even ?
 		var rowstyle='results-odd';
@@ -106,32 +106,21 @@ show: function(response) {
 		route_desc += "</tr>";
 	}
 	route_desc += '</tbody>';
-	route_desc += '</table>';
 	
 	// put everything in DOM
-	OSRM.G.printwindow.document.getElementById('description').innerHTML = route_desc;
-	OSRM.G.printwindow.document.getElementById('overview-map-description').innerHTML = 
-		'<table id="" class="results-table medium-font">' +
-		'<thead style="display:table-header-group;"><tr><td colspan="3">'+header+'</td></tr></thead>'+
-		'</table>';
+	OSRM.G.printwindow.document.getElementById('description').innerHTML = '<table class="results-table medium-font">' + header + route_desc + '</table>';		
+	OSRM.G.printwindow.document.getElementById('overview-map-description').innerHTML = '<table class="results-table medium-font">' + header + '</table>';
 	
-	// init map
-	var tile_servers = OSRM.DEFAULTS.TILE_SERVERS;
-	var tile_server_name = OSRM.G.map.layerControl.getActive();
-	var tile_server_id = 0;
-	for(var size=tile_servers.length;tile_server_id < size; tile_server_id++) {
-		if( tile_servers[tile_server_id].display_name == tile_server_name )
-			break;
-	}
-	
-	OSRM.Printing.map = OSRM.G.printwindow.initialize( OSRM.DEFAULTS.TILE_SERVERS[tile_server_id] );
-	var map = OSRM.Printing.map;
+	// draw map
+	var tile_server_id = OSRM.MapView.getActiveLayerId();
+	var map = OSRM.G.printwindow.initialize( OSRM.DEFAULTS.TILE_SERVERS[tile_server_id] );
+	// draw markers
 	var markers = OSRM.G.markers.route;
 	map.addLayer( new L.MouseMarker( markers[0].getPosition(), {draggable:false,clickable:false,icon:OSRM.G.icons['marker-source']} ) );
 	for(var i=1, size=markers.length-1; i<size; i++)
 		map.addLayer( new L.MouseMarker( markers[i].getPosition(), {draggable:false,clickable:false,icon:OSRM.G.icons['marker-via']} ) );
 	map.addLayer( new L.MouseMarker( markers[markers.length-1].getPosition(), {draggable:false,clickable:false,icon:OSRM.G.icons['marker-target']} ));
-	
+	// draw route
 	OSRM.Printing.route = new L.DashedPolyline();
 	var route = OSRM.Printing.route; 
 	route.setLatLngs( OSRM.G.route.getPositions() );
@@ -139,8 +128,7 @@ show: function(response) {
 	map.addLayer( route );
 	var bounds = new L.LatLngBounds( OSRM.G.route.getPositions() );
 	map.fitBoundsUI( bounds );
-	
-	// query better geometry
+	// query for a better route geometry
 	var zoom = map.getBoundsZoom(bounds);
 	OSRM.JSONP.call(OSRM.Routing._buildCall()+'&z='+zoom+'&instructions=false', OSRM.Printing.drawRoute, OSRM.Printing.timeoutRoute, OSRM.DEFAULTS.JSONP_TIMEOUT, 'print');
 },
diff --git a/WebContent/printing/printing.css b/WebContent/printing/printing.css
index 8efe55890..699f8ae56 100644
--- a/WebContent/printing/printing.css
+++ b/WebContent/printing/printing.css
@@ -255,4 +255,12 @@ div.header-title
 	display:table-cell;
 	text-align:center;
 	vertical-align:middle;
+}
+.header-group
+{
+	display:table-header-group;
+}
+.row-group
+{
+	display:table-row-group;
 }
\ No newline at end of file