continued printing work

WebContent/base/OSRM.Map.js

@@ -22,6 +22,22 @@ 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 = {
@@ -50,7 +66,8 @@ init: function() {
 	});
 
 	// add layer control
-	var layersControl = new L.Control.Layers(base_maps, {});
+	var layersControl = new L.MyLayers(base_maps, {});
+	OSRM.G.map.layerControl = layersControl;
 	OSRM.G.map.addControl(layersControl);
 
     // move zoom markers

WebContent/printing/OSRM.Printing.js

@@ -15,9 +15,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 or see http://www.gnu.org/licenses/agpl.txt.
 */
 
-// OSRM printer
+// OSRM printing
 // [printing support]
 
+
 OSRM.Printing = {
 		
 // create UI for printing in mainwindow
@@ -36,15 +37,9 @@ init: function() {
 	document.getElementById("gui-printer").onclick = OSRM.Printing.print;	
 },
 		
+
 // create UI in printwindow
 show: function(response) {
-	// add events
-	OSRM.printwindow.document.getElementById('gui-printer').onclick = OSRM.printwindow.printWindow;
-	
-	// localization 
-	OSRM.printwindow.document.getElementById('description-label').innerHTML = OSRM.loc( "ROUTE_DESCRIPTION" );
-	OSRM.printwindow.document.getElementById('overview-map-label').innerHTML = OSRM.loc( "OVERVIEW_MAP" );
-
 	// create header
 	header = 
 		'<div class="full">' +
@@ -114,14 +109,22 @@ show: function(response) {
 	route_desc += '</table>';
 	
 	// put everything in DOM
-	OSRM.printwindow.document.getElementById('description').innerHTML = route_desc;
+	OSRM.G.printwindow.document.getElementById('description').innerHTML = route_desc;
-	OSRM.printwindow.document.getElementById('overview-description').innerHTML = 
+	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>';
 	
 	// init map
-	OSRM.Printing.map = OSRM.printwindow.initialize( OSRM.DEFAULTS.TILE_SERVERS[0] );
+	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;
 	var markers = OSRM.G.markers.route;
 	map.addLayer( new L.MouseMarker( markers[0].getPosition(), {draggable:false,clickable:false,icon:OSRM.G.icons['marker-source']} ) );
@@ -150,23 +153,39 @@ drawRoute: function(response) {
 },
 
 
-
+//open printWindow
-// open printwindow
 print: function() {
 	// do not open window if there is no route to draw
 	if( !OSRM.G.route.isRoute() || !OSRM.G.route.isShown() )
 		return;
+	
 	// close old window (should we really do this?)
-	if( OSRM.printwindow )
+	if( OSRM.G.printwindow )
-		OSRM.printwindow.close();
+		OSRM.G.printwindow.close();
-	OSRM.printwindow = window.open("printing/printing.html","","width=540,height=500,left=100,top=100,dependent=yes,location=no,menubar=no,scrollbars=yes,status=no,toolbar=no,resizable=yes");
+	
-	OSRM.printwindow.addEventListener("DOMContentLoaded", OSRM.Printing.printwindowLoaded, false);
+	// generate a new window and wait till it has finished loading
+	OSRM.G.printwindow = window.open("printing/printing.html","","width=540,height=500,left=100,top=100,dependent=yes,location=no,menubar=no,scrollbars=yes,status=no,toolbar=no,resizable=yes");
+	OSRM.Browser.onLoadHandler( OSRM.Printing.printwindowLoaded, OSRM.G.printwindow );
 },
 
-// add content to printwindow after it has finished loading
+
+//add content to printwindow after it has finished loading
 printwindowLoaded: function(){
+	var print_window = OSRM.G.printwindow;
+	var print_document = print_window.document;
+	
+	// add events
+	print_document.getElementById('gui-printer').onclick = print_window.printWindow;
+	
+	// localization 
+	print_document.getElementById('description-label').innerHTML = OSRM.loc( "ROUTE_DESCRIPTION" );
+	print_document.getElementById('overview-map-label').innerHTML = OSRM.loc( "OVERVIEW_MAP" );
+
+	// add routing content	
 	OSRM.Printing.show( OSRM.G.response );
-	OSRM.printwindow.focus();
+	
+	// finally, focus on printwindow
+	print_window.focus();
 }
 
 };

WebContent/printing/printing.css

@@ -32,7 +32,7 @@ body
 }
 
 /* route description box */
-#overview-description
+#overview-map-description
 {
 	width:500px;
 	margin:5px;
@@ -141,18 +141,20 @@ div.header-title
 
 
 /* utility styles */
-@media print {
-.quad
-{
-	page-break-before:always;
-}
-}
-@media screen {
 .quad
 {
 	min-width:10px;
 	min-height:10px;
 }
+@media print {
+.pagebreak
+{
+	page-break-before:always;
+}
+.noprint
+{
+	display:none;
+}
 }
 
 

WebContent/printing/printing.html

@@ -38,7 +38,6 @@ or see http://www.gnu.org/licenses/agpl.txt.
 <script src="printing.js" type="text/javascript"></script>
 <script src="../leaflet/leaflet-src.js" type="text/javascript"></script>
 <script src="../base/osrm/OSRM.MapView.js" type="text/javascript"></script>
-<script src="../base/OSRM.Map.js" type="text/javascript"></script>
 </head>
 
 
@@ -46,7 +45,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
 <body class="base-font">
 
 <!--  header -->
-<div id="printing-header">
+<div id="printing-header" class="noprint">
 <div id="gui-printer" class="iconic-button top-right-button"></div>
 </div>
 
@@ -55,9 +54,11 @@ or see http://www.gnu.org/licenses/agpl.txt.
 <div id="description"></div>
 
 <!--map-->
-<div class="quad"></div>
+<div class="pagebreak"></div>
+<div class="quad noprint"></div>
+<div class="quad noprint"></div>
 <div id="overview-map-label" class="header-title">Übersichtskarte</div>
-<div id="overview-description" class="results-table medium-font"></div>
+<div id="overview-map-description" class="results-table medium-font"></div>
 <div id="overview-map"></div>
 
 </body>

WebContent/printing/printing.js

@@ -28,7 +28,7 @@ function initialize(tile_server) {
  	// setup map
 	var tile_layer = new L.TileLayer(tile_server.url, tile_server.options);
 	OSRM.G.map = new OSRM.MapView("overview-map", {
-    	center: new L.LatLng(51.505, -0.09),
+    	center: new L.LatLng(48.84, 10.10),
 	    zoom: 13,
 	    zoomAnimation: false,
 	    fadeAnimation: false,