From 5f96b1f914368ebe33a7b30fa6f87de36ae86ed6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Lemoine?= <eric.lemoine@camptocamp.com>
Date: Thu, 20 May 2010 20:05:52 +0000
Subject: [PATCH] do not store redundant data in the object created by WFS
 Capabilities format, r=tschaub (closes #2640)

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

diff --git a/lib/OpenLayers/Format/WFSCapabilities/v1.js b/lib/OpenLayers/Format/WFSCapabilities/v1.js
index 24c9eeceb7..71aedc2358 100644
--- a/lib/OpenLayers/Format/WFSCapabilities/v1.js
+++ b/lib/OpenLayers/Format/WFSCapabilities/v1.js
@@ -88,11 +88,10 @@ OpenLayers.Format.WFSCapabilities.v1 = OpenLayers.Class(
     read_cap_Name: function(obj, node) {
         var name = this.getChildValue(node);
         if(name) {
-            obj.name = name;
-            var prefix = name.split(":")[0];
-            if(prefix !== name) {
-                obj.featurePrefix = prefix;
-                obj.featureNS = this.lookupNamespaceURI(node, prefix);
+            var parts = name.split(":");
+            obj.name = parts.pop();
+            if(parts.length > 0) {
+                obj.featureNS = this.lookupNamespaceURI(node, parts[0]);
             }
         }
     },
diff --git a/tests/Format/WFSCapabilities/v1.html b/tests/Format/WFSCapabilities/v1.html
index 643ae1ac86..a22f03af43 100644
--- a/tests/Format/WFSCapabilities/v1.html
+++ b/tests/Format/WFSCapabilities/v1.html
@@ -4,7 +4,7 @@
     <script type="text/javascript">
     
     function test_read(t) {
-        t.plan(32);
+        t.plan(30);
        
         var parser = new OpenLayers.Format.WFSCapabilities();
 
@@ -15,8 +15,7 @@
         t.eq(ft.length, 14, "number of feature types correct");
         t.eq(ft[0]["abstract"], "Manhattan landmarks, identifies water, lakes, parks, interesting buildilngs", "abstract of first feature type correct");
         t.eq(ft[0]["title"], "Manhattan (NY) landmarks", "title of first feature type correct");
-        t.eq(ft[0]["name"], "tiger:poly_landmarks", "name of first feature type correct");
-        t.eq(ft[0]["featurePrefix"], "tiger", "prefix of first feature type correct");
+        t.eq(ft[0]["name"], "poly_landmarks", "name of first feature type correct");
         t.eq(ft[0]["featureNS"], "http://www.census.gov", "ns of first feature type correct");
 
         // GeoServer, v1.0.0
@@ -26,8 +25,7 @@
         t.eq(ft.length, 14, "number of feature types correct");
         t.eq(ft[0]["abstract"], "Manhattan landmarks, identifies water, lakes, parks, interesting buildilngs", "abstract of first feature type correct");
         t.eq(ft[0]["title"], "Manhattan (NY) landmarks", "title of first feature type correct");
-        t.eq(ft[0]["name"], "tiger:poly_landmarks", "name of first feature type correct");
-        t.eq(ft[0]["featurePrefix"], "tiger", "prefix of first feature type correct");
+        t.eq(ft[0]["name"], "poly_landmarks", "name of first feature type correct");
         t.eq(ft[0]["featureNS"], "http://www.census.gov", "ns of first feature type correct");
 
         var service = res.service;