[Mapbender-commits] r3338 - trunk/mapbender/http/javascripts
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Tue Dec 16 04:10:48 EST 2008
Author: christoph
Date: 2008-12-16 04:10:48 -0500 (Tue, 16 Dec 2008)
New Revision: 3338
Removed:
trunk/mapbender/http/javascripts/mod_closePolygon.js
trunk/mapbender/http/javascripts/mod_getArea.php
trunk/mapbender/http/javascripts/mod_rubber.js
Modified:
trunk/mapbender/http/javascripts/mod_measure.php
Log:
http://trac.osgeo.org/mapbender/ticket/351#comment:1
Deleted: trunk/mapbender/http/javascripts/mod_closePolygon.js
===================================================================
--- trunk/mapbender/http/javascripts/mod_closePolygon.js 2008-12-16 08:57:36 UTC (rev 3337)
+++ trunk/mapbender/http/javascripts/mod_closePolygon.js 2008-12-16 09:10:48 UTC (rev 3338)
@@ -1,11 +0,0 @@
-var mod_closePolygon_img = new Image();
-mod_closePolygon_img.src = "../img/button_gray/closePolygon_off.gif";
-register_measureSubFunctions("mod_closePolygon()");
-function mod_closePolygon(){
- var str = "<div style='position:absolute;top:25px' onmouseup='parent.mod_closePolygon_go()' ";
- str += "onmouseover='parent.mod_measure_timeout()' onmouseout='parent.mod_measure_disableTimeout()'><img src='"+mod_closePolygon_img.src+"'></div>";
- return str;
-}
-function mod_closePolygon_go(){
- mod_measure_close();
-}
\ No newline at end of file
Deleted: trunk/mapbender/http/javascripts/mod_getArea.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_getArea.php 2008-12-16 08:57:36 UTC (rev 3337)
+++ trunk/mapbender/http/javascripts/mod_getArea.php 2008-12-16 09:10:48 UTC (rev 3338)
@@ -1,71 +0,0 @@
-<?php
-# $Id$
-# http://www.mapbender.org/index.php/mod_getArea.php
-# Copyright (C) 2002 CCGIS
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-echo "var mod_getArea_target = '".$e_target[0]."';";
-?>
-var mod_getArea_img = new Image();
-mod_getArea_img.src = "../img/button_gray/getArea_off.gif";
-register_measureSubFunctions("mod_getArea()");
-
-function mod_getArea(){
- var str = "<div style='position:absolute;top:50px' onmouseup='parent.mod_getArea_go()' ";
- str += "onmouseover='parent.mod_measure_timeout()' onmouseout='parent.mod_measure_disableTimeout()'><img src='"+mod_getArea_img.src+"'></div>";
- return str;
-}
-function mod_getArea_go(){
- if(mod_measure_RX[mod_measure_RX.length -1] == mod_measure_RX[0] && mod_measure_RY[mod_measure_RY.length -1] == mod_measure_RY[0]){
- var ind = getMapObjIndexByName(mod_getArea_target);
- var url = "../php/mod_evalArea.php?x=";
- for(var i=0; i<mod_measure_RX.length;i++){
- if(i>0){ url += ",";}
- url += mod_measure_RX[i];
- }
- url += "&y=";
- for(var i=0; i<mod_measure_RY.length;i++){
- if(i>0){ url += ",";}
- url += mod_measure_RY[i];
- }
- var srs = mb_mapObj[ind].epsg.split(":");
- url += "&srs="+ escape(srs[1]);
- url += "&length=" + mod_measure_TotalDist[mod_measure_TotalDist.length-1];
- url += "&distance=" + mod_measure_TotalDist[mod_measure_TotalDist.length-2];
- if(!mod_measure_win || mod_measure_win == null || mod_measure_win.closed == true){
- mod_measure_win = window.open(url,"mod_measure_win","width=200,height=150,resizable=yes");
- }
- else{
- mod_measure_win.document.location.href = url;
- }
- mod_measure_win.focus();
- }
- else{
- if(!mod_measure_win || mod_measure_win == null || mod_measure_win.closed == true){
- mod_measure_win = window.open("","mod_measure_win","width=200,height=150,resizable=yes");
- mod_measure_win.document.open("text/html");
- mod_measure_win.document.write("<span style = 'font-family : Arial, Helvetica, sans-serif;font-size : 12px;font-weight : bold;';>Strecke: " +mod_measure_TotalDist[mod_measure_TotalDist.length-1]+" m</span>");
- mod_measure_win.document.close();
- }
- else{
- mod_measure_win.document.open("text/html");
- mod_measure_win.document.write("<span style = 'font-family : Arial, Helvetica, sans-serif;font-size : 12px;font-weight : bold;';>Strecke: " +mod_measure_TotalDist[mod_measure_TotalDist.length-1]+" m</span>");
- mod_measure_win.document.close();
- }
- mod_measure_win.focus();
- }
-}
\ No newline at end of file
Modified: trunk/mapbender/http/javascripts/mod_measure.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_measure.php 2008-12-16 08:57:36 UTC (rev 3337)
+++ trunk/mapbender/http/javascripts/mod_measure.php 2008-12-16 09:10:48 UTC (rev 3338)
@@ -41,12 +41,20 @@
var mod_measure_RY = new Array();
var mod_measure_Dist = new Array();
var mod_measure_TotalDist = new Array();
-var mod_measureSubFunctions = new Array();
+// global variable
+window.eventAfterMeasure = new MapbenderEvent();
+
var mod_measure_img_on = new Image(); mod_measure_img_on.src = "<?php echo preg_replace("/_off/","_on",$e_src); ?>";
var mod_measure_img_off = new Image(); mod_measure_img_off.src = "<?php echo $e_src; ?>";
var mod_measure_img_over = new Image(); mod_measure_img_over.src = "<?php echo preg_replace("/_off/","_over",$e_src); ?>";
+eventBeforeInit.register(function () {
+ mb_regButton(function (ind) {
+ init_mod_measure(ind);
+ });
+});
+
function init_mod_measure(ind){
mb_button[ind] = document.getElementById(mod_measure_elName);
mb_button[ind].img_over = mod_measure_img_over.src;
@@ -55,18 +63,21 @@
mb_button[ind].status = 0;
mb_button[ind].elName = mod_measure_elName;
mb_button[ind].fName = mod_measure_frameName;
- mb_button[ind].go = new Function ("mod_measure_go()");
- mb_button[ind].stop = new Function ("mod_measure_disable()");
+ mb_button[ind].go = function () {
+ mod_measure_go();
+ };
+ mb_button[ind].stop = function () {
+ mod_measure_disable();
+ };
var ind = getMapObjIndexByName(mod_measure_target);
mod_measure_width = mb_mapObj[ind].width;
mod_measure_height = mb_mapObj[ind].height;
mod_measure_epsg = mb_mapObj[ind].epsg;
- mb_registerSubFunctions("drawDashedLine()");
+ eventAfterMapRequest.register(function () {
+ drawDashedLine();
+ });
mb_registerPanSubElement("measuring");
}
-function register_measureSubFunctions(stringFunction){
- mod_measureSubFunctions[mod_measureSubFunctions.length] = stringFunction;
-}
function mod_measure_go(){
var el = window.frames[mod_measure_target].document;
el.onmousedown = mod_measure_start;
@@ -77,10 +88,7 @@
el.onmouseout = function () {
el.body.style.cursor = 'auto';
}
- var measureSub = "";
- for(var i=0; i<mod_measureSubFunctions.length; i++){
- measureSub += eval(mod_measureSubFunctions[i]);
- }
+ var measureSub = eventAfterMeasure.trigger({}, "CAT");
writeTag(mod_measure_target,"measure_sub",measureSub);
}
function mod_measure_disable(){
@@ -257,4 +265,87 @@
mod_measure_TotalDist = new Array();
writeTag(mod_measure_target,"measuring","");
writeTag(mod_measure_target,"measure_display","");
+}
+
+var mod_closePolygon_img = new Image();
+mod_closePolygon_img.src = "../img/button_gray/closePolygon_off.gif";
+
+eventAfterMeasure.register(function(){
+ return mod_closePolygon();
+});
+
+function mod_closePolygon(){
+ var str = "<div style='position:absolute;top:25px' onmouseup='parent.mod_closePolygon_go()' ";
+ str += "onmouseover='parent.mod_measure_timeout()' onmouseout='parent.mod_measure_disableTimeout()'><img src='"+mod_closePolygon_img.src+"'></div>";
+ return str;
+}
+function mod_closePolygon_go(){
+ mod_measure_close();
+}
+
+var mod_rubber_img = new Image();
+mod_rubber_img.src = "../img/button_gray/rubber_off.gif";
+mod_rubber_img.title = "gemessene Strecke löschen";
+eventAfterMeasure.register(function () {
+ return mod_rubber();
+});
+
+function mod_rubber(){
+ var str = "<div onmouseup='parent.mod_rubber_go()' onmouseover='parent.mod_measure_timeout()' onmouseout='parent.mod_measure_go()'><img src='"+mod_rubber_img.src+"' title='"+mod_rubber_img.title+"'></div>";
+ return str;
+}
+function mod_rubber_go(){
+ mod_measure_delete();
+}
+
+var mod_getArea_img = new Image();
+mod_getArea_img.src = "../img/button_gray/getArea_off.gif";
+eventAfterMeasure.register(function () {
+ return mod_getArea();
+});
+
+function mod_getArea(){
+ var str = "<div id='getAreaButton' style='position:absolute;top:50px' onmouseup='parent.mod_getArea_go()' ";
+ str += "onmouseover='parent.mod_measure_timeout()' onmouseout='parent.mod_measure_disableTimeout()'><img src='"+mod_getArea_img.src+"'></div>";
+ return str;
+}
+function mod_getArea_go(){
+ if(mod_measure_RX[mod_measure_RX.length -1] == mod_measure_RX[0] && mod_measure_RY[mod_measure_RY.length -1] == mod_measure_RY[0]){
+ var ind = getMapObjIndexByName(mod_measure_target);
+ var url = "../php/mod_evalArea.php?x=";
+ for(var i=0; i<mod_measure_RX.length;i++){
+ if(i>0){ url += ",";}
+ url += mod_measure_RX[i];
+ }
+ url += "&y=";
+ for(var i=0; i<mod_measure_RY.length;i++){
+ if(i>0){ url += ",";}
+ url += mod_measure_RY[i];
+ }
+ var srs = mb_mapObj[ind].epsg.split(":");
+ url += "&srs="+ escape(srs[1]);
+ url += "&length=" + mod_measure_TotalDist[mod_measure_TotalDist.length-1];
+ url += "&distance=" + mod_measure_TotalDist[mod_measure_TotalDist.length-2];
+ if(!mod_measure_win || mod_measure_win == null || mod_measure_win.closed == true){
+ mod_measure_win = window.open(url,"mod_measure_win","width=200,height=150,resizable=yes");
+ }
+ else{
+ mod_measure_win.document.location.href = url;
+ }
+ mod_measure_win.focus();
+ }
+ else{
+ if(!mod_measure_win || mod_measure_win == null || mod_measure_win.closed == true){
+ mod_measure_win = window.open("","mod_measure_win","width=200,height=150,resizable=yes");
+ mod_measure_win.document.open("text/html");
+ mod_measure_win.document.write("<span style = 'font-family : Arial, Helvetica, sans-serif;font-size : 12px;font-weight : bold;';>Strecke: " +mod_measure_TotalDist[mod_measure_TotalDist.length-1]+" m</span>");
+ mod_measure_win.document.close();
+ }
+ else{
+ mod_measure_win.document.open("text/html");
+ mod_measure_win.document.write("<span style = 'font-family : Arial, Helvetica, sans-serif;font-size : 12px;font-weight : bold;';>Strecke: " +mod_measure_TotalDist[mod_measure_TotalDist.length-1]+" m</span>");
+ mod_measure_win.document.close();
+ }
+ mod_measure_win.focus();
+ }
}
\ No newline at end of file
Deleted: trunk/mapbender/http/javascripts/mod_rubber.js
===================================================================
--- trunk/mapbender/http/javascripts/mod_rubber.js 2008-12-16 08:57:36 UTC (rev 3337)
+++ trunk/mapbender/http/javascripts/mod_rubber.js 2008-12-16 09:10:48 UTC (rev 3338)
@@ -1,14 +0,0 @@
-//$Id$
-//$Header: /cvsroot/mapbender/mapbender/http/javascripts/mod_rubber.js,v 1.4 2005/09/13 14:38:11 bjoern_heuser Exp $
-var mod_rubber_img = new Image();
-mod_rubber_img.src = "../img/button_gray/rubber_off.gif";
-mod_rubber_img.title = "gemessene Strecke löschen";
-register_measureSubFunctions("mod_rubber()");
-
-function mod_rubber(){
- var str = "<div onmouseup='parent.mod_rubber_go()' onmouseover='parent.mod_measure_timeout()' onmouseout='parent.mod_measure_go()'><img src='"+mod_rubber_img.src+"' title='"+mod_rubber_img.title+"'></div>";
- return str;
-}
-function mod_rubber_go(){
- mod_measure_delete();
-}
\ No newline at end of file
More information about the Mapbender_commits
mailing list