Skip to content

Commit

Permalink
remove gpx reader support for probelmatic extensions. (#1198)
Browse files Browse the repository at this point in the history
1. groundspeak is generally used with gpx 1.0.  Our attempt to
support it with gpx 1.1 required schema violations.

2. opencaching.de no longer uses the geocache element.  Our
implementation required schema violations.
  • Loading branch information
tsteven4 authored Oct 27, 2023
1 parent 0b19dda commit e81ff8d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
1 change: 1 addition & 0 deletions gpx.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1033,6 +1033,7 @@ GpxFormat::qualifiedName() const
{"http://www.garmin.com/xmlschemas/GpxExtensions/v3", "gpxx"},
{"http://www.garmin.com/xmlschemas/TrackPointExtension/v1", "gpxtpx"},
{"http://www.groundspeak.com/cache/1/0", "groundspeak"},
{"http://www.groundspeak.com/cache/1/0/1", "groundspeak"},
{"http://humminbird.com", "h"}
};

Expand Down
8 changes: 1 addition & 7 deletions gpx.h
Original file line number Diff line number Diff line change
Expand Up @@ -326,9 +326,7 @@ class GpxFormat : public Format
{"/gpx/metadata/" name, {type, false}}

#define GEOTAG(type,name) \
{"/gpx/wpt/groundspeak:cache/groundspeak:" name, {type, true}}, \
{"/gpx/wpt/extensions/cache/" name, {type, true}}, \
{"/gpx/wpt/geocache/" name, {type, true}} /* opencaching.de */
{"/gpx/wpt/groundspeak:cache/groundspeak:" name, {type, true}}

#define GPXWPTTYPETAG(name,type,passthrough) \
{"/gpx/wpt/" name, {type, passthrough}}, \
Expand Down Expand Up @@ -366,18 +364,14 @@ class GpxFormat : public Format
GEOTAG(tt_cache_difficulty, "difficulty"),
GEOTAG(tt_cache_terrain, "terrain"),
GEOTAG(tt_cache_hint, "encoded_hints"),
GEOTAG(tt_cache_hint, "hints"), /* opencaching.de */
GEOTAG(tt_cache_desc_short, "short_description"),
GEOTAG(tt_cache_desc_long, "long_description"),
GEOTAG(tt_cache_placer, "owner"),
GEOTAG(tt_cache_favorite_points, "favorite_points"),
GEOTAG(tt_cache_personal_note, "personal_note"),
{"/gpx/wpt/groundspeak:cache/groundspeak:logs/groundspeak:log/groundspeak:log_wpt", {tt_cache_log_wpt, true}},
{"/gpx/wpt/extensions/cache/logs/log/log_wpt", {tt_cache_log_wpt, true}},
{"/gpx/wpt/groundspeak:cache/groundspeak:logs/groundspeak:log/groundspeak:type", {tt_cache_log_type, true}},
{"/gpx/wpt/extensions/cache/logs/log/type", {tt_cache_log_type, true}},
{"/gpx/wpt/groundspeak:cache/groundspeak:logs/groundspeak:log/groundspeak:date", {tt_cache_log_date, true}},
{"/gpx/wpt/extensions/cache/logs/log/date", {tt_cache_log_date, true}},

{"/gpx/wpt/extensions", {tt_wpt_extensions, false}},

Expand Down

0 comments on commit e81ff8d

Please sign in to comment.