fastgpx 0.2.1__tar.gz → 0.3.0__tar.gz

{fastgpx-0.2.1 → fastgpx-0.3.0}/CMakeLists.txt

@@ -2,6 +2,14 @@ cmake_minimum_required(VERSION 3.30.2)
 
 project(fastgpx)
 
+if(NOT DEFINED FASTGPX_WARNINGS_AS_ERRORS)
+  set(FASTGPX_WARNINGS_AS_ERRORS "$ENV{FASTGPX_WARNINGS_AS_ERRORS}")
+endif()
+
+option(FASTGPX_WARNINGS_AS_ERRORS "Treat C++ warnings as errors" ${FASTGPX_WARNINGS_AS_ERRORS})
+
+message(STATUS "FASTGPX_WARNINGS_AS_ERRORS: ${FASTGPX_WARNINGS_AS_ERRORS}")
+
 # > The CTest module defines a BUILD_TESTING cache variable which defaults to true.
 # > It is used to decide whether the module calls enable_testing() or not, so the
 # > project does not have to make its own explicit call to enable_testing(). The

{fastgpx-0.2.1 → fastgpx-0.3.0}/Development.md

@@ -150,3 +150,7 @@ build\src\cpp\RelWithDebInfo\fastgpx_test.exe
 ```sh
 build\src\cpp\RelWithDebInfo\fastgpx_test.exe [!benchmark]
 ```
+
+## VSCode / CMake
+
+Building directly with CMake require pybind11 installed. Currently this is defined as a build tool dependency in `pyproject.toml` and will therefore have to be manually installed into the `.venv` using `pip install pybind11`.

