Wenn Daten fehlen, gibt es z.Bsp. keinen Code fuer die Flagge.

itm · Feb 17, 2012 · 19d9758 · 19d9758
1 parent 106dd4e
commit 19d9758
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/img/noFlag.png b/img/noFlag.png
diff --git a/js/ais-formatter.js b/js/ais-formatter.js
@@ -1,3 +1,14 @@
+var direction = new Array();
+	direction["7"] = "Nordwest";
+	direction["8"] = "Nord";
+	direction["9"] = "Nordost";
+	direction["6"] = "0st";
+	direction["3"] = "S&uuml;dost";
+	direction["2"] = "S&uuml;d";
+	direction["1"] = "S&uuml;dwest";
+	direction["4"] = "West";
+	direction["5"] = "unbekannt";
+
 var translations = new Array();
 
 // states
@@ -86,19 +97,7 @@ var cnvrt2Upper = function (str) {
 	}
 }
 
-var createMarkerContent = function(vesselinfo) {
-
-	var direction = new Array();
-	direction["7"] = "Nordwest";
-	direction["8"] = "Nord";
-	direction["9"] = "Nordost";
-	direction["6"] = "0st";
-	direction["3"] = "S&uuml;dost";
-	direction["2"] = "S&uuml;d";
-	direction["1"] = "S&uuml;dwest";
-	direction["4"] = "West";
-	direction["5"] = "unbekannt";
-
+var createMarkerContent = function(vesselinfo) {	
 
 	// get optional content
 	var description = new Object();
@@ -121,7 +120,7 @@ var createMarkerContent = function(vesselinfo) {
 
 	content = 
        "<div class='container'>"+
-       	"<div class='flag'>"+"<img src='" + flagSrc+ vesselinfo.flagid +".png'/> "+"</div>" +  
+       	"<div class='flag'>"+"<img src='"+ vesselinfo.flaglnk +"' /></div>" +  
 
        	" <div class='vesselname'>"+ cnvrt2Upper(vesselinfo.name)+ "</div>" + translateType(vesselinfo.type) +         	
 "<dl class='table-display'>"+

diff --git a/js/parser.js b/js/parser.js
@@ -59,7 +59,7 @@ var parseXml = function(xmlDoc) {
 		vessel.left 		= this.getAttribute("left");
 		vessel.front 		= this.getAttribute("front");
 		vessel.nationality	= this.getAttribute("country");
-		vessel.flagid 		= this.getAttribute("flag");
+		vessel.flaglnk 		= ((this.getAttribute("flag")==null)?"img/noFlag.png":flagSrc+ this.getAttribute("flag") +".png"); 
 		vessel.speed 		= ((this.getAttribute("speed")==null)?"0":this.getAttribute("speed"));
 		vessel.pic 			= this.getAttribute("p");
 		vessel.lastSeen 	= this.getAttribute("last_seen");