[bookmarks][pykmlib] Support invalid altitude in tracks.

mapsme · Mar 12, 2020 · 58b8af8 · 58b8af8
1 parent 51e7959
commit 58b8af8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/kml/pykmlib/bindings.cpp b/kml/pykmlib/bindings.cpp
@@ -679,6 +679,7 @@ std::string IndexToClassificatorType(uint32_t index)
 BOOST_PYTHON_MODULE(pykmlib)
 {
   scope().attr("__version__") = PYBINDINGS_VERSION;
+  scope().attr("invalid_altitude") = geometry::kInvalidAltitude;
   register_exception_translator<std::runtime_error>(&TranslateRuntimeError);
   TimestampConverter();
   LatLonConverter();

diff --git a/kml/pykmlib/bindings_test.py b/kml/pykmlib/bindings_test.py
@@ -79,7 +79,7 @@ def test_smoke(self):
         pt2.set_altitude(110)
         pt3 = pykmlib.PointWithAltitude()
         pt3.set_point(pykmlib.LatLon(45.1964, 56.9832))
-        pt3.set_altitude(120)
+        pt3.set_altitude(pykmlib.invalid_altitude)
         track.points_with_altitudes.set_list([pt1, pt2, pt3])
         track.visible = True
         track.nearest_toponyms.set_list(['12345', '54321', '98765'])

diff --git a/kml/serdes.cpp b/kml/serdes.cpp
@@ -78,7 +78,9 @@ std::string PointToString(m2::PointD const & org)
 
 std::string PointToString(geometry::PointWithAltitude const & pt)
 {
-  return PointToString(pt.GetPoint()) + "," + strings::to_string(pt.GetAltitude());
+  if (pt.GetAltitude() != geometry::kInvalidAltitude)
+    return PointToString(pt.GetPoint()) + "," + strings::to_string(pt.GetAltitude());
+  return PointToString(pt.GetPoint());
 }
 
 std::string GetLocalizableString(LocalizableString const & s, int8_t lang)
@@ -549,7 +551,7 @@ bool ParsePoint(std::string const & s, char const * delim, m2::PointD & pt)
 bool ParsePointWithAltitude(std::string const & s, char const * delim,
                             geometry::PointWithAltitude & point)
 {
-  geometry::Altitude altitude = geometry::kDefaultAltitudeMeters;
+  geometry::Altitude altitude = geometry::kInvalidAltitude;
   m2::PointD pt;
   auto result = ParsePoint(s, delim, pt, altitude);
   point.SetPoint(std::move(pt));