[geos-commits] r4065 - in branches/3.4: . src src/algorithm src/io src/operation/buffer tests/unit/capi

svn_geos at osgeo.org svn_geos at osgeo.org
Fri Jul 31 07:23:38 PDT 2015 

Author: mloskot
Date: 2015-07-31 07:23:38 -0700 (Fri, 31 Jul 2015)
New Revision: 4065

Modified:
   branches/3.4/
   branches/3.4/nmake.opt
   branches/3.4/src/Makefile.vc
   branches/3.4/src/algorithm/LineIntersector.cpp
   branches/3.4/src/dirlist.mk
   branches/3.4/src/io/WKTWriter.cpp
   branches/3.4/src/operation/buffer/BufferOp.cpp
   branches/3.4/src/operation/buffer/OffsetCurveSetBuilder.cpp
   branches/3.4/tests/unit/capi/GEOSPreparedGeometryTest.cpp
Log:
Merged revision(s) 4062-4064 from trunk:
Add NMAKE version from released Visual Studio 2015
........
Add operation/intersection/*.cpp to NMAKE makefiles
........
Include <geos/platform.h> which defines NOMINMAX on Windows/VC++.
Closes ticket #701.
........



Property changes on: branches/3.4
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:3981,4054
   + /trunk:3981,4054,4062-4064

Modified: branches/3.4/nmake.opt
===================================================================
--- branches/3.4/nmake.opt	2015-07-28 21:08:47 UTC (rev 4064)
+++ branches/3.4/nmake.opt	2015-07-31 14:23:38 UTC (rev 4065)
@@ -126,6 +126,9 @@
 !ELSEIF "$(_NMAKE_VER)" == "14.00.22816.0"
 GEOS_MSVC = 14.0
 GEOS_MSC = 1900
+!ELSEIF "$(_NMAKE_VER)" == "14.00.23026.0"
+GEOS_MSVC = 14.0
+GEOS_MSC = 1900
 !ELSE
 GEOS_MSVC = 0.0
 GEOS_MSC = 0

Modified: branches/3.4/src/Makefile.vc
===================================================================
--- branches/3.4/src/Makefile.vc	2015-07-28 21:08:47 UTC (rev 4064)
+++ branches/3.4/src/Makefile.vc	2015-07-31 14:23:38 UTC (rev 4065)
@@ -210,6 +210,9 @@
 	operation\distance\ConnectedElementPointFilter.$(EXT) \
 	operation\distance\DistanceOp.$(EXT) \
 	operation\distance\GeometryLocation.$(EXT) \
+	operation\intersection\Rectangle.$(EXT) \
+	operation\intersection\RectangleIntersection.$(EXT) \
+	operation\intersection\RectangleIntersectionBuilder.$(EXT) \
 	operation\linemerge\EdgeString.$(EXT) \
 	operation\linemerge\LineMergeDirectedEdge.$(EXT) \
 	operation\linemerge\LineMergeEdge.$(EXT) \

Modified: branches/3.4/src/algorithm/LineIntersector.cpp
===================================================================
--- branches/3.4/src/algorithm/LineIntersector.cpp	2015-07-28 21:08:47 UTC (rev 4064)
+++ branches/3.4/src/algorithm/LineIntersector.cpp	2015-07-31 14:23:38 UTC (rev 4065)
@@ -17,6 +17,7 @@
  *
  **********************************************************************/
 
+#include <geos/platform.h>
 #include <geos/algorithm/LineIntersector.h>
 #include <geos/algorithm/CGAlgorithms.h>
 #include <geos/algorithm/HCoordinate.h>

Modified: branches/3.4/src/dirlist.mk
===================================================================
--- branches/3.4/src/dirlist.mk	2015-07-28 21:08:47 UTC (rev 4064)
+++ branches/3.4/src/dirlist.mk	2015-07-31 14:23:38 UTC (rev 4065)
@@ -28,6 +28,7 @@
 	operation \
 	operation\buffer \
 	operation\distance \
+	operation\intersection \
 	operation\linemerge \
 	operation\overlay \
 	operation\overlay\snap \

Modified: branches/3.4/src/io/WKTWriter.cpp
===================================================================
--- branches/3.4/src/io/WKTWriter.cpp	2015-07-28 21:08:47 UTC (rev 4064)
+++ branches/3.4/src/io/WKTWriter.cpp	2015-07-31 14:23:38 UTC (rev 4065)
@@ -18,6 +18,7 @@
  *
  **********************************************************************/
 
+#include <geos/platform.h>
 #include <geos/io/WKTWriter.h>
 #include <geos/io/Writer.h>
 #include <geos/io/CLocalizer.h>

