[DEV] Use geofabrik .json for countries and regions for internal processing (from former constants.py and wahoomc/resources/json)
#182
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
should make it clearer like this
- less cluttered (access) - only one read location of the .json file - download might be placed to another place or changed
- dont use function translate_country_input_to_geofabrik as it make things harder to understand - calc relevant countries in setUp. these should be valid for the whole class - remove all countries which have no id in geofabrik file, makes most sense here
- for better access don't read the whole geofabrik and loop through it - refactor get functions to reflect that and easier reading
did break test_generated_files and test_osm_maps This reverts commit 03f31a2.
- tiles X/Y are mostly different - latitude longitude are different even if X/Y are equal
not per each instantiation
- get_osm_pbf_filepath_url might be fully removed later on - translating input to valid geofabrik ident no in class GeofabrikJson - return of get_geofabrik_parent changed --> adjust test_reading_geofabrik_parent
- comparing via test_gofabrik_url_against_built_url makes no sense anymore
- superseeded by fully relying on geofabrik
- and adjust/ delete functions + test
treee111
force-pushed
the
switch-to-geofabrik-constants
branch
from
9270b91 to
8a1ed3e
Compare
treee111
changed the title
treee111
changed the title
treee111
changed the title
treee111
force-pushed
the
switch-to-geofabrik-constants
branch
from
7981dde to
6a5d00c
Compare
treee111
changed the title
constants.py and wahoomc/resources/json)
- helper function equals the real function - not needed commented out test - autoformatting test
treee111
force-pushed
the
switch-to-geofabrik-constants
branch
from
6a5d00c to
9c3e7f2
Compare
treee111
changed the title
constants.py and wahoomc/resources/json)constants.py and wahoomc/resources/json)
treee111
added a commit
that referenced
this pull request
May 5, 2023
…essing (from former `constants.py` and `wahoomc/resources/json`) (#182) * variables are empty at that time should make it clearer like this * unittests for existing functionality * geofabrik .json file as own class, move gefabrik functions - less cluttered (access) - only one read location of the .json file - download might be placed to another place or changed * correct json file to geofabrik country comparison - dont use function translate_country_input_to_geofabrik as it make things harder to understand - calc relevant countries in setUp. these should be valid for the whole class - remove all countries which have no id in geofabrik file, makes most sense here * unittest: compare built URL with geofabrik URL * refactor geofabrik class - for better access don't read the whole geofabrik and loop through it - refactor get functions to reflect that and easier reading * Revert "variables are empty at that time" did break test_generated_files and test_osm_maps This reverts commit 03f31a2. * check input for valid geofabrik id * unittest: compare regions * unittests make no sense - tiles X/Y are mostly different - latitude longitude are different even if X/Y are equal * only read geofabrik .json file once not per each instantiation * fetch geofabrik URL instead of composing - get_osm_pbf_filepath_url might be fully removed later on - translating input to valid geofabrik ident no in class GeofabrikJson - return of get_geofabrik_parent changed --> adjust test_reading_geofabrik_parent * reduce function to make it readabler - comparing via test_gofabrik_url_against_built_url makes no sense anymore * additional unittests * remove unnused functions and constants - superseeded by fully relying on geofabrik * exchange continents and regions with geofabrik content - and adjust/ delete functions + test * after running vulture * changes during coding review - helper function equals the real function - not needed commented out test - autoformatting test * move geofabrik json class to own file * Bump to version v4.0.0a0 * delete maps/ content version when last run version < v4.0.0a0
alfh
pushed a commit
to alfh/wahooMapsCreator
that referenced
this pull request
Nov 4, 2023
…essing (from former `constants.py` and `wahoomc/resources/json`) (treee111#182) * variables are empty at that time should make it clearer like this * unittests for existing functionality * geofabrik .json file as own class, move gefabrik functions - less cluttered (access) - only one read location of the .json file - download might be placed to another place or changed * correct json file to geofabrik country comparison - dont use function translate_country_input_to_geofabrik as it make things harder to understand - calc relevant countries in setUp. these should be valid for the whole class - remove all countries which have no id in geofabrik file, makes most sense here * unittest: compare built URL with geofabrik URL * refactor geofabrik class - for better access don't read the whole geofabrik and loop through it - refactor get functions to reflect that and easier reading * Revert "variables are empty at that time" did break test_generated_files and test_osm_maps This reverts commit 03f31a2. * check input for valid geofabrik id * unittest: compare regions * unittests make no sense - tiles X/Y are mostly different - latitude longitude are different even if X/Y are equal * only read geofabrik .json file once not per each instantiation * fetch geofabrik URL instead of composing - get_osm_pbf_filepath_url might be fully removed later on - translating input to valid geofabrik ident no in class GeofabrikJson - return of get_geofabrik_parent changed --> adjust test_reading_geofabrik_parent * reduce function to make it readabler - comparing via test_gofabrik_url_against_built_url makes no sense anymore * additional unittests * remove unnused functions and constants - superseeded by fully relying on geofabrik * exchange continents and regions with geofabrik content - and adjust/ delete functions + test * after running vulture * changes during coding review - helper function equals the real function - not needed commented out test - autoformatting test * move geofabrik json class to own file * Bump to version v4.0.0a0 * delete maps/ content version when last run version < v4.0.0a0
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.
This PR…
wahoomc/geofabrik_json.pyfile and classConsiderations and implementations
This PR takes away local hardcoded values in
constants.pyandwahoomc/resources/json/by using fresh downloaded geofabrik .json therefore.This ensures
and most important:
wahoomc/resources/json/files with the next PR [DEV] Use geofabrik .json for countries and regions for internal processing (from formerconstants.pyandwahoomc/resources/json) #182The local
wahoomc/resources/json/files are still there and the -co as well as -xy coding uses it. The reason is that X/Y processing at the time of writing is not integrated using geofabrik .json. For comparison of local json/ and geofabrik .json output, the files are still there for now.In the next PR, all that will be done.
How to test
Pull Request Checklist