diff --git a/app/forms/unapproved_building_dimensions.py b/app/forms/unapproved_building_dimensions.py index ef46a94f8fcbb43cd8aeeb8003dfb202f40f3827..4765f7433152bbcc3c81c9af4bcb9320f840ff24 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 c7fe2185632bc995d50ffd425891ed2fd11cbef5..4a34a59058346d47c5a402e1a1ca7e273b6b1ef8 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 9864a613d7fb1e8c3ba5772b59bda896a7aba31f..d4f5f7f70e70d29133967a14070b42eebca9e764 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 e4a59c96ca37198e2a67f310cda994b33575bcf7..5ba5492c78380a6efa2a0614bfe2a98d093bd5a4 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) diff --git a/app/models/unapproved_point.py b/app/models/unapproved_point.py index e44674d08300be77593a5ba03f89c0c3b30f35c9..2c831cb9227205a163342f6df36a5f96ac02f24e 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 a3e43440b1c1f88ed9e85474c531af97ea0d60f7..409fe555c7bf4099adaf113e2360c934a06acff0 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) diff --git a/requirements.txt b/requirements.txt index 641a43c02bef88bb746800e58144a1c35b18fda2..7d484cbf2993ae82a1f00b4381ed9f5243b77844 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