From 71c1e34d58accc255aa668d3a62f3d89eb5610f5 Mon Sep 17 00:00:00 2001 From: Conrad S Date: Thu, 20 Apr 2017 10:29:13 -0400 Subject: [PATCH 1/3] Update unapproved models to reflect new parsing --- app/models/unapproved_point.py | 3 ++- app/models/unapproved_window_door.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/models/unapproved_point.py b/app/models/unapproved_point.py index e44674d..2c831cb 100644 --- a/app/models/unapproved_point.py +++ b/app/models/unapproved_point.py @@ -16,7 +16,8 @@ class UnapprovedPoint(Model, db.Model): latitude = db.Column(db.Float) longitude = db.Column(db.Float) elevation = db.Column(db.Integer) - corresponding_height = db.Column(db.Integer) + wall_num_first = db.Column(db.Integer) + wall_num_second = db.Column(db.Integer) feature = db.Column(db.Integer) hit_id = db.Column(db.Integer, nullable=False) building_id = db.Column(db.Integer) diff --git a/app/models/unapproved_window_door.py b/app/models/unapproved_window_door.py index a3e4344..409fe55 100644 --- a/app/models/unapproved_window_door.py +++ b/app/models/unapproved_window_door.py @@ -16,8 +16,8 @@ class UnapprovedWindowDoor(Model, db.Model): height = db.Column(db.Float) width = db.Column(db.Float) quantity = db.Column(db.Integer) + wall_num = db.Column(db.Integer) orientation = db.Column(db.Integer) - direction = db.Column(db.Integer) feature = db.Column(db.Integer) hit_id = db.Column(db.Integer, nullable=False) building_id = db.Column(db.Integer) -- GitLab From 3d6de5627f34593f2f595d5cc77e4eacb5a9a04a Mon Sep 17 00:00:00 2001 From: Conrad S Date: Thu, 20 Apr 2017 15:57:04 -0400 Subject: [PATCH 2/3] Update to reflect new mech turk template --- app/forms/unapproved_building_dimensions.py | 5 ----- app/forms/unapproved_point.py | 5 +++-- app/forms/unapproved_window_door.py | 2 +- app/models/unapproved_building_dimensions.py | 5 ----- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/app/forms/unapproved_building_dimensions.py b/app/forms/unapproved_building_dimensions.py index ef46a94..4765f74 100644 --- a/app/forms/unapproved_building_dimensions.py +++ b/app/forms/unapproved_building_dimensions.py @@ -9,9 +9,4 @@ class UnapprovedBuildingDimensionsForm(wtf.Form): perimeter = wtf.DecimalField() area = wtf.DecimalField() num_floors = wtf.IntegerField() - ground_elevation = wtf.IntegerField() building_id = wtf.IntegerField() - north_adjacency = wtf.DecimalField() - south_adjacency = wtf.DecimalField() - west_adjacency = wtf.DecimalField() - east_adjacency = wtf.DecimalField() diff --git a/app/forms/unapproved_point.py b/app/forms/unapproved_point.py index c7fe218..4a34a59 100644 --- a/app/forms/unapproved_point.py +++ b/app/forms/unapproved_point.py @@ -8,7 +8,8 @@ class UnapprovedPointForm(wtf.Form): validators=[wtf.validators.Required()]) latitude = wtf.DecimalField() longitude = wtf.DecimalField() - elevation = wtf.IntegerField() - corresponding_height = wtf.IntegerField() + elevation = wtf.DecimalField() + wall_num_first = wtf.IntegerField() + wall_num_second = wtf.IntegerField() feature = wtf.IntegerField() building_id = wtf.IntegerField() diff --git a/app/forms/unapproved_window_door.py b/app/forms/unapproved_window_door.py index 9864a61..d4f5f7f 100644 --- a/app/forms/unapproved_window_door.py +++ b/app/forms/unapproved_window_door.py @@ -9,7 +9,7 @@ class UnapprovedWindowDoorForm(wtf.Form): height = wtf.DecimalField() width = wtf.DecimalField() quantity = wtf.IntegerField() + wall_num = wtf.IntegerField() orientation = wtf.IntegerField() - direction = wtf.IntegerField() feature = wtf.IntegerField() building_id = wtf.IntegerField() diff --git a/app/models/unapproved_building_dimensions.py b/app/models/unapproved_building_dimensions.py index e4a59c9..5ba5492 100644 --- a/app/models/unapproved_building_dimensions.py +++ b/app/models/unapproved_building_dimensions.py @@ -16,13 +16,8 @@ class UnapprovedBuildingDimensions(Model, db.Model): perimeter = db.Column(db.Float) area = db.Column(db.Float) num_floors = db.Column(db.Integer) - ground_elevation = db.Column(db.Integer) hit_id = db.Column(db.Integer, nullable=False) building_id = db.Column(db.Integer) - north_adjacency = db.Column(db.Float) - south_adjacency = db.Column(db.Float) - west_adjacency = db.Column(db.Float) - east_adjacency = db.Column(db.Float) def __str__(self): return "unapproved_building_dimensions data for account {}".format(self.hit_id) -- GitLab From 7015217a9034b87c3419a33f39e06d6e16248531 Mon Sep 17 00:00:00 2001 From: Conrad S Date: Thu, 20 Apr 2017 16:01:17 -0400 Subject: [PATCH 3/3] Update requirement to point to correct release of bpeng --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 641a43c..7d484cb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -42,4 +42,4 @@ websocket-client==0.35.0 Werkzeug==0.11.4 WTForms==2.1 -git+ssh://git@github.com/Blocp/bpeng.git +git+ssh://git@github.com/Blocp/bpeng.git@v0.2.2 -- GitLab