From a785dc1b1f1e2620620f74c32c4f13d7220ddc31 Mon Sep 17 00:00:00 2001
From: crschmidt <crschmidt@crschmidt.net>
Date: Sat, 21 Aug 2010 16:04:50 +0000
Subject: [PATCH] Commit fix for #2670 from fredj, r=me (Closes #2670)

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

diff --git a/lib/OpenLayers/Format/WKT.js b/lib/OpenLayers/Format/WKT.js
index 632102d32d..d4058e20f1 100644
--- a/lib/OpenLayers/Format/WKT.js
+++ b/lib/OpenLayers/Format/WKT.js
@@ -151,7 +151,9 @@ OpenLayers.Format.WKT = OpenLayers.Class(OpenLayers.Format, {
         'multipoint': function(multipoint) {
             var array = [];
             for(var i=0, len=multipoint.components.length; i<len; ++i) {
-                array.push(this.extract.point.apply(this, [multipoint.components[i]]));
+                array.push('(' +
+                           this.extract.point.apply(this, [multipoint.components[i]]) +
+                           ')');
             }
             return array.join(',');
         },
@@ -244,10 +246,12 @@ OpenLayers.Format.WKT = OpenLayers.Class(OpenLayers.Format, {
          * @private
          */
         'multipoint': function(str) {
-            var points = OpenLayers.String.trim(str).split(',');
+            var point;
+            var points = OpenLayers.String.trim(str).split(this.regExes.parenComma);
             var components = [];
             for(var i=0, len=points.length; i<len; ++i) {
-                components.push(this.parse.point.apply(this, [points[i]]).geometry);
+                point = points[i].replace(this.regExes.trimParens, '$1');
+                components.push(this.parse.point.apply(this, [point]).geometry);
             }
             return new OpenLayers.Feature.Vector(
                 new OpenLayers.Geometry.MultiPoint(components)
diff --git a/tests/Format/WKT.html b/tests/Format/WKT.html
index fdadda8b9b..a7deee771c 100644
--- a/tests/Format/WKT.html
+++ b/tests/Format/WKT.html
@@ -108,9 +108,9 @@
  
         // test a multipoint 
         t.eq(format.write(multipoint), 
-             "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 + ")", 
+             "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 + "))", 
              "format correctly writes MultiPoint WKT"); 
  
         // test a linestring