Modified: branches/3.4/src/operation/buffer/BufferOp.cpp
===================================================================
--- branches/3.4/src/operation/buffer/BufferOp.cpp	2015-07-28 21:08:47 UTC (rev 4064)
+++ branches/3.4/src/operation/buffer/BufferOp.cpp	2015-07-31 14:23:38 UTC (rev 4065)
@@ -21,6 +21,7 @@
 #include <algorithm>
 #include <cmath>
 
+#include <geos/platform.h>
 #include <geos/profiler.h>
 #include <geos/precision/GeometryPrecisionReducer.h>
 #include <geos/operation/buffer/BufferOp.h>

Modified: branches/3.4/src/operation/buffer/OffsetCurveSetBuilder.cpp
===================================================================
--- branches/3.4/src/operation/buffer/OffsetCurveSetBuilder.cpp	2015-07-28 21:08:47 UTC (rev 4064)
+++ branches/3.4/src/operation/buffer/OffsetCurveSetBuilder.cpp	2015-07-31 14:23:38 UTC (rev 4065)
@@ -18,6 +18,7 @@
  *
  **********************************************************************/
 
+#include <geos/platform.h>
 #include <geos/algorithm/CGAlgorithms.h>
 #include <geos/algorithm/MinimumDiameter.h>
 #include <geos/util/UnsupportedOperationException.h>

Modified: branches/3.4/tests/unit/capi/GEOSPreparedGeometryTest.cpp
===================================================================
--- branches/3.4/tests/unit/capi/GEOSPreparedGeometryTest.cpp	2015-07-28 21:08:47 UTC (rev 4064)
+++ branches/3.4/tests/unit/capi/GEOSPreparedGeometryTest.cpp	2015-07-31 14:23:38 UTC (rev 4065)
@@ -170,6 +170,44 @@
 
     }
 
+    // Test PreparedIntersects: point on segment
+    template<>
+    template<>
+    void object::test<7>()
+    {
+        // POINT located between 3rd and 4th vertex of LINESTRING
+        // POINT(-23.1094689600055 50.5195368635957)
+        std::string point("01010000009a266328061c37c0e21a172f80424940");
+        // LINESTRING(-23.122057005539 50.5201976774794,-23.1153476966995 50.5133404815199,-23.1094689600055 50.5223376452201,-23.1094689600055 50.5169177629559,-23.0961967920942 50.5330464848094,-23.0887991006034 50.5258515213185,-23.0852302622362 50.5264582238409)
+        std::string line("0102000000070000009909bf203f1f37c05c1d66d6954249404afe386d871d37c0a7eb1124b54149409c266328061c37c056d8bff5db42494098266328061c37c0034f7b5c2a42494060065c5aa01837c08ac001de3a4449408401b189bb1637c0b04e471a4f43494014ef84a6d11537c0b20dabfb62434940");
+        geom1_ = GEOSGeomFromHEX_buf(reinterpret_cast<const unsigned char*>(line.data()), line.size());
+        geom2_ = GEOSGeomFromHEX_buf(reinterpret_cast<const unsigned char*>(point.data()), point.size());
+        prepGeom1_ = GEOSPrepare(geom1_);
+        ensure(0 != prepGeom1_);
+
+        int ret = GEOSPreparedIntersects(prepGeom1_, geom2_);
+        ensure_equals(ret, 1);
+    }
+
+    // Test PreparedIntersects: point on vertex
+    template<>
+    template<>
+    void object::test<8>()
+    {
+        // POINT located on the 3rd vertex of LINESTRING
+        // POINT(-23.1094689600055 50.5223376452201)
+        std::string point("01010000009c266328061c37c056d8bff5db424940");
+        // LINESTRING(-23.122057005539 50.5201976774794,-23.1153476966995 50.5133404815199,-23.1094689600055 50.5223376452201,-23.1094689600055 50.5169177629559,-23.0961967920942 50.5330464848094,-23.0887991006034 50.5258515213185,-23.0852302622362 50.5264582238409)
+        std::string line("0102000000070000009909bf203f1f37c05c1d66d6954249404afe386d871d37c0a7eb1124b54149409c266328061c37c056d8bff5db42494098266328061c37c0034f7b5c2a42494060065c5aa01837c08ac001de3a4449408401b189bb1637c0b04e471a4f43494014ef84a6d11537c0b20dabfb62434940");
+        geom1_ = GEOSGeomFromHEX_buf(reinterpret_cast<const unsigned char*>(line.data()), line.size());
+        geom2_ = GEOSGeomFromHEX_buf(reinterpret_cast<const unsigned char*>(point.data()), point.size());
+        prepGeom1_ = GEOSPrepare(geom1_);
+        ensure(0 != prepGeom1_);
+
+        int ret = GEOSPreparedIntersects(prepGeom1_, geom2_);
+        ensure_equals(ret, 1);
+    }
+
     // TODO: add lots of more tests
     
 } // namespace tut

More information about the geos-commits mailing list