Skip to content

Commit

Permalink
fix: merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
nrjadkry committed Oct 13, 2023
2 parents 2ebe631 + ba9c2e5 commit 63db1c9
Show file tree
Hide file tree
Showing 17 changed files with 16,651 additions and 87 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pr_label.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: PR Label

on:
pull_request:
pull_request_target:

jobs:
pr-label:
Expand Down
10 changes: 9 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,15 @@ Right now, we are in the process of building the prototype. We warmly welcome yo

Create pull requests (PRs) for changes that you think are needed. We would really appreciate your help!

In fact, we are specifically looking for input from developers with **Python skills** and **familiarity with Fast API**.
Skills with the following would be beneficial:
- Python
- FastAPI
- Javascript
- React
- Docker
- CI/CD workflows

Our latest task board can be found [here](https://github.com/orgs/hotosm/projects/22).

## Report bugs and suggest improvements

Expand Down
4 changes: 2 additions & 2 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@

Before you can install and use this application, you will need to have the following software installed and configured on your system

- Git(or any other Terminal)
- Docker
- [Git(or any other Terminal)](https://git-scm.com/)
- [Docker](https://docs.docker.com/)

To install Git, please follow the instructions on the official Git website:

Expand Down
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,14 @@

🕮 [Documentation](https://hotosm.github.io/fmtm/)

A project to provide tools for Open Mapping campaigns
🎯 [Task Board](https://github.com/orgs/hotosm/projects/22)

A project to provide tools for Open Mapping campaigns.

While we have pretty good field mapping applications,
we don’t have great tools to coordinate field mapping.
However, we have most of the elements needed to create a field mapping-oriented
version of the HOT Tasking Manager,
version of the [HOT Tasking Manager](https://tasks.hotosm.org),
which allows people to select specific areas and
complete tasks in a coordinated, organized fashion.

Expand Down Expand Up @@ -68,7 +70,7 @@ To aid future diaster response, we would really welcome developer

## How to contribute

👍🎉We are actively looking for contributors for this project- from design,
👍🎉We are actively looking for contributors for this project - from design,
user testing and both front and backend developers.
We have a specific request for volunteer developers at the moment!
![image](https://user-images.githubusercontent.com/98902727/218812430-3c07b60e-4fd2-4f05-a289-bf37d6f0b9cd.png)
Expand Down Expand Up @@ -206,7 +208,7 @@ A computer-screen-optimized web app that allows Campaign Managers to:

- Click on Submit button.

#### FMTM back end
#### FMTM Backend

A back end that converts the project parameters entered by the Campaign Manager in
the Manager Web Interface into a corresponding ODK Central project.
Expand Down
1 change: 1 addition & 0 deletions src/backend/app/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ def get_application() -> FastAPI:
"url": "https://raw.githubusercontent.com/hotosm/fmtm/main/LICENSE",
},
debug=settings.DEBUG,
root_path=settings.API_PREFIX,
)

# Set custom logger
Expand Down
6 changes: 4 additions & 2 deletions src/backend/app/projects/project_crud.py
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,10 @@ def update_multi_polygon_project_boundary(
return False

# Update the boundary polyon on the database.
polygons = boundary["features"]
if boundary["type"] == "Feature":
polygons = [boundary]
else:
polygons = boundary["features"]
log.debug(f"Processing {len(polygons)} task geometries")
for polygon in polygons:
# If the polygon is a MultiPolygon, convert it to a Polygon
Expand Down Expand Up @@ -774,7 +777,6 @@ def split_polygon_into_tasks(
)
return []

features = json.loads(features)
log.debug(f"Project {project_id} split into {len(features)} tasks")
return features

Expand Down
Loading

0 comments on commit 63db1c9

Please sign in to comment.