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

[Draft] [gpx] Add gpx import #5166

Merged
merged 19 commits into from
Jun 4, 2023
Merged

[Draft] [gpx] Add gpx import #5166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
540e30d
[gpx][ios] Add GPX to OMaps.plist
dvdmrtnz Dec 10, 2022
e621fff
[gpx][android] Add GPX to AndroidManifest.xml
dvdmrtnz Dec 31, 2022
c61a31c
[gpx] Add serdes_gpx
dvdmrtnz Dec 31, 2022
bdb5d8b
[gpx] Add GPX to bookmark_helpers
dvdmrtnz Dec 31, 2022
8e1a025
[gpx][android] Add GPX to Framework.cpp
dvdmrtnz Dec 31, 2022
b3b318b
[gpx] Add GPX test
dvdmrtnz Dec 18, 2022
41371eb
[android] Adjust gpx filter
cyber-toad Apr 10, 2023
9704c79
[gpx] Update test and manifest
cyber-toad May 15, 2023
9024308
[gpx] Apply code-review suggestions
cyber-toad May 16, 2023
dce8961
[gpx] Add basic parser tests for real gpx tracks
cyber-toad May 17, 2023
2bfd753
[gpx] Remove unused code, add test for waypoints only
cyber-toad May 18, 2023
d66ceee
[gpx] Support of gpx route (rte/rtept tag)
cyber-toad May 18, 2023
d7c53e6
[gpx] Rework parser to use string_view
cyber-toad May 21, 2023
e9bab03
[gpx] Remove unsupported parameters
cyber-toad May 21, 2023
b01f630
[gpx] Add support for <color> tag
cyber-toad May 23, 2023
ed8207a
[gpx] Fix name/description extraction
cyber-toad May 23, 2023
8843e70
[gpx] Implement code-review suggestions
cyber-toad May 28, 2023
a567e6e
[gpx] Extract track & category names from file name
cyber-toad May 29, 2023
89d7444
[gpx] Implement code-review suggestions
cyber-toad Jun 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions android/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,13 +584,17 @@
<data android:host="*"/>
<data android:mimeType="application/vnd.google-earth.kml+xml"/>
<data android:mimeType="application/vnd.google-earth.kmz"/>
<data android:mimeType="application/gpx"/>
<data android:mimeType="application/gpx+xml"/>
</intent-filter>

<intent-filter>
<action android:name="android.intent.action.SEND"/>
<category android:name="android.intent.category.DEFAULT"/>
<data android:mimeType="application/vnd.google-earth.kml+xml"/>
<data android:mimeType="application/vnd.google-earth.kmz"/>
<data android:mimeType="application/gpx"/>
<data android:mimeType="application/gpx+xml"/>
</intent-filter>

<intent-filter>
Expand All @@ -608,17 +612,31 @@
<data android:pathPattern="/.*\\..*\\..*\\.kmz" />
<data android:pathPattern="/.*\\..*\\..*\\..*\\.kmz" />
<data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\.kmz" />
<data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\.kmz" />
<data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\.kmz" />
<data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kmz" />
<data android:pathPattern="/.*\\.kml" />
<data android:pathPattern="/.*\\..*\\.kml" />
<data android:pathPattern="/.*\\..*\\..*\\.kml" />
<data android:pathPattern="/.*\\..*\\..*\\..*\\.kml" />
<data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\.kml" />
<data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\.kml" />
<data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\.kml" />
<data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kml" />
<!-- Old MAPS.ME binary format //-->
<data android:pathPattern="/.*\\.kmb" />
<data android:pathPattern="/.*\\..*\\.kmb" />
<data android:pathPattern="/.*\\..*\\..*\\.kmb" />
<data android:pathPattern="/.*\\..*\\..*\\..*\\.kmb" />
<data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\.kmb" />
<data android:pathPattern="/.*\\.gpx" />
<data android:pathPattern="/.*\\..*\\.gpx" />
<data android:pathPattern="/.*\\..*\\..*\\.gpx" />
<data android:pathPattern="/.*\\..*\\..*\\..*\\.gpx" />
<data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\.gpx" />
cyber-toad marked this conversation as resolved.
Show resolved Hide resolved
<data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\.gpx" />
<data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\.gpx" />
<data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.gpx" />
</intent-filter>
</activity>

Expand Down
2 changes: 1 addition & 1 deletion android/jni/app/organicmaps/Framework.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1089,7 +1089,7 @@ Java_app_organicmaps_Framework_nativeGetMovableFilesExts(JNIEnv * env, jclass)
JNIEXPORT jobjectArray JNICALL
Java_app_organicmaps_Framework_nativeGetBookmarksFilesExts(JNIEnv * env, jclass)
{
const vector<string> exts = { kKmzExtension, kKmlExtension, kKmbExtension };
const vector<string> exts = { kKmzExtension, kKmlExtension, kKmbExtension, kGpxExtension };
cyber-toad marked this conversation as resolved.
Show resolved Hide resolved
return jni::ToJavaStringArray(env, exts);
}

Expand Down
2 changes: 2 additions & 0 deletions android/src/app/organicmaps/bookmarks/data/BookmarkManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,8 @@ public void loadBookmarksFile(@NonNull String path, boolean isTemporaryFile)
else if (type.equalsIgnoreCase("kml+xml"))
return filename + ".kml";
}
if (mime.endsWith("gpx+xml") || mime.endsWith("gpx")) // match application/gpx, application/gpx+xml
return filename + ".gpx";
}

