(no commit message)

diff --git a/.gitattributes b/.gitattributes
index 1cd02fb29fb9fdda7475cc37657d5bec53ceac7a..0ee21cb1ffe088f85a4637d88837fb7e36dbb856 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1616,9 +1616,6 @@ mapviewer/edit_geo/lib/widget/MapPane2.js -text
 mapviewer/edit_geo/lib/widget/MapPane2.xsl -text
 mapviewer/edit_geo/lib/widget/MapPaneOL.js -text
 mapviewer/edit_geo/lib/widget/MapScaleBar.js -text
-mapviewer/edit_geo/lib/widget/MapScaleText.js -text
-mapviewer/edit_geo/lib/widget/MapScaleText.xsl -text
-mapviewer/edit_geo/lib/widget/MapTitle.xsl -text
 mapviewer/edit_geo/lib/widget/Measurement.js -text
 mapviewer/edit_geo/lib/widget/ModelStatus.js -text
 mapviewer/edit_geo/lib/widget/ModelStatus.xsl -text

diff --git a/mapviewer/edit_geo/lib/widget/MapScaleText.js b/mapviewer/edit_geo/lib/widget/MapScaleText.js
deleted file mode 100644 (file)
index 31493c5..0000000
--- a/mapviewer/edit_geo/lib/widget/MapScaleText.js
+++ /dev/null
@@ -1,50 +0,0 @@
-mapbuilder.loadScript(baseDir+"/widget/WidgetBaseXSL.js");
-function MapScaleText(widgetNode,model){
-WidgetBaseXSL.apply(this,new Array(widgetNode,model));
-this.submitForm=function(){
-var newScale=this.mapScaleTextForm.mapScale.value;
-this.model.extent.setScale(newScale.split(",").join(""));
-return false;}
-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.showScale=function(objRef){
-if(objRef.mapScaleTextForm){
-var newScale=Math.round(objRef.model.extent.getScale());
-var parts=new Array();
-while(newScale>=1000.0){
-var newPart=newScale/1000.0;
-newScale=Math.floor(newPart);
-var strPart=leadingZeros(Math.round((newPart-newScale)*1000).toString(),3);
-parts.unshift(strPart);
-}
-parts.unshift(newScale);
-objRef.mapScaleTextForm.mapScale.value=parts.join(",");
-}
-}
-this.model.addListener("bbox",this.showScale,this);
-this.model.addListener("refresh",this.showScale,this);
-this.prePaint=function(objRef){
-var mapScale=objRef.model.extent.getScale();
-this.stylesheet.setParameter("mapScale",mapScale);
-}
-this.postPaint=function(objRef){
-objRef.mapScaleTextForm=document.getElementById(objRef.formName);
-objRef.mapScaleTextForm.parentWidget=objRef;
-objRef.mapScaleTextForm.onkeypress=objRef.handleKeyPress;
-objRef.showScale(objRef);
-}
-this.formName="MapScaleText_"+mbIds.getId();
-this.stylesheet.setParameter("formName",this.formName);
-}

diff --git a/mapviewer/edit_geo/lib/widget/MapScaleText.xsl b/mapviewer/edit_geo/lib/widget/MapScaleText.xsl
deleted file mode 100644 (file)
index 34a2611..0000000
--- a/mapviewer/edit_geo/lib/widget/MapScaleText.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="widgetId"/><xsl:param name="mapScale"/><xsl:param name="mapScaleLabel">scale 1:</xsl:param><xsl:param name="formName">MapScaleTextForm</xsl:param><xsl:template match="/"><div><form name="{$formName}" id="{$formName}" onsubmit="return config.objects.{$widgetId}.submitForm()"><xsl:value-of select="$mapScaleLabel"/><input name="mapScale" type="text" size="10" value="{$mapScale}"/></form></div></xsl:template></xsl:stylesheet>

diff --git a/mapviewer/edit_geo/lib/widget/MapTitle.xsl b/mapviewer/edit_geo/lib/widget/MapTitle.xsl
deleted file mode 100644 (file)
index 22177b8..0000000
--- a/mapviewer/edit_geo/lib/widget/MapTitle.xsl
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:wmc="http://www.opengis.net/context" 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:template match="/wmc:ViewContext/wmc:General | /wmc:OWSContext/wmc:General "><span><xsl:choose><xsl:when test="wmc:Title/@xml:lang"><xsl:value-of select="wmc:Title[@xml:lang=$lang]"/></xsl:when><xsl:otherwise><xsl:value-of select="wmc:Title"/></xsl:otherwise></xsl:choose></span></xsl:template><xsl:template match="text()|@*"/></xsl:stylesheet>