(no commit message)

diff --git a/.gitattributes b/.gitattributes
index 9a6496aff79f13ee35c71abb39730318beb54632..6a7a1399479d5daa3827f815b5af7cb270d0042f 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1623,9 +1623,6 @@ mapviewer/edit_geo/lib/widget/SLDEditor.js -text
 mapviewer/edit_geo/lib/widget/Save.js -text
 mapviewer/edit_geo/lib/widget/SaveModel.js -text
 mapviewer/edit_geo/lib/widget/SaveModel.xsl -text
-mapviewer/edit_geo/lib/widget/SearchForm.xsl -text
-mapviewer/edit_geo/lib/widget/SearchWidget.js -text
-mapviewer/edit_geo/lib/widget/SearchWidget.xsl -text
 mapviewer/edit_geo/lib/widget/SelectAllMapLayers.xsl -text
 mapviewer/edit_geo/lib/widget/SelectFeatureType.xsl -text
 mapviewer/edit_geo/lib/widget/SelectMapLayers.xsl -text

diff --git a/mapviewer/edit_geo/lib/widget/SearchForm.xsl b/mapviewer/edit_geo/lib/widget/SearchForm.xsl
deleted file mode 100644 (file)
index 8bf8a52..0000000
--- a/mapviewer/edit_geo/lib/widget/SearchForm.xsl
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"><xsl:output method="xml" encoding="utf-8"/><xsl:param name="lang">en</xsl:param><xsl:param name="modelId"/><xsl:param name="widgetId"/><xsl:param name="searchFormTitle"/><xsl:param name="north"/><xsl:param name="south"/><xsl:param name="east"/><xsl:param name="west"/><xsl:param name="formName">AOIForm</xsl:param><xsl:template match="/"><form name="{$formName}" id="{$formName}" method="get" action="defaultUrl"><table><tr><th align="left" colspan="3"><xsl:value-of select="$searchFormTitle"/></th></tr><tr><td>
-            keyword:
-          </td><td><input name="keyword" type="text" size="10"/></td><td><input type="submit"/></td></tr><tr><td/><td><xsl:value-of select="$north"/><input NAME="northCoord" TYPE="text" SIZE="10" STYLE="font: 8pt Verdana, geneva, arial, sans-serif;"/></td><td/></tr><tr><td><xsl:value-of select="$west"/><input NAME="westCoord" TYPE="text" SIZE="10" STYLE="font: 8pt Verdana, geneva, arial, sans-serif;"/></td><td/><td><xsl:value-of select="$east"/><input NAME="eastCoord" TYPE="text" SIZE="10" STYLE="font: 8pt Verdana, geneva, arial, sans-serif;"/></td></tr><tr><td/><td><xsl:value-of select="$south"/><input NAME="southCoord" TYPE="text" SIZE="10" STYLE="font: 8pt Verdana, geneva, arial, sans-serif;"/></td><td/></tr></table></form></xsl:template></xsl:stylesheet>

diff --git a/mapviewer/edit_geo/lib/widget/SearchWidget.js b/mapviewer/edit_geo/lib/widget/SearchWidget.js
deleted file mode 100644 (file)
index dc0589e..0000000
--- a/mapviewer/edit_geo/lib/widget/SearchWidget.js
+++ /dev/null
@@ -1,70 +0,0 @@
-mapbuilder.loadScript(baseDir+"/widget/WidgetBase.js");
-function SearchWidget(widgetNode,model){
-WidgetBaseXSL.apply(this,new Array(widgetNode,model));
-this.host=widgetNode.selectSingleNode("mb:host").firstChild.nodeValue; 
-this.submitQuery=function(query){
-this.urlInputForm.defaultUrl.value=query;
-var httpPayload=new Object();
-httpPayload.url=this.host+"?query="+query; 
-httpPayload.method=this.targetModel.method;
-var newUrl=this.urlInputForm.defaultUrl.value;
-if(newUrl.indexOf("?")>0){
-this.stylesheet.setParameter("defaultUrl",this.urlInputForm.defaultUrl.value);
-}
-this.targetModel.newRequest(this.targetModel,httpPayload);
-}
-this.submitForm=function(){
-if(this.aoiFormId==undefined){
-var forms=document.getElementsByTagName("form");
-var num=forms.length;
-for(var i=num-1;i>=0;i--){
-var aoiFormId=new String(forms[i].getAttribute("id"));
-if(aoiFormId.indexOf("AoiForm_")>=0){
-this.aoiFormId=aoiFormId;
-}
-}
-}
-if(this.aoiFormId==undefined){
-alert("Could not find aoiForm for geoSearch");
-}
-var bbox="";
-var aoiForm=document.getElementById(this.aoiFormId);
-if((aoiForm!=null)&&(aoiForm.westCoord.value!="")){
-var west=parseFloat(aoiForm.westCoord.value);
-var north=parseFloat(aoiForm.northCoord.value);
-var east=parseFloat(aoiForm.eastCoord.value);
-var south=parseFloat(aoiForm.southCoord.value);
-bbox="&ULLon="+west.toPrecision(3)+"&ULLat="+north.toPrecision(3)+
-"&LRLon="+east.toPrecision(3)+"&LRLat="+south.toPrecision(3);
-}
-var httpPayload=new Object();
-var query=this.urlInputForm.defaultUrl.value;
-httpPayload.url=this.host+"?query="+escape(query)+bbox; 
-httpPayload.method=this.targetModel.method;
-this.stylesheet.setParameter("defaultUrl",query);
-this.targetModel.newRequest(this.targetModel,httpPayload);
-}
-this.handleKeyPress=function(event){
-var keycode;
-var target;
-if(event){
-keycode=event.which;
-target=event.currentTarget;
-}else{
-keycode=window.event.keyCode;
-target=window.event.srcElement.form;
-}
-if(keycode==13){target.parentWidget.submitForm();
-return false;}
-}
-this.prePaint=function(objRef){
-objRef.stylesheet.setParameter("modelTitle",objRef.targetModel.title);
-}
-this.postPaint=function(objRef){
-objRef.urlInputForm=document.getElementById(objRef.formName);
-objRef.urlInputForm.parentWidget=objRef;
-objRef.urlInputForm.onkeypress=objRef.handleKeyPress;
-}
-this.formName="urlInputForm_"+mbIds.getId();
-this.stylesheet.setParameter("formName",this.formName);
-}

diff --git a/mapviewer/edit_geo/lib/widget/SearchWidget.xsl b/mapviewer/edit_geo/lib/widget/SearchWidget.xsl
deleted file mode 100644 (file)
index dc86c08..0000000
--- a/mapviewer/edit_geo/lib/widget/SearchWidget.xsl
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:mb="http://mapbuilder.sourceforge.net/mapbuilder" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"><xsl:output method="xml" encoding="utf-8"/><xsl:param name="lang">en</xsl:param><xsl:param name="modelId"/><xsl:param name="modelTitle"/><xsl:param name="targetModel"/><xsl:param name="widgetId"/><xsl:param name="title"/><xsl:param name="load"/><xsl:param name="defaultUrl"/><xsl:param name="formName">SearchInputForm</xsl:param><xsl:template match="/"><div><form name="{$formName}" id="{$formName}" onsubmit="return config.objects.{$widgetId}.submitForm()"><input name="defaultUrl" type="text" size="30" value="{$defaultUrl}"/><input type="button" onclick="javascript:config.objects.{$widgetId}.submitForm();" value="Search"/></form></div></xsl:template></xsl:stylesheet>