Now geomodelr deletes geojson by default so more memory is available.

geomodelr/__main__.py

@@ -31,7 +31,7 @@ class ParametersException(Exception):
     pass
 
 def prep_model(geojson):
-    model = GeologicalModel(json.loads(geojson.read()))
+    model = GeologicalModel(json.loads(geojson.read()), delete=False)
     return model
 
 def query_coordinates(geojson, verbose=False):
@@ -134,7 +134,7 @@ def query_func(p):
 
 def get_information(geojson, verbose):
     # Show map, cross sections, polygons, etc.
-    model = GeologicalModel(json.loads(geojson.read()))
+    model = GeologicalModel(json.loads(geojson.read()), delete=False)
     model.print_information(verbose)
 
 def main(args=None):

geomodelr/cpp/geomodel.cpp

@@ -175,6 +175,7 @@ BOOST_PYTHON_MODULE(cpp)
 							  .def("signed_distance_bounded", &ModelPython::signed_distance_bounded, python::args("unit", "point"), doc_signed_distance_bounded)
 							  .def("height", &ModelPython::height, python::args("point"), doc_height)
 							  .def("info", &ModelPython::info)
+							  .add_property("bbox", &ModelPython::pybbox)
 							  .add_property("matches", &ModelPython::get_matches, &ModelPython::set_matches);
 }
 

geomodelr/cpp/model.cpp

@@ -647,6 +647,17 @@ pylist ModelPython::get_matches( ) const {
 	return ret;
 }
 
+pylist ModelPython::pybbox( ) const {
+	pylist p;
+	p.append( g0( g0( this->bbox ) ) );
+	p.append( g1( g0( this->bbox ) ) );
+	p.append( g2( g0( this->bbox ) ) );
+	p.append( g0( g1( this->bbox ) ) );
+	p.append( g1( g1( this->bbox ) ) );
+	p.append( g2( g1( this->bbox ) ) );
+	return p;
+}
+
 double ModelPython::signed_distance( const wstring& unit, const pyobject& pt ) const {
 	return ((Model *)this)->signed_distance(unit, point3(python::extract<double>(pt[0]), python::extract<double>(pt[1]), python::extract<double>(pt[2])));
 }

geomodelr/cpp/model.hpp

@@ -43,7 +43,9 @@ class TopographyPython : public Topography {
 class Model {
 protected:
 	std::pair<double, double> cuts_range;
-	std::tuple<std::tuple<double, double, double>, std::tuple<double, double, double>> bbox;
+	std::tuple<std::tuple<double, double, double>, 
+		   std::tuple<double, double, double>> bbox;
+
 	point2 base_point;
 	point2 direction;
 	vector<Section *> sections;
@@ -87,6 +89,7 @@ class Model {
 				return Possible(cls.first, -1, cls.second, cls.second+s_dist);
 			}
 		};
+
 		// Given a match in section b, find a match in section b.
 		auto b_possible = [&](const std::pair<int, double>& cls) { 
 			if ( cls.first == -1 ) {
@@ -270,6 +273,7 @@ class ModelPython : public Model {
 	pylist get_matches() const;
 	// Methods to query matches.
 	pylist possible_closest(const pyobject& pt) const;
+	pylist pybbox() const;
 	pytuple model_point(const pyobject& pt) const;
 	pytuple inverse_point(const pyobject& pt) const;
 	pytuple closest(const pyobject& pt) const;

geomodelr/model.py

@@ -66,7 +66,7 @@ class GeologicalModel(cpp.Model):
     with a transformation. Go to Geomodelr.com, create a new model and use it with this 
     tool.
     """
-    def __init__( self, geolojson ):
+    def __init__( self, geolojson, delete=True ):
         """ 
         Initializes the geological model from a Geological JSON 
         file created in www.geomodelr.com.
@@ -127,7 +127,12 @@ def __init__( self, geolojson ):
         bbox = self.geojson['bbox']
         super(GeologicalModel, self).__init__(bbox, list(base_point), list(direction), geomap, topography, sections)
         self.make_matches()
+
+        # Save space.
+        if delete:
+            del self.geojson
 
+
     def make_matches(self):
         """ Prepares the model to query by matching polygons and lines.
             It finds which polygons, when projected to the next cross section,

geomodelr/utils.py

@@ -116,7 +116,7 @@ def fix_solid( vertices, triangles ):
 
 def calculate_isosurface(model, unit, grid_divisions):
 
-    bbox = list(model.geojson['bbox']) # Copy so original is not modified.
+    bbox = list(model.bbox) # Copy so original is not modified.
 
     dx = (bbox[3]-bbox[0])/grid_divisions
     dy = (bbox[4]-bbox[1])/grid_divisions