removed printouts

exercisemodel/__init__.py

@@ -106,7 +106,6 @@ def writeStatus(status):
 def run():
   try: 
     writeStatus("INITIAL")
-    # strtree = STRtree(pickle.load(pkg_resources.resource_stream(__name__, '/'.join(('resources', 'strtree.pickle')))))
     jsondata = json.load(pkg_resources.resource_stream(__name__, '/'.join(('resources', 'strtree.json'))));
     sections = []
     for section in jsondata:
@@ -148,6 +147,6 @@ def run():
   To run in terminal call with python __init__.py 
 '''
 if __name__ == "__main__": 
-  # storetree()
+  storetree()
   loadtree()
   
\ No newline at end of file

exercisemodel/model.py

@@ -290,27 +290,15 @@ class Model(object):
       activepoints.append([point.x, point.y])
     linestring = geometry.shape(exercisefeature['geometry'])
     latlngpoints = [[latlng[1], latlng[0]] for latlng in linestring.coords]
-    # print('before matches')
     matches = strtree.query(LineString(latlngpoints))    
-    # print('matches: '+str(matches))
     for i, coord in enumerate(linestring.coords):
-      # start = time.time()
       if (len(activepoints) > 0):
-        # print('active: '+str(len(mp.geoms)))
         mp = geometry.MultiPoint(activepoints)
         points = self.centerPoints(coord, mp.centroid, mp.geoms)
         displacedpoints = self.displacePoints(pDist, points)
-        # print('displacedpoints: '+str(len(displacedpoints)))
         activepoints, onlandpoints = self.onlandPoints(mp.geoms, displacedpoints, matches)
-        # print('activepoints: '+str(len(activepoints)))
-        # print('onlandpoints: '+str(len(onlandpoints)))
         deactivepoints += onlandpoints
-      # print('active: '+str(len(activepoints)))
-      # print('onland: '+str(len(onlandpoints)))
-      # end = time.time()
-      # print('onland: '+str(end-start))
       mp = geometry.MultiPoint(activepoints+deactivepoints)
-      # print('active+deactive: '+str(len(mp.geoms)))
       level = [0] * len(mp.geoms)
       category = [2] * len(mp.geoms)
       properties = self.createProperties((i+2), timearray[i], mp.centroid, level, category)