[Mapbender-commits] r8623 - in trunk/mapbender/http/extensions/mobilemap: . _build js mod_mapbender query
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Tue May 21 08:08:21 PDT 2013
Author: armin11
Date: 2013-05-21 08:08:21 -0700 (Tue, 21 May 2013)
New Revision: 8623
Removed:
trunk/mapbender/http/extensions/mobilemap/_build/_merge_compress_js.sh~
trunk/mapbender/http/extensions/mobilemap/js/backgroundlayer.js~
trunk/mapbender/http/extensions/mobilemap/js/backgroundlayer.php~
trunk/mapbender/http/extensions/mobilemap/map.php~
trunk/mapbender/http/extensions/mobilemap/mod_mapbender/search.js~
trunk/mapbender/http/extensions/mobilemap/mod_mapbender/search_proxy.php~
trunk/mapbender/http/extensions/mobilemap/mod_mapbender/wmc_proxy.php~
trunk/mapbender/http/extensions/mobilemap/query/proxy.php~
trunk/mapbender/http/extensions/mobilemap/query/rasterquery.php~
trunk/mapbender/http/extensions/mobilemap/query/searchproxy.php~
Log:
Delete files which are not needed
Deleted: trunk/mapbender/http/extensions/mobilemap/_build/_merge_compress_js.sh~
===================================================================
--- trunk/mapbender/http/extensions/mobilemap/_build/_merge_compress_js.sh~ 2013-05-21 15:06:10 UTC (rev 8622)
+++ trunk/mapbender/http/extensions/mobilemap/_build/_merge_compress_js.sh~ 2013-05-21 15:08:21 UTC (rev 8623)
@@ -1,16 +0,0 @@
-#!/bin/sh
-outputfile="ngms_eventtest.js"
-outputfilemin="ngms_eventtest.min.js"
-dirjs="../js/dev/"
-dirmb="../mod_mapbender/"
-dirtarget="../js/"
-echo "//concatenated js files" > $outputfile
-cat $dirjs"1_ngms_olextent.js" >> $outputfile
-cat $dirjs"2_ngms_global.js" >> $outputfile
-cat $dirmb"searchobjects.js" >> $outputfile
-cat $dirmb"search.js" >> $outputfile
-cat $dirjs"4_ngms_base.js" >> $outputfile
-cat $dirjs"5_ngms_jq.js" >> $outputfile
-java -jar compress/compiler.jar --js=$outputfile --js_output_file=$outputfilemin
-
-
Deleted: trunk/mapbender/http/extensions/mobilemap/js/backgroundlayer.js~
===================================================================
--- trunk/mapbender/http/extensions/mobilemap/js/backgroundlayer.js~ 2013-05-21 15:06:10 UTC (rev 8622)
+++ trunk/mapbender/http/extensions/mobilemap/js/backgroundlayer.js~ 2013-05-21 15:08:21 UTC (rev 8623)
@@ -1,9 +0,0 @@
-<?php
-//Basic configuration of mapserver client
-require_once(dirname(__FILE__)."/../../../conf/mobilemap.conf");
-$js = "";
-for ($i==0; count($layer);$i++) {
- $js .= layer[$i];
-}
-echo $js;
-?>
Deleted: trunk/mapbender/http/extensions/mobilemap/js/backgroundlayer.php~
===================================================================
--- trunk/mapbender/http/extensions/mobilemap/js/backgroundlayer.php~ 2013-05-21 15:06:10 UTC (rev 8622)
+++ trunk/mapbender/http/extensions/mobilemap/js/backgroundlayer.php~ 2013-05-21 15:08:21 UTC (rev 8623)
@@ -1,12 +0,0 @@
-<?php
-//Basic configuration of mapserver client
-//require_once(dirname(__FILE__)."/../../../conf/mobilemap.conf");
-echo "test";
-$js = "";
-/*for ($i = 0; $i < count($layer); $i++) {
- $js .= $layer[$i];
-}*/
-//header - javascript
-
-echo $js;
-?>
Deleted: trunk/mapbender/http/extensions/mobilemap/map.php~
===================================================================
--- trunk/mapbender/http/extensions/mobilemap/map.php~ 2013-05-21 15:06:10 UTC (rev 8622)
+++ trunk/mapbender/http/extensions/mobilemap/map.php~ 2013-05-21 15:08:21 UTC (rev 8623)
@@ -1,353 +0,0 @@
-<?php
-//Basic configuration of mapserver client
-require_once(dirname(__FILE__)."/../../../conf/mobilemap.conf");
-
-//Fixes IPhone, Android 2.x
-if(strstr($_SERVER['HTTP_USER_AGENT'], 'iPhone') || strstr($_SERVER['HTTP_USER_AGENT'], 'iPod') || strstr($_SERVER['HTTP_USER_AGENT'], 'Android 2.')) {
- $scaleselect = "false";
-}
-else {
- $scaleselect = "true";
-}
-
-//WMC Anfrage Mapbendermodul
-if (isset($_GET['wmcid'])) {
- $wmcid = htmlspecialchars($_GET["wmcid"]);
-}
-//Validate parameters for zooming to special extent for WMC
-if(isset($_REQUEST["mb_myBBOX"]) && $_REQUEST["mb_myBBOX"] != ""){
- //Check for numerical values for BBOX
- $array_bbox = explode(',',$_REQUEST["mb_myBBOX"]);
- if ((is_numeric($array_bbox[0])) and (is_numeric($array_bbox[1])) and (is_numeric($array_bbox[2])) and (is_numeric($array_bbox[3])) ) {
- $mb_myBBOX = $_REQUEST["mb_myBBOX"];
- if(isset($_REQUEST["mb_myBBOXEpsg"])){
- //Check epsg
- $targetEpsg=intval($_REQUEST["mb_myBBOXEpsg"]);
- if (($targetEpsg >= 1) and ($targetEpsg <= 50001)) {
- #echo "is in the codespace of the epsg registry\n";
- $mb_myBBOXEpsg = $targetEpsg;
-
- } else {
- #echo "is outside\n";
- echo 'The REQUEST parameter mb_myBBOXEpsg is not in the epsg realm - please define another EPSG Code.';
- die();
- }
- }
- } else {
- echo "The REQUEST parameters for mb_myBBOX are not numeric - please give numeric values!";
- die();
- }
-}
-?>
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-<title><?php echo $apptitle; ?></title>
-<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0;">
-<meta name="apple-mobile-web-app-capable" content="yes">
-<link rel="apple-touch-icon" href="<?php echo $iPhoneIcon; ?>"/>
-<link rel="shortcut icon" href="<?php echo $favIcon; ?>"/>
-<link rel="stylesheet" href="http://code.jquery.com/mobile/1.2.0/jquery.mobile-1.2.0.min.css" />
-<link href="<?php echo $style_1; ?>" rel="stylesheet" >
-<link href="<?php echo $style_2; ?>" rel="stylesheet" >
-<?php if($googleapi){ ?>
-<script src="http://maps.google.com/maps/api/js?sensor=false®ion=DE"></script>
-<?php } ?>
-<script src="../mobilemap/js/proj4js.min.js" ></script>
-<script src="../mobilemap/js/OpenLayers.mobile.min.js"></script>
-<script src="http://code.jquery.com/jquery-1.8.2.min.js"></script>
-<script src="http://code.jquery.com/mobile/1.2.0/jquery.mobile-1.2.0.min.js"></script>
-<script src="../mobilemap/js/jquery-lang.js"></script>
-<script src="../mobilemap/js/langpack/en.js" charset="utf-8" type="text/javascript"></script>
-<script src="../mobilemap/backgroundlayer.php" charset="utf-8" type="text/javascript"></script>
-<?php if($mapbendermod){ ?>
-<!-- Mod Mapbender -->
-<link href="../mobilemap/mod_mapbender/search.css" rel="stylesheet" >
-<!-- /Mod Mapbedner -->
-<?php } ?>
-<?php if($devmode){ ?>
-<script src="../mobilemap/js/dev/1_ngms_olextent.js" ></script>
-<script src="../mobilemap/js/dev/2_ngms_global.js" ></script>
-<?php if($mapbendermod){ ?>
-<!-- Mod Mapbender -->
-<script src="../mobilemap/mod_mapbender/searchobjects.js"></script>
-<script src="../mobilemap/mod_mapbender/search.js"></script>
-<!-- /Mod Mapbedner -->
-<?php } else { ?>
-<script src="../mobilemap/js/dev/3_ngms_layer.js" ></script>
-<?php } ?>
-<script src="../mobilemap/js/dev/4_ngms_base.js" ></script>
-<script src="../mobilemap/js/dev/5_ngms_jq.js" ></script>
-<?php } else{ ?>
-<script src="../mobilemap/js/ngms_event.min.js" ></script>
-<?php } ?>
-<script type="text/javascript">
- window.lang = new jquery_lang_js();
- $().ready(function () {
- window.lang.run();
- changeLanguage('<?php echo $mylang; ?>',false);
- <?php if($wmcid != ''){ ?>
- var wmcurl = '<?php echo $mapbender_wmcurl.$wmcid; ?>';
- //add user defined bbox values if given
- <?php if(isset($mb_myBBOX) && isset($mb_myBBOXEpsg)){ ?>
- var wmcurl = wmcurl+"&mb_myBBOX="+<?php echo "'".$mb_myBBOX."'"; ?>+"&mb_myBBOXEpsg="+<?php echo "'".$mb_myBBOXEpsg."'"; ?>;
- <?php } ?>
- searchWmc(wmcurl);
- <?php } ?>
- });
-</script>
-</head>
-<body>
-
-<!-- Map Seite Start-->
-<div data-role="page" id="mappage">
- <div data-role="content">
- <div id="logo"><a href="map.php?lang=<?php echo $mylang; ?>" target="_self"><img src="img/logo.png" ></a></div>
- <div id="map"></div>
- <div id="navbutgroup">
- <div id="ovbut" class="navbuttons" style="margin-top:2px"></div>
- <div id="zoominbut" class="navbuttons" style="margin-top:2px"></div>
- <div id="zoomoutbut" class="navbuttons" style="margin-top:2px"></div>
- </div>
- <div id="navbutgrouptop">
- <?php if($mapbendermod){ ?>
- <!-- Mapbender -->
- <div id="mapbenderbut" class="navbuttons" style="float:left; margin-left:2px;" ></div>
- <!-- Mapbender -->
- <?php } else { ?>
- <div id="layerbut" class="navbuttons" style="float:left; margin-left:2px;" ></div>
- <?php } ?>
- <div id="searchbut" class="navbuttons" style="float:left; margin-left:2px;" ></div>
- <div id="locatebut" class="navbuttons" style="float:left; margin-left:2px;" ></div>
- <div id="menubut" class="navbuttons" style="float:left; margin-left:2px;" ></div>
-
- </div>
- <div id="markerhint">
- <div id="xheader"></div>
- <div id="xcontent"></div>
- </div>
- <div id="measurehint" >
- <div id="mheader"><span lang="de">Messen</span></div>
- <div id="measureoutput"></div>
- </div>
-
- <div id="scaleline"></div>
- <div id="copyright"><span lang="de"><?php echo $copyright; ?></span></div>
- <div id="LoadingPanel"></div>
- <div id="zoomscale">
- <select name="selectzoom" id="selectzoom" onChange="changeScale(this.value);" data-inline="true" data-mini="true" data-native-menu="<?php echo $scaleselect; ?>" >
- </select>
- <label for="test"></label>
- </div>
- <div data-role="popup" id="popupMenu" data-overlay-theme="a" data-theme="a" style="max-width:2280px;" class="ui-corner-all">
- <a href="#" data-rel="back" data-role="button" data-theme="a" data-icon="delete" data-iconpos="notext" class="ui-btn-right">Close</a>
- <div data-role="header" data-theme="a" class="ui-corner-top">
- <h1>Tools</h1>
- </div>
- <div data-role="content" data-theme="d" class="ui-corner-bottom ui-content"><br>
-<table border="0" cellspacing="0" cellpadding="14">
- <tr>
- <td><div id="helpbut" class="navbuttons" ></div></td>
- <td><div id="gearbut" class="navbuttons" ></div></td>
- </tr>
- <tr>
- <td><div id="measurelinebut" class="navbuttons" ></div></td>
- <td><div id="measurepolybut" class="navbuttons" ></div></td>
- </tr>
-</table>
- </div>
- </div>
-
- </div>
- <!-- /content -->
-</div>
-<!-- /Map Seite Ende-->
-
-
-<?php if($mapbendermod){ ?>
-<!-- Mapbender Seite Start-->
-<div data-role="page" id="mod_mapbender" >
- <div data-role="header" data-position="fixed" data-theme="d"> <a href="#" class="addToMapBut" data-icon="arrow-l"><span lang="de">Karte</span></a>
- <h1><span lang="de">Katalogsuche</span></h1>
- </div>
- <!-- /header -->
- <div data-role="content" style="padding: 10px; overflow:hidden;" >
-
- <div data-role="collapsible" >
- <h3><span lang="de">Hintergrundkarte</span></h3>
- <div id="baselayers"></div>
- </div>
- <label for="mapbendersearchfield"><span lang="de">Layer suchen:</span> </label>
- <input type="search" name="mapbendersearchfield" id="mapbendersearchfield" value="" />
- <input type="submit" value="Suchen" lang="de" id="mapbendersearchformbut" data-icon="arrow-r" data-iconpos="right" />
-
- <ul data-role="listview" data-inset="true">
- <li data-theme="b">Ihre Auswahl</li>
- <li id="ownlist"></li>
- </ul>
-
- <div data-role="popup" id="preview" data-overlay-theme="a" data-theme="a" style="max-width:2280px;" class="ui-corner-all">
- <a href="#" data-rel="back" data-role="button" data-theme="a" data-icon="delete" data-iconpos="notext" class="ui-btn-right">Close</a>
- <div data-role="header" data-theme="a" class="ui-corner-top">
- <a href="#" id="preview_zoom" data-icon="search"><span lang="de">Karte</span></a>
- <h3> </h3>
- </div>
- <div data-role="content" data-theme="d" class="ui-corner-bottom ui-content"></div>
- </div>
-
- <div data-role="popup" id="info" data-overlay-theme="a" data-theme="a" style="max-width:2280px;" class="ui-corner-all">
- <a href="#" data-rel="back" data-role="button" data-theme="a" data-icon="delete" data-iconpos="notext" class="ui-btn-right">Close</a>
- <div data-role="header" data-theme="a" class="ui-corner-top"><h3><span lang="de">Meldung</span></h3></div>
- <div data-role="content" data-theme="d" class="ui-corner-bottom ui-content">
- <table border="0" cellspacing="0" cellpadding="14">
- <tr><td id="info_content"></td></tr>
- </table>
- </div>
- </div>
-
- <ul data-role="listview" data-inset="true" id="resultlist"></ul>
-
- </div>
-</div>
-<!-- /Mapbender Seite Ende-->
-<?php } else { ?>
-<!-- Layer Seite nicht dynamisch (Beispieleinträge vgl. 3_ngms_layer.js) Start-->
-<div data-role="page" id="layerpage" >
- <div data-role="header" data-position="fixed" > <a href="#" class="mapbackbut" data-icon="arrow-l"><span lang="de">Karte</span></a>
- <h1><span lang="de">Ebenen</span></h1>
- </div>
- <!-- /header -->
- <div data-role="content" style="padding: 10px" >
- <div data-role="collapsible" >
- <h3><span lang="de">Hintergrundkarte</span></h3>
- <div class="checkrow" >
- <div class="baselayer_check" id="atkis_praes_tms" ><span lang="de">Rlp Zusammenstellung</span></div>
- </div>
- <div class="clearfix"></div>
- <div class="checkrow" >
- <div class="baselayer_check" id="luftbilder" ><span lang="de">Luftbilder</span></div>
- </div>
- <div class="clearfix"></div>
- <div class="checkrow" >
- <div class="baselayer_check" id="grenze_leer" ><span lang="de">keine Hintergrundkarte</span></div>
- </div>
- <div class="clearfix"></div>
- </div>
- <div data-role="collapsible" >
- <h3><span lang="de">Overlays</span></h3>
- <div class="checkrow" >
- <div class="layer_check" id="likar" ><span lang="de">Liegenschaftskarte</span></div>
- </div>
- <div class="clearfix"></div>
- <div class="checkrow" >
- <div class="query_check" id="naturschutzgebiet_query" > </div>
- <div class="layer_check" id="naturschutzgebiet" ><span lang="de">Naturschutzgebiete</span></div>
- </div>
- <div class="clearfix"></div>
- </div>
- <div class="infobox" ><span lang="de">Hinweis: Um eine Ebene abzufragen aktivieren Sie die Info-Option und tapen danach in der Karte auf das Objekt der Ebene.</span> </div>
- <div class="query_check" id="dhm_query" > </div>
- <div class="layer_nocheck" ><span lang="de">Abfrage Höhe + GPS</span></div>
- <div class="clearfix"></div>
- <div class="clearfix"></div>
- <input name="queryselect" id="queryselect" type="hidden" value="dhm">
- <br>
- <div class="infobox" ><span lang="de">Änderung der Ebenen wechselt direkt zur Kartenansicht</span></div>
- <div data-role="fieldcontain" style="margin:1px; padding:1px;">
- <select name="slider" id="autolayerchange" data-role="slider">
- <option value="off" selected >off</option>
- <option value="on">on</option>
- </select>
- </div>
- </div>
-</div>
-<!-- /Layer Seite Ende-->
-<?php } ?>
-
-<!-- Search Seite Start-->
-<div data-role="page" id="searchpage" >
- <div data-role="header" data-position="fixed" > <a href="#" class="mapbackbut" data-icon="arrow-l"><span lang="de">Karte</span></a>
- <h1><span lang="de">Suche</span></h1>
- </div>
- <!-- /header -->
- <div data-role="content" style="padding: 10px" >
- <div>
- <label for="searchfield"><span lang="de">Ort suchen:</span> </label>
- <input type="search" name="searchfield" id="searchfield" value="" />
- <input type="submit" lang="de" value="Suchen" id="searchformbut" data-icon="arrow-r" data-iconpos="right" />
- </div>
- <div id="mygooglelink" > </div>
- <div id="searchdbresult" style="margin-top:20px;" >
- <ul data-role="listview" id= "search_results" data-theme="a" data-divider-theme="a" >
- </ul>
- </div>
- <div id="mygooglemap" > </div>
- </div>
-</div>
-<!-- /Search Seite Ende-->
-
-<!-- FeatureInfo Seite Start-->
-<div data-role="page" id="featureinforesult" style="height: 100%">
- <div data-role="header" data-position="fixed" > <a href="#" class="mapbackbut" data-icon="arrow-l" onclick='$("#ficontentdiv").empty();'><span lang="de">Karte</span></a>
- <h1><span lang="de">Sachdatenanzeige</span></h1>
- </div>
- <!-- /header -->
- <!-- <div data-role="content" style="padding: 10px" >-->
- <div id="ficontentdiv" style="height: 100%"> </div>
- <!-- </div>-->
-</div>
-<!-- /FeatureInfo Seite Ende-->
-
-<!-- Hilfe Seite Start-->
-<div data-role="page" id="helppage">
- <div data-role="header" data-position="fixed" > <a href="#" class="mapbackbut" data-icon="arrow-l" ><span lang="de">Karte</span></a>
- <h1><span lang="de">Hilfe / Info</span></h1>
- </div>
- <div data-role="content" style="padding: 10px">
-
- <div id="helpdiv"> </div>
- </div>
- <!-- /content -->
-</div>
-<!-- /Hilfe Seite Ende-->
-
-
-<!-- Einstellungen Start-->
-<div data-role="page" id="gearpage">
- <div data-role="header" data-position="fixed" > <a href="#" class="mapbackbut" data-icon="arrow-l"><span lang="de">Karte</span></a>
- <h1><span lang="de">Einstellungen</span></h1>
- </div>
- <div data-role="content" style="padding: 10px">
- <strong><span lang="de">App Einstellungen</span></strong>
- <br>
- <label for="select-lang" class="select"><span lang="de">Sprache:</span></label>
- <select name="select-lang" id="select-lang" onChange="changeLanguage(this.value,true);" data-icon="gear" data-inline="true" data-native-menu="false">
- <option value="de" lang="de">Deutsch</option>
- <option value="en" lang="de">English</option>
- </select>
- <br>
- <label for="select-hand" class="select"><span lang="de">Händigkeit:</span></label>
- <select name="select-hand" id="select-hand" onChange="changeHand(this.value);" data-icon="gear" data-inline="true" data-native-menu="false">
- <option value="r" lang="de">Rechtshänder</option>
- <option value="l" lang="de">Linkshänder</option>
- </select>
- <br>
- <label for="select-feature-info" class="select"><span lang="de">Sachdatenanzeige:</span></label>
- <select name="select-feature-info" id="select-feature-info" onChange="changeFeatureInfo(this.value);" data-icon="gear" data-inline="true" data-native-menu="false">
- <option value="n" lang="de">Neues Fenster</option>
- <option value="p" lang="de">Popup</option>
- </select>
- <br>
- <div class="apptools">
- Browserinfo:<br>
- <?php echo $_SERVER['HTTP_USER_AGENT']; ?> <br>
- <a href="#" onClick="checkZindex();">Testfunktion</a><br>
- </div>
- </div>
- </div>
- <!-- /content -->
-</div>
-<!-- /Loading Seite Ende-->
-</body>
-</html>
Deleted: trunk/mapbender/http/extensions/mobilemap/mod_mapbender/search.js~
===================================================================
--- trunk/mapbender/http/extensions/mobilemap/mod_mapbender/search.js~ 2013-05-21 15:06:10 UTC (rev 8622)
+++ trunk/mapbender/http/extensions/mobilemap/mod_mapbender/search.js~ 2013-05-21 15:08:21 UTC (rev 8623)
@@ -1,727 +0,0 @@
-/*
-Anmerkungen:
-############
-Die Suche gibt Dienste (data.wms.srv zurück), die Dienstinformationen (id, title, abstract ect. enthalten).
-Hier werden auch die Zusatzinformationen zur verfügbarkeit ect. abgelegt.
-Diese beinhalten auch das Objekt data.wms.srv.layer, welches über (id, title, abstract, getMapUrl) verfügt.
-Es scheint jedoch immer nur einer dieser Gruppenlayer vorzuliegen.
-Es handelt sich bei data.wms.srv.layer wiederum um eine Zusammenfassung von Layern mit dem unterobjekt Objekt data.wms.srv.layer.layer.
-Dort finden sich Informationen zum Layer selber (id, title, abstract) und Informationen zur Abfragbarbeit.
-
-Beim Testen fiel auf, dass Services (mit eindeutiger id) auch doppelt mit unterschiedlichen Layern vorkommen können.
-
-
-Implementierung:
-################
-Hier werden diese einzelen Objekte als js-Objekte neu definiert um gegen änderungen in der Mapbender-Schnittstelle unabhängig zu sein.
-
-Hier wurde folgende Objekthierarchie festgelegt
-
-"ServiceList" ist eine Zusammenstellung (Array) von Services und trägt die Informationn ob es sich um das Suchergebnis oder die Auswahlliste handelt
-diese Information wird beim Einfügen eines "Service" weitegegeben.
-
-Ein "Service" ist ein Array von Gruppenlayern
-
-Ein "Gruppenlayer" ist ein Array von Layern
-
-"Layer" enthält die Layerinformation
-
-
-*/
-
-var maxlayers = 5;
-var maxresults = 40;
-
-// Hintergrundkarten (Urls werden erst beim laden in die Karte besorgt)
-var baseinfo = [];
-// Angabe Bezeichnung, kommaseperierte Id's
-//baseinfo.push(["Hintergrund1","27694","4.8,49,9.9,50"]);
-//baseinfo.push(["Hintergrund2","25420","4.8,49,9.9,50"]);
-//baseinfo.push(["Hintergrund3","25351,100110","4.8,49,9.9,50"]);
-
-searchUrl = 'mod_mapbender/search_proxy.php?languageCode=de&resultTarget=web&maxResults='+maxresults;
-
-
-// Initialisierung
-function addmyLayer(){
-
- //Erweiterung OpenLayers - angepasster Click Event
- OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, {
- defaultHandlerOptions: {
- 'single': true,
- 'pixelTolerance': 0,
- 'stopSingle': false
- },
-
- initialize: function(options) {
- var opts = options || {};
- this.handlerOptions = OpenLayers.Util.applyDefaults(opts.handlerOptions || {},this.defaultHandlerOptions);
- OpenLayers.Control.prototype.initialize.apply(this,arguments);
- this.handler = new OpenLayers.Handler.Click(this,{'click': this.onClick},this.handlerOptions);
- },
-
- onClick: function( evt ) {
- // click funktion
- var lonlat = map.getLonLatFromViewPortPx(evt.xy);
- var querylayer = $('#ownlist').find('.query_checked').parent();
- var actuallang = $('#select-lang').val();
- //Punkt erzeugen
- var geompoint = new OpenLayers.Geometry.Point(lonlat.lon, lonlat.lat);
- var geompoint1 = new OpenLayers.Geometry.Point(lonlat.lon, lonlat.lat);
- vector_marker.removeAllFeatures();
- vector_marker.addFeatures([
- new OpenLayers.Feature.Vector(geompoint,{},olSearchSymbol),
- new OpenLayers.Feature.Vector(geompoint1,{},olFeaturequerySymbol)
- ]);
- if ($("#select-feature-info").val() === 'p') {
- var fiPopUp = true;
- } else {
- var fiPopUp = false;
- }
- if (fiPopUp) {
- setMarkerhint(window.lang.convert('Meldung:'),window.lang.convert('bitte warten...'));
- } else {
- $.mobile.changePage($("#featureinforesult"),pageTransition);
- $("#ficontentdiv").text(window.lang.convert("Bitte warten..."));
- }
- //
- if(querylayer.length>0){
- // Abfrage des ausgewählten Layers
- var featureurl = querylayer.attr('getmapurl')
- + '&wms=SERVICE=WMS&REQUEST=getFeatureInfo&VERSION=1.1.1'
- + '&mapfile='+ querylayer.attr('name')
- + '&layers=' + querylayer.attr('name') + '&QUERY_LAYERS=' + querylayer.attr('name')
- + '&SRS=' + featurequerySrc
- + '&BBOX=' + map.getExtent().toBBOX()
- + '&WIDTH=' + map.size.w + '&HEIGHT=' + map.size.h
- + '&X=' + evt.xy.x + '&Y=' + evt.xy.y
- + '&INFO_FORMAT=text/html'
- + '&FORMAT=image/png' //only for some wms that have problems if this parameter is not given
- + '&STYLES='; //only for some wms that have problems if this parameter is not given
-
- if (fiPopUp) {
- var iframe=$('<iframe src="'+featureurl+'" class="query_iframe">'
- +'<p>Die Abfrage kann leider nicht angezeigt werden.</p></img>'
- );
- setMarkerhint('Abfrageergebnis:',iframe);
- } else {
- var iframe=$('<iframe src="'+featureurl+'" class="query_iframe_full">'
- +'<p>Die Abfrage kann leider nicht angezeigt werden.</p></img>'
- );
- //alert(featureurl);
- //$.mobile.changePage($("#featureinforesult"),pageTransition);
- $("#ficontentdiv").append(iframe);
- //add onclick delete iframe from page
-
- }
- } else {
- // Standardabfrage, falls keiner ausgewählt ist
- var featureurl = 'query/rasterquery.php?coord='+lonlat.lon+ ', '+lonlat.lat+'&lang='+actuallang;
- loadFeature(featureurl);
- }
- },
-
- CLASS_NAME: "OpenLayers.Control.Click"
- });
-
- $("#mapbenderbut").click(function(){
- $.mobile.changePage($("#mod_mapbender"),pageTransition);
- refresh();
- });
-
- //Suchbutton
- $('#mapbendersearchformbut').click(function() {
- searchMaps(searchUrl+'&searchText='+$('#mapbendersearchfield').val());
- });
-
- //Suchfeld
- $('#mapbendersearchfield').live('keypress', function(e) {
- if(e.keyCode === 13){
- searchMaps(searchUrl+'&searchText='+$('#mapbendersearchfield').val());
- }
- });
-
- // Alle anderen Layer einklappen
- $('div[data-role=collapsible]').live('expand', function(){
- $("div[data-role=collapsible]").not($(this)).trigger("collapse");
- });
-
- //zurück zur Karte-Button
- $(".addToMapBut").click(function(){
- $("div[data-role=collapsible]").not('.ui-collapsible-collapsed').trigger("collapse");
- $.mobile.changePage($("#mappage"),pageTransition);
- });
-
- addBaselayers();
-
-}
-
-
-
-// ---------------
-// Popupfenster:
-// ---------------
-
-// Popupfenster für Vorschau mit Ajax (deaktiviert)
-function preview(url,layerid,bbox){
- $.ajax({
- previewurl: url,
- layerid: layerid,
- bbox: bbox,
- success: function() {
- $("#preview").find('div[data-role=content]').empty();
- $("#preview").find('div[data-role=content]').append('<img src="' + $(this).attr("previewurl") + '" alt="image" style="width:200px;">');
- var bbox=$(this).attr("bbox");
- var layerid=$(this).attr("layerid");
- $("#preview_zoom").click(function(){
- var index=getOpenlayersIndex(layerid);
- /*if(index>=0){
- map.zoomToExtent(map.layers[index].getExtent());
- };*/
- zoomToBbox(bbox);
- $.mobile.changePage($("#mappage"),pageTransition);
-
- });
- $('#preview').popup('open');
- }
- });
-}
-
-// Anzeigen eines Popups, bei einer zu großen Auswahl
-getInfo = function(content){
- $("#info_content").empty();
- $("#info_content").append(content);
- $('#info').popup('open');
-}
-
-
-
-// ----------------------------
-// Funktionen für Openlayers:
-// ----------------------------
-
-// Index des Openlayer Eintrages zurückgeben
-function getOpenlayersIndex(layerid){
- for (var i=0; i<map.layers.length; i++){
- if(map.layers[i].name==layerid){
- return i;
- }
- }
- return -1;
-}
-
-// Layer in die Karte einfügen
-function addOpenlayer(layerid,layername,getMapUrl){
- var openLayer = new OpenLayers.Layer.WMS(layerid,getMapUrl,
- { layers: layername, format: "image/png", transparent: "TRUE", transitionEffect: 'resize'},
- { projection: mapProj, units: projUnits, opacity: 0.8, singleTile: true, 'isBaseLayer': false, visibility: true, alwaysInRange: true
- }
- );
- map.addLayer(openLayer);
- map.setLayerIndex(openLayer, 0);
-
-}
-
-// Bestimmter Layer aus Karte entfernen
-function removeOpenlayer(layerid){
- var index=getOpenlayersIndex(layerid);
- if(index>=0){
- map.removeLayer(map.layers[index]);
- }
-}
-
-// Baselayer auswählen
-function setOpenBaselayer(baseid){
- var index=getOpenlayersIndex(baseid);
- if(index>=0){
- map.setBaseLayer(map.layers[index]);
- }
-}
-
-// Overlay sichtbar schalten
-function selectOpenlayer(layerid,visibility){
- var index=getOpenlayersIndex(layerid);
- if(index>=0){
- map.layers[index].setVisibility(visibility);
- }
-}
-
-// Dynamische Hintergrundkarte in die Karte einfügen
-function addOpenBaselayer(baselayername,baselayerids){
-
- // Layerdaten dynamisch laden
- var searchUrl = 'mod_mapbender/search_proxy.php?languageCode=de&resultTarget=web&resourceIds='+baselayerids;
-
- $.getJSON(
- searchUrl,
- function(data){
-
- // Hintergrundkarten
- var services=data.wms.srv;
- $.each(services, function(index,srv){
- $.each(srv.layer, function(index, layer){
- if(layer.layer){
- layer=layer.layer[0];
- }
- var layername=layer.name;
- var getMapUrl=srv.getMapUrl;
- var openLayer = new OpenLayers.Layer.WMS(baselayername,getMapUrl,
- { layers:layername, format:"image/png", transparent:"false", transitionEffect:'resize'},
- { projection:mapProj, units:projUnits, singleTile:true, 'isBaseLayer':true, alwaysInRange:true}
- );
- map.addLayers([openLayer]);
- });
- });
- });
-}
-
-// Zoomen auf bestimmte Boundingbox (in WGS84 gegeben!)
-function zoomToBbox(bbox){
- var extend=bbox.split(',');
- var p1 = new OpenLayers.LonLat(extend[0],extend[1]).transform(wgs84Proj,mapProj);
- var p2 = new OpenLayers.LonLat(extend[2],extend[3]).transform(wgs84Proj,mapProj);
- map.zoomToExtent(new OpenLayers.Bounds(p1.lon, p1.lat, p2.lon, p2.lat));
-}
-
-
-// -------------------
-// Listenfunktionen:
-// -------------------
-
-// Anzahl der Dienste zurückgeben
-function numServices(){
- return $('#resultlist').find('.service').length;
-}
-
-// Anzahl der Layer in einem bestimmten Element zurückgeben
-function numResultLayers(element){
- return element.find('.layer').length;
-}
-
-// Prüfen ob und wo ein Layer in einer Liste ist
-function layerInList(list,id){
- var layers=list.find('.layer');
- for(var i=0; i<layers.length; i++){
- if($(layers[i]).attr('layerid')==id) { return i }
- }
- return -1;
-};
-
-// Layer in Auswahl rauf
-function up(layerid){
- var position = layerInList($('#ownlist'),layerid);
- if(position>0){
- $($('#ownlist').find('.layer')[position]).after($($('#ownlist').find('.layer')[position-1]));
-console.log('todo: layerreihenfolge')
- map.raiseLayer(map.layers[getOpenlayersIndex(layerid)],1);
- validateArrows();
- refresh();
- }
-}
-
-// Anzahl der Aktuellen Auswahl ausgeben
-function numOwnlayers(){
- return $('#ownlist').find('.layer').length;
-}
-
-
-
-// ----------------------------------------
-// Funktioen zur Validierung der Anzeige:
-// ----------------------------------------
-
-// Erneuern der Darstellung
-function refresh(){
- $('#resultlist').listview('refresh');
- $($('#ownlist').parent()).listview('refresh');
- $('div[data-role=collapsible]').collapsible();
- $('a[data-role=button]').button();
-}
-
-// Layerauswahl kennntlich machen
-function validateLayers(){
- layers=$('#resultlist').find('.layer');
- $.each(layers, function(index,layer){
- var position = layerInList($('#ownlist'),$(layer).attr('layerid'));
- if(position>=0){
- $(layer).find('.layer_icon').first().attr('class','layer_icon icon layer_remove');
- $(layer).find('.collapsible').first().removeClass('unselected').addClass('selected');
- } else {
- $(layer).find('.layer_icon').first().attr('class','layer_icon icon layer_add');
- $(layer).find('.collapsible').first().removeClass('selected').addClass('unselected');
- }
- });
-}
-
-// Validierung der Pfeile zum verschieben der Layer
-function validateArrows(){
- var movers=$('#ownlist').find('.move');
- $(movers[0]).attr('class','icon move arrow_empty');
- if(movers.length>1){
- $(movers[1]).attr('class','icon move arrow_up');
- }
-}
-
-// Validierung der Queryable-Auswahl
-function query_check(item){
- if($(item).hasClass('query_unchecked')){
- $('#ownlist').find('.query_checked').addClass('query_unchecked').removeClass('query_checked');
- $(item).addClass('query_checked').removeClass('query_unchecked');
- } else {
- $(item).addClass('query_unchecked').removeClass('query_checked');
- }
-}
-
-
-
-
-// ---------------------------------
-// Hinzufüge- + Entfernfunktionen:
-// ---------------------------------
-
-// Layer zur Auswahl hinzufügen
-function addLayer(layer){
- if(numOwnlayers()>=maxlayers){
- getInfo('Es können nicht mehr als '+maxlayers+' Ebenen zur Auswahl hinzugefügt werden.');
- return false;
- } else {
- $.mobile.showPageLoadingMsg();
- var position = layerInList($('#ownlist'),$(layer).attr('layerid'));
- if(position<0){
- // Layer hinzufügen
- $('#ownlist').append(OwnLayer(layer.attr('layerid'),layer.attr('title'),layer.attr('name'),layer.attr('desc'),layer.parent().attr('title'),layer.parent().attr('desc'),layer.attr('previewUrl'),layer.attr('queryable')=='true',layer.attr('getMapUrl'),layer.attr('bbox'),layer.parent().attr('avail')));
- validateLayers();
- validateArrows();
- refresh();
- addOpenlayer(layer.attr('layerid'),layer.attr('name'),layer.attr('getMapUrl'));
- $.mobile.hidePageLoadingMsg();
- return true;
- }
- $.mobile.hidePageLoadingMsg();
- return false;
- }
-}
-
-// Layer entfernen
-function removeLayer(layer){
- var position = layerInList($('#ownlist'),$(layer).attr('layerid'));
- $($('#ownlist').find('.layer')[layerInList($('#ownlist'),$(layer).attr('layerid'))]).remove();
- validateLayers();
- validateArrows();
- refresh();
- removeOpenlayer($(layer).attr('layerid'));
-}
-
-// Layer hinzfügen oder entfernen
-function switchLayer(layer){
- var position = layerInList($('#ownlist'),$(layer).attr('layerid'));
- if(position<0){
- addLayer(layer);
- } else {
- removeLayer(layer);
- }
-}
-
-// Service mit allen Layern hinzufügen
-function addService(service){
- var layers=service.find('.layer');
- for(var i=0; i<layers.length; i++){
- addLayer($(layers[i]));
- if(numOwnlayers()>maxlayers){ break; }
- }
-}
-
-// Service mit allen Layern entfernen
-function removeService(service){
- $.each(service.find('.layer'), function(index, layer){
- removeLayer($(layer));
- });
-}
-
-// Sichtbarkeit eines Layers umschalten
-function switchVisibility(layer){
- if($(layer).hasClass('layer')){ // Overlay
- $(layer).find('.layer_visibility').toggleClass('layer_checked').toggleClass('layer_unchecked');
- selectOpenlayer($(layer).attr('layerid'),$(layer).find('.layer_visibility').hasClass('layer_checked'));
- } else { // Baselayer
- $('#baselayers').find('.base_checked').addClass('base_unchecked').removeClass('base_checked');
- $(layer).addClass('base_checked').removeClass('base_unchecked');
- setOpenBaselayer($(layer).attr('layerids'));
- }
-}
-
-// Validierung der Baselayer-Auswahl
-function base_check(item){
- $('#baselayers').find('.base_checked').addClass('base_unchecked').removeClass('base_checked');
- $(item).addClass('base_checked').removeClass('base_unchecked');
-}
-
-
-
-// -----------------------
-// Daten Laden + Parsen:
-// -----------------------
-
-// Standardsuche
-function searchMaps(searchurl){
- $.mobile.showPageLoadingMsg();
- $('#search_results').empty();
- $.getJSON(searchurl, function(data){
- var datacollection=parseMapBenderJson(data);
- appendData(datacollection.services,datacollection.layers,datacollection.nresults);
- $.mobile.hidePageLoadingMsg();
- if(datacollection.nresults>maxresults){
- getInfo('Es gab '+datacollection.nresults
- +' Treffer, es können aber nur '
- +maxresults+' Ergebnisse angezeigt werden.'
- +'</br><b>Schränken Sie Ihre Suche weiter ein.</b>');
- };
- });
-}
-
-// Suche über WMC-Dienste
-function searchWmc(wmcurl){
- $.mobile.showPageLoadingMsg();
- $('#search_results').empty();
- $.getJSON(wmcurl, function(data){
- appendWmc(data);
- $.mobile.hidePageLoadingMsg();
- });
-}
-
-// Parst das JSON-Objekt von MapBender in ein Array [services,layers]
-function parseMapBenderJson(json){
- // Daten generalisieren
- var srvs=json.wms.srv;
- var services=[];
- var layers=[];
- $.each(srvs, function(index,srv){
- // Dienste zusammenfassen
- var dublicated=false;
- for(var i=0; i<services.length; i++){
- if(services[i].id==srv.id){
- dublicated=true;
- break;
- }
- }
- // Dienst freigegeben?
- if(!srv.logged && !srv.nwaccess){
- if(!dublicated){
- services.push(srv);
- }
- // Layer aufnehmen
- $.each(srv.layer, function(index, grplayer){
- if(grplayer.layer){
- $.each(grplayer.layer, function(index, lyr){
- layers.push([srv.id,lyr]);
- });
- } else {
- layers.push([srv.id,grplayer]);
- }
- });
- }
- });
-
- return {"services": services, "layers": layers, "nresults":json.wms.md.nresults};
-}
-
-// Fügt die Dienste und Layer in das DOM ein
-function appendData(services,layers,nresults){
- $("#resultlist").empty();
- for(var i=0; i<services.length; i++){
- var srv=services[i];
- service=Service(srv.id,srv.title,$(srv).attr('abstract'),srv.getMapUrl,srv.status,(srv.logoUrl==""? 'mod_mapbender/img/defaulicon.png' : srv.logoUrl ),srv.symbolLink,srv.avail);
- // Layer zuordnen
- for(var j=0; j<layers.length; j++){
- var layer=layers[j];
- var serviceid=layer[0];
- var lyr=layer[1];
-
- if(serviceid==srv.id){
- service.append(ResultLayer(lyr.id,lyr.title,lyr.name,$(lyr).attr('abstract'),lyr.previewURL,lyr.queryable=='1',srv.getMapUrl,lyr.bbox));
- }
- }
- $('#resultlist').append(service);
- }
- $('#resultlist').prepend('<li data-theme="b">Suchergebnis: '+numServices()+' Dienste, '
- +numResultLayers($('#resultlist'))+' Layer '
- +'('+nresults+' Treffer) </li>');
- validateLayers();
- refresh();
-}
-
-// Fügt die WMC-Layer in das DOM ein
-function appendWmcData(services,layers,layerlist,bbox,crs){
- $("#ownlist").empty();
- var ownlayers = [];
- for(var i=0; i<services.length; i++){
- var srv=services[i];
- // Layer zuordnen
- for(var j=0; j<layers.length; j++){
- var layer=layers[j];
- var serviceid=layer[0];
- var lyr=layer[1];
-
- if(serviceid==srv.id){
- ownlayers.push(OwnLayer(lyr.id,lyr.title,lyr.name,$(lyr).attr('abstract'),srv.title,$(srv).attr('abstract'),lyr.previewURL,lyr.queryable=='1',srv.getMapUrl,lyr.bbox,srv.avail));
- }
- }
- }
-
-
- // Layer richtig sortiert einfügen und selektieren
- for(var i=0; i<layerlist.length; i++){
- for(var j=0; j<ownlayers.length; j++){
- if(layerlist[i].layerId==ownlayers[j].attr('layerid')){
- var layer=ownlayers[j];
- $('#ownlist').append(layer);
- addOpenlayer(layer.attr('layerid'),layer.attr('name'),layer.attr('getMapUrl'));
- if(!layerlist[i].active){ // Auswahl umschalten
- switchVisibility(layer);
- }
- break;
- }
- }
- }
- validateLayers();
- validateArrows();
- //zoom to wmc extent
- var extend=bbox.split(',');
- var p1 = new OpenLayers.LonLat(extend[0],extend[1]).transform(crs,mapProj);
- var p2 = new OpenLayers.LonLat(extend[2],extend[3]).transform(crs,mapProj);
- map.zoomToExtent(new OpenLayers.Bounds(p1.lon, p1.lat, p2.lon, p2.lat));
-
-}
-
-// Alle ausgewählten Overlays entfernen
-function clearOwnlist(){
- var layers=$('#ownlist').find('.layer');
- for(var i=0; i<layers.length; i++){
- removeLayer(layers[i]);
- }
-}
-
-// WMC-Daten hinzufügen
-function appendWmc(json){
-
- // Hintergrundkarte auswählen
- for(var i=0; i<json.backGroundLayer.length; i++){
- var layer=json.backGroundLayer[i];
- if(layer.active){
- var layers=$('#baselayers').find('.baselayer')
- for(var j=0; j<layers.length; j++){
- if($(layers[j]).attr('layerids')==layer.name){
- switchVisibility(layers[j]);
- break;
- }
- }
- }
- }
- // Parsen der bbox aus wmc
- //var bbox = json.wmc.bbox;
- //var crs = json.wmc.crs;
- // Alle ausgewählten overlays entfernen
- clearOwnlist();
-
- // Layerids für die Abfrage zusammenstellen
- var layerids="";
- $.each(json.layerList, function(index,layer){
- layerids=layerids+","+layer.layerId;
- });
- layerids=layerids.substr(1,layerids.length);
-
- // Overlays auswählen
- $.getJSON(searchUrl+'&resourceIds='+layerids, function(data){
- // Informationen sammeln und Parsen
- var datacollection=parseMapBenderJson(data);
- appendWmcData(datacollection.services,datacollection.layers,json.layerList,json.wmc.bbox,json.wmc.crs);
- $.mobile.hidePageLoadingMsg();
- });
-}
-
-
-
-// Hintergrunddaten in Collapsible aufnehmen
-function addBaselayers(){
-
- $("#baselayers").empty();
-
- // Vektorlayer
- vector_marker = new OpenLayers.Layer.Vector("Vector Layer", {});
-
- // Hintergrund:Topographie ect.
-/* var atkis_praes_tms = new OpenLayers.Layer.TMS(
- "Hybrid",
- "http://www.gdi-rp-dienste2.rlp.de/mapcache/tms/",
- {
- layername: 'test at UTM32',
- type: "jpeg",
- serviceVersion:"1.0.0",
- gutter:0,
- buffer:0,
- isBaseLayer:true,
- transitionEffect:'resize',
- resolutions: [529.16666666670005270134,396.87500000000000000000,264.58333333330000414207,132.29166666669999585793,66.14583333330000414207,39.68750000000000000000,26.45833333330000058936,13.22916666669999941064,6.61458333329999970118,3.96875000000000000000,2.64583333330000014527,2.11666666670000003236,1.32291666670000007677,0.79375000000000000000,0.26458333330000001204,0.13229166670000001016],
- units: projUnits,
- projection: mapProj,
- sphericalMercator: false
- }
- );*/
-
- $('#baselayers').append(BaseLayer("RLP Zusammenstellung",atkis_praes_tms.name));
-
- // Hintergrund: Luftbild
-/* var luftbilder = new OpenLayers.Layer.WMS( "Luftbild",
- "http://geo4.service24.rlp.de/wms/dop40_geo4.fcgi?",
- {
- layers: "dop",
- format: "image/jpeg",
- transparent: "false",
- transitionEffect: 'resize'
- },
- {
- projection: mapProj,
- units: projUnits,
- singleTile: false,
- alwaysInRange: true,
- 'isBaseLayer': true
- }
- ); */
-
- $('#baselayers').append(BaseLayer("Luftbilder",luftbilder.name));
-
-/* var grenze_leer = new OpenLayers.Layer.WMS( "grenze_leer",
- "http://map1.naturschutz.rlp.de/service_basis/mod_wms/wms_getmap.php?mapfile=tk_rlp_gesamt&",
- {
- layers: "grenzen_land",
- format: "image/jpeg",
- transparent: "false",
- transitionEffect: 'resize'
- },
- {
- projection: mapProj,
- units: projUnits,
- singleTile: true,
- alwaysInRange: true,
- 'isBaseLayer': true
- } );*/
-
-
- $('#baselayers').append(BaseLayer("Keine Hintergrundkarte",grenze_leer.name));
-
- map.addLayers([atkis_praes_tms,luftbilder,grenze_leer,vector_marker]);
-
- // Dynamische Hintergrundkarten hinzufügen
- for(i in baseinfo){
- var name=baseinfo[i][0]
- var layerids=baseinfo[i][1];
- $('#baselayers').append(BaseLayer(name,layerids));
- addOpenBaselayer(name,layerids);
- }
-
- // Erste Hintergrundkarte auswählen
- base_check($('#baselayers').find('.baselayer').first());
-}
-
-
-
Deleted: trunk/mapbender/http/extensions/mobilemap/mod_mapbender/search_proxy.php~
===================================================================
--- trunk/mapbender/http/extensions/mobilemap/mod_mapbender/search_proxy.php~ 2013-05-21 15:06:10 UTC (rev 8622)
+++ trunk/mapbender/http/extensions/mobilemap/mod_mapbender/search_proxy.php~ 2013-05-21 15:08:21 UTC (rev 8623)
@@ -1,60 +0,0 @@
-<?php
-
-//Basic configuration of mapserver client
-require_once(dirname(__FILE__)."/../../../../conf/mobilemap.conf");
-require_once(dirname(__FILE__)."/../../../../conf/mapbender.conf");
-// PHP Proxy
-// Erlaubte Hostnamen aus baseconfig
-$mapbenderurl = $catalogueInterface;
-$mapbenderurl = "http://www.geoportal.rlp.de/mapbender/php/mod_callMetadata.php?";
-//Url-Parameter
-$urlparam = $_SERVER['QUERY_STRING'];
-$url = $mapbenderurl.$urlparam ;
-//angefragtes Format GetMap
-if ((isset($_GET['FORMAT'])) && ($_GET['FORMAT'] != "")) {
- $myformat = $_GET["FORMAT"];
-}
-
- // Open the Curl session
- $session = curl_init($url);
-
- // If it's a POST, put the POST data in the body
- if ($_POST['yws_path']) {
- $postvars = '';
- while ($element = current($_POST)) {
- $postvars .= urlencode(key($_POST)).'='.urlencode($element).'&';
- next($_POST);
- }
- curl_setopt ($session, CURLOPT_POST, true);
- curl_setopt ($session, CURLOPT_POSTFIELDS, $postvars);
- }
-
- //use proxy if proxy is given in mapbender.conf - from class_connector.php
- $arURL = parse_url($url);
- $host = $arURL["host"];
- $NOT_PROXY_HOSTS_array = explode(",", NOT_PROXY_HOSTS);
- if(CONNECTION_PROXY != "" AND (in_array($host, $NOT_PROXY_HOSTS_array)!= true)){
- curl_setopt($session, CURLOPT_PROXY,CONNECTION_PROXY.":".CONNECTION_PORT);
- if(CONNECTION_PASSWORD != ""){
- curl_setopt ($session, CURLOPT_PROXYUSERPWD, CONNECTION_USER.':'.CONNECTION_PASSWORD);
- }
- }
-
- // Don't return HTTP headers. Do return the contents of the call
- curl_setopt($session, CURLOPT_HEADER, false);
- curl_setopt($session, CURLOPT_RETURNTRANSFER, true);
-
- // Make the call
- $response = curl_exec($session);
-
- //Content-Type
- if($myformat == "image/jpeg"){
- header("Content-Type: image/jpeg");
- }
-
- //Datenausgabe
- echo $response;
- curl_close($session);
-
-
-?>
Deleted: trunk/mapbender/http/extensions/mobilemap/mod_mapbender/wmc_proxy.php~
===================================================================
--- trunk/mapbender/http/extensions/mobilemap/mod_mapbender/wmc_proxy.php~ 2013-05-21 15:06:10 UTC (rev 8622)
+++ trunk/mapbender/http/extensions/mobilemap/mod_mapbender/wmc_proxy.php~ 2013-05-21 15:08:21 UTC (rev 8623)
@@ -1,41 +0,0 @@
-<?php
-
-//Basic configuration of mapserver client
-require_once(dirname(__FILE__)."/../../../../conf/mobilemap.conf");
-require_once(dirname(__FILE__)."/../../../../conf/mapbender.conf");
-// PHP Proxy
-// Erlaubte Hostnamen aus baseconfig
-$mapbenderurl = $wmcInterface;
-$mapbenderurl = "http://www.geoportal.rlp.de/mapbender/php/mod_exportWmc2Json.php?";
-
-//Url-Parameter
-$urlparam = $_SERVER['QUERY_STRING'];
-$url = $mapbenderurl.$urlparam ;
-
-// Open the Curl session
-$session = curl_init($url);
-
-//use proxy if proxy is given in mapbender.conf - from class_connector.php
-$arURL = parse_url($url);
-$host = $arURL["host"];
-$NOT_PROXY_HOSTS_array = explode(",", NOT_PROXY_HOSTS);
-if(CONNECTION_PROXY != "" AND (in_array($host, $NOT_PROXY_HOSTS_array)!= true)){
- curl_setopt($session, CURLOPT_PROXY,CONNECTION_PROXY.":".CONNECTION_PORT);
- if(CONNECTION_PASSWORD != ""){
- curl_setopt ($session, CURLOPT_PROXYUSERPWD, CONNECTION_USER.':'.CONNECTION_PASSWORD);
- }
-}
-
-// Don't return HTTP headers. Do return the contents of the call
-curl_setopt($session, CURLOPT_HEADER, false);
-curl_setopt($session, CURLOPT_RETURNTRANSFER, true);
-
-// Make the call
-$response = curl_exec($session);
-
-//Datenausgabe
-echo $response;
-curl_close($session);
-
-
-?>
Deleted: trunk/mapbender/http/extensions/mobilemap/query/proxy.php~
===================================================================
--- trunk/mapbender/http/extensions/mobilemap/query/proxy.php~ 2013-05-21 15:06:10 UTC (rev 8622)
+++ trunk/mapbender/http/extensions/mobilemap/query/proxy.php~ 2013-05-21 15:08:21 UTC (rev 8623)
@@ -1,79 +0,0 @@
-<?php
-
-//Basic configuration of mapserver client
-require_once(dirname(__FILE__)."/../../../../conf/mobilemap.conf");
-require_once(dirname(__FILE__)."/../../../../conf/mapbender.conf");
-
-// PHP Proxy
-// Erlaubte Hostnamen aus baseconfig
-define ('MAPPROXY_HOSTNAME', $mapproxyurl);
-define ('GETMAP_HOSTNAME',$getmapurl);
-define ('GETFEATURE_HOSTNAME', $getfeatureurl);
-
-//Url-Parameter
-$path = $_SERVER['QUERY_STRING'];
-
-//angefragtes Format GetMap
-if ((isset($_GET['FORMAT'])) && ($_GET['FORMAT'] != "")) {
- $myformat = $_GET["FORMAT"];
- $url = GETMAP_HOSTNAME.$path;
-}
-
-//angefragtes Format Featureinfo
-if ((isset($_GET['INFO_FORMAT'])) && ($_GET['INFO_FORMAT'] != "")) {
- $myformat = $_GET["INFO_FORMAT"];
- $url = GETFEATURE_HOSTNAME.$path;
-}
-
-//Url ändern falls URL-Variable cache mitgegeben wird
-if ((isset($_GET['CACHE'])) && ($_GET['CACHE'] == "mapproxy")) {
- $url = MAPPROXY_HOSTNAME.$path;
-}
-
-
-if($useproxy){
- // Open the Curl session
- $session = curl_init($url);
-
- // If it's a POST, put the POST data in the body
- if ($_POST['yws_path']) {
- $postvars = '';
- while ($element = current($_POST)) {
- $postvars .= urlencode(key($_POST)).'='.urlencode($element).'&';
- next($_POST);
- }
- curl_setopt ($session, CURLOPT_POST, true);
- curl_setopt ($session, CURLOPT_POSTFIELDS, $postvars);
- }
-
- // Don't return HTTP headers. Do return the contents of the call
- curl_setopt($session, CURLOPT_HEADER, false);
- curl_setopt($session, CURLOPT_RETURNTRANSFER, true);
-
- // Make the call
- $response = curl_exec($session);
-
- //Content-Type
- if($myformat == "image/jpeg"){
- header("Content-Type: image/jpeg");
- }
- else if($myformat == "image/png"){
- header("Content-Type: image/png");
- }
- else if($myformat == "text/html"){
- header("Content-Type: text/html");
- }
- else {
- //header("Content-Type: text/plain");
- }
-
- //Datenausgabe
- echo $response;
- curl_close($session);
-}
-else{
- Header($url);
- exit();
-}
-
-?>
Deleted: trunk/mapbender/http/extensions/mobilemap/query/rasterquery.php~
===================================================================
--- trunk/mapbender/http/extensions/mobilemap/query/rasterquery.php~ 2013-05-21 15:06:10 UTC (rev 8622)
+++ trunk/mapbender/http/extensions/mobilemap/query/rasterquery.php~ 2013-05-21 15:08:21 UTC (rev 8623)
@@ -1,101 +0,0 @@
-<?php
-
-//Basic configuration of mapserver client
-require_once(dirname(__FILE__)."/../../../../conf/mobilemap.conf");
-
-//Language config
-include_once('../config/language/check_lang.php');
-include_once('../config/language/language.'.$mylang.'.php');
-
-$coord = split(',',$_GET["coord"]);
-
-//Mapfile laden
-$map= ms_newMapObj($mapfilepath.'\map.map');
-
-//Punkt erzeugen
-$qPoint = ms_newPointObj();
-$qPoint->setXY($coord[0]*1,$coord[1]*1);
-
-//Layer festlegen
-$layer = $map->getLayerByName($rquerylayer);
-
-//Punktabfrage (Single)
-@$datQuery = $layer->queryByPoint($qPoint, MS_SINGLE, 1);
- // UMRECHNUNG Eingabe koordinatensystem -> WGS84
-$projInObj = ms_newprojectionobj("init=epsg:$ggepsg");
-$projOutObj = ms_newprojectionobj("init=epsg:4326");
-$qPoint->project($projInObj, $projOutObj);
-$WGS_X = round($qPoint->x,6);
-$WGS_Y = round($qPoint->y,6);
-print '<div id="dhmqueryId" >';
-print ('<table border="0" cellspacing="0" cellpadding="1" class="normal">');
-
-//Wenn Query erfolgreich
- if ($datQuery == MS_SUCCESS) {
- for ($j=0; $j<$layer->getNumResults(); $j++) {
- $result = $layer->getResult($j);
- //Versionsüberprüfung
- if (ms_GetVersionInt() < 50600){
- $layer->open();
- }
-
- //Versionsüberprüfung
- if (ms_GetVersionInt() < 50600){
- $shpobj = $layer->getShape($result->tileindex,$result->shapeindex);
- }
- else{
- $shpobj = $layer->resultsGetShape($result->shapeindex,$result->tileindex);
- }
-
- $attr = $shpobj->values;
-
- //echo round($attr["value_0"],2);
- $hoehe = round($attr["value_0"],1);
- if ($hoehe <0){
- print '<tr ><td colspan="3" ><strong>'.$maplang['rasterquery_nodata'].'</strong></td></tr>';
- }
- else{
- print '<tr><td>'.$maplang['rasterquery_h'].'</td><td><span class="hilite">'.$hoehe.'</span></td><td>m NN</td></tr>';
- }
- $shpobj->free();
-
- //Versionsüberprüfung
- if (ms_GetVersionInt() < 50600){
- $layer->close();
- }
- }
- }
- else{
- print '<tr ><td colspan="3" ><strong>'.$maplang['rasterquery_noh'].'</strong></td></tr>';
- //echo "Kein Wert verfügbar!";
- }
-
-print ('<tr bgcolor="#E6E6E6"><td colspan="3" >'.$maplang['rasterquery_gps'].'</td></tr>
- <tr>
- <td>Lat:</td>
- <td colspan="2">'.$WGS_Y.'</td>
- </tr>
- <tr>
- <td>Lon:</td>
- <td colspan="2">'.$WGS_X.'</td>
- </tr>
- <tr bgcolor="#E6E6E6">
- <td colspan="3" >'.$maplang['rasterquery_xy'].'</td>
- </tr>
- <tr>
- <td>X</td>
- <td colspan="2">'.round($coord[0],0).'</td>
- </tr>
- <tr>
- <td>Y</td>
- <td colspan="2">'.round($coord[1],0).'</td>
- </tr>
- <tr>
- <td colspan="3" align="left"><a href="javascript:void(0);" onClick="javascript:zoompoint('.round($coord[0],0).','.round($coord[1],0).');" ><img src="'.$applicationurl.'/img/ico_zoomin.png" border="0" > '.$maplang['geocode_result4'].'</a></td>
- </tr>
- <tr>
- <td colspan="3" align="right">');
-
-print(' </td></tr></table></div>');
-
-?>
Deleted: trunk/mapbender/http/extensions/mobilemap/query/searchproxy.php~
===================================================================
--- trunk/mapbender/http/extensions/mobilemap/query/searchproxy.php~ 2013-05-21 15:06:10 UTC (rev 8622)
+++ trunk/mapbender/http/extensions/mobilemap/query/searchproxy.php~ 2013-05-21 15:08:21 UTC (rev 8623)
@@ -1,48 +0,0 @@
-<?php
-require_once(dirname(__FILE__)."/../../../../conf/mobilemap.conf");
-require_once(dirname(__FILE__)."/../../../../conf/mapbender.conf");
-// PHP Proxy
-// Erlaubter Hostname
-$getjsonurl = 'http://www.geoportal.rlp.de/mapbender/geoportal/gaz_geom_mobile.php?';
-
-//Url-Parameter
-$path = $_SERVER['QUERY_STRING'];
-$url = $getjsonurl.$path;
-$useproxy = true;
-
-
-if($useproxy){
- // Open the Curl session
- $session = curl_init($url);
-
- // Don't return HTTP headers. Do return the contents of the call
- curl_setopt($session, CURLOPT_HEADER, false);
- curl_setopt($session, CURLOPT_RETURNTRANSFER, true);
-
- //use proxy if proxy is given in mapbender.conf - from class_connector.php
- $arURL = parse_url($url);
- $host = $arURL["host"];
- $NOT_PROXY_HOSTS_array = explode(",", NOT_PROXY_HOSTS);
- if(CONNECTION_PROXY != "" AND (in_array($host, $NOT_PROXY_HOSTS_array)!= true)){
- curl_setopt($session, CURLOPT_PROXY,CONNECTION_PROXY.":".CONNECTION_PORT);
- if(CONNECTION_PASSWORD != ""){
- curl_setopt ($session, CURLOPT_PROXYUSERPWD, CONNECTION_USER.':'.CONNECTION_PASSWORD);
- }
- }
-
- // Make the call
- $response = curl_exec($session);
-
- //header("Content-Type: text/plain");
- //header("Content-Type: application/json");
-
- //Datenausgabe
- echo $response;
- curl_close($session);
-}
-else{
- Header($url);
- exit();
-}
-
-?>
More information about the Mapbender_commits
mailing list