[Mapbender-commits] r3386 - in trunk/mapbender: core
http/javascripts http/php resources/db/update
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Fri Jan 2 07:31:38 EST 2009
Author: christoph
Date: 2009-01-02 07:31:38 -0500 (Fri, 02 Jan 2009)
New Revision: 3386
Removed:
trunk/mapbender/http/php/system.php
Modified:
trunk/mapbender/core/system.php
trunk/mapbender/http/javascripts/mod_highlightPOI.php
trunk/mapbender/http/javascripts/mod_sandclock.php
trunk/mapbender/http/javascripts/mod_zoomOut1.php
trunk/mapbender/resources/db/update/update_2.6.sql
Log:
http://trac.osgeo.org/mapbender/ticket/360
Modified: trunk/mapbender/core/system.php
===================================================================
--- trunk/mapbender/core/system.php 2009-01-02 12:30:55 UTC (rev 3385)
+++ trunk/mapbender/core/system.php 2009-01-02 12:31:38 UTC (rev 3386)
@@ -36,4 +36,4 @@
define("ZOOM_MOUSEWHEEL", "1.1");
-define("MODULES_NOT_RELYING_ON_GLOBALS", "back,forward,copyright,dependentDiv,dragMapSize,FeatureInfoRedirect,highlightPOI,measure,navFrame,sandclock,scaleBar,scaleSel,setBackground,setBBOX,setPOI2Scale");
+define("MODULES_NOT_RELYING_ON_GLOBALS", "back,forward,zoomIn1,copyright,dependentDiv,dragMapSize,FeatureInfoRedirect,highlightPOI,measure,navFrame,sandclock,scaleBar,scaleSel,setBackground,setBBOX,setPOI2Scale");
Modified: trunk/mapbender/http/javascripts/mod_highlightPOI.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_highlightPOI.php 2009-01-02 12:30:55 UTC (rev 3385)
+++ trunk/mapbender/http/javascripts/mod_highlightPOI.php 2009-01-02 12:31:38 UTC (rev 3386)
@@ -132,6 +132,8 @@
"height":mb_mapObj[ind].height+"px",
"top":0,
"left":0,
+ "width":0,
+ "height":0,
"visibility":"visible"
});
var tagSource = "";
Modified: trunk/mapbender/http/javascripts/mod_sandclock.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_sandclock.php 2009-01-02 12:30:55 UTC (rev 3385)
+++ trunk/mapbender/http/javascripts/mod_sandclock.php 2009-01-02 12:31:38 UTC (rev 3386)
@@ -39,8 +39,26 @@
var ind = getMapObjIndexByName(mod_sandclock_target);
if(start){
var temp = "<img src='"+mod_sandclock_img.src+"'>";
- writeTag(mod_sandclock_target, "sandclock", temp);
- mb_arrangeElement(mod_sandclock_target, "sandclock", (mb_mapObj[ind].width/2 - 16), (mb_mapObj[ind].height/2 - 16));
+
+ var map_el = mb_mapObj[ind].getDomElement();
+ if(!map_el.ownerDocument.getElementById(mb_mapObj[ind].elementName+"_sandclock")){
+ //create Box Elements
+ el_top = map_el.ownerDocument.createElement("div");
+ el_top.style.position = "absolute";
+ el_top.style.top = "0px";
+ el_top.style.left = "0px";
+ el_top.style.width = "0px";
+ el_top.style.height = "0px";
+ el_top.style.overflow = "hidden";
+ el_top.style.zIndex = "10";
+ el_top.style.visibility = "hidden";
+ el_top.style.cursor = "crosshair";
+ el_top.style.backgroundColor = "#ff0000";
+ el_top.id = mb_mapObj[ind].elementName+"_sandclock";
+ map_el.appendChild(el_top);
+ }
+ writeTag(mb_mapObj[ind].frameName, mb_mapObj[ind].elementName+"_sandclock", temp);
+ mb_arrangeElement("", mod_sandclock_target+"_sandclock", (mb_mapObj[ind].width/2 - 16), (mb_mapObj[ind].height/2 - 16));
}
aktiv = setTimeout(function () {
mod_sandclock('',myMapId);
@@ -50,13 +68,14 @@
var myMapId;
for (var i = 0; i < myMapIdArray.length && complete; i++) {
myMapId = myMapIdArray[i];
- if(window.frames[mod_sandclock_target].document.getElementById(myMapId) &&
- !window.frames[mod_sandclock_target].document.getElementById(myMapId).complete) {
+ var myDoc = mb_mapObj[ind].getDomElement().ownerDocument;
+ if(myDoc.getElementById(myMapId) &&
+ !myDoc.getElementById(myMapId).complete) {
complete = false;
}
}
if (complete) {
clearTimeout(aktiv);
- writeTag(mod_sandclock_target, "sandclock", "");
+ writeTag(mb_mapObj[ind].frameName, mb_mapObj[ind].elementName+"_sandclock", "");
}
}
Modified: trunk/mapbender/http/javascripts/mod_zoomOut1.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_zoomOut1.php 2009-01-02 12:30:55 UTC (rev 3385)
+++ trunk/mapbender/http/javascripts/mod_zoomOut1.php 2009-01-02 12:31:38 UTC (rev 3386)
@@ -9,10 +9,14 @@
var mod_zoomOut_img_over = new Image();
mod_zoomOut_img_over.src = "<?php echo preg_replace("/_off/","_over",$e_src); ?>";
+var zoomOut1Id = '<?php echo $e_id; ?>';
-function mod_zoomOut1(){
- zoom("<?php echo $e_target[0]; ?>", false,2.0);
-}
+var $zoomOut1Button = $("#"+zoomOut1Id);
+
+$zoomOut1Button.click(function () {
+ zoom("<?php echo $e_target[0]; ?>", false, 2.0);
+});
+
function mod_zoomOut1_init(obj){
document.getElementById("zoomOut1").src = mod_zoomOut_img_over.src;
obj.onmouseover = new Function("mod_zoomOut1_over()");
Deleted: trunk/mapbender/http/php/system.php
===================================================================
--- trunk/mapbender/http/php/system.php 2009-01-02 12:30:55 UTC (rev 3385)
+++ trunk/mapbender/http/php/system.php 2009-01-02 12:31:38 UTC (rev 3386)
@@ -1,37 +0,0 @@
-<?php
-# $Id:$
-# 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.
-
-#
-# mapbender version
-#
-define("MB_VERSION_NUMBER", "2.5.0");
-define("MB_VERSION_APPENDIX", "RC2");
-define("MB_RELEASE_DATE", mktime(0,0,0,4,21,2008));//h, min,sec,month,day,year
-
-#
-# constants from map.js
-#
-define("MB_RESOLUTION", "28.35");
-define("MB_FEATURE_COUNT", "100");
-define("MB_SECURITY_PROXY", "http://wms1.ccgis.de/mapbender/tools/security_proxy.php?mb_ows_security_proxy=");
-#
-# available log levels
-#
-define("LOG_LEVEL_LIST", "off,error,warning,notice,all");
-
-define("ZOOM_MOUSEWHEEL", "1.1");
\ No newline at end of file
Modified: trunk/mapbender/resources/db/update/update_2.6.sql
===================================================================
--- trunk/mapbender/resources/db/update/update_2.6.sql 2009-01-02 12:30:55 UTC (rev 3385)
+++ trunk/mapbender/resources/db/update/update_2.6.sql 2009-01-02 12:31:38 UTC (rev 3386)
@@ -53,7 +53,11 @@
--
-- remove event handlers, are now in the script
-UPDATE gui_element SET e_attributes = '' WHERE e_id = 'forward' OR e_id = 'back';
+UPDATE gui_element SET e_attributes = '' WHERE e_id = 'forward';
+UPDATE gui_element SET e_attributes = '' WHERE e_id = 'back';
+UPDATE gui_element SET e_attributes = '' WHERE e_id = 'zoomIn1';
+UPDATE gui_element SET e_attributes = '' WHERE e_id = 'zoomOut1';
+UPDATE gui_element SET e_attributes = '' WHERE e_id = 'measure';
-- remove event handlers, are now in the script
UPDATE gui_element SET e_content = '<div id="mbN" style="position:absolute;width:0;height:0;top:0;left:0;background-color:#B8C1C7;">
@@ -80,3 +84,8 @@
<div id="mbNW" style="position:absolute;width:0;height:0;top:0;left:0;background-color:#B8C1C7;">
<img id="arrow_nw" style="position:relative;top:0;left:0" src="../img/arrows/arrow_nw.gif" width="10" height="10">
</div>' WHERE e_id = 'navFrame';
+
+
+UPDATE gui_element SET e_pos = 1, e_element = 'div', e_src = '', e_attributes = '', e_more_styles = 'overflow:hidden;', e_content = '<div id="mapframe1_maps" style="position:absolute;left:0px;right:0px;"></div>', e_closetag = 'div', e_js_file = 'mapnf.php' WHERE e_id = 'mapframe1';
+UPDATE gui_element SET e_element = 'div', e_src = '', e_attributes = '', e_more_styles = 'overflow:hidden;', e_content = '<div id="overview_maps" style="position:absolute;left:0px;right:0px;"></div>', e_closetag = 'div', e_js_file = 'ovnf.php', e_target = '', e_requires = 'mapframe1' WHERE e_id = 'overview';
+UPDATE gui_element SET e_pos = 2, e_element = 'div', e_more_styles = 'visibility:visible;overflow:scroll', e_content = '', e_closetag = 'div', e_js_file = '../html/mod_treefolderPlain.php', e_mb_mod = 'jsTree.js', e_requires = 'mapframe1' WHERE e_id = 'treeGDE';
More information about the Mapbender_commits
mailing list