[Mapbender-commits] r6986 - in trunk/mapbender: http/classes http/plugins lib

[svn_mapbender at osgeo.org]

Author: kmq
Date: 2010-09-30 13:31:20 +0000 (Thu, 30 Sep 2010)
New Revision: 6986

Modified:
   trunk/mapbender/http/classes/class_gml.php
   trunk/mapbender/http/classes/class_gml_feature_collection.php
   trunk/mapbender/http/plugins/feedTree.js
   trunk/mapbender/lib/class_Filter.php
   trunk/mapbender/lib/mb.ui.wfsGazetteer.js
   trunk/mapbender/lib/wizard.js
Log:
highlights for geometries other than pointhttp/plugins/feedTree.js

Modified: trunk/mapbender/http/classes/class_gml.php
===================================================================
--- trunk/mapbender/http/classes/class_gml.php	2010-09-30 12:43:13 UTC (rev 6985)
+++ trunk/mapbender/http/classes/class_gml.php	2010-09-30 13:31:20 UTC (rev 6986)
@@ -20,7 +20,9 @@
 require_once(dirname(__FILE__)."/../../core/globalSettings.php");
 require_once(dirname(__FILE__)."/../classes/class_connector.php");
 require_once(dirname(__FILE__)."/../classes/class_json.php");
+		$e = new mb_exception("BB");
 require_once(dirname(__FILE__)."/../classes/class_gml_feature_collection.php");
+		$e = new mb_exception("DD");
 
 abstract class Gml {
 	var $featureCollection = null;
@@ -109,4 +111,4 @@
 	}
 }
 
-?>
\ No newline at end of file
+?>

Modified: trunk/mapbender/http/classes/class_gml_feature_collection.php
===================================================================
--- trunk/mapbender/http/classes/class_gml_feature_collection.php	2010-09-30 12:43:13 UTC (rev 6985)
+++ trunk/mapbender/http/classes/class_gml_feature_collection.php	2010-09-30 13:31:20 UTC (rev 6986)
@@ -1,4 +1,5 @@
 <?php
+		$e = new mb_exception("CC");
 # $Id: class_gml2.php 3099 2008-10-02 15:29:23Z nimix $
 # http://www.mapbender.org/index.php/class_gml2.php
 # Copyright (C) 2002 CCGIS 
@@ -25,10 +26,11 @@
 
 class FeatureCollection {
 	var $type = "FeatureCollection";
+	var $title = "";
 	var $featureArray = array();
 	
-	public function __construct() {
-		
+	public function __construct($title="") {
+		$this->title = $title;
 	}
 	
 	public function addFeature ($aFeature) {
@@ -49,7 +51,9 @@
 			}
 		}
 
-		$str .= "]}";
+		$str .= "]";
+		$str .= $this->title ? ',"properties": { "title": "' . $this->title . '"} ': "";
+		$str .= "}";
 		return $str;
 	}
 	
@@ -78,4 +82,4 @@
 		return count($this->featureArray);
 	}
 }
-?>
\ No newline at end of file
+?>

Modified: trunk/mapbender/http/plugins/feedTree.js
===================================================================
--- trunk/mapbender/http/plugins/feedTree.js	2010-09-30 12:43:13 UTC (rev 6985)
+++ trunk/mapbender/http/plugins/feedTree.js	2010-09-30 13:31:20 UTC (rev 6986)
@@ -2,10 +2,7 @@
 var FeedTree = function(o){
 	$feedTree.children().remove();
 	$feedTree.addClass('feedtree');
-	
-	
 
-
 	var $RSSfolder = $('<li class="open rss"><button class="toggle" name="toggle" value="toggle"></button><a href="#">RSS</a><ul></ul></li>');
 	$feedTree.append($RSSfolder);
 
@@ -72,7 +69,7 @@
 				var map = o.$target.mapbender();
 				var g = new GeometryArray();
 				g.importGeoJSON(jsonFeature,false);
-				feature = g.get(0);
+				var feature = g.get(0);
 		
 				var bbox = feature.getBBox();
 				var bufferFloat = parseFloat(0.1);
@@ -88,8 +85,33 @@
 	
 				};
 			})(obj.data.features[i]));
+			
+			$feature.bind('mouseover',(function(jsonFeature){return function(){
+				var me = $feedTree.mapbender();
+				var g = new GeometryArray();
+				g.importGeoJSON(jsonFeature,false);
+				var feature = g.get(0);
+			
+				console.log(feature);
+				if(feature.geomType != "point"){
+					feature = feature.getBBox4();
+					me.resultHighlight = new Highlight(
+							[o.target],
+							"FeedTreeHighlight", 
+							{"position":"absolute", "top":"0px", "left":"0px", "z-index":100}, 
+							2);
+				
+					me.resultHighlight.add(feature, "#ff0000");
+					me.resultHighlight.paint();
+				}
+				else if(feature.geomType == "point"){
 
+				}
+	
+				};
+			})(obj.data.features[i]));
 
+
 		}
 
 		$("*:checkbox",$rssEntry).bind('click', function(){

Modified: trunk/mapbender/lib/class_Filter.php
===================================================================
--- trunk/mapbender/lib/class_Filter.php	2010-09-30 12:43:13 UTC (rev 6985)
+++ trunk/mapbender/lib/class_Filter.php	2010-09-30 13:31:20 UTC (rev 6986)
@@ -138,4 +138,4 @@
 	}
 	
 }
-?>
\ No newline at end of file
+?>

Modified: trunk/mapbender/lib/mb.ui.wfsGazetteer.js
===================================================================
--- trunk/mapbender/lib/mb.ui.wfsGazetteer.js	2010-09-30 12:43:13 UTC (rev 6985)
+++ trunk/mapbender/lib/mb.ui.wfsGazetteer.js	2010-09-30 13:31:20 UTC (rev 6986)
@@ -2,7 +2,8 @@
 
 $.widget("mb.wfsGazetteer", {
 	options: {
-		geometry : null
+		geometry : null,
+		wfsConf: null
 	},
 
 	_create: function () {
@@ -78,7 +79,6 @@
  	*
  	*/
 	search : function(filter) {
-		$('.error',this.element).css('border','');
 		$('.error',this.element).removeClass('error');
 		this._status('Searching');
 		
@@ -107,7 +107,6 @@
 			// check if field is mandatory
 			if(el.f_min_input > value.length){
 				$('#'+id).addClass('error');
-				$(".error",this.element).css('border','2px inset red');
 				this._status('Errors in search');
 				return;
 			}

Modified: trunk/mapbender/lib/wizard.js
===================================================================
--- trunk/mapbender/lib/wizard.js	2010-09-30 12:43:13 UTC (rev 6985)
+++ trunk/mapbender/lib/wizard.js	2010-09-30 13:31:20 UTC (rev 6986)
@@ -20,7 +20,6 @@
 					that._trigger("to" + $t.attr("id").toLowerCase(), null, {});
 					that._trigger("to", null, {});
 					that.options.onClickLink(path);			
-
 				});
 			});
 		}