return null;
Expand Down
80 changes: 80 additions & 0 deletions data/gpx_test_data/color.gpx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
<?xml version="1.0" encoding="UTF-8"?>
<gpx xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.topografix.com/GPX/1/1" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd http://www.garmin.com/xmlschemas/GpxExtensions/v3 http://www.garmin.com/xmlschemas/GpxExtensionsv3.xsd http://www.garmin.com/xmlschemas/TrackPointExtension/v1 http://www.garmin.com/xmlschemas/TrackPointExtensionv1.xsd http://www.topografix.com/GPX/gpx_style/0/2 http://www.topografix.com/GPX/gpx_style/0/2/gpx_style.xsd" xmlns:gpxtpx="http://www.garmin.com/xmlschemas/TrackPointExtension/v1" xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" xmlns:gpx_style="http://www.topografix.com/GPX/gpx_style/0/2" version="1.1" creator="https://gpx.studio">
<metadata>
<name>new</name>
<author>
<name>gpx.studio</name>
cyber-toad marked this conversation as resolved.
Show resolved Hide resolved
<link href="https://gpx.studio"></link>
</author>
<desc>Short description</desc>
</metadata>
<trk>
<name>new red</name>
<desc>description 1</desc>
<type>Running</type>
<extensions>
<gpx_style:line>
<color>ff0000</color>
<opacity>0.7</opacity>
<weight>3</weight>
</gpx_style:line>
</extensions>
<trkseg>
<trkpt lat="48.208378" lon="16.374915">
<ele>184.8</ele>
<extensions>
<gpxtpx:TrackPointExtension>
<gpxtpx:Extensions>
<surface>asphalt</surface>
</gpxtpx:Extensions>
</gpxtpx:TrackPointExtension>
</extensions>
</trkpt>
<trkpt lat="48.208407" lon="16.374831">
<ele>184.8</ele>
<extensions>
<gpxtpx:TrackPointExtension>
<gpxtpx:Extensions>
<surface>asphalt</surface>
</gpxtpx:Extensions>
</gpxtpx:TrackPointExtension>
</extensions>
</trkpt>
</trkseg>
</trk>

<trk>
<name>new blue</name>
<desc>description 2</desc>
<type>Running</type>
<extensions>
<gpx_style:line>
<color>0000ff</color>
<opacity>0.7</opacity>
<weight>3</weight>
</gpx_style:line>
</extensions>
<trkseg>
<trkpt lat="58.208378" lon="26.374915">
<ele>184.8</ele>
<extensions>
<gpxtpx:TrackPointExtension>
<gpxtpx:Extensions>
<surface>asphalt</surface>
</gpxtpx:Extensions>
</gpxtpx:TrackPointExtension>
</extensions>
</trkpt>
<trkpt lat="58.208407" lon="26.374831">
<ele>184.8</ele>
<extensions>
<gpxtpx:TrackPointExtension>
<gpxtpx:Extensions>
<surface>asphalt</surface>
</gpxtpx:Extensions>
</gpxtpx:TrackPointExtension>
</extensions>
</trkpt>
</trkseg>
</trk>
</gpx>
15 changes: 15 additions & 0 deletions data/gpx_test_data/empty.gpx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<gpx version="1.1">
<metadata>
<name>new</name>
<time>2023-06-01T09:14:53.000Z</time>
</metadata>
<trk>
<name>empty 1</name>
<trkseg/>
</trk>
<trk>
<name>empty 2</name>
<trkseg/>
</trk>
</gpx>
24 changes: 24 additions & 0 deletions data/gpx_test_data/empty_names1.gpx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<gpx xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.topografix.com/GPX/1/1" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd http://www.garmin.com/xmlschemas/GpxExtensions/v3 http://www.garmin.com/xmlschemas/GpxExtensionsv3.xsd http://www.garmin.com/xmlschemas/TrackPointExtension/v1 http://www.garmin.com/xmlschemas/TrackPointExtensionv1.xsd http://www.topografix.com/GPX/gpx_style/0/2 http://www.topografix.com/GPX/gpx_style/0/2/gpx_style.xsd" xmlns:gpxtpx="http://www.garmin.com/xmlschemas/TrackPointExtension/v1" xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" xmlns:gpx_style="http://www.topografix.com/GPX/gpx_style/0/2" version="1.1" creator="https://gpx.studio">
<trk>
<trkseg>
<trkpt lat="48.208378" lon="16.374915">
<ele>184.8</ele>
</trkpt>
<trkpt lat="48.208407" lon="16.374831">
<ele>184.8</ele>
</trkpt>
</trkseg>
</trk>

<trk>
<trkseg>
<trkpt lat="58.208378" lon="26.374915">
<ele>184.8</ele>
</trkpt>
<trkpt lat="58.208407" lon="26.374831">
<ele>184.8</ele>
</trkpt>
</trkseg>
</trk>
</gpx>
13 changes: 13 additions & 0 deletions data/gpx_test_data/empty_names2.gpx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<gpx xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.topografix.com/GPX/1/1" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd http://www.garmin.com/xmlschemas/GpxExtensions/v3 http://www.garmin.com/xmlschemas/GpxExtensionsv3.xsd http://www.garmin.com/xmlschemas/TrackPointExtension/v1 http://www.garmin.com/xmlschemas/TrackPointExtensionv1.xsd http://www.topografix.com/GPX/gpx_style/0/2 http://www.topografix.com/GPX/gpx_style/0/2/gpx_style.xsd" xmlns:gpxtpx="http://www.garmin.com/xmlschemas/TrackPointExtension/v1" xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" xmlns:gpx_style="http://www.topografix.com/GPX/gpx_style/0/2" version="1.1" creator="https://gpx.studio">
<trk>
<trkseg>
<trkpt lat="48.208378" lon="16.374915">
<ele>184.8</ele>
</trkpt>
<trkpt lat="48.208407" lon="16.374831">
<ele>184.8</ele>
</trkpt>
</trkseg>
</trk>
</gpx>
Loading