Removed repeated points so that the line string validated.

rserrano · Aug 22, 2018 · 57fe7e0 · 57fe7e0
1 parent 3b2ee4d
commit 57fe7e0
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/geomodelr/cpp/faults.cpp b/geomodelr/cpp/faults.cpp
@@ -449,7 +449,7 @@ map<wstring, vector<line>> find_faults_multiple_planes_intersection(const map<ws
     map<wstring, vector<line>> faults_intersection;
     double start_x = 0.0;
     for (size_t k=0; k<planes_cpp.size(); k++){
-        find_faults_plane_intersection(faults_cpp,planes_cpp[k],faults_intersection, k, start_x);
+        find_faults_plane_intersection(faults_cpp, planes_cpp[k], faults_intersection, k, start_x);
     }
 
     return faults_intersection;

diff --git a/geomodelr/cpp/section.cpp b/geomodelr/cpp/section.cpp
@@ -18,6 +18,7 @@
 
 #include "section.hpp"
 #include <cmath>
+#include <iostream>
 
 Section::~Section()
 {
@@ -151,10 +152,19 @@ SectionPython::SectionPython(const wstring& name, double cut,
 
 			pylist pypt = pylist(points[lines[i][j]]);
 			point2 aux = point2(python::extract<double>(pypt[0]), python::extract<double>(pypt[1]));
+			if ( lin.size() ) {
+				if ( geometry::distance(lin.back(), aux) < boost_tol ) {
+					continue;
+				}
+			}
 			lin.push_back(aux);
 		}
-
 		if ( not geometry::is_valid(lin) or not geometry::is_simple(lin) ) {
+			if ( geomodelr_verbose ) {
+				wstring name = python::extract<wstring>( lnames[i] );
+				std::wcerr << L"ignoring line " << name << L" is valid: " 
+					   << geometry::is_valid(lin) << L" is simple "<< geometry::is_simple(lin) << L"\n" ;
+			}
 			continue; // This should guarantee that the line has at least 2 points.
 		}
 

diff --git a/geomodelr/model.py b/geomodelr/model.py
@@ -107,7 +107,7 @@ def __init__( self, geolojson, delete=True, params={'faults': 'basic'} ):
         # Add units to model before deleting geojson.
         units = self.geojson['properties']['units'].keys()
         self.units = units
-
+        print "all faults", self.faults.keys()
         # Save space.
         if delete:
             del self.geojson

diff --git a/geomodelr/test.py b/geomodelr/test.py
@@ -1173,14 +1173,14 @@ def test_anchored_lines( self ):
                            ["s2", 2, points_2, pols_2, units, faults_2, fname, [[0, False], [0, True]]]], { "F1": "FAULT" }, {})
         model.make_matches()
         self.assertEqual(len(model.not_extended_faults["F1"]), 36)
-        self.assertEqual(len(model.faults["F1"]), 48)
+        self.assertEqual(len(model.faults["F1"]), 42)
 
         model = cpp.Model([-1,-1,-1,4,4,4],[-1,-1,-1,4,4,4],[0, 0], [1, 0], [], {}, [["s1", 1, points_1, pols_1, units, faults_1, fname, [[0, False], [0, True]]], 
                                                                     ["s2", 2, points_2, pols_2, units, faults_2, fname, []]], { "F1": "FAULT" }, {})
         model.make_matches()
 
-        self.assertEqual(len(model.not_extended_faults["F1"]), 35)
-        self.assertEqual(len(model.faults["F1"]), 42)
+        self.assertEqual(len(model.not_extended_faults["F1"]), 36)
+        self.assertEqual(len(model.faults["F1"]), 39)
 
         model = cpp.Model([-1,-1,-1,4,4,4],[-1,-1,-1,4,4,4],[0, 0], [1, 0], [], {}, [["s1", 1, points_1, pols_1, units, faults_1, fname, []], ["s2", 2, points_2, pols_2, units, faults_2, fname, []]], { "F1": "FAULT" }, {})
         model.make_matches()