Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Filter data extract with osm-rawdata (allow custom form upload) #881

Merged
merged 11 commits into from
Oct 9, 2023

Conversation

Sujanadh
Copy link
Contributor

@Sujanadh Sujanadh commented Oct 6, 2023

This pull request extracts the data from osm using osm-rawdata package and the output are passed into filter_data in osm_fieldwork in order to filter the data according to the xlsform.

I have another pull request with the same functionality in #877 which was from my fork. I am closing that pull request as all the changes in that pull request are in this one.

closes #509

@nrjadkry
Copy link
Contributor

nrjadkry commented Oct 6, 2023

This requires new release of osm-fieldwork. Config files are updated in the osm-fieldwork. Older config files wont work with these changes. @spwoodcock

Copy link
Contributor

@nrjadkry nrjadkry left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Sujanadh there is no osm-rawdata in the requirements. Please add that in the pyproject.toml

@Sujanadh
Copy link
Contributor Author

Sujanadh commented Oct 6, 2023

@nrjadkry ok i added the package.

@spwoodcock
Copy link
Member

spwoodcock commented Oct 6, 2023

Dependencies

For future ref, the lock file also needs to be regenerated for builds to work:

cd src/backend
pdm lock

It's done automatically if you add the package with: pdm add osm-rawdata.

Or install after updating manually: pdm install.

osm-fieldwork

I'll make the new osm-fieldwork release tomorrow @nrjadkry and check / merge this PR.

Additional notes

@Sujanadh on first glance it looks like we remove the UNDERPASS_API_URL config from the code. Can this be added back in anywhere, so it's easily configurable?
Edit this is not an issue, as UNDERPASS_API_URL is read by osm-rawdata as long as it's in the env. If not set, it has a default anyway.

@spwoodcock spwoodcock changed the title filter data extract with osm-rawdata Filter data extract with osm-rawdata (allow custom form upload) Oct 9, 2023
@spwoodcock spwoodcock merged commit eaac85e into development Oct 9, 2023
1 of 3 checks passed
@spwoodcock spwoodcock deleted the feat-data-filter branch October 9, 2023 20:40
@spwoodcock spwoodcock temporarily deployed to test October 9, 2023 20:57 — with GitHub Actions Inactive
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants