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

Use tools v4 with on-the-fly boundary generation #750

Merged
merged 10 commits into from Mar 6, 2020

Conversation

nyurik
Copy link
Member

@nyurik nyurik commented Dec 19, 2019

  • Switch OMT to use the new tools v4.0.0
  • borders are dynamically generated from the PBF file instead of downloading a prepared CSV file
  • all tools are executed as current user instead of root, thus files are easier to modify/delete if needed
  • all data is stored in the local file system instead of docker volumes (Docker currently has a limitation of non-root operation for internal volumes). This also makes it easier to examine and test it.
  • New init-dirs make target creates all the needed dirs - build, data, cache
  • make clean deletes the whole build dir instead of individual files.
  • clean-docker for backward compatibility deletes cache dirs (it used to be a volume)
  • all psql calls are now done with ON_ERROR_STOP=1
  • got rid of pgclimb-* targets -- same results can be done with psql (pgclimb-list-views & pgclimb-list-tables renamed to list-views and list-tables)

@nyurik nyurik force-pushed the import-borders branch 2 times, most recently from a94b80b to 1b4244e Compare January 23, 2020 02:08
nyurik added a commit to nyurik/openmaptiles-tools that referenced this pull request Jan 23, 2020
The new bin/import-borders utility already
does the importing from the downloaded OSM data,
so these two images are no longer needed.

This can be safely merged because the next OMT
will use bin/import-borders once this PR is merged:
  openmaptiles/openmaptiles#750
and the older releases can continue using existing
docker images from docker hub (they won't be affected).
nyurik added a commit to openmaptiles/openmaptiles-tools that referenced this pull request Jan 24, 2020
The new bin/import-borders utility already
does the importing from the downloaded OSM data,
so these two images are no longer needed.

This can be safely merged because the next OMT
will use bin/import-borders once this PR is merged:
  openmaptiles/openmaptiles#750
and the older releases can continue using existing
docker images from docker hub (they won't be affected).
@nyurik nyurik changed the title Use on-the-fly boundary generation Use tools v4 with on-the-fly boundary generation Jan 24, 2020
@nyurik nyurik requested a review from TomPohys January 24, 2020 23:30
@nyurik nyurik mentioned this pull request Jan 25, 2020
@nyurik nyurik force-pushed the import-borders branch 5 times, most recently from bfe35cb to 7149ae5 Compare January 28, 2020 05:44
@nyurik nyurik requested a review from klokan January 28, 2020 20:45
This uses the new (not yet released) tool to parse planet
data file and generate a new table directly from it,
instead of downloading a prepared CSV file.
@klokan
Copy link
Member

klokan commented Mar 6, 2020

+1 on merging

@nyurik nyurik merged commit 490acf9 into openmaptiles:master Mar 6, 2020
@nyurik nyurik deleted the import-borders branch March 6, 2020 18:15
zstadler added a commit to zstadler/openmaptiles that referenced this pull request Sep 14, 2020
Update `make help` according to openmaptiles#750
@zstadler zstadler mentioned this pull request Sep 14, 2020
TomPohys pushed a commit that referenced this pull request Sep 15, 2020
Update `make help` according to #750
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.

None yet

3 participants