From 34fea3caaa4e286eaed0d3b4ad34b46f112e20db Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Sun, 26 Sep 2021 13:01:22 -0400 Subject: [PATCH] Fix tests --- app/api/imageuploads.py | 3 +-- app/static/app/js/components/GCPPopup.jsx | 2 +- app/static/app/js/components/Map.jsx | 2 -- app/static/app/js/components/tests/GCPPopup.test.jsx | 10 ++++++++++ app/tests/test_api_task.py | 9 +++++++++ nodeodm/external/NodeODM | 2 +- nodeodm/tests.py | 2 +- 7 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 app/static/app/js/components/tests/GCPPopup.test.jsx diff --git a/app/api/imageuploads.py b/app/api/imageuploads.py index b84630c1..d88f8a78 100644 --- a/app/api/imageuploads.py +++ b/app/api/imageuploads.py @@ -134,10 +134,9 @@ class Thumbnail(TaskNestedView): sx = (p['x'] + (0.5 - center_x)) * sw sy = (p['y'] + (0.5 - center_y)) * sh - #x = sx / scale_factor - #y = sy / scale_factor x = sx - off_x * scale_factor y = sy - off_y * scale_factor + d.ellipse([(x - r, y - r), (x + r, y + r)], outline=p['color'], width=int(max(1.0, math.floor(r / 3.0)))) diff --git a/app/static/app/js/components/GCPPopup.jsx b/app/static/app/js/components/GCPPopup.jsx index d23892dd..41412ee0 100644 --- a/app/static/app/js/components/GCPPopup.jsx +++ b/app/static/app/js/components/GCPPopup.jsx @@ -126,7 +126,7 @@ class GCPPopup extends React.Component { } render(){ - const { error, loading, expandGCPImage, selectedShot, zoom } = this.state; + const { error, loading, expandGCPImage, selectedShot } = this.state; const { feature, task } = this.props; const downloadGCPLink = `/api/projects/${task.project}/tasks/${task.id}/download/ground_control_points.geojson`; diff --git a/app/static/app/js/components/Map.jsx b/app/static/app/js/components/Map.jsx index 22edee56..767d10c9 100644 --- a/app/static/app/js/components/Map.jsx +++ b/app/static/app/js/components/Map.jsx @@ -313,8 +313,6 @@ class Map extends React.Component { overlays: {$push: [gcpLayer]} })); - gcpLayer.addTo(this.map); // TODO REMOVE - this.addedGroundControlPoints = true; } diff --git a/app/static/app/js/components/tests/GCPPopup.test.jsx b/app/static/app/js/components/tests/GCPPopup.test.jsx new file mode 100644 index 00000000..7480a0cb --- /dev/null +++ b/app/static/app/js/components/tests/GCPPopup.test.jsx @@ -0,0 +1,10 @@ +import React from 'react'; +import { mount } from 'enzyme'; +import ImagePopup from '../GCPPopup'; + +describe('', () => { + it('renders without exploding', () => { + const wrapper = mount(); + expect(wrapper.exists()).toBe(true); + }) + }); diff --git a/app/tests/test_api_task.py b/app/tests/test_api_task.py index 5100ed02..e3de5ea6 100644 --- a/app/tests/test_api_task.py +++ b/app/tests/test_api_task.py @@ -362,6 +362,7 @@ class TestApiTask(BootTransactionTestCase): # Can download assets for asset in list(task.ASSETS_MAP.keys()): res = client.get("/api/projects/{}/tasks/{}/download/{}".format(project.id, task.id, asset)) + print("DOWLOAD: " + asset) self.assertEqual(res.status_code, status.HTTP_200_OK) # We can stream downloads @@ -420,6 +421,14 @@ class TestApiTask(BootTransactionTestCase): self.assertEqual(i.width, 48) self.assertEqual(i.height, 36) + # Can plot points, recenter thumbnails, zoom + res = client.get("/api/projects/{}/tasks/{}/images/thumbnail/tiny_drone_image.jpg?size=9999999¢er_x=0.3¢er_y=0.2&draw_point=0.4,0.4&point_color=ff0000&point_radius=3&zoom=2".format(project.id, task.id)) + self.assertTrue(res.status_code == status.HTTP_200_OK) + with Image.open(io.BytesIO(res.content)) as i: + # Thumbnail has been resized to the max allowed (oringinal image size) + self.assertEqual(i.width, 48) + self.assertEqual(i.height, 36) + # Can download images res = client.get("/api/projects/{}/tasks/{}/images/download/tiny_drone_image.jpg".format(project.id, task.id)) self.assertTrue(res.status_code == status.HTTP_200_OK) diff --git a/nodeodm/external/NodeODM b/nodeodm/external/NodeODM index 019629c0..2fb254e3 160000 --- a/nodeodm/external/NodeODM +++ b/nodeodm/external/NodeODM @@ -1 +1 @@ -Subproject commit 019629c0df581d0bcab56178918120a5b0ed882e +Subproject commit 2fb254e378abfa42ddd04bd0662583b9dbe277bf diff --git a/nodeodm/tests.py b/nodeodm/tests.py index 6c6a0956..310aba66 100644 --- a/nodeodm/tests.py +++ b/nodeodm/tests.py @@ -143,7 +143,7 @@ class TestClientApi(TestCase): # Verify that options have been updated after restarting the task task_info = api.get_task(uuid).info() - self.assertTrue(len(task_info.options) == 1) + self.assertTrue(len(task_info.options) == 2) # pc-ept has been added self.assertTrue(task_info.options[0]['name'] == 'mesh-size') self.assertTrue(task_info.options[0]['value'] == 12345)