WIP: Multi polygons #391

Hagellach37 · 2020-07-08T16:21:56Z

this is work in progress.

Goal: support multi polygon projects (aka island mapping in MapSwipe) #374

manager_dashboard/manager_dashboard/js/forms.js

Hagellach37 · 2020-07-08T16:23:09Z

mapswipe_workers/mapswipe_workers/mapswipe_workers.py

        try:
            # Create a project object using appropriate class (project type).
            project = ProjectType(project_type).constructor(project_draft)
+            # TODO: here the project.geometry attribute is overwritten


remove here and decide where validate_geometries should be called

mapswipe_workers/mapswipe_workers/project_types/base/project.py

mapswipe_workers/mapswipe_workers/project_types/tile_map_service_grid/project.py

mapswipe_workers/mapswipe_workers/utils/tile_grouping_functions.py

Hagellach37

Hey @TahiraU,
I have put some minor comments. Overall it looks good now. :) Maybe you find some time tomorrow to adjust the small bits and then we can put it into dev. :)

mapswipe-data/api/project_geometries/project_geom_-MC6zDSrCeUXzyCCwTQ_.geojson

mapswipe_workers/mapswipe_workers/definitions.py

mapswipe_workers/mapswipe_workers/project_types/tile_map_service_grid/project.py

mapswipe_workers/mapswipe_workers/utils/tile_grouping_functions.py

mapswipe_workers/tests/unittests/test_groups_overlap.py

postgres/initdb.sql

mapswipe_workers/mapswipe_workers/utils/tile_grouping_functions.py

mapswipe_workers/tests/unittests/test_groups_overlap.py

Hagellach37

Hey,
only some minor comments again. I thnk we need to explicitly remove the files under mapswipe-data so that they are not uploaded to github.

…pswipe-workers into multiPolygons

Hagellach37 · 2020-08-04T12:05:46Z

mapswipe_workers/mapswipe_workers/definitions.py

 LOGGING_FILE_PATH = os.path.join(DATA_PATH, "mapswipe_workers.log")

+# number of geometries for project geometries
+MAX_INPUT_GEOMETRIES = 2


should we change this to 10? how many geometries do we want to allow to start with?

Tahira Ullah and others added 21 commits June 9, 2020 17:20

form.js adapted to read multiple features

4f12a73

improved formatting

475985d

projectDraf created for testing multiple geometries

ff933f9

created test function for multiple polygons

e38bfcb

test single and multiple geometry for project creation

2241b43

test functions for overlapping geoms

6a3bd29

groups overlap

293c8de

adjust structure of test for groups overlap

6417fa2

add assertion to test number of groups correct

62b45d8

add some print and rename variable

f6a4c45

fix test

61a7a19

add test for polygons within

5bbc06f

add test for polygons within

6baa368

add test for polygons within

b70f320

wip groups within other groups

c324f0c

fix bug in zoom level

6ac8e2b

trying to find out bug while saving project geometry to postgres

1c041f0

trying to save multiple geometries into postgres

e8145b0

changed geometry column in DB

cdb18c9

found bug postgres import #374

42f8437

fix postgres import bug and use geometry collection instead of list

0869347

Hagellach37 commented Jul 8, 2020

View reviewed changes

manager_dashboard/manager_dashboard/js/forms.js Outdated Show resolved Hide resolved

Hagellach37 commented Jul 8, 2020

View reviewed changes

mapswipe_workers/mapswipe_workers/project_types/base/project.py Show resolved Hide resolved

Hagellach37 commented Jul 8, 2020

View reviewed changes

mapswipe_workers/mapswipe_workers/project_types/tile_map_service_grid/project.py Outdated Show resolved Hide resolved

Hagellach37 commented Jul 8, 2020

View reviewed changes

mapswipe_workers/mapswipe_workers/utils/tile_grouping_functions.py Outdated Show resolved Hide resolved

Hagellach37 commented Jul 15, 2020

View reviewed changes

mapswipe_workers/mapswipe_workers/utils/tile_grouping_functions.py Outdated Show resolved Hide resolved

Hagellach37 commented Jul 15, 2020

View reviewed changes

mapswipe_workers/mapswipe_workers/utils/tile_grouping_functions.py Show resolved Hide resolved

Tahira Ullah added 2 commits July 20, 2020 12:44

multiple geoms dissolve return none

984e299

multiple polygons as input does not incorporate second polygon

4716d3a

Tahira Ullah added 2 commits July 27, 2020 12:46

completeness tutorial adjusted path to geojson file

6f93029

put number of features for input geom in definitions.py

e454a8b

Hagellach37 commented Jul 28, 2020

View reviewed changes

union cascaded outside of loop

ccf8932

Hagellach37 commented Aug 4, 2020

View reviewed changes

mapswipe_workers/mapswipe_workers/utils/tile_grouping_functions.py Outdated Show resolved Hide resolved

Hagellach37 commented Aug 4, 2020

View reviewed changes

mapswipe_workers/tests/unittests/test_groups_overlap.py Outdated Show resolved Hide resolved

Hagellach37 commented Aug 4, 2020

View reviewed changes

Hagellach37 and others added 18 commits August 4, 2020 13:00

Delete project_geom_-MC6zDSrCeUXzyCCwTQ_.geojson

aa1bd3f

Delete project_geom_-MClQtGCC_sgKTB7mAeW.geojson

59edbeb

Delete project_geom_-MCw-n1trbI1yzqDEOuc.geojson

b0af0ec

Delete project_geom_-MCw0zzwMY4ZNExGSrvw.geojson

3d37038

Delete project_geom_-MCwCkpstMiHcHQmL3Ex.geojson

f44d1d5

Delete raw_input_-MC6vz49TfX2dk-6myDd.geojson

40dafce

Delete raw_input_-MC6zDSrCeUXzyCCwTQ_.geojson

eb2cce6

Delete raw_input_-MClQtGCC_sgKTB7mAeW.geojson

de09816

Delete raw_input_-MCw-n1trbI1yzqDEOuc.geojson

0601b29

Delete raw_input_-MCw0zzwMY4ZNExGSrvw.geojson

bde303c

Delete raw_input_-MCwCkpstMiHcHQmL3Ex.geojson

85e5edc

Delete mapswipe_workers.log.2020-07-13

fcee8d8

Delete mapswipe_workers.log.2020-07-21

5d400d3

Delete mapswipe_workers.log.2020-07-20

2e423b4

Delete raw_groups_-MC6vz49TfX2dk-6myDd.txt

92ddb56

Delete raw_tasks_-MC6vz49TfX2dk-6myDd.txt

87e8695

test function improved

3c38233

Merge branch 'multiPolygons' of https://github.com/mapswipe/python-ma…

8a1326f

…pswipe-workers into multiPolygons

Hagellach37 commented Aug 4, 2020

View reviewed changes

max input geometries extended to 10

f401e03

Hagellach37 merged commit 84aeb92 into dev Aug 4, 2020

Hagellach37 deleted the multiPolygons branch March 3, 2021 13:37

WIP: Multi polygons #391

WIP: Multi polygons #391

Uh oh!

Conversation

Hagellach37 commented Jul 8, 2020

Uh oh!

Uh oh!

Hagellach37 Jul 8, 2020

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Hagellach37 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Hagellach37 left a comment

Choose a reason for hiding this comment

Uh oh!

Hagellach37 Aug 4, 2020

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants