Gpx wpt mappoints #452
Gpx wpt mappoints #452
Conversation
Store waypoints from GPX files' <wpt> tags into MapPoints, while track points remain in MapPath.
In addition to path from getMapPath(), get wpoints from getMapPoints() and plot them on the marker layer. Somehow the for loop `wpoints_loop` tends to continue infinitely, forcing stop with `break wpoints_loop` for now.
For testing displaying wpt markers on the gallery map
For testing of wpt markers from GPX file
| @@ -92,3 +109,8 @@ export interface MapPath { | |||
| lat: number; | |||
| lng: number; | |||
| } | |||
|
|
|||
| export interface MapPoints { | |||
There was a problem hiding this comment.
You can reuse the interface above. Maybe refactor it to something like MapCoordinates.
| @@ -387,14 +387,32 @@ export class GalleryMapLightboxComponent implements OnChanges { | |||
| for (let i = 0; i < this.gpxFiles.length; i++) { | |||
| const file = this.gpxFiles[i]; | |||
| const path = await this.mapService.getMapPath(file); | |||
| const wpoints = await this.mapService.getMapPoints(file); | |||
There was a problem hiding this comment.
I would add the code from getMapPoints to getMapPath, as both functions do a network call and that is wasteful (probably the browser would serve the second call from cache, but still). Also the two function has some common code. You can rename the function to something more generic.
There was a problem hiding this comment.
Ok, I've made it a single getMapCoordinates[][] instead, which returns the array of arrays coordinates = [path,wpoints] - so there's only one network call to the GPX file, but 2 calls to getElementsByTagName in getMapCoordinates(). I hope that's good enough :)
There was a problem hiding this comment.
That is perfect, thank you.
Added argument tagname to getMapCoordinates() to accept 'trkpt' or 'wpt'; replaced interfaces MapPoints and MapPath with MapCoordinates.
Passing 'trkpt' or 'wpt' to getMapCoordinates() to handle both paths and waypoints from GPX files.
Retrieve directly [path,wpoints] from getMapCoordinates[][]
Removed input parameter tagname, hardcoded instead the array tagnames=['trkpt,'wpt'] , and iterated through this array to get elements from the XML file at once and gather them in coordinates[ ] = [ track_path_points[ ], wpoints_points[ ] ].
| if (file !== this.gpxFiles[i]) { // check race condition | ||
| return; | ||
| } | ||
| if (path.length === 0) { | ||
| continue; | ||
| if (path.length !== 0) { |
There was a problem hiding this comment.
Can you clean up this part a bit? removing unnecessary comments, etc. Otherwise this PR looks good.
Removed unnecessary comments; replaced `break wpoints_loop` with `continue wpoints_loop` which caused infinite loops, let's see if it still happens and if I can fix it...
|
Thank you! |
|
Aaaah sorry, I did not realize that the PR was automatically updated with my last commit! It wasn't ready, the infinite loop is back! I just committed a real fix in cd541e3, shall I make a new PR for this? |
|
Ah it's okay. I might have refactored the code a bit. (Sorry about that :/ ). It will take a while until it hits nightly as I messed up the CI pipeline. |
No description provided.