diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index ac73c883..edf0ec89 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -2,7 +2,9 @@ #### Table of contents - [How to Contribute](#how-to-contribute) -- [Developer Anaconda environment](#developer-anaconda-environment) + - [Developer Anaconda environment](#developer-anaconda-environment) + - [Pylint](#pylint) + - [Unittests](#unittests) - [Structure of the repository](#structure-of-the-repository) - [User directory](#user-directory) - [Git Guidelines](#git-guidelines) @@ -15,20 +17,22 @@ - [Release](#release) - [Automatic CHANGELOG creation](#automatic-changelog-creation) - [PyPI commands](#pypi-commands) -- [Other command](#other-command) ## How to Contribute 1. Create a Anaconda environment for developers + - 👉 [Developer Anaconda environment](#developer-anaconda-environment) 2. Create a branch by forking the repository and apply your change. 3. Commit and push your change on that branch. -4. Create a pull request. +4. Run Pylint with 10.00/10 +5. Run unittests successfully +6. Create a pull request. - 👉 **Please follow the [Git Guidlines](#Git-Guidelines).** -5. Wait for our code review and approval, possibly enhancing your change on request. +7. Wait for our code review and approval, possibly enhancing your change on request. - Note that the wahooMapsCreator maintainers have many duties. So, depending on the required effort for reviewing, testing, and clarification, this may take a while. -6. Once the change has been approved and merged, we will inform you in a comment. -7. Celebrate! 🎉 +8. Once the change has been approved and merged, we will inform you in a comment. +9. Celebrate! 🎉 -## Developer Anaconda environment +### Developer Anaconda environment - /conda_env/gdal-user.yml is for creating Anaconda environment for users - /conda_env/gdal-dev.yml is for creating Anaconda environment for developers @@ -50,6 +54,24 @@ The .yml files with only the installed packages were created via conda env export > environment.yml --from-history ``` +### Pylint +Run pylint for all relevant directories/files +``` +pylint -j 0 ./wahoomc ./tests +``` + +### Unittests +Python unittests are defined in the directory `tests`. +They can be started via "Testing" pane from VSCode or via terminal in the root of the repo with +``` +python -m unittest +``` + +For the `test_generated_files.py` unittests to run successful, static land-poligons-file and static country files are needed to ensure equal results. The country files are included in the repo in `tests/resources`, the land-poligons-file needs to be downloaded from https://1drv.ms/u/s!AnpNcYd7Zz7TnXorg_zZuvsbMGsJ?e=fL6zvM and extracted to `~/wahooMapsCreatorData/_unittest/` like this: +land-poligons extracted for unittests + +More information about Python unittest can be read here: https://docs.python.org/3/library/unittest.html. + ## Structure of the repository There is one python coding base for both Windows and for macOS. Differences between the different OS are the used programs. @@ -125,9 +147,3 @@ py -m build ``` twine upload dist\* ``` - -## Other command -Run pylint for all relevant directories/files -``` -pylint -j 0 ./wahoomc ./tests -``` \ No newline at end of file diff --git a/docs/COPY_TO_WAHOO.md b/docs/COPY_TO_WAHOO.md index 0a282683..b0b2aa91 100644 --- a/docs/COPY_TO_WAHOO.md +++ b/docs/COPY_TO_WAHOO.md @@ -59,7 +59,7 @@ Copy the the whole content of the country- or X/Y folder or just the content of After copying, it should look like that: -filestructure on device +filestructure on device For another way of explanation, see [here](FAQ.md#where-on-my-wahoo-do-i-have-to-copy-the-maps) diff --git a/docs/pictures/unittest-land-poligons.png b/docs/pictures/unittest-land-poligons.png new file mode 100644 index 00000000..7bef2953 Binary files /dev/null and b/docs/pictures/unittest-land-poligons.png differ diff --git a/tests/resources/macos/134/89.map b/tests/resources/macos/134/89.map index 4ad4af96..e735bc14 100644 Binary files a/tests/resources/macos/134/89.map and b/tests/resources/macos/134/89.map differ diff --git a/tests/resources/macos/134/89.map.lzma b/tests/resources/macos/134/89.map.lzma index 525ec957..65db18e4 100644 Binary files a/tests/resources/macos/134/89.map.lzma and b/tests/resources/macos/134/89.map.lzma differ diff --git a/tests/resources/macos/134/89/merged.osm.pbf b/tests/resources/macos/134/89/merged.osm.pbf index 5a1e6a25..989c5cfa 100644 Binary files a/tests/resources/macos/134/89/merged.osm.pbf and b/tests/resources/macos/134/89/merged.osm.pbf differ diff --git a/tests/resources/macos/134/89/split-liechtenstein-names.osm.pbf b/tests/resources/macos/134/89/split-liechtenstein-names.osm.pbf index db5025e1..fd2da3c8 100644 Binary files a/tests/resources/macos/134/89/split-liechtenstein-names.osm.pbf and b/tests/resources/macos/134/89/split-liechtenstein-names.osm.pbf differ diff --git a/tests/resources/macos/134/89/split-liechtenstein.osm.pbf b/tests/resources/macos/134/89/split-liechtenstein.osm.pbf index 0434d7be..613c6ecb 100644 Binary files a/tests/resources/macos/134/89/split-liechtenstein.osm.pbf and b/tests/resources/macos/134/89/split-liechtenstein.osm.pbf differ diff --git a/tests/resources/macos/137/100.map b/tests/resources/macos/137/100.map index 4474af8c..12dddcfe 100644 Binary files a/tests/resources/macos/137/100.map and b/tests/resources/macos/137/100.map differ diff --git a/tests/resources/macos/137/100.map.lzma b/tests/resources/macos/137/100.map.lzma index c1d2aa94..39a116cd 100644 Binary files a/tests/resources/macos/137/100.map.lzma and b/tests/resources/macos/137/100.map.lzma differ diff --git a/tests/resources/macos/137/100/split-malta-names.osm.pbf b/tests/resources/macos/137/100/split-malta-names.osm.pbf index fa7c67de..e1c6394b 100644 Binary files a/tests/resources/macos/137/100/split-malta-names.osm.pbf and b/tests/resources/macos/137/100/split-malta-names.osm.pbf differ diff --git a/tests/resources/macos/137/100/split-malta.osm.pbf b/tests/resources/macos/137/100/split-malta.osm.pbf index fea97c01..842da503 100644 Binary files a/tests/resources/macos/137/100/split-malta.osm.pbf and b/tests/resources/macos/137/100/split-malta.osm.pbf differ diff --git a/tests/resources/macos/138/100.map b/tests/resources/macos/138/100.map index f5e5c24a..cb2491ab 100644 Binary files a/tests/resources/macos/138/100.map and b/tests/resources/macos/138/100.map differ diff --git a/tests/resources/macos/138/100.map.lzma b/tests/resources/macos/138/100.map.lzma index 1ecc0066..b1f85942 100644 Binary files a/tests/resources/macos/138/100.map.lzma and b/tests/resources/macos/138/100.map.lzma differ diff --git a/tests/resources/macos/138/100/merged.osm.pbf b/tests/resources/macos/138/100/merged.osm.pbf index a61bf755..62ea5734 100644 Binary files a/tests/resources/macos/138/100/merged.osm.pbf and b/tests/resources/macos/138/100/merged.osm.pbf differ diff --git a/tests/resources/macos/138/100/split-malta-names.osm.pbf b/tests/resources/macos/138/100/split-malta-names.osm.pbf index 9059eb2e..2350caf6 100644 Binary files a/tests/resources/macos/138/100/split-malta-names.osm.pbf and b/tests/resources/macos/138/100/split-malta-names.osm.pbf differ diff --git a/tests/resources/macos/138/100/split-malta.osm.pbf b/tests/resources/macos/138/100/split-malta.osm.pbf index 37d73a50..054f78eb 100644 Binary files a/tests/resources/macos/138/100/split-malta.osm.pbf and b/tests/resources/macos/138/100/split-malta.osm.pbf differ diff --git a/tests/resources/macos/liechtenstein/filtered.o5m.pbf b/tests/resources/macos/liechtenstein/filtered.o5m.pbf index 43142f43..32221ca8 100644 Binary files a/tests/resources/macos/liechtenstein/filtered.o5m.pbf and b/tests/resources/macos/liechtenstein/filtered.o5m.pbf differ diff --git a/tests/resources/macos/malta/filtered.o5m.pbf b/tests/resources/macos/malta/filtered.o5m.pbf index 2ec3709f..8b558fbf 100644 Binary files a/tests/resources/macos/malta/filtered.o5m.pbf and b/tests/resources/macos/malta/filtered.o5m.pbf differ diff --git a/tests/resources/windows/134/89.map b/tests/resources/windows/134/89.map index dc410ff5..0dd45640 100644 Binary files a/tests/resources/windows/134/89.map and b/tests/resources/windows/134/89.map differ diff --git a/tests/resources/windows/134/89.map.lzma b/tests/resources/windows/134/89.map.lzma index 9b8e65ea..6fe41273 100644 Binary files a/tests/resources/windows/134/89.map.lzma and b/tests/resources/windows/134/89.map.lzma differ diff --git a/tests/resources/windows/134/89/merged.osm.pbf b/tests/resources/windows/134/89/merged.osm.pbf index d50f626e..40c95b2d 100644 Binary files a/tests/resources/windows/134/89/merged.osm.pbf and b/tests/resources/windows/134/89/merged.osm.pbf differ diff --git a/tests/resources/windows/134/89/split-liechtenstein-names.osm.pbf b/tests/resources/windows/134/89/split-liechtenstein-names.osm.pbf index 12952439..ffb6287b 100644 Binary files a/tests/resources/windows/134/89/split-liechtenstein-names.osm.pbf and b/tests/resources/windows/134/89/split-liechtenstein-names.osm.pbf differ diff --git a/tests/resources/windows/134/89/split-liechtenstein.osm.pbf b/tests/resources/windows/134/89/split-liechtenstein.osm.pbf index ee2426ba..1fa2a06e 100644 Binary files a/tests/resources/windows/134/89/split-liechtenstein.osm.pbf and b/tests/resources/windows/134/89/split-liechtenstein.osm.pbf differ diff --git a/tests/resources/windows/137/100.map b/tests/resources/windows/137/100.map new file mode 100644 index 00000000..2a60b09b Binary files /dev/null and b/tests/resources/windows/137/100.map differ diff --git a/tests/resources/windows/137/100.map.lzma b/tests/resources/windows/137/100.map.lzma new file mode 100644 index 00000000..ff2c7a3f Binary files /dev/null and b/tests/resources/windows/137/100.map.lzma differ diff --git a/tests/resources/windows/137/100.map.lzma.17 b/tests/resources/windows/137/100.map.lzma.17 new file mode 100644 index 00000000..e69de29b diff --git a/tests/resources/windows/137/100/land.prj b/tests/resources/windows/137/100/land.prj new file mode 100644 index 00000000..f45cbadf --- /dev/null +++ b/tests/resources/windows/137/100/land.prj @@ -0,0 +1 @@ +GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]] \ No newline at end of file diff --git a/tests/resources/windows/137/100/land.shp b/tests/resources/windows/137/100/land.shp new file mode 100644 index 00000000..24550889 Binary files /dev/null and b/tests/resources/windows/137/100/land.shp differ diff --git a/tests/resources/windows/137/100/land.shx b/tests/resources/windows/137/100/land.shx new file mode 100644 index 00000000..7aaae52e Binary files /dev/null and b/tests/resources/windows/137/100/land.shx differ diff --git a/tests/resources/windows/137/100/land1.osm b/tests/resources/windows/137/100/land1.osm new file mode 100644 index 00000000..f488b8cb --- /dev/null +++ b/tests/resources/windows/137/100/land1.osm @@ -0,0 +1,8516 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/resources/windows/137/100/merged.osm.pbf b/tests/resources/windows/137/100/merged.osm.pbf new file mode 100644 index 00000000..09121381 Binary files /dev/null and b/tests/resources/windows/137/100/merged.osm.pbf differ diff --git a/tests/resources/windows/137/100/sea.osm b/tests/resources/windows/137/100/sea.osm new file mode 100644 index 00000000..2ee4746e --- /dev/null +++ b/tests/resources/windows/137/100/sea.osm @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/resources/windows/137/100/split-malta-names.osm.pbf b/tests/resources/windows/137/100/split-malta-names.osm.pbf new file mode 100644 index 00000000..50144380 Binary files /dev/null and b/tests/resources/windows/137/100/split-malta-names.osm.pbf differ diff --git a/tests/resources/windows/137/100/split-malta.osm.pbf b/tests/resources/windows/137/100/split-malta.osm.pbf new file mode 100644 index 00000000..79e4fe24 Binary files /dev/null and b/tests/resources/windows/137/100/split-malta.osm.pbf differ diff --git a/tests/resources/windows/138/100.map b/tests/resources/windows/138/100.map index d2a6411e..f8d26f07 100644 Binary files a/tests/resources/windows/138/100.map and b/tests/resources/windows/138/100.map differ diff --git a/tests/resources/windows/138/100.map.lzma b/tests/resources/windows/138/100.map.lzma index 0b48269b..045eaba7 100644 Binary files a/tests/resources/windows/138/100.map.lzma and b/tests/resources/windows/138/100.map.lzma differ diff --git a/tests/resources/windows/138/100/merged.osm.pbf b/tests/resources/windows/138/100/merged.osm.pbf index d42292c8..910e65ee 100644 Binary files a/tests/resources/windows/138/100/merged.osm.pbf and b/tests/resources/windows/138/100/merged.osm.pbf differ diff --git a/tests/resources/windows/138/100/split-malta-names.osm.pbf b/tests/resources/windows/138/100/split-malta-names.osm.pbf index 505ee8a4..2d10ba21 100644 Binary files a/tests/resources/windows/138/100/split-malta-names.osm.pbf and b/tests/resources/windows/138/100/split-malta-names.osm.pbf differ diff --git a/tests/resources/windows/138/100/split-malta.osm.pbf b/tests/resources/windows/138/100/split-malta.osm.pbf index 4fda556d..15191d31 100644 Binary files a/tests/resources/windows/138/100/split-malta.osm.pbf and b/tests/resources/windows/138/100/split-malta.osm.pbf differ diff --git a/tests/resources/windows/liechtenstein/filtered.o5m b/tests/resources/windows/liechtenstein/filtered.o5m index 01f75172..398e9d94 100644 Binary files a/tests/resources/windows/liechtenstein/filtered.o5m and b/tests/resources/windows/liechtenstein/filtered.o5m differ diff --git a/tests/resources/windows/malta/filtered.o5m b/tests/resources/windows/malta/filtered.o5m index 445b8e65..43004822 100644 Binary files a/tests/resources/windows/malta/filtered.o5m and b/tests/resources/windows/malta/filtered.o5m differ diff --git a/tests/test_constants.py b/tests/test_constants.py index 184e79b3..8c6c5e82 100644 --- a/tests/test_constants.py +++ b/tests/test_constants.py @@ -84,12 +84,12 @@ def test_translate_tags_to_keep_full_macos(self): Test translating tags to keep from universal format to macOS // all "tags to keep" """ tags = ['access', 'area=yes', 'bicycle', 'bridge', 'foot=ft_yes, foot_designated', - 'amenity=fuel, cafe, drinking_water', 'shop=bakery, bicycle', + 'amenity=fuel, cafe, drinking_water, shelter', 'shop=bakery, bicycle', 'highway=abandoned, bus_guideway, disused, bridleway, byway, construction, cycleway, footway, living_street, motorway, motorway_link, path, pedestrian, primary, primary_link, residential, road, secondary, secondary_link, service, steps, tertiary, tertiary_link, track, trunk, trunk_link, unclassified', 'natural=coastline, nosea, sea, beach, land, scrub, water, wetland, wood', 'landuse=forest, commercial, industrial, residential, retail', 'leisure=park, nature_reserve', 'railway=rail, tram, station, stop', - 'surface', 'tracktype', 'tunnel', 'waterway=canal, drain, river, riverbank', 'wood=deciduous'] + 'surface', 'tracktype', 'tunnel', 'waterway=canal, drain, river, riverbank, stream', 'wood=deciduous', 'tourism=alpine_hut'] transl_tags = translate_tags_to_keep(use_repo=True) self.assertEqual(tags, transl_tags) @@ -98,7 +98,7 @@ def test_translate_tags_to_keep_full_win(self): """ Test translating tags to keep from universal format to Windows // all "tags to keep" """ - tags_win = 'access= area=yes bicycle= bridge= foot=ft_yes =foot_designated amenity=fuel =cafe =drinking_water shop=bakery =bicycle highway=abandoned =bus_guideway =disused =bridleway =byway =construction =cycleway =footway =living_street =motorway =motorway_link =path =pedestrian =primary =primary_link =residential =road =secondary =secondary_link =service =steps =tertiary =tertiary_link =track =trunk =trunk_link =unclassified natural=coastline =nosea =sea =beach =land =scrub =water =wetland =wood landuse=forest =commercial =industrial =residential =retail leisure=park =nature_reserve railway=rail =tram =station =stop surface= tracktype= tunnel= waterway=canal =drain =river =riverbank wood=deciduous' + tags_win = 'access= area=yes bicycle= bridge= foot=ft_yes =foot_designated amenity=fuel =cafe =drinking_water =shelter shop=bakery =bicycle highway=abandoned =bus_guideway =disused =bridleway =byway =construction =cycleway =footway =living_street =motorway =motorway_link =path =pedestrian =primary =primary_link =residential =road =secondary =secondary_link =service =steps =tertiary =tertiary_link =track =trunk =trunk_link =unclassified natural=coastline =nosea =sea =beach =land =scrub =water =wetland =wood landuse=forest =commercial =industrial =residential =retail leisure=park =nature_reserve railway=rail =tram =station =stop surface= tracktype= tunnel= waterway=canal =drain =river =riverbank =stream wood=deciduous tourism=alpine_hut' transl_tags = translate_tags_to_keep( sys_platform='Windows', use_repo=True)