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

[FEATURE] Include POIs into generated maps and diplay them with VTM rendering #106

Merged
merged 23 commits into from
May 8, 2022

Conversation

treee111
Copy link
Owner

@treee111 treee111 commented Apr 11, 2022

This PR…

  • introduces POIs into the generated files and display them as symbol on your wahoo device!
    • bakery
    • drinking water
    • fuel station
    • cafe

Considerations and implementations

  • launch config for POIs
  • adjustments to enable POIs
    • constants update to NOT-filter out POIs
    • tag-wahoo file update to include POIs into generated file
    • VTM device theme for POIs incl. symbols
  • documentation adjustments

How to test

  1. create maps and act like written in the documentation

Pull Request Checklist

@treee111 treee111 force-pushed the enable-pois branch 5 times, most recently from 7107e22 to 4e76129 Compare April 11, 2022 22:25
@treee111 treee111 force-pushed the enable-pois branch 5 times, most recently from 890fd8f to 33e98e0 Compare April 20, 2022 22:32
@mweirauch
Copy link
Contributor

I think you don't need any custom symbols in the project. They are part of the vtm library (to my understanding).

https://github.com/mapsforge/vtm/tree/master/vtm-themes/resources/assets

Using a @Intyre inspired snippet in my custom vtm-elemnt.xml shows up POI icons just fine in Cruiser and on the Bolt2:
(of course with a modified tag-mapping to include these tags and custom keep-tag-constants, but the latter was merged ...)

	<m k="amenity" zoom-min="15">
		<m v="cafe">
			<symbol src="assets:symbols/food/cafe.svg" symbol-percent="100" />
		</m>
		<m v="drinking_water">
			<symbol src="assets:symbols/food/drinkingtap.svg" symbol-percent="100" />
		</m>
		<m v="fuel">
			<symbol src="assets:symbols/transport/fuel.svg" symbol-percent="100" />
		</m>
	</m>

	<m k="shop" zoom-min="15">
		<m v="bakery">
			<symbol src="assets:symbols/shopping/bakery.svg" />
		</m>
		<m v="bicycle">
			<symbol src="assets:symbols/shopping/bicycle.svg" />
		</m>
		<m v="supermarket">
			<symbol src="assets:symbols/shopping/supermarket.svg" />
		</m>
	</m>

@treee111 treee111 added this to the v2.0.0 milestone Apr 22, 2022
@treee111 treee111 force-pushed the enable-pois branch 3 times, most recently from 0dd3f06 to 5ad1fa0 Compare April 25, 2022 19:55
@treee111 treee111 changed the base branch from develop to release-v2.0.0 May 7, 2022 13:13
treee111 added 2 commits May 7, 2022 16:14
- refactor and correct copyFiles  script
- correct cd .. statements
@treee111 treee111 force-pushed the enable-pois branch 2 times, most recently from 7138618 to 91d3f0c Compare May 7, 2022 14:25
@treee111
Copy link
Owner Author

treee111 commented May 7, 2022

I think you don't need any custom symbols in the project. They are part of the vtm library (to my understanding).

https://github.com/mapsforge/vtm/tree/master/vtm-themes/resources/assets

Using a @Intyre inspired snippet in my custom vtm-elemnt.xml shows up POI icons just fine in Cruiser and on the Bolt2: (of course with a modified tag-mapping to include these tags and custom keep-tag-constants, but the latter was merged ...)

	<m k="amenity" zoom-min="15">
		<m v="cafe">
			<symbol src="assets:symbols/food/cafe.svg" symbol-percent="100" />
		</m>
		<m v="drinking_water">
			<symbol src="assets:symbols/food/drinkingtap.svg" symbol-percent="100" />
		</m>
		<m v="fuel">
			<symbol src="assets:symbols/transport/fuel.svg" symbol-percent="100" />
		</m>
	</m>

	<m k="shop" zoom-min="15">
		<m v="bakery">
			<symbol src="assets:symbols/shopping/bakery.svg" />
		</m>
		<m v="bicycle">
			<symbol src="assets:symbols/shopping/bicycle.svg" />
		</m>
		<m v="supermarket">
			<symbol src="assets:symbols/shopping/supermarket.svg" />
		</m>
	</m>

Good point! I checked that on my BOLTv1. That did not work. In cruiser it also worked without having the symbols.
I think this is because only the BOLTv2 has VTM rendering per default and the VTM library on the device while the others don't (or have a version without some symbols etc.)

@treee111 treee111 force-pushed the enable-pois branch 2 times, most recently from 1d741b2 to b2949a7 Compare May 8, 2022 17:21
@treee111 treee111 added the enhancement New feature or request label May 8, 2022
treee111 added 3 commits May 8, 2022 19:58
- make highways smaller on bolt (because they are black)
- who drinking_water on the same zoom-level as bakeries
@treee111 treee111 force-pushed the enable-pois branch 2 times, most recently from 97f56ae to 44c071e Compare May 8, 2022 18:27
@treee111 treee111 marked this pull request as ready for review May 8, 2022 18:28
@treee111 treee111 changed the title [FEATURE] Include POIs into generated maps and VTM rendering files [FEATURE] Include POIs into generated maps and diplay them with VTM rendering May 8, 2022
@treee111 treee111 merged commit 255a36e into release-v2.0.0 May 8, 2022
@treee111 treee111 deleted the enable-pois branch May 8, 2022 18:29
treee111 added a commit that referenced this pull request May 8, 2022
…endering (#106)

* initial VTM rendering theme

- from https://gist.github.com/Intyre/7494d5c6c86b5bc60ce4d03b9cfce2df

* copy files in

- from: https://github.com/zenziwerken/Bolt2-Mapsforge-Rendertheme

* write new files to the created .zip files

* add docu for POI creation

* move themes folder to root directory

- docs: copy the whole vtm_theme_poi content (does not harm on e.g. BOLT)

* scale icons to appear bigger

* launch config for POIs

* read out content of generated .map files

- to check, if certain OSM tags / POIs are in the generated .map files

* Added some tags not to be filtered.

Added landuse forest and amenity for =fuel =cafe, shop=bicycle =bakery

* add drinking_water POI in all relevant files

* make some streets black for bolt

* do not render place/locality

* publish device_themes as separate .zip
- refactor and correct copyFiles  script
- correct cd .. statements

* fix unittests according to new POI constants

* adjust documentation

* use new symbol for drinking water

- from: https://github.com/mapsforge/vtm/blob/master/vtm-themes/resources/assets/symbols/food/drinkingtap.svg

* adjust launch config to correct module name

- remaning from wahoo_mc to mahoomc was via #117

* vtm device theme adjustments

- make highways smaller on bolt (because they are black)
- who drinking_water on the same zoom-level as bakeries

* adjust gitignore for osmfilter files

* adjust copyFiles script

* README: add POI pictures

Co-authored-by: zenziwerken <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants