ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit fix for #2670 from fredj, r=me (Closes #2670)

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@10663 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
crschmidt
2010-08-21 16:04:50 +00:00
parent 23137091fc
commit a785dc1b1f
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/OpenLayers/Format/WKT.js
+7 -3
View File
@@ -151,7 +151,9 @@ OpenLayers.Format.WKT = OpenLayers.Class(OpenLayers.Format, {
'multipoint': function(multipoint) { 'multipoint': function(multipoint) {
var array = []; var array = [];
for(var i=0, len=multipoint.components.length; i<len; ++i) { 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(','); return array.join(',');
}, },
@@ -244,10 +246,12 @@ OpenLayers.Format.WKT = OpenLayers.Class(OpenLayers.Format, {
* @private * @private
*/ */
'multipoint': function(str) { 'multipoint': function(str) {
var points = OpenLayers.String.trim(str).split(','); var point;
var points = OpenLayers.String.trim(str).split(this.regExes.parenComma);
var components = []; var components = [];
for(var i=0, len=points.length; i<len; ++i) { 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( return new OpenLayers.Feature.Vector(
new OpenLayers.Geometry.MultiPoint(components) new OpenLayers.Geometry.MultiPoint(components)
tests/Format/WKT.html
+3 -3
View File
@@ -108,9 +108,9 @@
// test a multipoint // test a multipoint
t.eq(format.write(multipoint), t.eq(format.write(multipoint),
"MULTIPOINT(" + points[0].geometry.x + " " + points[0].geometry.y + "," + "MULTIPOINT((" + points[0].geometry.x + " " + points[0].geometry.y + "),(" +
points[1].geometry.x + " " + points[1].geometry.y + "," + points[1].geometry.x + " " + points[1].geometry.y + "),(" +
points[2].geometry.x + " " + points[2].geometry.y + ")", points[2].geometry.x + " " + points[2].geometry.y + "))",
"format correctly writes MultiPoint WKT"); "format correctly writes MultiPoint WKT");
// test a linestring // test a linestring