Skip to content

Add FileIO support #5

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

Open
alhirzel wants to merge 2 commits into
base: master
Choose a base branch
from
+16 −11
Open

Add FileIO support #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5f8348
add support for loading via FileIO
alhirzel Jun 29, 2020
380bb61
whitespace
alhirzel Jun 29, 2020
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
1 change: 1 addition & 0 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ version = "0.1.0"

[deps]
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
LightXML = "9c8b4983-aa76-5018-a973-4c85ecc9e179"
TimeZones = "f269a46b-ccf7-5d73-abea-4c690281aa53"

Expand Down
26 changes: 15 additions & 11 deletions src/GPX.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ module GPX
using LightXML
using Dates
using TimeZones
using FileIO

import Base: push!, iterate, length, getindex

export GPXAuthor, GPXMetadata, GPXPoint,
export GPXAuthor, GPXMetadata, GPXPoint,
GPXTrackSegment, GPXDocument, GPXRoute
export read_gpx_file, parse_gpx_string
export new_track, new_track_segment, last_segment
Expand Down Expand Up @@ -45,7 +46,7 @@ The person or organization who created the GPX file.
struct GPXAuthor
name::String
email::String
link::String
link::String
end
function GPXAuthor(name; email="", link="")
GPXAuthor(name, email, link)
Expand Down Expand Up @@ -150,7 +151,7 @@ end
GPXDocument(metadata::GPXMetadata; tracks=GPXTracks(), namespaces=GPX_NS, version=GPX_VERSION, creator=GPX_CREATOR)

GPX documents contain a metadata header, followed by waypoints, routes, and tracks.
You can add your own elements to the extensions section of the GPX document.
You can add your own elements to the extensions section of the GPX document.
"""
struct GPXDocument
namespaces::Dict{String, String}
Expand All @@ -159,8 +160,8 @@ struct GPXDocument
creator::String
metadata::GPXMetadata

waypoints::Vector{GPXPoint}
routes::Vector{GPXRoute}
waypoints::Vector{GPXPoint}
routes::Vector{GPXRoute}
tracks::GPXTracks

function GPXDocument(metadata::GPXMetadata; tracks=GPXTracks(), namespaces=GPX_NS, version=GPX_VERSION, creator=GPX_CREATOR)
Expand All @@ -173,7 +174,7 @@ end
"""
new_track(gpx::GPXDocument) -> GPXTrack

Get a new track from a `GPXDocument`.
Get a new track from a `GPXDocument`.
"""
function new_track(gpx::GPXDocument)
return new_track(gpx.tracks)
Expand Down Expand Up @@ -212,7 +213,7 @@ end

"""
last_segment(gpx) -> GPXTrackSegment


"""
function last_segment(gpx::GPXDocument)
Expand All @@ -239,14 +240,14 @@ function LightXML.XMLDocument(gpx::GPXDocument)
end
set_attribute(xroot, "version", gpx.version)
set_attribute(xroot, "creator", gpx.creator)

x_metadata = new_child(xroot, "metadata")
x_metadata_name = new_child(x_metadata, "name")
add_text(x_metadata_name, gpx.metadata.name)
x_metadata_author = new_child(x_metadata, "author")
x_metadata_author_name = new_child(x_metadata_author, "name")
add_text(x_metadata_author_name, gpx.metadata.author.name)

for track in gpx.tracks
x_trk = new_child(xroot, "trk")
for segment in track.segments
Expand All @@ -271,7 +272,7 @@ function LightXML.XMLDocument(gpx::GPXDocument)
end
end
end

return xdoc
end

Expand All @@ -285,6 +286,9 @@ function read_gpx_file(fname)
return _parse_gpx(xdoc)
end

load(f::File{format"GPX"}) = read_gpx_file(filename(f))


"""
parse_gpx_string(s) -> GPXDocument

Expand All @@ -311,7 +315,7 @@ function _parse_gpx(xdoc::XMLDocument)
)

tracks = GPXTracks()

for x_gpx in child_elements(gpxs)
if name(x_gpx) == "trk"
track = new_track(tracks)
Expand Down