Commit acf24cb7 authored by Tomas Pettersson's avatar Tomas Pettersson 🏸

removed printouts

parent 51cf239c
...@@ -106,7 +106,6 @@ def writeStatus(status): ...@@ -106,7 +106,6 @@ def writeStatus(status):
def run(): def run():
try: try:
writeStatus("INITIAL") 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')))); jsondata = json.load(pkg_resources.resource_stream(__name__, '/'.join(('resources', 'strtree.json'))));
sections = [] sections = []
for section in jsondata: for section in jsondata:
...@@ -148,6 +147,6 @@ def run(): ...@@ -148,6 +147,6 @@ def run():
To run in terminal call with python __init__.py To run in terminal call with python __init__.py
''' '''
if __name__ == "__main__": if __name__ == "__main__":
# storetree() storetree()
loadtree() loadtree()
\ No newline at end of file
...@@ -290,27 +290,15 @@ class Model(object): ...@@ -290,27 +290,15 @@ class Model(object):
activepoints.append([point.x, point.y]) activepoints.append([point.x, point.y])
linestring = geometry.shape(exercisefeature['geometry']) linestring = geometry.shape(exercisefeature['geometry'])
latlngpoints = [[latlng[1], latlng[0]] for latlng in linestring.coords] latlngpoints = [[latlng[1], latlng[0]] for latlng in linestring.coords]
# print('before matches')
matches = strtree.query(LineString(latlngpoints)) matches = strtree.query(LineString(latlngpoints))
# print('matches: '+str(matches))
for i, coord in enumerate(linestring.coords): for i, coord in enumerate(linestring.coords):
# start = time.time()
if (len(activepoints) > 0): if (len(activepoints) > 0):
# print('active: '+str(len(mp.geoms)))
mp = geometry.MultiPoint(activepoints) mp = geometry.MultiPoint(activepoints)
points = self.centerPoints(coord, mp.centroid, mp.geoms) points = self.centerPoints(coord, mp.centroid, mp.geoms)
displacedpoints = self.displacePoints(pDist, points) displacedpoints = self.displacePoints(pDist, points)
# print('displacedpoints: '+str(len(displacedpoints)))
activepoints, onlandpoints = self.onlandPoints(mp.geoms, displacedpoints, matches) activepoints, onlandpoints = self.onlandPoints(mp.geoms, displacedpoints, matches)
# print('activepoints: '+str(len(activepoints)))
# print('onlandpoints: '+str(len(onlandpoints)))
deactivepoints += 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) mp = geometry.MultiPoint(activepoints+deactivepoints)
# print('active+deactive: '+str(len(mp.geoms)))
level = [0] * len(mp.geoms) level = [0] * len(mp.geoms)
category = [2] * len(mp.geoms) category = [2] * len(mp.geoms)
properties = self.createProperties((i+2), timearray[i], mp.centroid, level, category) properties = self.createProperties((i+2), timearray[i], mp.centroid, level, category)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment