[Mapbender-commits] r6202 - trunk/mapbender/http/php

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2010-05-12 09:16:40 -0400 (Wed, 12 May 2010)
New Revision: 6202

Modified:
   trunk/mapbender/http/php/mod_callMetadata.php
   trunk/mapbender/http/php/mod_wmc2ol.php
Log:
some small bugfixes, the wmc2ol does set a maximum amount of features before when requesting the getfeatureinfo request

Modified: trunk/mapbender/http/php/mod_callMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_callMetadata.php	2010-05-12 10:36:32 UTC (rev 6201)
+++ trunk/mapbender/http/php/mod_callMetadata.php	2010-05-12 13:16:40 UTC (rev 6202)
@@ -700,7 +700,7 @@
 //$queryJSON->searchFilter = (object) array();
 if ($_REQUEST["orderBy"] == '') {
 //echo "<br>orderBy:>".$_REQUEST["orderBy"]."<<br>";
-	$queryJSON->searchFilter->orderFilter->title = $orderByTitle['header'];
+	$queryJSON->searchFilter->orderFilter->title = $orderByTitle['rank'];
 	
 
 	$queryJSON->searchFilter->orderFilter->item[0]->title = $orderByTitle['title'];
@@ -712,7 +712,7 @@
 //read out actual order filter
 switch ($orderBy) {
 					case "rank":
-						$queryJSON->searchFilter->orderFilter->title = $orderByTitle['header'];
+						$queryJSON->searchFilter->orderFilter->title = $orderByTitle['rank'];
 						$queryJSON->searchFilter->orderFilter->item[0]->title = $orderByTitle['id'];
 						
 						$queryJSON->searchFilter->orderFilter->item[0]->url = str_replace("orderBy=rank", "orderBy=id", $searchURL);
@@ -721,7 +721,7 @@
 						$queryJSON->searchFilter->orderFilter->item[1]->url = str_replace("orderBy=rank", "orderBy=title", $searchURL);
 						break;
 					case "id":
-						$queryJSON->searchFilter->orderFilter->title = $orderByTitle['header'];
+						$queryJSON->searchFilter->orderFilter->title = $orderByTitle['id'];
 						$queryJSON->searchFilter->orderFilter->item[0]->title = $orderByTitle['rank'];
 
 						$queryJSON->searchFilter->orderFilter->item[0]->url = str_replace("orderBy=id", "orderBy=rank", $searchURL);
@@ -730,7 +730,7 @@
 						$queryJSON->searchFilter->orderFilter->item[1]->url = str_replace("orderBy=id", "orderBy=title", $searchURL);
 						break;
 					case "title":
-						$queryJSON->searchFilter->orderFilter->title = $orderByTitle['header'];
+						$queryJSON->searchFilter->orderFilter->title = $orderByTitle['title'];
 						$queryJSON->searchFilter->orderFilter->item[0]->title = $orderByTitle['rank'];
 
 						$queryJSON->searchFilter->orderFilter->item[0]->url = str_replace("orderBy=title", "orderBy=rank", $searchURL);

Modified: trunk/mapbender/http/php/mod_wmc2ol.php
===================================================================
--- trunk/mapbender/http/php/mod_wmc2ol.php	2010-05-12 10:36:32 UTC (rev 6201)
+++ trunk/mapbender/http/php/mod_wmc2ol.php	2010-05-12 13:16:40 UTC (rev 6202)
@@ -404,7 +404,8 @@
 		for ($i=0; $i<count($layer_array); $i++){
 			if ($layer_array_queryable[$i]=='1'){
 				$html.="var url".$i." =  layer".$i.".getFullRequestString({\n";
-                      		$html.=" REQUEST: \"GetFeatureInfo\",\n";
+                $html.=" REQUEST: \"GetFeatureInfo\",\n";
+                $html.=" FEATURE_COUNT: \"100\",\n";
 				$html.="EXCEPTIONS: \"application/vnd.ogc.se_xml\",\n";
 				$html.="BBOX: layer".$i.".map.getExtent().toBBOX(),\n";
 				$html.="X: e.xy.x,\n";