-
Notifications
You must be signed in to change notification settings - Fork 240
Track segments #310
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
Open
AlainKnaff
wants to merge
3
commits into
labexp:develop
Choose a base branch
from
AlainKnaff:track-segments
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Track segments #310
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
59 changes: 59 additions & 0 deletions
59
app/src/main/java/net/osmtracker/overlay/PathOverlays.java
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| package net.osmtracker.overlay; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| import org.osmdroid.views.MapView; | ||
| import org.osmdroid.views.overlay.PathOverlay; | ||
|
|
||
| import android.content.Context; | ||
|
|
||
| /** | ||
| * Collection of Overlays, useful to draw interrupted paths | ||
| */ | ||
| public class PathOverlays { | ||
| private int color; | ||
| private float width; | ||
| private Context ctx; | ||
| private MapView osmView; | ||
| private boolean havePoint; | ||
|
|
||
| private int curIdx=0; | ||
|
|
||
| private List<PathOverlay> paths = new ArrayList<PathOverlay>(); | ||
|
|
||
| private void addPath() { | ||
| PathOverlay path = new PathOverlay(color, width, ctx); | ||
| paths.add(path); | ||
| osmView.getOverlays().add(path); | ||
| } | ||
|
|
||
| public void clearPath() { | ||
| for(PathOverlay path : paths) | ||
| path.clearPath(); | ||
| curIdx=0; | ||
| } | ||
|
|
||
| public PathOverlays(int color, float width, | ||
| Context ctx, MapView osmView) { | ||
| this.color=color; | ||
| this.width=width; | ||
| this.ctx=ctx; | ||
| this.osmView = osmView; | ||
| addPath(); | ||
| havePoint=false; | ||
| } | ||
|
|
||
| public void addPoint(double lat, double lon) { | ||
| if(curIdx >= paths.size()) | ||
| addPath(); | ||
| paths.get(curIdx).addPoint(lat, lon); | ||
| havePoint=true; | ||
| } | ||
|
|
||
| public void nextSegment() { | ||
| if(havePoint) | ||
| curIdx++; | ||
| havePoint=false; | ||
| } | ||
| } |
This file contains hidden or 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Update documentation:
* v18: add TBL_TRACKPOINT.COL_NEW_SEGMENTThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for your feedback
You mean, every segment? Yes, that would be another way to represent multiple segments.
The way the my proposal currently works is that the first point of each segment has 1 (or true), and all the following ones are false again. In a way, it is the derivative of the segment number.
However, if you have a strong preference for the other way, I can change it. However, in that case, I'll apply this to my later pull request (#312, "Import a gpx file as a route to follow"), because there is some interdependence among both. Also, please note that I will be on the move until end of August, and might not get back to this until then.