Changeset 805 for flamingo

Timestamp:

23-12-11 15:32:31 (5 months ago)

Author:

rbraam

Message:

Result point also possible in wfs search.

Location:

flamingo/trunk/fmc

Files:

• LayerOGWMS.as (modified) (1 diff)
• LocationFinder.as (modified) (1 diff)
• classes/coremodel/service/wfs/FeatureType.as (modified) (2 diffs)
• classes/coremodel/service/wfs/WFSFeature.as (modified) (2 diffs)
• classes/geometrymodel/GeometryTools.as (modified) (1 diff)

flamingo/trunk/fmc/LayerOGWMS.as

@@ -36 +36 @@
 */
 
-import roo.FilterLayerLayerOGWMSAdapter;
 
 var version:String = "2.0";

flamingo/trunk/fmc/LocationFinder.as

@@ -634 +634 @@
                                 } else if (!isNaN(extent.minx) && !isNaN(extent.maxx) && !isNaN(extent.miny) && !isNaN(extent.maxy)){
                                         env = new Envelope(extent.minx, extent.miny, extent.maxx, extent.maxy) ;
-                        conn.performGetFeature(serviceLayer, env, whereClauses, null, false, this, reqprops, contextObject);
-                                } else{
-                                        conn.performGetFeature(serviceLayer, null, whereClauses, null, false, this, reqprops);
-                                }
+                                        conn.performGetFeature(serviceLayer, env, whereClauses, null, false, this, reqprops, contextObject);                                    
+                                } else{                                 
+                                        conn.performGetFeature(serviceLayer, null, whereClauses, null, false, this, reqprops, contextObject);
+                                }
                         } else if (serviceFeatures != null) {
                                 foundlocations = new Array();

flamingo/trunk/fmc/classes/coremodel/service/wfs/FeatureType.as

@@ -1 @@
-/*-----------------------------------------------------------------------------
+/*-----------------------------------------------------------------------------
 * This file is part of Flamingo MapComponents.
 * Author: Michiel J. van Heek.
@@ -78 +78 @@
                 ||property.getType() == preFix + ":MultiPolygonPropertyType "
                 ||property.getType() == preFix + ":MultiLineStringPropertyType"
-                ||property.getType() == preFix + ":MultiPointPropertyType") {
+                ||property.getType() == preFix + ":MultiPointPropertyType"
+                                ||property.getType() == preFix + ":PointPropertyType") {
                 geometryProperties.push(property);
             }

flamingo/trunk/fmc/classes/coremodel/service/wfs/WFSFeature.as

@@ -1 @@
-/*-----------------------------------------------------------------------------
+/*-----------------------------------------------------------------------------
 * This file is part of Flamingo MapComponents.
 * Author: Michiel J. van Heek.
@@ -55 +55 @@
                                 ||property.getType() == preFix + ":MultiPolygonPropertyType "
                                 ||property.getType() == preFix + ":MultiLineStringPropertyType"
-                                ||property.getType() == preFix + ":MultiPointPropertyType") {
+                                ||property.getType() == preFix + ":MultiPointPropertyType"
+                                                ||property.getType() == preFix + ":PointPropertyType") {
                                 if(!contextObject.parseGeometry){
                                         //keep xmlNode as value

flamingo/trunk/fmc/classes/geometrymodel/GeometryTools.as

@@ -38 +38 @@
         var preFix:String = geometryNode.getPrefixForNamespace("http://www.opengis.net/gml");
                 var coordNodes:Array = XMLTools.getElementsByTagName(preFix +":posList", geometryNode);
+                if (coordNodes.length==0){
+                        coordNodes = XMLTools.getElementsByTagName(preFix +":pos", geometryNode);
+                }
                 for(var i:Number = 0;i<coordNodes.length;i++){
                         var coordsStr:String =  Utils.trim(XMLNode(coordNodes[i]).firstChild.nodeValue)