Merge commit 'f2efcfc588f75c391946b1cf8d5600fcf849d3c9' into develop

This commit is contained in:
DennisSchiefer 2012-04-17 22:33:26 +02:00
commit 572a306d6d
2 changed files with 8 additions and 7 deletions

View File

@ -39,13 +39,13 @@ OSRM.MapView = L.Map.extend({
var zoom = this.getBoundsZoom(bounds);
var sw_point = this.project( southwest, zoom);
if( OSRM.GUI.visible == true )
sw_point.x-=OSRM.GUI.width/2;
sw_point.x-=OSRM.GUI.width/2+20;
else
sw_point.x-=10;
sw_point.y+=10;
sw_point.x-=20;
sw_point.y+=20;
var ne_point = this.project( northeast, zoom);
ne_point.y-=10;
sw_point.x+=10;
ne_point.y-=20;
sw_point.x+=20;
bounds.extend( this.unproject(sw_point,zoom) );
bounds.extend( this.unproject(ne_point,zoom) );
this.fitBounds( bounds );
@ -132,4 +132,4 @@ geolocationResponse: function(response) {
var latlng = new L.LatLng(response.coords.latitude, response.coords.longitude);
OSRM.G.map.setViewUI(latlng, OSRM.DEFAULTS.ZOOM_LEVEL );
}
};
};

View File

@ -71,7 +71,8 @@ show: function(response) {
route_desc += '<tr class="'+rowstyle+'">';
route_desc += '<td class="result-directions">';
route_desc += '<img width="18px" src=../"'+OSRM.RoutingDescription.getDrivingInstructionIcon(response.route_instructions[i][0])+'" alt="" />';
route_desc += '<img width="18px" src="../'+OSRM.RoutingDescription.getDrivingInstructionIcon(response.route_instructions[i][0])+'" alt="" />';
console.log(route_desc);
route_desc += "</td>";
route_desc += '<td class="result-items">';