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.

Sign up for GitHub

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

Jump to bottom

[FEAT] correctly integrate tunnels to maps in macOS (in the same way as in Windows) #165

Merged
merged 8 commits into from
Nov 12, 2022
Merged

[FEAT] correctly integrate tunnels to maps in macOS (in the same way as in Windows) #165

merged 8 commits into from
Nov 12, 2022

Conversation

treee111
Copy link
Owner

@treee111 treee111 commented Nov 5, 2022 •
edited
Loading

This PR…

  • closes Show tunnels in the map #160
  • transforms tunnels under macOS to be included in the generated maps
  • adds tunnels to the VTM-theme to be shown under BOLT, ROAM and BOLTv2

Considerations and implementations

During implementation, the osmium call for macOS was refactored to a osmosis call like used in Windows.
A lot of thoughts and tryouts for tunnels in macOS can be seen in the assigned issue.

  • Two .osm.pbf files can be compared with osmium diff , example call: osmium diff -c merged.osm.pbf merged_osmosis.osm.pbf
  • The documentation for osmosis helped during refactoring.

How to test

  1. create .map files using -c
  2. check the created mapfiles in cruiser with different defaultvalue in the VTM theme to check the different devices

Pull Request Checklist

@treee111 treee111 added the enhancement New feature or request label Nov 5, 2022
@treee111 treee111 force-pushed the tunnels-macOS-2 branch 6 times, most recently from ccbec36 to beb97f9 Compare November 7, 2022 20:19
@treee111 treee111 added this to the v3.1.0 milestone Nov 7, 2022
@treee111 treee111 force-pushed the tunnels-macOS-2 branch 3 times, most recently from 4e3e8b0 to 508c0da Compare November 12, 2022 13:57
@treee111
change macOS merging to osmosis
18d67a6 
calculate difference:
osmium diff -c merged.osm.pbf merged_osmosis.osm.pbf

difference is only 3 files:
*n83638824 v9======>                                                   ]  26%
*n3384511942 v5==============================================>         ]  87%
*n8983537175 v1========================================================] 100%
@treee111
implement tunnel transform for both OS identically
7065c58 
reduce doubled coding
@treee111 treee111 force-pushed the tunnels-macOS-2 branch 2 times, most recently from bd02516 to 16e413c Compare November 12, 2022 14:03
@treee111 treee111 marked this pull request as ready for review November 12, 2022 14:03
@treee111
set level value to 0 to not be rendered over all other objects
1eec633 
When using 2, the tunnels are rendered over all other objects
@treee111
sort .osm files with osmosis (was osmium on macOS before)
f253900 
osmium diff -c land1.osm land1_osmosis.osm
[======================================================================] 100%
@treee111
launch config for lake garda
d78d01b
@treee111
shows tunnels for BOLTv2 and ROAMv2
e9d1d11 
taken from
https://github.com/masc4ii/wahooMapsCreator/blob/124a5f964c01c0570c1a3942e8fc2ae6d28873e8/device_themes/vtm_theme_poi/vtm-elemnt.xml
written here
#160 (comment)
@treee111
let the theme render tunnels for BOLT and BOLTv2 identical to ROAM
c2c9669
@treee111
additional changes to the theme after checking in cruiser
dc1a1ca 
- dont have one but two entries for "use" of bolt2 and roam
- change order to: bolt, roam, bolt2
- remove "outline" from BOLT entries (these are not defined)
@treee111 treee111 merged commit 7d5520b into develop Nov 12, 2022
@treee111 treee111 deleted the tunnels-macOS-2 branch November 12, 2022 14:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
v3.1.0
Development

Successfully merging this pull request may close these issues.

Show tunnels in the map
1 participant
@treee111