Merge remote-tracking branch 'upstream/main' into from_wkt

.github/workflows/run-tests.yaml

@@ -58,7 +58,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: paleolimbot/s2geography
-          ref: master
+          ref: main
           path: deps/s2geography
           fetch-depth: 0
         if: |

CMakeLists.txt

@@ -72,8 +72,9 @@ endif()
 # Build
 
 add_library(spherely MODULE
-  src/geography.cpp
   src/accessors-geog.cpp
+  src/creation.cpp
+  src/geography.cpp
   src/io.cpp
   src/predicates.cpp
   src/spherely.cpp

docs/api.rst

@@ -5,18 +5,6 @@ API reference
 
 .. currentmodule:: spherely
 
-.. _api_types:
-
-Geography types
----------------
-
-.. autosummary::
-   :toctree: _api_generated/
-
-   Point
-   LineString
-   Polygon
-
 .. _api_properties:
 
 Geography properties
@@ -38,6 +26,12 @@ Geography creation
 .. autosummary::
    :toctree: _api_generated/
 
+   point
+   linestring
+   multipoint
+   multilinestring
+   polygon
+   geography_collection
    is_prepared
    prepare
    destroy_prepared

src/accessors-geog.cpp

@@ -1,6 +1,8 @@
 #include <s2geography.h>
+#include <s2geography/geography.h>
 
 #include "constants.hpp"
+#include "creation.hpp"
 #include "geography.hpp"
 #include "pybind11.hpp"
 
@@ -11,24 +13,17 @@ using namespace spherely;
 PyObjectGeography centroid(PyObjectGeography a) {
     const auto& a_ptr = a.as_geog_ptr()->geog();
     auto s2_point = s2geog::s2_centroid(a_ptr);
-    std::unique_ptr<Point> point =
-        make_geography<s2geog::PointGeography, spherely::Point>(s2_point);
-    return PyObjectGeography::from_geog(std::move(point));
+    return make_py_geography<s2geog::PointGeography>(s2_point);
 }
 
 PyObjectGeography boundary(PyObjectGeography a) {
     const auto& a_ptr = a.as_geog_ptr()->geog();
-    auto s2_obj = s2geog::s2_boundary(a_ptr);
-    // TODO return specific subclass
-    auto geog_ptr = std::make_unique<spherely::Geography>(std::move(s2_obj));
-    return PyObjectGeography::from_geog(std::move(geog_ptr));
+    return make_py_geography(s2geog::s2_boundary(a_ptr));
 }
 
 PyObjectGeography convex_hull(PyObjectGeography a) {
     const auto& a_ptr = a.as_geog_ptr()->geog();
-    auto s2_obj = s2geog::s2_convex_hull(a_ptr);
-    auto geog_ptr = std::make_unique<spherely::Polygon>(std::move(s2_obj));
-    return PyObjectGeography::from_geog(std::move(geog_ptr));
+    return make_py_geography(s2geog::s2_convex_hull(a_ptr));
 }
 
 double distance(PyObjectGeography a, PyObjectGeography b, double radius = EARTH_RADIUS_METERS) {