From 0a6ea3125d3ee62ea3c23b81d3d417b85a6f4a34 Mon Sep 17 00:00:00 2001
From: ahocevar <andreas.hocevar@gmail.com>
Date: Fri, 20 Mar 2009 17:26:40 +0000
Subject: [PATCH] always include field type in DescribeFeatureType fields. With
 modifications from tschaub. r=tschaub (closes #1202)

git-svn-id: http://svn.openlayers.org/trunk/openlayers@9106 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
---
 lib/OpenLayers/Format/WFSDescribeFeatureType.js |  1 +
 tests/Format/WFSDescribeFeatureType.html        | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/OpenLayers/Format/WFSDescribeFeatureType.js b/lib/OpenLayers/Format/WFSDescribeFeatureType.js
index abc1c1e557..82735413a1 100644
--- a/lib/OpenLayers/Format/WFSDescribeFeatureType.js
+++ b/lib/OpenLayers/Format/WFSDescribeFeatureType.js
@@ -112,6 +112,7 @@ OpenLayers.Format.WFSDescribeFeatureType = OpenLayers.Class(
                         type = {};
                         this.readChildNodes(node, type)
                         element.restriction = type;
+                        element.type = type.base;
                     }
                     var fullType = type.base || type;
                     element.localType = fullType.split(":").pop();
diff --git a/tests/Format/WFSDescribeFeatureType.html b/tests/Format/WFSDescribeFeatureType.html
index 5743917e4e..d191d4f589 100644
--- a/tests/Format/WFSDescribeFeatureType.html
+++ b/tests/Format/WFSDescribeFeatureType.html
@@ -4,7 +4,7 @@
     <script type="text/javascript">
     
     function test_read_WFSDescribeFeatureType(t) {
-        t.plan(36);
+        t.plan(39);
        
         var parser = new OpenLayers.Format.WFSDescribeFeatureType();
 
@@ -281,6 +281,9 @@
             t.eq(res.featureTypes[0].properties[0].name, 'cat',
                 "The first attribute has name cat");
     
+            t.eq(res.featureTypes[0].properties[0].type.split(":")[1], 'long',
+                "The first attribute has type long with a prefix");
+
             t.eq(res.featureTypes[0].properties[0].localType, 'long',
                 "The first attribute has localType long");
     
@@ -344,8 +347,11 @@
         t.eq(res.featureTypes[0].properties[1].name, "STATE_NAME",
             "name of 2nd property of 1st featureType should be 'STATE_NAME'");
         
+        t.eq(res.featureTypes[0].properties[1].type, "xs:string",
+            "type of 2nd property of 1st featureType should be 'xs:string'");
+
         t.eq(res.featureTypes[0].properties[1].localType, "string",
-            "type of 2nd property of 1st featureType should be 'string'");
+            "localType of 2nd property of 1st featureType should be 'string'");
         
         t.eq(res.featureTypes[0].properties[1].restriction.maxLength, "25",
             "the maxLength restriction should be 25");