Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

- store prefetched images permanently

Browse Source 
(otherwise they are not prefetched before the function terminated)
- store each type of marker icon once
This commit is contained in:
schiefer 2012-03-09 15:26:32 +01:00
parent 8b109904c8
commit 749d83a69f
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
WebContent/OSRM.Markers.js
View File

@ -129,7 +129,7 @@ toString: function() {
//marker array class //marker array class
OSRM.Markers = function() { OSRM.Markers = function() {
this.route = new Array(); this.route = new Array();
this.highlight = new OSRM.HighlightMarker("highlight", {draggable:false,icon:new L.Icon('images/marker-highlight.png')});; this.highlight = new OSRM.HighlightMarker("highlight", {draggable:false,icon:OSRM.icons['marker-highlight']});;
}; };
OSRM.extend( OSRM.Markers,{ OSRM.extend( OSRM.Markers,{
removeAll: function() { removeAll: function() {
@ -148,7 +148,7 @@ setSource: function(position) {
if( this.route[0] && this.route[0].label == OSRM.SOURCE_MARKER_LABEL ) if( this.route[0] && this.route[0].label == OSRM.SOURCE_MARKER_LABEL )
this.route[0].setPosition(position); this.route[0].setPosition(position);
else else
this.route.splice(0,0, new OSRM.RouteMarker("source", {draggable:true,icon:new L.Icon('images/marker-source.png')}, position)); this.route.splice(0,0, new OSRM.RouteMarker("source", {draggable:true,icon:OSRM.icons['marker-source']}, position));
return 0; return 0;
}, },
setTarget: function(position) { setTarget: function(position) {
@ -156,7 +156,7 @@ setTarget: function(position) {
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.TARGET_MARKER_LABEL )
this.route[this.route.length-1].setPosition(position); this.route[this.route.length-1].setPosition(position);
else else
this.route.splice( this.route.length,0, new OSRM.RouteMarker("target", {draggable:true,icon:new L.Icon('images/marker-target.png')}, position)); this.route.splice( this.route.length,0, new OSRM.RouteMarker("target", {draggable:true,icon:OSRM.icons['marker-target']}, position));
return this.route.length-1; return this.route.length-1;
}, },
setVia: function(id, position) { setVia: function(id, position) {
@ -164,7 +164,7 @@ setVia: function(id, position) {
if( this.route.length<2 || id > this.route.length-2 ) if( this.route.length<2 || id > this.route.length-2 )
return -1; return -1;
this.route.splice(id+1,0, new OSRM.RouteMarker("via", {draggable:true,icon:new L.Icon('images/marker-via.png')}, position)); this.route.splice(id+1,0, new OSRM.RouteMarker("via", {draggable:true,icon:OSRM.icons['marker-via']}, position));
return id+1; return id+1;
}, },
removeMarker: function(id) { removeMarker: function(id) {

29
WebContent/main.js
View File

@ -3,6 +3,7 @@ var map;
function init() { function init() {
prefetchImages(); prefetchImages();
prefetchIcons();
initLocale(); initLocale();
initMap(); initMap();
@ -14,21 +15,35 @@ function init() {
// prefetch images // prefetch images
OSRM.images = Array();
function prefetchImages() { function prefetchImages() {
var images = [ 'images/marker-source.png', var images = [ 'http://map.project-osrm.org/new/images/marker-source.png',
'images/marker-target.png', 'http://map.project-osrm.org/new/images/marker-target.png',
'images/marker-via.png', 'http://map.project-osrm.org/new/images/marker-via.png',
'images/marker-highlight.png' 'http://map.project-osrm.org/new/images/marker-highlight.png'
]; ];
var tmp = [];
for(var i=0; i<images.length; i++) { for(var i=0; i<images.length; i++) {
tmp[i] = new Image(); OSRM.images[i] = new Image();
tmp[i].src = images[i]; OSRM.images[i].src = images[i];
} }
} }
// prefetch icons
OSRM.icons = Array();
function prefetchIcons() {
var images = [ 'marker-source',
'marker-target',
'marker-via',
'marker-highlight',
];
for(var i=0; i<images.length; i++)
OSRM.icons[images[i]] = new L.Icon('http://map.project-osrm.org/new/images/'+images[i]+'.png');
}
// init localization // init localization
function initLocale() { function initLocale() {
document.getElementById("gui-route").innerHTML = OSRM.loc("GUI_ROUTE"); document.getElementById("gui-route").innerHTML = OSRM.loc("GUI_ROUTE");