[Mapbender-commits] r1408 - trunk/mapbender/http/javascripts

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2007-05-31 08:41:06 -0400 (Thu, 31 May 2007)
New Revision: 1408

Modified:
   trunk/mapbender/http/javascripts/mod_gazetteerSQL_client.php
Log:
added a new address search (without commune restriction)

Modified: trunk/mapbender/http/javascripts/mod_gazetteerSQL_client.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_gazetteerSQL_client.php	2007-05-31 12:39:47 UTC (rev 1407)
+++ trunk/mapbender/http/javascripts/mod_gazetteerSQL_client.php	2007-05-31 12:41:06 UTC (rev 1408)
@@ -27,7 +27,7 @@
 // --- begin: expected element vars ---
 // var scale 
 // var numberOfResults
-// var profile = "adresse" | "alk" | "alb"
+// var profile = "adresse" | "alk" | "alb" | "adresse2"
 
 if (typeof(scale) == 'undefined') {
 	var scale = 2000;
@@ -41,7 +41,7 @@
 	var tooManyResultsString = "Too many results. Please specify your query.";
 	var e = new parent.Mb_warning("mod_gazetteerSQL: element var tooManyResultsString is missing.");
 }
-if (typeof(profile) == 'undefined' || (profile != "alb" && profile != "alk" && profile != "adresse")) {
+if (typeof(profile) == 'undefined' || (profile != "alb" && profile != "alk" && profile != "adresse" && profile != "adresse2")) {
 	profile = "adresse"
 	var e = new parent.Mb_exception("mod_gazetteerSQL: element var profile is missing.");
 }
@@ -76,6 +76,10 @@
 	registerFunction(communesSubFunctions, "updateStreets();");
 	registerFunction(streetSubFunctions, "updateNumbers();");
 }
+else if (profile == "adresse2") {
+	registerFunction(onloadSubFunctions, "updateStreets();");
+	registerFunction(streetSubFunctions, "updateNumbers();");
+}
 
 function executeFunctions(arrayOfFunctionStrings) {
 	for (var i = 0; i < arrayOfFunctionStrings.length; i++) {
@@ -118,7 +122,7 @@
 var phpUrl = "../php/mod_gazetteerSQL_server.php";
 
 parent.mb_registerInitFunctions("window.frames['"+e_id+"'].initHighlight()");
-parent.mb_registerInitFunctions("window.frames['"+e_id+"'].updateCommunes()");
+parent.mb_registerInitFunctions("window.frames['"+e_id+"'].executeFunctions(window.frames['"+e_id+"'].onloadSubFunctions)");
 
 
 // - BEGIN -------- HIGHLIGHTING AND ZOOMING ------------------------------------------
@@ -221,7 +225,6 @@
 
 		removeChildNodes(document.getElementById('selectStreet'));
 
-
 		for (var streetId in json.streets) {
 			if (typeof(json.streets[streetId]) != 'function') {
 				var currentNode = document.createElement("option");