{fastgpx-0.2.1 → fastgpx-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastgpx
-Version: 0.2.1
+Version: 0.3.0
 Summary: An experimental Python library for parsing GPX files fast.
 Keywords: gpx,parser,fast
 Author: Thomas Thomassen
@@ -45,6 +45,19 @@ for track in gpx.tracks:
 
 [Documentation](https://thomthom.github.io/fastgpx/)
 
+## Requirements
+
+* Python 3.11+ (Tested with 3.11, 3.12)
+* C++23 Compiler
+
+### Windows
+
+* Tested with MSVC 17.12.4+ and Clang-cl 19+.
+
+### Linux (Tested on Ubuntu)
+
+* C++23 compatible runtime (GCC libstdc++ 14+ or Clang libc++ 18.1+)
+
 ## GPX/XML Performance (Background)
 
 `gpxpy` appear to be the most popular GPX library for Python.

{fastgpx-0.2.1 → fastgpx-0.3.0}/README.md

@@ -28,6 +28,19 @@ for track in gpx.tracks:
 
 [Documentation](https://thomthom.github.io/fastgpx/)
 
+## Requirements
+
+* Python 3.11+ (Tested with 3.11, 3.12)
+* C++23 Compiler
+
+### Windows
+
+* Tested with MSVC 17.12.4+ and Clang-cl 19+.
+
+### Linux (Tested on Ubuntu)
+
+* C++23 compatible runtime (GCC libstdc++ 14+ or Clang libc++ 18.1+)
+
 ## GPX/XML Performance (Background)
 
 `gpxpy` appear to be the most popular GPX library for Python.

{fastgpx-0.2.1 → fastgpx-0.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "fastgpx"
-version = "0.2.1"
+version = "0.3.0"
 requires-python = ">=3.11"
 
 description = "An experimental Python library for parsing GPX files fast."

{fastgpx-0.2.1 → fastgpx-0.3.0}/src/cpp/CMakeLists.txt

@@ -40,12 +40,16 @@ function(set_common_properties TARGET)
     # Elevate warning level.
     # Ignore unknown pragmas (mac).
     target_compile_options(${TARGET} PRIVATE
-        /W4 /WX
+        /W4
         /wd4068
     )
+    if(FASTGPX_WARNINGS_AS_ERRORS)
+      target_compile_options(${TARGET} PRIVATE /WX)
+    endif()
 
     if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-      # Clang pretending to be MSVC – add Clang-specific warnings
+      # Clang pretending to be MSVC – add Clang-specific warnings what /W4 does
+      # not cover.
       target_compile_options(${TARGET} PRIVATE
           -Wshadow -Wconversion
           -Wno-unknown-pragmas
@@ -59,14 +63,18 @@ function(set_common_properties TARGET)
     # Ensure MSVC report up to date version for __cplusplus macro.
     # https://docs.microsoft.com/en-us/cpp/build/reference/zc-cplusplus?view=msvc-160
     target_compile_options(${TARGET} PRIVATE /Zc:__cplusplus)
+
   else()
     # Elevate warning level.
     # Ignore unknown pragmas (win).
     target_compile_options(${TARGET} PRIVATE
-        -Wall -Wextra -pedantic -Werror
+        -Wall -Wextra -pedantic
         -Wshadow -Wconversion
         -Wno-unknown-pragmas
     )
+    if(FASTGPX_WARNINGS_AS_ERRORS)
+      target_compile_options(${TARGET} PRIVATE -Werror)
+    endif()
   endif()
 endfunction()
 

{fastgpx-0.2.1 → fastgpx-0.3.0}/src/cpp/fastgpx/fastgpx.cpp

@@ -43,10 +43,14 @@ std::chrono::system_clock::time_point TimePoint::value() const
 
 bool TimeBounds::IsEmpty() const
 {
-  assert(start_time.has_value() == end_time.has_value());
   return !start_time.has_value() && !end_time.has_value();
 }
 
+bool TimeBounds::IsRange() const
+{
+  return start_time.has_value() && end_time.has_value();
+}
+
 void TimeBounds::Add(const std::chrono::system_clock::time_point time_point)
 {
   if (start_time.has_value())

{fastgpx-0.2.1 → fastgpx-0.3.0}/src/cpp/fastgpx/fastgpx.hpp

@@ -28,6 +28,7 @@ struct TimeBounds
   std::optional<std::chrono::system_clock::time_point> end_time = std::nullopt;
 
   bool IsEmpty() const;
+  bool IsRange() const;
 
   void Add(std::chrono::system_clock::time_point time_point);
   void Add(const TimeBounds& time_bounds);

{fastgpx-0.2.1 → fastgpx-0.3.0}/src/cpp/fastgpx/polyline.cpp

@@ -12,7 +12,7 @@ namespace polyline {
 std::string encode(std::span<const LatLong> locations, Precision precision)
 {
   const int factor = (precision == Precision::Six) ? 1'000'000 : 100'000;
-  std::string encoded;
+  std::string encoded_polyline;
   int last_lat = 0;
   int last_lng = 0;
 
@@ -25,25 +25,25 @@ std::string encode(std::span<const LatLong> locations, Precision precision)
     const int delta_lng = lng - last_lng;
 
     auto encode_value = [](int value) -> std::string {
-      std::string encoded;
+      std::string encoded_latlong;
       value = (value < 0) ? ~(value << 1) : (value << 1);
       while (value >= 0x20)
       {
-        encoded += static_cast<char>((0x20 | (value & 0x1f)) + 63);
+        encoded_latlong += static_cast<char>((0x20 | (value & 0x1f)) + 63);
         value >>= 5;
       }
-      encoded += static_cast<char>(value + 63);
-      return encoded;
+      encoded_latlong += static_cast<char>(value + 63);
+      return encoded_latlong;
     };
 
-    encoded += encode_value(delta_lat);
-    encoded += encode_value(delta_lng);
+    encoded_polyline += encode_value(delta_lat);
+    encoded_polyline += encode_value(delta_lng);
 
     last_lat = lat;
     last_lng = lng;
   }
 
-  return encoded;
+  return encoded_polyline;
 }
 
 std::vector<LatLong> decode(std::string_view encoded, Precision precision)

{fastgpx-0.2.1 → fastgpx-0.3.0}/src/cpp/python_fastgpx.cpp

@@ -53,7 +53,13 @@ PYBIND11_MODULE(fastgpx, m)
            py::arg("end_time"))
       .def_readwrite("start_time", &fastgpx::TimeBounds::start_time)
       .def_readwrite("end_time", &fastgpx::TimeBounds::end_time)
-      .def("is_empty", &fastgpx::TimeBounds::IsEmpty);
+      .def("is_empty", &fastgpx::TimeBounds::IsEmpty)
+      .def("is_range", &fastgpx::TimeBounds::IsRange)
+      .def("add",
+           py::overload_cast<std::chrono::system_clock::time_point>(&fastgpx::TimeBounds::Add),
+           py::arg("datetime"))
+      .def("add", py::overload_cast<const fastgpx::TimeBounds&>(&fastgpx::TimeBounds::Add),
+           py::arg("timebounds"));
 
   py::class_<fastgpx::LatLong>(m, "LatLong")
       .def(py::init<>())

{fastgpx-0.2.1 → fastgpx-0.3.0}/src/cpp/python_utc_chrono.hpp

@@ -27,6 +27,15 @@
 namespace PYBIND11_NAMESPACE {
 namespace detail {
 
+inline std::time_t to_utc_time_t(std::tm* tm)
+{
+#if defined(_WIN32)
+  return _mkgmtime(tm);
+#else
+  return timegm(tm);
+#endif
+}
+
 template<typename type>
 class duration_caster
 {
@@ -195,7 +204,10 @@ public:
       return false;
     }
 
-    value = time_point_cast<Duration>(system_clock::from_time_t(std::mktime(&cal)) + msecs);
+    // HACK: Assume datetime.datetime objects are in UTC, so we use timegm instead of mktime.
+    // value = time_point_cast<Duration>(system_clock::from_time_t(std::mktime(&cal)) + msecs);
+    std::time_t tt = to_utc_time_t(&cal);
+    value = time_point_cast<Duration>(system_clock::from_time_t(tt) + msecs);
     return true;
   }
 

{fastgpx-0.2.1 → fastgpx-0.3.0}/src/fastgpx/__init__.pyi

@@ -9,4 +9,4 @@ from fastgpx.fastgpx import geo
 from fastgpx.fastgpx import parse
 from fastgpx.fastgpx import polyline
 from . import fastgpx
-__all__ = ['Bounds', 'Gpx', 'LatLong', 'Segment', 'TimeBounds', 'Track', 'fastgpx', 'geo', 'parse', 'polyline']
+__all__: list = ['Bounds', 'Gpx', 'LatLong', 'Segment', 'TimeBounds', 'Track', 'geo', 'parse', 'polyline']

{fastgpx-0.2.1 → fastgpx-0.3.0}/src/fastgpx/fastgpx/__init__.pyi

@@ -101,8 +101,16 @@ class TimeBounds:
     @typing.overload
     def __init__(self, start_time: datetime.datetime | None, end_time: datetime.datetime | None) -> None:
         ...
+    @typing.overload
+    def add(self, datetime: datetime.datetime) -> None:
+        ...
+    @typing.overload
+    def add(self, timebounds: TimeBounds) -> None:
+        ...
     def is_empty(self) -> bool:
         ...
+    def is_range(self) -> bool:
+        ...
 class Track:
     comment: str | None
     description: str | None

{fastgpx-0.2.1 → fastgpx-0.3.0}/tests/test_fastgpx.py

@@ -1,7 +1,6 @@
 import datetime
 
 import gpxpy
-import gpxpy.gpx
 import pytest
 
 import fastgpx

fastgpx-0.3.0/tests/test_time_bounds.py

@@ -0,0 +1,73 @@
+from datetime import datetime
+
+import fastgpx
+
+
+class TestTimeBounds:
+
+    def test_init_defaults(self):
+        bounds = fastgpx.TimeBounds()
+        assert bounds.is_empty()
+        assert not bounds.is_range()
+        assert bounds.start_time is None
+        assert bounds.end_time is None
+
+    def test_init_with_start_time(self):
+        start_time = datetime.fromisoformat("2025-06-20 08:07:28+00:00")
+        bounds = fastgpx.TimeBounds(start_time=start_time, end_time=None)
+        assert not bounds.is_empty()
+        assert not bounds.is_range()
+        assert bounds.start_time == start_time
+        assert bounds.end_time is None
+
+    def test_init_with_end_time(self):
+        end_time = datetime.fromisoformat("2025-06-27 13:37:00+00:00")
+        bounds = fastgpx.TimeBounds(start_time=None, end_time=end_time)
+        assert not bounds.is_empty()
+        assert not bounds.is_range()
+        assert bounds.start_time is None
+        assert bounds.end_time == end_time
+
+    def test_init_with_start_and_end_time(self):
+        start_time = datetime.fromisoformat("2025-06-20 08:07:28+00:00")
+        end_time = datetime.fromisoformat("2025-06-27 13:37:00+00:00")
+        bounds = fastgpx.TimeBounds(start_time=start_time, end_time=end_time)
+        assert not bounds.is_empty()
+        assert bounds.is_range()
+        assert bounds.start_time == start_time
+        assert bounds.end_time == end_time
+
+    def test_add_single_time_point(self):
+        bounds = fastgpx.TimeBounds()
+        time_point = datetime.fromisoformat("2025-06-20 08:07:28+00:00")
+        bounds.add(time_point)
+        assert not bounds.is_empty()
+        assert bounds.is_range()
+        assert bounds.start_time == time_point
+        assert bounds.end_time == time_point
+
+    def test_add_second_time_point(self):
+        bounds = fastgpx.TimeBounds()
+        time_point1 = datetime.fromisoformat("2025-06-20 08:07:28+00:00")
+        time_point2 = datetime.fromisoformat("2025-06-27 13:37:00+00:00")
+        bounds.add(time_point1)
+        bounds.add(time_point2)
+        assert not bounds.is_empty()
+        assert bounds.is_range()
+        assert bounds.start_time == time_point1
+        assert bounds.end_time == time_point2
+
+    def test_add_time_bounds(self):
+        bounds1 = fastgpx.TimeBounds(
+            start_time=datetime.fromisoformat("2025-06-20 08:07:28+00:00"),
+            end_time=datetime.fromisoformat("2025-06-27 13:37:00+00:00")
+        )
+        bounds2 = fastgpx.TimeBounds(
+            start_time=datetime.fromisoformat("2025-06-25 10:00:00+00:00"),
+            end_time=datetime.fromisoformat("2025-06-30 15:00:00+00:00")
+        )
+        bounds1.add(bounds2)
+        assert not bounds1.is_empty()
+        assert bounds1.is_range()
+        assert bounds1.start_time == bounds1.start_time
+        assert bounds1.end_time == bounds2.end_time

{fastgpx-0.2.1 → fastgpx-0.3.0}/uv.lock

@@ -97,7 +97,7 @@ wheels = [
 
 [[package]]
 name = "fastgpx"
-version = "0.0.1.dev0"
+version = "0.3.0"
 source = { editable = "." }
 
 [package.dev-dependencies]