--- dao/DaoAdresseService/WebContent/index.html 2015/03/16 09:17:03 2445
+++ dao/DaoAdresseService/src/main/webapp/index.html 2015/10/15 14:35:46 2752
@@ -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,8 +47,17 @@
var varPostnr = $("#postnr").val();
var varAdresse = $("#adresse").val();
+ var uriParamObj = {
+ brugerid: varBrugerid,
+ postnr: varPostnr,
+ adresse: varAdresse
+ } ;
+
+ var uriParam = jQuery.param(uriParamObj);
+
logEvent("Postnr: " + varPostnr);
- logEvent("Adresse: " + varAdresse);
+ logEvent("Adresse: " + varAdresse);
+ logEvent("Link til søgning");
logEvent("");
var obj = {
@@ -58,6 +82,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 +93,27 @@
var afstand = xml.find("extafstand").text();
if (afstand != "") {
+ 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;
+
logEvent("Udv. Adresse: " + xml.find("extaddr").text() );
logEvent("Udv. Afstand: " + Number( afstand ).toFixed(3) );
+ logEvent("Udv. Pos: " + extpos );
+ logEvent("Udv. rute: link" );
}
-
-
+ logEvent("");
+
+ logEvent("Hverdag: " + xml.find("hverdag").text() );
+ logEvent("Lørdag: " + xml.find("loerdag").text() );
+ logEvent("Søndag: " + xml.find("soendag").text() );
+ logEvent("");
+
+
logEvent("Levenshtein: " + xml.find("levenshtein").text() );
-
+ logEvent("Levenshtein distance: " + xml.find("levenshteindistance").text() );
logEvent("OSM: " + xml.find("osm").text() );
logEvent("OSM vej: " + xml.find("osmvej").text() );
logEvent("Google: " + xml.find("google").text() );
@@ -88,6 +128,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();
+ }
+
});
@@ -140,4 +197,4 @@