[Mapbender-commits] r2854 - branches/nimix_dev/http/javascripts
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Mon Aug 18 10:37:20 EDT 2008
Author: nimix
Date: 2008-08-18 10:37:20 -0400 (Mon, 18 Aug 2008)
New Revision: 2854
Added:
branches/nimix_dev/http/javascripts/mod_openlayers_layerSwitch.js
Modified:
branches/nimix_dev/http/javascripts/mod_openlayers.php
branches/nimix_dev/http/javascripts/mod_pan.php
branches/nimix_dev/http/javascripts/mod_perimeter.php
branches/nimix_dev/http/javascripts/mod_sandclock.php
branches/nimix_dev/http/javascripts/mod_sandclock2.php
branches/nimix_dev/http/javascripts/mod_savewmc.php
Log:
merge
Modified: branches/nimix_dev/http/javascripts/mod_openlayers.php
===================================================================
--- branches/nimix_dev/http/javascripts/mod_openlayers.php 2008-08-18 14:34:12 UTC (rev 2853)
+++ branches/nimix_dev/http/javascripts/mod_openlayers.php 2008-08-18 14:37:20 UTC (rev 2854)
@@ -31,11 +31,6 @@
units: "degrees"
};
-
-eventInit.register(function (){
- OpenLayers.ImgPath = "../img/openlayers/";
- var ol_map = new OpenLayers.Map('<?php echo $e_id;?>', {'maxResolution': 1.40625/2});
-
// var ol_wms = new OpenLayers.Layer.WMS( "Germany",
// "http://wms1.ccgis.de/cgi-bin/mapserv?map=/data/umn/germany/germany.map&", {layers: 'Germany,Topographie,Grenze,Bundeslaender,Staedte,Postleitzahlbereiche,Bahnlinien,Fluesse,Strassen,Staedtepunkte,Postleitzahlbereichname,Staedtenamen,Bundeslaendernamen', format: 'image/png' } );
@@ -61,11 +56,12 @@
//var wms_407 = new OpenLayers.Layer.WMS('Mapbender User','http://wms1.ccgis.de/cgi-bin/mapserv?map=/data/umn/mapbender_user/mapbender_user.map&',{layers:'Mapbender,Mapbender_User,Mapbender_Names', transparent: 'true',format: 'image/png'});
//wms_407.setVisibility(false);
-//ol_map.addLayers([wms_407,wms_893]);
- <?php
- include(dirname(__FILE__)."/../php/mod_createOlObjFromDB.php");
- ?>
-
- ol_map.addControl(new OpenLayers.Control.LayerSwitcher());
+
+var ol_map;
+OpenLayers.ImgPath = "../img/openlayers/";
+ol_map = new OpenLayers.Map('<?php echo $e_id;?>', {'maxResolution': 1.40625/2});
+
+eventAfterInit.register(function () {
ol_map.zoomToMaxExtent();
+
});
\ No newline at end of file
Copied: branches/nimix_dev/http/javascripts/mod_openlayers_layerSwitch.js (from rev 2653, trunk/mapbender/http/javascripts/mod_openlayers_layerSwitch.js)
===================================================================
--- branches/nimix_dev/http/javascripts/mod_openlayers_layerSwitch.js (rev 0)
+++ branches/nimix_dev/http/javascripts/mod_openlayers_layerSwitch.js 2008-08-18 14:37:20 UTC (rev 2854)
@@ -0,0 +1 @@
+ol_map.addControl(new OpenLayers.Control.LayerSwitcher());
\ No newline at end of file
Modified: branches/nimix_dev/http/javascripts/mod_pan.php
===================================================================
--- branches/nimix_dev/http/javascripts/mod_pan.php 2008-08-18 14:34:12 UTC (rev 2853)
+++ branches/nimix_dev/http/javascripts/mod_pan.php 2008-08-18 14:37:20 UTC (rev 2854)
@@ -28,6 +28,9 @@
var mod_pan_img_off = new Image(); mod_pan_img_off.src = "<?php echo $e_src; ?>";
var mod_pan_img_over = new Image(); mod_pan_img_over.src = "<?php echo preg_replace("/_off/","_over",$e_src); ?>";
+
+var mb_panActive = false;
+
function init_mod_pan(ind){
mb_button[ind] = document.getElementById(mod_pan_elName);
mb_button[ind].img_over = mod_pan_img_over.src;
@@ -40,12 +43,18 @@
mb_button[ind].stop = new Function ("mod_pan_disable()");
}
function mod_pan_click(){
+ var p = window.frames[mod_pan_target].document.getElementById("maps");
+ p.style.cursor = "pointer";
+
var el = window.frames[mod_pan_target].document;
el.onmousedown = mod_pan_start;
el.onmouseup = mod_pan_stop;
el.onmousemove = mod_pan_run;
}
function mod_pan_disable(){
+ var p = window.frames[mod_pan_target].document.getElementById("maps");
+ p.style.cursor = "";
+
var el = window.frames[mod_pan_target].document;
el.onmousedown = null;
el.onmouseup = null;
Modified: branches/nimix_dev/http/javascripts/mod_perimeter.php
===================================================================
--- branches/nimix_dev/http/javascripts/mod_perimeter.php 2008-08-18 14:34:12 UTC (rev 2853)
+++ branches/nimix_dev/http/javascripts/mod_perimeter.php 2008-08-18 14:37:20 UTC (rev 2854)
@@ -36,6 +36,40 @@
var mod_perimeter_status = 0;
var mod_perimeter_img_obj = null;
+function mb_checkTag(frameName, tagName, elementId, appendAtTagName, attributes){
+ var oldElement;
+ var newElement;
+ var prefix;
+ if(frameName && frameName !== ""){
+ prefix = window.frames[frameName].document;
+ }
+ else if(!frameName || frameName === ""){
+ prefix = document;
+ }
+ oldElement = prefix.getElementById(elementId);
+ if (oldElement === null) {
+ newElement = prefix.createElement(tagName);
+ newElement = prefix.getElementsByTagName(appendAtTagName)[0].appendChild(newElement);
+ }
+ else {
+ if (oldElement.nodeName.toLowerCase() == tagName.toLowerCase()) {
+ for (var i=0; i<attributes.length; i++) {
+ oldElement.setAttribute(attributes[i][0], attributes[i][1]);
+ }
+ return oldElement;
+ }
+ else {
+ return false;
+ }
+ }
+ var newElementAttributeNode = document.createAttribute("id");
+ newElementAttributeNode.value = elementId;
+ newElement.setAttributeNode(newElementAttributeNode);
+ for (var i=0; i<attributes.length; i++) {
+ newElement.setAttribute(attributes[i][0], attributes[i][1]);
+ }
+ return newElement;
+}
function mod_perimeter_checkDefaults(){
try{var t = mod_perimeter_thickness;}catch(e){mod_perimeter_thickness = 2;}
try{var t = mod_perimeter_color;}catch(e){mod_perimeter_color = '#000000';}
Modified: branches/nimix_dev/http/javascripts/mod_sandclock.php
===================================================================
--- branches/nimix_dev/http/javascripts/mod_sandclock.php 2008-08-18 14:34:12 UTC (rev 2853)
+++ branches/nimix_dev/http/javascripts/mod_sandclock.php 2008-08-18 14:37:20 UTC (rev 2854)
@@ -31,17 +31,27 @@
var mod_sandclock_img = new Image();
mod_sandclock_img.src = mod_sandclock_image;
-mb_registerSubFunctions("mod_sandclock(true,myMapId)");
+mb_registerSubFunctions("mod_sandclock(true,myMapIds)");
-function mod_sandclock(start,myMapId){
+function mod_sandclock(start,myMapIds){
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));
}
- aktiv = setTimeout("mod_sandclock('','"+myMapId+"')",100);
- if(window.frames[mod_sandclock_target].document.getElementById(myMapId) && window.frames[mod_sandclock_target].document.getElementById(myMapId).complete){
+ aktiv = setTimeout("mod_sandclock('','"+myMapIds+"')",10);
+ var myMapIdArray = myMapIds.split(",");
+ var complete = true;
+ 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) {
+ complete = false;
+ }
+ }
+ if (complete) {
clearTimeout(aktiv);
writeTag(mod_sandclock_target, "sandclock", "");
}
Modified: branches/nimix_dev/http/javascripts/mod_sandclock2.php
===================================================================
--- branches/nimix_dev/http/javascripts/mod_sandclock2.php 2008-08-18 14:34:12 UTC (rev 2853)
+++ branches/nimix_dev/http/javascripts/mod_sandclock2.php 2008-08-18 14:37:20 UTC (rev 2854)
@@ -29,7 +29,7 @@
mb_registerSubFunctions("mod_sandclock(true,myMapId)");
-function mod_sandclock(start,myMapId){
+function mod_sandclock(start){
var ind = getMapObjIndexByName(mod_sandclock_target);
if(start){
mod_sandclock_count = mod_sandclock_maxWait;
@@ -44,7 +44,7 @@
}
// check images:
- aktiv = setTimeout("mod_sandclock('','"+myMapId+"')",100);
+ aktiv = setTimeout("mod_sandclock(false)",100);
mod_sandclock_count -= 1000;
var allMaps = window.frames[mod_sandclock_target].document.getElementsByName("mapimage");
Modified: branches/nimix_dev/http/javascripts/mod_savewmc.php
===================================================================
--- branches/nimix_dev/http/javascripts/mod_savewmc.php 2008-08-18 14:34:12 UTC (rev 2853)
+++ branches/nimix_dev/http/javascripts/mod_savewmc.php 2008-08-18 14:37:20 UTC (rev 2854)
@@ -22,9 +22,12 @@
echo "mod_savewmc_target = '".$e_target[0]."';";
?>
+
function setOnUnload() {
if (ie) {
- document.getElementsByTagName('body')[0].onunload = function() {var x = new Function ("", "mod_savewmc_session()"); x(); };
+ document.getElementsByTagName('body')[0].onunload = function() {
+ var x = new Function ("", "mod_savewmc_session()"); x();
+ };
}
else {
document.getElementsByTagName('body')[0].setAttribute("onUnload", "mod_savewmc_session();");
@@ -64,5 +67,5 @@
if (storeInSession) {
$.ajaxSetup({async:false}); //TODO: find out why async doesn't work onunload
}
- $.post("../php/mod_insertWmcIntoDb.php", {"saveInSession":storeInSession, "generalTitle":generalTitle, "extensionData":extensionDataString, "mapObject":$.toJSON(mb_mapObj[ind])}, callbackFunction);
+ $.post("../php/mod_savewmc_server.php", {"saveInSession":storeInSession, "generalTitle":generalTitle, "extensionData":extensionDataString, "mapObject":$.toJSON(mb_mapObj)}, callbackFunction);
}
\ No newline at end of file
More information about the Mapbender_commits
mailing list