preserve dimension as part of CoordinateArraySequence and while readi…

…ng WKT (#345) git-svn-id: http://svn.osgeo.org/geos/trunk@2990 5242fede-7e19-0410-aef8-94bd7d2200fb
libgeos · May 18, 2010 · 6449265 · 6449265
1 parent ac69c95
commit 6449265
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 35 deletions.
diff --git a/include/geos/geom/CoordinateArraySequence.h b/include/geos/geom/CoordinateArraySequence.h
@@ -38,7 +38,7 @@ namespace geom { // geos.geom
 class GEOS_DLL CoordinateArraySequence : public CoordinateSequence {
 public:
 
-	CoordinateArraySequence(const CoordinateArraySequence &cl);
+        CoordinateArraySequence(const CoordinateArraySequence &cl);
 
 	CoordinateSequence *clone() const;
 
@@ -61,10 +61,11 @@ class GEOS_DLL CoordinateArraySequence : public CoordinateSequence {
 	CoordinateArraySequence();
 
 	/// Construct sequence taking ownership of given Coordinate vector
-	CoordinateArraySequence(std::vector<Coordinate> *coords);
-
+	CoordinateArraySequence(std::vector<Coordinate> *coords,
+                                std::size_t dimension = 3);
+
 	/// Construct sequence allocating space for n coordinates
-	CoordinateArraySequence(std::size_t n);
+	CoordinateArraySequence(std::size_t n, std::size_t dimension = 3);
 
 	~CoordinateArraySequence();
 
@@ -108,7 +109,7 @@ class GEOS_DLL CoordinateArraySequence : public CoordinateSequence {
 
 	void expandEnvelope(Envelope &env) const;
 
-	size_t getDimension() const { return 3; }
+        std::size_t getDimension() const { return dimension; }
 
 	void apply_rw(const CoordinateFilter *filter); 
 
@@ -118,6 +119,7 @@ class GEOS_DLL CoordinateArraySequence : public CoordinateSequence {
 
 private:
 	std::vector<Coordinate> *vect;
+        std::size_t dimension;
 };
 
 /// This is for backward API compatibility

diff --git a/include/geos/geom/CoordinateArraySequenceFactory.inl b/include/geos/geom/CoordinateArraySequenceFactory.inl
@@ -26,22 +26,21 @@ namespace geom { // geos::geom
 INLINE CoordinateSequence*
 CoordinateArraySequenceFactory::create(std::vector<Coordinate> *coords) const
 {
-	return new CoordinateArraySequence(coords);
+	return new CoordinateArraySequence(coords,3);
 }
 
 INLINE CoordinateSequence *
 CoordinateArraySequenceFactory::create(std::vector<Coordinate> *coords,
-		size_t /* dimension */) const
+		size_t dimension ) const
 {
-	return new CoordinateArraySequence(coords);
+	return new CoordinateArraySequence(coords,dimension);
 }
 
 INLINE CoordinateSequence *
-CoordinateArraySequenceFactory::create(std::size_t size, std::size_t /* dimension */)
+CoordinateArraySequenceFactory::create(std::size_t size, std::size_t dimension)
 		const
 {
-	/* CoordinateArraySequence only accepts 3d Coordinates */
-	return new CoordinateArraySequence(size);
+	return new CoordinateArraySequence(size,dimension);
 }
 
 

diff --git a/include/geos/geom/CoordinateSequenceFactory.h b/include/geos/geom/CoordinateSequenceFactory.h
@@ -63,7 +63,8 @@ class GEOS_DLL CoordinateSequenceFactory {
 	 * @param coordinates the coordinates
 	 */
 	virtual CoordinateSequence *create(
-			std::vector<Coordinate> *coordinates) const=0;
+            std::vector<Coordinate> *coordinates,
+            std::size_t dimension=3 ) const=0;
 
 	/** \brief
 	 * Creates a CoordinateSequence of the specified size and dimension.
@@ -76,7 +77,7 @@ class GEOS_DLL CoordinateSequenceFactory {
 	 * 	(if user-specifiable, otherwise ignored)
 	 */
 	virtual CoordinateSequence *create(std::size_t size,
-			size_t dimension) const=0;
+                                           std::size_t dimension) const=0;
 
 	virtual ~CoordinateSequenceFactory();
 };

diff --git a/include/geos/io/WKTReader.h b/include/geos/io/WKTReader.h
@@ -103,7 +103,7 @@ class GEOS_DLL WKTReader {
 	const geom::GeometryFactory *geometryFactory;
 	const geom::PrecisionModel *precisionModel;
 
-	void getPreciseCoordinate(io::StringTokenizer *tokenizer, geom::Coordinate&);
+	void getPreciseCoordinate(io::StringTokenizer *tokenizer, geom::Coordinate&, std::size_t &dim );
 
 	bool isNumberNext(io::StringTokenizer *tokenizer);
 };

diff --git a/src/geom/CoordinateArraySequence.cpp b/src/geom/CoordinateArraySequence.cpp
@@ -31,26 +31,31 @@ namespace geos {
 namespace geom { // geos::geom
 
 CoordinateArraySequence::CoordinateArraySequence():
-	vect(new vector<Coordinate>())
+	vect(new vector<Coordinate>()),
+        dimension(3)
 {
 }
 
-CoordinateArraySequence::CoordinateArraySequence(size_t n):
-	vect(new vector<Coordinate>(n))
+CoordinateArraySequence::CoordinateArraySequence(size_t n, 
+                                                 size_t dimension_in ):
+	vect(new vector<Coordinate>(n)),
+        dimension(dimension_in)
 {
 }
 
 CoordinateArraySequence::CoordinateArraySequence(
-	vector<Coordinate> *coords): vect(coords)
+    vector<Coordinate> *coords, size_t dimension_in )
+        : vect(coords), dimension(dimension_in)
 {
 	if ( ! vect ) vect = new vector<Coordinate>();
 }
 
 CoordinateArraySequence::CoordinateArraySequence(
-	const CoordinateArraySequence &c)
+    const CoordinateArraySequence &c )
 	:
 	CoordinateSequence(c),
-	vect(new vector<Coordinate>(*(c.vect)))
+	vect(new vector<Coordinate>(*(c.vect))),
+        dimension(c.getDimension())
 {
 }
 

diff --git a/src/geom/GeometryFactory.cpp b/src/geom/GeometryFactory.cpp
@@ -235,7 +235,8 @@ GeometryFactory::createPoint(const Coordinate& coordinate) const
 	if (coordinate.isNull()) {
 		return createPoint();
 	} else {
-		CoordinateSequence *cl=coordinateListFactory->create(new vector<Coordinate>(1, coordinate));
+		std::size_t dim = ISNAN(coordinate.z) ? 2 : 3;
+		CoordinateSequence *cl = coordinateListFactory->create(new vector<Coordinate>(1, coordinate), dim);
 		//cl->setAt(coordinate, 0);
 		Point *ret = createPoint(cl);
 		return ret;

diff --git a/src/io/WKTReader.cpp b/src/io/WKTReader.cpp
@@ -72,39 +72,47 @@ WKTReader::read(const string &wellKnownText)
 CoordinateSequence*
 WKTReader::getCoordinates(StringTokenizer *tokenizer)
 {
+	size_t dim;
 	string nextToken=getNextEmptyOrOpener(tokenizer);
 	if (nextToken=="EMPTY") {
 		return geometryFactory->getCoordinateSequenceFactory()->create(NULL);
 		//new CoordinateArraySequence(); 
 	}
-	CoordinateSequence *coordinates = \
-		geometryFactory->getCoordinateSequenceFactory()->create(NULL);
+
 	Coordinate coord;
-	getPreciseCoordinate(tokenizer, coord);
+	getPreciseCoordinate(tokenizer, coord, dim);
+
+	CoordinateSequence *coordinates = \
+            geometryFactory->getCoordinateSequenceFactory()->create((size_t)0,dim);
 	coordinates->add(coord);
 	try {
 		nextToken=getNextCloserOrComma(tokenizer);
 		while (nextToken==",") {
-			getPreciseCoordinate(tokenizer, coord);
+			getPreciseCoordinate(tokenizer, coord, dim );
 			coordinates->add(coord);
 			nextToken=getNextCloserOrComma(tokenizer);
 		}
 	} catch (...) {
 		delete coordinates;
 		throw;
 	}
+
 	return coordinates;
 }
 
 void
-WKTReader::getPreciseCoordinate(StringTokenizer *tokenizer, Coordinate& coord)
+WKTReader::getPreciseCoordinate(StringTokenizer *tokenizer, 
+                                Coordinate& coord,
+                                size_t &dim )
 {
 	coord.x=getNextNumber(tokenizer);
 	coord.y=getNextNumber(tokenizer);
 	if (isNumberNext(tokenizer)) {
 		coord.z=getNextNumber(tokenizer);
+		dim = 3;
 	} else {
 		coord.z=DoubleNotANumber;
+		dim = 2;
 	}
 	precisionModel->makePrecise(coord);
 }
@@ -221,13 +229,14 @@ WKTReader::readGeometryTaggedText(StringTokenizer *tokenizer)
 Point*
 WKTReader::readPointText(StringTokenizer *tokenizer)
 {
+	size_t dim;
 	string nextToken=getNextEmptyOrOpener(tokenizer);
 	if (nextToken=="EMPTY") {
 		return geometryFactory->createPoint(Coordinate::getNull());
 	}
 
 	Coordinate coord;
-	getPreciseCoordinate(tokenizer, coord);
+	getPreciseCoordinate(tokenizer, coord, dim);
 	getNextCloser(tokenizer);
 
 	return geometryFactory->createPoint(coord);
@@ -258,14 +267,16 @@ WKTReader::readMultiPointText(StringTokenizer *tokenizer)
 
 	if ( tok == StringTokenizer::TT_NUMBER )
 	{
+		size_t dim;
+
 		// Try to parse deprecated form "MULTIPOINT(0 0, 1 1)"
 		const CoordinateSequenceFactory* csf = \
 			geometryFactory->getCoordinateSequenceFactory();
 		CoordinateSequence *coords = csf->create(NULL);
 		try {
 			do {
 				Coordinate coord;
-				getPreciseCoordinate(tokenizer, coord);
+				getPreciseCoordinate(tokenizer, coord, dim);
 				coords->add(coord);
 				nextToken=getNextCloserOrComma(tokenizer);
 			} while(nextToken == ",");

diff --git a/tests/unit/noding/BasicSegmentStringTest.cpp b/tests/unit/noding/BasicSegmentStringTest.cpp
@@ -64,7 +64,7 @@ namespace tut
     template<>
     void object::test<1>()
     {
-    	CoordinateSequenceAutoPtr cs(csFactory->create(0, 2));
+    	CoordinateSequenceAutoPtr cs(csFactory->create((size_t)0, 2));
 
 	ensure(0 != cs.get());
 
@@ -107,7 +107,7 @@ namespace tut
     template<>
     void object::test<2>()
     {
-    	CoordinateSequenceAutoPtr cs(csFactory->create(0, 2));
+    	CoordinateSequenceAutoPtr cs(csFactory->create((size_t)0, 2));
 
 	ensure(0 != cs.get());
 
@@ -143,7 +143,7 @@ namespace tut
     template<>
     void object::test<3>()
     {
-    	CoordinateSequenceAutoPtr cs(csFactory->create(0, 2));
+    	CoordinateSequenceAutoPtr cs(csFactory->create((size_t)0, 2));
 
 	ensure(0 != cs.get());
 

diff --git a/tests/unit/noding/NodedSegmentStringTest.cpp b/tests/unit/noding/NodedSegmentStringTest.cpp
@@ -64,7 +64,7 @@ namespace tut
     template<>
     void object::test<1>()
     {
-        CoordinateSequenceAutoPtr cs(csFactory->create(0, 2));
+        CoordinateSequenceAutoPtr cs(csFactory->create((size_t)0, 2));
 
         ensure(0 != cs.get());
 
@@ -111,7 +111,7 @@ namespace tut
     template<>
     void object::test<2>()
     {
-        CoordinateSequenceAutoPtr cs(csFactory->create(0, 2));
+        CoordinateSequenceAutoPtr cs(csFactory->create((size_t)0, 2));
 
     ensure(0 != cs.get());
 
@@ -148,7 +148,7 @@ namespace tut
     template<>
     void object::test<3>()
     {
-        CoordinateSequenceAutoPtr cs(csFactory->create(0, 2));
+        CoordinateSequenceAutoPtr cs(csFactory->create((size_t)0, 2));
 
     ensure(0 != cs.get());
 
@@ -221,7 +221,7 @@ namespace tut
         geos::geom::Coordinate p1(10, 0);
 
 
-        CoordinateSequenceAutoPtr cs(csFactory->create(0, 2));
+        CoordinateSequenceAutoPtr cs(csFactory->create((size_t)0, 2));
         cs->add(p0);
         cs->add(p1);