[geos-commits] r2758 - in trunk: source/geom/util source/io source/operation/distance source/operation/overlay/snap tests/unit

[svn_geos at osgeo.org]

Author: mloskot
Date: 2009-12-01 11:16:18 -0500 (Tue, 01 Dec 2009)
New Revision: 2758

Modified:
   trunk/source/geom/util/CoordinateOperation.cpp
   trunk/source/io/WKBReader.cpp
   trunk/source/operation/distance/DistanceOp.cpp
   trunk/source/operation/overlay/snap/SnapIfNeededOverlayOp.cpp
   trunk/tests/unit/geos_unit.cpp
Log:
Improved WKBReader::readHEX to read WKB encoded with lower-case hex digits, useful if combined with SQL encode(geometry, 'hex')

Modified: trunk/source/geom/util/CoordinateOperation.cpp
===================================================================
--- trunk/source/geom/util/CoordinateOperation.cpp	2009-12-01 15:39:41 UTC (rev 2757)
+++ trunk/source/geom/util/CoordinateOperation.cpp	2009-12-01 16:16:18 UTC (rev 2758)
@@ -15,8 +15,6 @@
 
 #include <typeinfo>
 
-//#include <geos/geomUtil.h>
-//#include <geos/util.h> // to be removed when util.h is finished
 #include <geos/geom/util/CoordinateOperation.h>
 #include <geos/geom/CoordinateSequence.h>
 #include <geos/geom/LinearRing.h>

Modified: trunk/source/io/WKBReader.cpp
===================================================================
--- trunk/source/io/WKBReader.cpp	2009-12-01 15:39:41 UTC (rev 2757)
+++ trunk/source/io/WKBReader.cpp	2009-12-01 16:16:18 UTC (rev 2758)
@@ -123,21 +123,27 @@
 				result_high = 9;
 				break;
 			case 'A' :
+            case 'a' :
 				result_high = 10;
 				break;
 			case 'B' :
+            case 'b' :
 				result_high = 11;
 				break;
 			case 'C' :
+			case 'c' :
 				result_high = 12;
 				break;
 			case 'D' :
+			case 'd' :
 				result_high = 13;
 				break;
 			case 'E' :
+			case 'e' :
 				result_high = 14;
 				break;
 			case 'F' :
+			case 'f' :
 				result_high = 15;
 				break;
 			default:
@@ -177,21 +183,27 @@
 				result_low = 9;
 				break;
 			case 'A' :
+            case 'a' :
 				result_low = 10;
 				break;
 			case 'B' :
+            case 'b' :
 				result_low = 11;
 				break;
 			case 'C' :
+			case 'c' :
 				result_low = 12;
 				break;
 			case 'D' :
+			case 'd' :
 				result_low = 13;
 				break;
 			case 'E' :
+			case 'e' :
 				result_low = 14;
 				break;
 			case 'F' :
+			case 'f' :
 				result_low = 15;
 				break;
 			default:

Modified: trunk/source/operation/distance/DistanceOp.cpp
===================================================================
--- trunk/source/operation/distance/DistanceOp.cpp	2009-12-01 15:39:41 UTC (rev 2757)
+++ trunk/source/operation/distance/DistanceOp.cpp	2009-12-01 16:16:18 UTC (rev 2758)
@@ -21,8 +21,6 @@
 #include <geos/operation/distance/DistanceOp.h>
 #include <geos/operation/distance/GeometryLocation.h>
 #include <geos/operation/distance/ConnectedElementLocationFilter.h>
-//#include <geos/geomUtil.h>
-//#include <geos/geosAlgorithm.h>
 #include <geos/algorithm/PointLocator.h> 
 #include <geos/algorithm/CGAlgorithms.h> 
 #include <geos/geom/Coordinate.h>

Modified: trunk/source/operation/overlay/snap/SnapIfNeededOverlayOp.cpp
===================================================================
--- trunk/source/operation/overlay/snap/SnapIfNeededOverlayOp.cpp	2009-12-01 15:39:41 UTC (rev 2757)
+++ trunk/source/operation/overlay/snap/SnapIfNeededOverlayOp.cpp	2009-12-01 16:16:18 UTC (rev 2758)
@@ -22,7 +22,7 @@
 #include <geos/operation/overlay/snap/SnapOverlayOp.h>
 #include <geos/operation/overlay/OverlayOp.h>
 #include <geos/geom/Geometry.h> // for use in auto_ptr
-#include <geos/Util.h>
+#include <geos/util.h>
 
 #include <cassert>
 #include <limits> // for numeric_limits

Modified: trunk/tests/unit/geos_unit.cpp
===================================================================
--- trunk/tests/unit/geos_unit.cpp	2009-12-01 15:39:41 UTC (rev 2757)
+++ trunk/tests/unit/geos_unit.cpp	2009-12-01 16:16:18 UTC (rev 2758)
@@ -114,4 +114,3 @@
     return (visi.all_ok() ? EXIT_SUCCESS : EXIT_FAILURE);
     
 }
-