syncing with upstream

This commit is contained in:
Senad Uka
2018-01-15 13:31:00 +01:00
parent bc646b86c2
commit fe35b0aa91
24 changed files with 325 additions and 149 deletions

View File

@@ -2,6 +2,7 @@ import sys
from math import sqrt, atan, degrees
from helix.models.corner import Corner
from helix.constants.global_constants import max_corner_angle
import flask_featureflags as feature
class ProjectPresenter(object):
def __init__(self, system_type, module_type):
@@ -76,40 +77,41 @@ class ProjectPresenter(object):
def get_corners(self, buildings):
result = []
for building in buildings:
presentable_building = []
result.append(presentable_building)
previous_corner = building[-1]
for i, corner in enumerate(building):
if (i+1 == len(building)):
next_corner = building[0]
else:
next_corner = building[i+1]
if feature.is_active('ff_cpp'):
for building in buildings:
presentable_building = []
result.append(presentable_building)
previous_corner = building[-1]
for i, corner in enumerate(building):
if (i+1 == len(building)):
next_corner = building[0]
else:
next_corner = building[i+1]
#x coordinate is stored as first element of corner variable
#y coordinate is stored as second element of corner variable
corner_length_ccw = sqrt((next_corner[0] - corner[0])**2 + (next_corner[1] - corner[1])**2)
corner_length_cw = sqrt((previous_corner[0] - corner[0])**2 + (previous_corner[1] - corner[1])**2)
#x coordinate is stored as first element of corner variable
#y coordinate is stored as second element of corner variable
corner_length_ccw = sqrt((next_corner[0] - corner[0])**2 + (next_corner[1] - corner[1])**2)
corner_length_cw = sqrt((previous_corner[0] - corner[0])**2 + (previous_corner[1] - corner[1])**2)
k1 = float('Inf') if (corner[0]==previous_corner[0]) else (corner[1] - previous_corner[1]) / (corner[0] - previous_corner[0])
k2 = float('Inf') if (corner[0]==next_corner[0]) else (next_corner[1] - corner[1]) / (next_corner[0] - corner[0])
k1 = float('Inf') if (corner[0]==previous_corner[0]) else (corner[1] - previous_corner[1]) / (corner[0] - previous_corner[0])
k2 = float('Inf') if (corner[0]==next_corner[0]) else (next_corner[1] - corner[1]) / (next_corner[0] - corner[0])
theta2 = degrees(atan(k2))
theta1 = degrees(atan(k1)) - theta2
theta2 = degrees(atan(k2))
theta1 = degrees(atan(k1)) - theta2
if (theta1 < 0):
if (k1 < 0 and k2 < 0):
theta1 = 360 + theta1
elif (k1 <= 0 and k2 >= 0):
theta1 = 180 + theta1
else:
if (k1 > 0 and k2 > 0):
theta1 = 180 + theta1
if (theta1 < 0):
if (k1 < 0 and k2 < 0):
theta1 = 360 + theta1
elif (k1 <= 0 and k2 >= 0):
theta1 = 180 + theta1
else:
if (k1 > 0 and k2 > 0):
theta1 = 180 + theta1
if (theta1 < max_corner_angle):
presentable_building.append(Corner(corner[0], corner[1], corner_length_ccw,corner_length_cw, theta1).__dict__)
if (theta1 < max_corner_angle):
presentable_building.append(Corner(corner[0], corner[1], corner_length_ccw,corner_length_cw, theta1).__dict__)
previous_corner = corner
previous_corner = corner
return result