Fix incorrect Imposm config updates #922
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Current code incorrectly passes `IMPOSM_CONFIG_FILE` to the `generate-tiles` image, but should pass it to the tools. * add a test to ensure imposm config exists * add a test to ensure area is set during updates
|
Results evaluating commit ddac1d1 (merged with base ffd237d as 1be64e7). See run details. PostgreSQL DB size in MB: 2666 ⇒ 2665 (-0.0% change)
expand for details... |
TomPohys
approved these changes
Jun 9, 2020
frodrigo
pushed a commit
to frodrigo/openmaptiles
that referenced
this pull request
Jun 10, 2020
* Current code incorrectly passes `IMPOSM_CONFIG_FILE` to the `generate-tiles` image, but should pass it to the tools. * add a test to ensure imposm config exists * add a test to ensure area is set during updates
TomPohys
pushed a commit
that referenced
this pull request
Apr 28, 2022
Since PR #922 the contents of `.env` are included in `Makefile` in order for `make` to by aligned with the `docker-compose` settings. ``` # Make all .env variables available for make targets include .env ``` The down-side of employing the `include` mechanism is that the settings in `.env` now take higher precedence than the shell environment variables. As a result, controlling the OpenMapTiles flow because more difficult. For example, tests for `DIFF_MODE=true` had to modify the contents of `.env` in order to work: https://github.com/openmaptiles/openmaptiles/blob/b0e7f7884cc826d3176505ea840bb41f12463c75/.github/workflows/integrity.yml#L45-L47 and https://github.com/openmaptiles/openmaptiles/blob/b0e7f7884cc826d3176505ea840bb41f12463c75/Makefile#L629-L630 Users were also faced with similar difficulties. This PR restores the ability to control `make` and `quickstart.sh` using environment variable while keeping the use of the `.env` at a lower priority. The result is restoring the ability to easily adjust the OpenMapTiles flow using environment variables, such as: ``` PGPORT=54321 DIFF_MODE=true ./quickstart.sh monaco ``` #### Notes: 1. This PR depends on #1363 2. This PR includes some clean-up of `Makefile`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
IMPOSM_CONFIG_FILEto thegenerate-tilesimage, but should pass it to the tools.