--- dao/DaoAdresseService/WebContent/index.html	2015/03/16 09:17:03	2445
+++ dao/DaoAdresseService/src/main/webapp/index.html	2016/01/19 10:02:51	2821
@@ -22,6 +22,21 @@
 }
 
 
+function getQueryVariable(variable) {
+    var query = window.location.search.substring(1);
+    var vars = query.split('&');
+    for (var i = 0; i < vars.length; i++) {
+        var pair = vars[i].split('=');
+        if (decodeURIComponent(pair[0]) == variable) {
+
+        	var res = decodeURI(pair[1]);
+        	res = res.replace(/\+/g, ' ');
+            return res;
+        }
+    }
+    console.log('Query variable %s not found', variable);
+}
+
 $(document).ready( function() {
 	logObj = document.getElementById("simplelog");
 	
@@ -32,17 +47,28 @@
 		var varPostnr = $("#postnr").val();
 		var varAdresse = $("#adresse").val();
 		
+		var varDaekning = $("#daekning").val();
+		
+		var varNaermestehusnr = $('#naermestehusnr').prop('checked') ? 1 : 0;
+		
+		var uriParamObj = {
+			brugerid: varBrugerid,
+			postnr: varPostnr,
+			adresse: varAdresse,
+			daekning: varDaekning,
+			naermestehusnr: varNaermestehusnr
+		} ;
+		
+		var uriParam = jQuery.param(uriParamObj);
+		
 		logEvent("Postnr: " + varPostnr);
-		logEvent("Adresse: " + varAdresse);
+		logEvent("Adresse: " + varAdresse);		
+		logEvent("<a href='?" + uriParam + "'>Link til søgning</a>");
 		logEvent("");
 		
-		var obj = {
-				brugerid: varBrugerid,
-				postnr: varPostnr,
-				adresse: varAdresse
-		};
+
 		
-		$.get("search", obj, function(data) {
+		$.get("search", uriParamObj, function(data) {
 			var xml = $(data);
 			
 			var status = xml.find("status").text();
@@ -58,6 +84,9 @@
 			logEvent("");
 			
 			logEvent("Split: " + xml.find("vej").text() + " / " + xml.find("husnr").text() + " / " + xml.find("litra").text() + " / " + xml.find("etage").text() + " / " + xml.find("lejlighed").text());
+			
+			logEvent("Vasketvejnavn: " + xml.find("vasketvejnavn").text() );
+			
 			logEvent("Gadeident: " + xml.find("gadeident").text() );
 			logEvent("Vejnavn: " + xml.find("vejnavn").text() );
 			logEvent("Position: " + xml.find("latitude").text() + "," + xml.find("longitude").text());
@@ -66,14 +95,51 @@
 				
 			var afstand = xml.find("extafstand").text();
 			if (afstand != "") {
-				logEvent("Udv. Adresse: " + xml.find("extaddr").text() );
+				var extpos = xml.find("extpos").text();
+				var srcpos = xml.find("latitude").text() + "," + xml.find("longitude").text();
+				
+				var mapslink = "https://www.google.dk/maps/dir/" + extpos + "/" + srcpos;
+				
+				var extParamObj = {
+					brugerid: 'test',
+					postnr:  xml.find("extpost").text(),
+					adresse: xml.find("extaddr").text()
+				} ;
+				var extParam = jQuery.param(extParamObj);
+				var extAddr = xml.find("extaddr").text() + ", " + xml.find("extpost").text();
+				
+
+				logEvent("Udv. Adresse: <a href='?" + extParam + "'>" + extAddr +  "</a>" );
 				logEvent("Udv. Afstand: " + Number( afstand ).toFixed(3) );
+				logEvent("Udv. Pos: " + extpos );
+				logEvent("Udv. rute: <a href='" + mapslink + "'>link</a>" );
 					
 			}
-				
-				
+			logEvent("");
+			
+			logEvent("Mandag: "  + xml.find("mandag").text() );
+			logEvent("Tirsdag: " + xml.find("tirsdag").text() );
+			logEvent("Onsdag: "  + xml.find("onsdag").text() );
+			logEvent("Torsdag: " + xml.find("torsdag").text() );
+			logEvent("Fredag: "  + xml.find("fredag").text() );
+			logEvent("Lørdag: "  + xml.find("loerdag").text() );
+			logEvent("Søndag: "  + xml.find("soendag").text() );
+			logEvent("");
+			
+			logEvent("Nærmeste Husnr: " + xml.find("nearesthusnr").text() );
+			logEvent("Anvendt Husnr: " + xml.find("anvendthusnr").text() );			
+			logEvent("Nærmeste Litra: " + xml.find("nearestlitra").text() );			
+			logEvent("");
+			
+			
+			
+			
 			logEvent("Levenshtein: " + xml.find("levenshtein").text() );
-				
+			logEvent("Levenshtein distance: " + xml.find("levenshteindistance").text() );
+			
+			logEvent("Metaphone: " + xml.find("metaphone").text() );
+			logEvent("Metaphone vej: " + xml.find("metaphonevej").text() );
+			
 			logEvent("OSM: " + xml.find("osm").text() );
 			logEvent("OSM vej: " + xml.find("osmvej").text() );
 			logEvent("Google: " + xml.find("google").text() );
@@ -88,6 +154,23 @@
 		clearLog();
 	});
 	
+	if (window.location.search.substring(1) != "") {
+		/*var varBrugerid = $("#brugerid").val();
+		var varPostnr = $("#postnr").val();
+		var varAdresse = $("#adresse").val();*/
+		
+		var brugerid = getQueryVariable("brugerid");
+		$("#brugerid").val(brugerid);
+		
+		var postnr = getQueryVariable("postnr");
+		$("#postnr").val(postnr);
+		
+		var adresse = getQueryVariable("adresse");
+		$("#adresse").val(adresse);
+		
+		$("#okBtn").click();
+	}
+	
 });
 
 
@@ -125,6 +208,28 @@
 	<td>Adresse: </td>
 	<td><input type="text" name="adresse" id="adresse"></td>
 </tr>
+
+<tr>
+	<td>Ugedag</td>
+	<td>
+		<select name="daekning" id="daekning">
+			<option></option>
+			<option value="MA">Mandag</option>
+			<option value="TI">Tirsdag</option>
+			<option value="ON">Onsdag</option>
+			<option value="TO">Torsdag</option>
+			<option value="FR">Fredag</option>
+			<option value="LO">L&oslash;rdag</option>
+			<option value="SO">S&oslash;ndag</option>
+		</select> 	
+	</td>
+</tr>
+
+<tr>
+	<td>Nærmeste husnr: </td>
+	<td><input type="checkbox" name="naermestehusnr" id="naermestehusnr"></td>
+</tr>
+
 <tr>
 	<td>&nbsp;</td>
 	<td>
@@ -140,4 +245,4 @@
 
 
 </body>
-</html>
\ No newline at end of file
+</html>