--- android/TrainInfoService/src/dk/thoerup/traininfoservice/RequestPlotter.java	2010/06/29 16:11:43	941
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/RequestPlotter.java	2010/07/11 17:15:47	988
@@ -20,12 +20,15 @@
 import java.util.zip.ZipOutputStream;
 
 import javax.servlet.ServletException;
+import javax.servlet.annotation.WebListener;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import dk.thoerup.traininfoservice.banedk.TimeoutMap;
 
+@WebServlet(urlPatterns={"/RequestPlotter"})
 public class RequestPlotter extends HttpServlet {
 	private static final long serialVersionUID = 1L;
 
@@ -34,7 +37,7 @@
 	static final String KML = "application/vnd.google-earth.kml";
 	static final String KMZ = "application/vnd.google-earth.kmz";
 	
-	Map<String,String> cache = new TimeoutMap<String,String>(2*60*1000);
+	Map<String,String> cache = new TimeoutMap<String,String>(30*60*1000);
 
 	class RequestPosition {
 		public String ip;
@@ -44,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>();
@@ -124,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
 					}
 	
 				}
@@ -167,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>");
 		
 		
@@ -185,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>" +
@@ -204,6 +214,7 @@
 	*/	
 		
 
+		formatPositions(sb, "blue", positions.blue);
 		formatPositions(sb, "green", positions.green);
 		formatPositions(sb, "yellow", positions.yellow);
 		formatPositions(sb, "red", positions.red);