organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

[gpx] Remove unsupported parameters

Browse source 
Signed-off-by: cyber-toad <the.cyber.toad@proton.me>
This commit is contained in:
cyber-toad 2023-05-21 11:22:37 +02:00
parent d7c53e64fa
commit e9bab037cf
2 changed files with 3 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
kml/serdes_gpx.cpp
View file

@ -31,7 +31,6 @@ std::string_view const kName = "name";
std::string_view const kDesc = "desc";
std::string PointToString(m2::PointD const & org)
{
double const lon = mercator::XToLon(org.x);
@ -48,7 +47,6 @@ std::string PointToString(m2::PointD const & org)
GpxParser::GpxParser(FileData & data)
: m_data(data)
, m_categoryData(&m_data.m_categoryData)
, m_attrCode(StringUtf8Multilang::kUnsupportedLanguageCode)
{
ResetPoint();
}
@ -59,26 +57,9 @@ void GpxParser::ResetPoint()
m_description.clear();
m_org = {};
m_predefinedColor = PredefinedColor::None;
m_viewportScale = 0;
m_timestamp = {};
m_color = 0;
m_styleId.clear();
m_mapStyleId.clear();
m_styleUrlKey.clear();
m_featureTypes.clear();
m_customName.clear();
m_boundTracks.clear();
m_visible = true;
m_nearestToponym.clear();
m_nearestToponyms.clear();
m_properties.clear();
m_localId = 0;
m_trackLayers.clear();
m_trackWidth = gpx::kDefaultTrackWidth;
m_icon = BookmarkIcon::None;
m_geometry.Clear();
m_geometryType = GEOMETRY_TYPE_UNKNOWN;
}
@ -90,7 +71,7 @@ bool GpxParser::MakeValid()
if (mercator::ValidX(m_org.x) && mercator::ValidY(m_org.y))
{
// Set default name.
if (m_name.empty() && m_featureTypes.empty())
if (m_name.empty())
m_name[gpx::kDefaultLang] = gpx::PointToString(m_org);
// Set default pin.
@ -178,22 +159,12 @@ void GpxParser::Pop(std::string_view const & tag)
data.m_description = std::move(m_description);
data.m_color.m_predefinedColor = m_predefinedColor;
data.m_color.m_rgba = m_color;
data.m_icon = m_icon;
data.m_viewportScale = m_viewportScale;
data.m_timestamp = m_timestamp;
data.m_point = m_org;
data.m_featureTypes = std::move(m_featureTypes);
data.m_customName = std::move(m_customName);
data.m_boundTracks = std::move(m_boundTracks);
data.m_visible = m_visible;
data.m_nearestToponym = std::move(m_nearestToponym);
data.m_minZoom = m_minZoom;
data.m_properties = std::move(m_properties);
data.m_compilations = std::move(m_compilations);
// Here we set custom name from 'name' field for KML-files exported from 3rd-party services.
if (data.m_name.size() == 1 && data.m_name.begin()->first == kDefaultLangCode &&
data.m_customName.empty() && data.m_featureTypes.empty())
data.m_customName.empty())
{
data.m_customName = data.m_name;
}
@ -203,15 +174,10 @@ void GpxParser::Pop(std::string_view const & tag)
else if (GEOMETRY_TYPE_LINE == m_geometryType)
{
TrackData data;
data.m_localId = m_localId;
data.m_name = std::move(m_name);
data.m_description = std::move(m_description);
data.m_layers = std::move(m_trackLayers);
data.m_timestamp = m_timestamp;
data.m_geometry = std::move(m_geometry);
data.m_visible = m_visible;
data.m_nearestToponyms = std::move(m_nearestToponyms);
data.m_properties = std::move(m_properties);
m_data.m_tracksData.push_back(std::move(data));
}
}

24
kml/serdes_gpx.hpp
View file

@ -57,42 +57,18 @@ private:
GeometryType m_geometryType;
MultiGeometry m_geometry;
uint32_t m_color;
std::string m_styleId;
std::string m_mapStyleId;
std::string m_styleUrlKey;
std::map<std::string, uint32_t> m_styleUrl2Color;
std::map<std::string, double> m_styleUrl2Width;
std::map<std::string, std::string> m_mapStyle2Style;
int8_t m_attrCode;
std::string m_attrId;
std::string m_attrKey;
LocalizableString m_name;
LocalizableString m_description;
PredefinedColor m_predefinedColor;
Timestamp m_timestamp;
m2::PointD m_org;
double m_lat;
double m_lon;
MultiGeometry::LineT m_line;
uint8_t m_viewportScale;
std::vector<uint32_t> m_featureTypes;
LocalizableString m_customName;
std::vector<LocalId> m_boundTracks;
LocalId m_localId;
BookmarkIcon m_icon;
std::vector<TrackLayer> m_trackLayers;
bool m_visible;
std::string m_nearestToponym;
std::vector<std::string> m_nearestToponyms;
int m_minZoom = 1;
kml::Properties m_properties;
std::vector<CompilationId> m_compilations;
double m_trackWidth;
};
class DeserializerGpx