--- android/TrainInfoService/src/dk/thoerup/traininfoservice/RequestPlotter.java	2010/07/05 09:48:06	958
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/RequestPlotter.java	2010/07/17 06:09:01	998
@@ -47,6 +47,7 @@
 	}
 	
 	class PositionContainer {
+		List<RequestPosition> blue = new ArrayList<RequestPosition>();
 		List<RequestPosition> green = new ArrayList<RequestPosition>();
 		List<RequestPosition> yellow = new ArrayList<RequestPosition>();
 		List<RequestPosition> red = new ArrayList<RequestPosition>();
@@ -127,8 +128,10 @@
 						positions.red.add(pos); //RED
 					} else if ( timediff < (24*60*60*1000)) {
 						positions.yellow.add(pos); //YELLOW
-					} else {
+					} else if ( timediff < (7*24*60*60*1000)) {
 						positions.green.add(pos); //GREEN
+					} else {
+						positions.blue.add(pos); //BLUE
 					}
 	
 				}
@@ -155,7 +158,7 @@
 		for(RequestPosition current : list) {			
 			sb.append( " <Placemark>\n" );
 			sb.append( "  <styleUrl>#").append(color).append("</styleUrl>\n" );
-			sb.append( "  <description>IP=").append(current.ip).append("  Time=").append(current.time).append("</description>\n" );
+			sb.append( "  <description><![CDATA[IP=").append(current.ip).append("<br/>Time=").append(current.time).append("]]></description>\n" );
 			sb.append( "  <Point><coordinates>").append(current.lng).append(",").append(current.lat).append(",0</coordinates></Point>\n" );
 			sb.append( " </Placemark>\n" );			
 		}		
@@ -170,9 +173,10 @@
 		sb.append( "<kml xmlns=\"http://www.opengis.net/kml/2.2\">\n" );
 		sb.append( "<Document>\n" );		
 		sb.append( " <description><![CDATA[");
-		sb.append( "  Green:").append(positions.green.size()).append("<br/>\n");
-		sb.append( "  Yellow:").append(positions.yellow.size()).append("<br/>\n");
-		sb.append( "  Red:").append(positions.red.size()).append("\n");
+		sb.append( "  Red:").append(positions.red.size()).append(" (whithin 3 hours)<br/>\n");
+		sb.append( "  Yellow:").append(positions.yellow.size()).append(" (within 24 hours)<br/>\n");
+		sb.append( "  Green:").append(positions.green.size()).append(" (within one week)<br/>\n");
+		sb.append( "  Blue:").append(positions.blue.size()).append(" (older)<br/>\n");		
 		sb.append( " ]]></description>");
 		
 		
@@ -188,6 +192,9 @@
 		sb.append( "  <IconStyle><Icon><href>http://maps.google.com/mapfiles/kml/paddle/grn-circle.png</href></Icon></IconStyle>\n" );
 		sb.append( " </Style>\n\n" );
 		
+		sb.append( " <Style id=\"blue\">\n" );
+		sb.append( "  <IconStyle><Icon><href>http://maps.google.com/mapfiles/kml/paddle/blu-circle.png</href></Icon></IconStyle>\n" );
+		sb.append( " </Style>\n\n" );		
 /*
 		String overlay = 
 	      " <ScreenOverlay>" +
@@ -207,6 +214,7 @@
 	*/	
 		
 
+		formatPositions(sb, "blue", positions.blue);
 		formatPositions(sb, "green", positions.green);
 		formatPositions(sb, "yellow", positions.yellow);
 		formatPositions(sb, "red", positions.red);