From fdd7843a6a812350488f33441b8e5d90855e1eaf Mon Sep 17 00:00:00 2001
From: bartvde <bartvde@osgis.nl>
Date: Thu, 7 Jul 2011 16:41:02 +0000
Subject: [PATCH] WKT parser should still support the old signature of
 multipoints without separating parens, thanks to ronan for the patch,
 p=ronan,r=me (pullup #2670)

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

diff --git a/lib/OpenLayers/Format/WKT.js b/lib/OpenLayers/Format/WKT.js
index 0c437b8546..f9fe75c603 100644
--- a/lib/OpenLayers/Format/WKT.js
+++ b/lib/OpenLayers/Format/WKT.js
@@ -276,7 +276,7 @@ OpenLayers.Format.WKT = OpenLayers.Class(OpenLayers.Format, {
          */
         'multipoint': function(str) {
             var point;
-            var points = OpenLayers.String.trim(str).split(this.regExes.parenComma);
+            var points = OpenLayers.String.trim(str).split(',');
             var components = [];
             for(var i=0, len=points.length; i<len; ++i) {
                 point = points[i].replace(this.regExes.trimParens, '$1');
diff --git a/tests/Format/WKT.html b/tests/Format/WKT.html
index a0ca28c071..15d2b2cf62 100644
--- a/tests/Format/WKT.html
+++ b/tests/Format/WKT.html
@@ -188,7 +188,7 @@
     }
 
     function test_Format_WKT_read(t) { 
-        t.plan(12); 
+        t.plan(13); 
 
         var format = new OpenLayers.Format.WKT(); 
          
@@ -204,7 +204,14 @@
         // test a multipoint 
         t.ok(multipoint.geometry.equals(format.read(format.write(multipoint)).geometry), 
              "format correctly reads MultiPoint WKT"); 
- 
+
+        // test a multipoint without separating parens 
+        t.ok(multipoint.geometry.equals(format.read( 
+ 	        "MULTIPOINT(" + points[0].geometry.x + " " + points[0].geometry.y + "," +  
+                            points[1].geometry.x + " " + points[1].geometry.y + "," +  
+                            points[2].geometry.x + " " + points[2].geometry.y + ")").geometry), 
+            "format correctly reads MultiPoint WKT without parens");
+
         // test a linestring 
         t.ok(linestrings[0].geometry.equals(format.read(format.write(linestrings[0])).geometry), 
              "format correctly reads LineString WKT");