svn commit: r749 - trunk/mapbender/http/javascripts
christoph at osgeo.org
christoph at osgeo.org
Tue Aug 8 08:24:08 EDT 2006
Author: christoph
Date: 2006-08-08 12:24:08+0000
New Revision: 749
Modified:
trunk/mapbender/http/javascripts/mod_initWmc.php
trunk/mapbender/http/javascripts/mod_insertKmlIntoDb.php
trunk/mapbender/http/javascripts/mod_saveWmcKml.php
Log:
added flag; fixed some bugs; click on flag opens website
Modified: trunk/mapbender/http/javascripts/mod_initWmc.php
Url: https://mapbender.osgeo.org/source/browse/mapbender/trunk/mapbender/http/javascripts/mod_initWmc.php?view=diff&rev=749&p1=trunk/mapbender/http/javascripts/mod_initWmc.php&p2=trunk/mapbender/http/javascripts/mod_initWmc.php&r1=748&r2=749
==============================================================================
--- trunk/mapbender/http/javascripts/mod_initWmc.php (original)
+++ trunk/mapbender/http/javascripts/mod_initWmc.php 2006-08-08 12:24:08+0000
@@ -26,11 +26,12 @@
$x;
$y;
$icon;
-
-$js = "function mod_initWMC_init() {";
+$alt;
+$url;
$adm = new administration();
+
//KML
if ($_SESSION['mb_myKml']) {
$sql = "SELECT * FROM mb_meetingpoint WHERE mb_meetingpoint_id = $1";
@@ -50,9 +51,14 @@
$x = $kml->x;
$y = $kml->y;
$icon = $kml->icon;
+ $alt = $kml->title . ", " .$kml->description;
+ if (ereg("^.*,[[:space:]]([[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]).*$", $kml->title)) {
+ $url = ereg_replace("^.*,[[:space:]]([[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]).*$", "\\1", $kml->title);
+ }
+
}
else {
- $js .= "alert('Meetingpoint ID id ".$_SESSION['mb_myKml']." is not valid. Default GUI will be loaded instead.');";
+ $js_error .= "alert('Meetingpoint ID id ".$_SESSION['mb_myKml']." is not valid. Default GUI will be loaded instead.');";
}
}
//WMC
@@ -65,40 +71,54 @@
echo "wmc_id = '".$wmc_id."';";
$wmc = new wmc();
$wmc->createObjFromWMC($wmc_id);
- $js .= $wmc->createJsObjFromWMC("", $e_target[0], "load");
+ $js_wmc .= $wmc->createJsObjFromWMC("", $e_target[0], "load");
if ($x && $y && $icon) {
- $js .= "var myPoint = realToMap('".$e_target[0]."', new Point(".$x.",".$y."));\n";
- $js .= "var poleheight = 100;";
- $js .= "myPoint.y -= poleheight;";
- $js .= "var attributes = new Array();\n";
- $js .= "attributes[0] = new Array();\n";
- $js .= "attributes[0][0] = 'style';\n";
- $js .= "attributes[0][1] = 'position:absolute; top:'+myPoint.y+'px; left:'+myPoint.x+'px; z-index:100; font-size:10px';\n";
- $js .= "node = mb_checkTag('".$e_target[0]."', 'div', 'meeting_pole', 'body', attributes);\n";
- $js .= "if (node == false) {\n";
- $js .= "\talert('Fatal error: Element id is already taken!');\n";
- $js .= "}\n";
- $js .= "else {\n";
- $js .= "node.innerHTML = \"<table cellspacing=0 cellpadding=0><tr><td><img width=0 height=100 border=1></td><td valign=top><img src='".$icon."'></td></tr></table>\";";
- $js .= "}\n";
+ $js_kml .= "var myPoint = realToMap('".$e_target[0]."', new Point(".$x.",".$y."));\n";
+ $js_kml .= "var poleheight = 100;";
+ $js_kml .= "myPoint.y -= poleheight;";
+ $js_kml .= "var attributes = new Array();\n";
+ $js_kml .= "attributes[0] = new Array();\n";
+ $js_kml .= "attributes[0][0] = 'style';\n";
+ $js_kml .= "attributes[0][1] = 'position:absolute; top:'+myPoint.y+'px; left:'+myPoint.x+'px; z-index:100; font-size:10px';\n";
+ $js_kml .= "node = mb_checkTag('".$e_target[0]."', 'div', 'meeting_pole', 'body', attributes);\n";
+ $js_kml .= "if (node == false) {\n";
+ $js_kml .= "\talert('Fatal error: Element id is already taken!');\n";
+ $js_kml .= "}\n";
+ $js_kml .= "else {\n";
+ $js_kml .= "node.innerHTML = \"<table cellspacing=0 cellpadding=0><tr><td bgcolor=#000000><img width=0 height=100 border=1></td><td valign=top>";
+ $js_img .= "<img border='0' src='".$icon."' title='".$alt."'>";
+ if ($url) {
+ $js_img = "<a href='".$url."' target='_blank'>" . $js_img . "</a>";
+ }
+ $js_kml .= $js_img . "</td></tr></table>\";";
+ $js_kml .= "}\n";
}
}
else {
- $js .= "alert('".$adm->getUserNameByUserId($_SESSION["mb_user_id"])." is not allowed to access WMC ".$_SESSION['mb_myWmc'].". Default GUI will be loaded instead.');";
+ $js_error .= "alert('".$adm->getUserNameByUserId($_SESSION["mb_user_id"])." is not allowed to access WMC ".$_SESSION['mb_myWmc'].". Default GUI will be loaded instead.');";
}
}
else {
- $js .= "alert('WMC id ".$_SESSION['mb_myWmc']." is not valid. Default GUI will be loaded instead.');";
+ $js_error .= "alert('WMC id ".$_SESSION['mb_myWmc']." is not valid. Default GUI will be loaded instead.');";
}
}
+echo "function mod_initWMC_init() {";
+echo $js_wmc;
+echo $js_kml;
+echo $js_error;
+echo "}";
+
+echo "function addFlag() {";
+echo $js_kml;
+echo $js_error;
+echo "}";
-$js .= "}";
-echo $js;
?>
mb_registerInitFunctions("mod_initWMC()");
function mod_initWMC(){
mod_initWMC_init();
+ mb_registerSubFunctions('addFlag()');
}
Modified: trunk/mapbender/http/javascripts/mod_insertKmlIntoDb.php
Url: https://mapbender.osgeo.org/source/browse/mapbender/trunk/mapbender/http/javascripts/mod_insertKmlIntoDb.php?view=diff&rev=749&p1=trunk/mapbender/http/javascripts/mod_insertKmlIntoDb.php&p2=trunk/mapbender/http/javascripts/mod_insertKmlIntoDb.php&r1=748&r2=749
==============================================================================
--- trunk/mapbender/http/javascripts/mod_insertKmlIntoDb.php (original)
+++ trunk/mapbender/http/javascripts/mod_insertKmlIntoDb.php 2006-08-08 12:24:08+0000
@@ -56,7 +56,14 @@
$y = $d[2];
$icon = $d[3];
$gui_id = $d[4];
- $title = $_POST['name'] . ", " . $_POST['street'] . ", " . $_POST['postcode']. " " .$_POST['city'] . ", " . $_POST['website'];
+ $title_array = array();
+ if ($_POST['name']) $title_array[count($title_array)] = $_POST['name'];
+ if ($_POST['street']) $title_array[count($title_array)] = $_POST['street'];
+ if ($_POST['postcode']) $title_array[count($title_array)] = $_POST['postcode'];
+ if ($_POST['city']) $title_array[count($title_array)] = $_POST['city'];
+ if ($_POST['website']) $title_array[count($title_array)] = $_POST['website'];
+
+ $title = implode(", ", $title_array);
$description = $_POST['description'];
$kml = new kml($title, $description, $x, $y, $icon);
Modified: trunk/mapbender/http/javascripts/mod_saveWmcKml.php
Url: https://mapbender.osgeo.org/source/browse/mapbender/trunk/mapbender/http/javascripts/mod_saveWmcKml.php?view=diff&rev=749&p1=trunk/mapbender/http/javascripts/mod_saveWmcKml.php&p2=trunk/mapbender/http/javascripts/mod_saveWmcKml.php&r1=748&r2=749
==============================================================================
--- trunk/mapbender/http/javascripts/mod_saveWmcKml.php (original)
+++ trunk/mapbender/http/javascripts/mod_saveWmcKml.php 2006-08-08 12:24:08+0000
@@ -82,7 +82,7 @@
cssTmp.appendChild(cssLink);
*/
var wmc_title = "meetingpoint";
- var icon = "http://www.eracareers-germany.de/drmp_de/image/rote_stecknadel.gif";
+ var icon = "http://wms1.ccgis.de/mapbender_dev/img/flag.png";
var str = "";
var onclick = "wmcid=window.opener.mod_savewmc('"+wmc_title+"');";
More information about the Mapbender_commits
mailing list