fix std::array (#4)

* stl

* fix std::array<double, 2>

* fix version

* not good

---------

Co-authored-by: TANG ZHIXIONG <zhixiong.tang@momenta.ai>

CMakeLists.txt

@@ -5,6 +5,20 @@ project(
   VERSION ${SKBUILD_PROJECT_VERSION}
   LANGUAGES CXX)
 
+if(NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL "")
+    set(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)
+    message(STATUS "Set build type to default: ${CMAKE_BUILD_TYPE}")
+else()
+    message(STATUS "Your build type: ${CMAKE_BUILD_TYPE}")
+endif()
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -ggdb")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -ggdb")
+elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
+endif()
+
 find_package(Python REQUIRED COMPONENTS Interpreter Development.Module)
 find_package(pybind11 CONFIG REQUIRED)
 

docs/conf.py

@@ -58,9 +58,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.1.0'
+version = '0.1.1'
 # The full version, including alpha/beta/rc tags.
-release = '0.1.0'
+release = '0.1.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "pybind11_coordtransform"
-version = "0.1.0"
+version = "0.1.1"
 description="c++/python version of coordtransform"
 readme = "README.md"
 authors = [

src/main.cpp

@@ -42,7 +42,7 @@ inline bool out_of_china(double lng, double lat)
     return !(73.66 < lng && lng < 135.05 && 3.86 < lat && lat < 53.55);
 }
 
-inline std::array<double, 2> bd09togcj02(double bd_lng, double bd_lat)
+inline Eigen::Vector2d bd09togcj02(double bd_lng, double bd_lat)
 {
     double x = bd_lng - 0.0065;
     double y = bd_lat - 0.006;
@@ -53,7 +53,7 @@ inline std::array<double, 2> bd09togcj02(double bd_lng, double bd_lat)
     return {gg_lng, gg_lat};
 }
 
-inline std::array<double, 2> gcj02tobd09(double lng, double lat)
+inline Eigen::Vector2d gcj02tobd09(double lng, double lat)
 {
     double z =
         std::sqrt(lng * lng + lat * lat) + 0.00002 * std::sin(lat * x_PI);
@@ -63,8 +63,8 @@ inline std::array<double, 2> gcj02tobd09(double lng, double lat)
     return {bd_lng, bd_lat};
 }
 
-inline std::array<double, 2> wgs84togcj02(double lng, double lat,
-                                          bool check_output_china = true)
+inline Eigen::Vector2d wgs84togcj02(double lng, double lat,
+                                    bool check_output_china = true)
 {
     if (check_output_china && out_of_china(lng, lat)) {
         return {lng, lat};
@@ -82,8 +82,8 @@ inline std::array<double, 2> wgs84togcj02(double lng, double lat,
     return {mglng, mglat};
 }
 
-inline std::array<double, 2> gcj02towgs84(double lng, double lat,
-                                          bool check_output_china = true)
+inline Eigen::Vector2d gcj02towgs84(double lng, double lat,
+                                    bool check_output_china = true)
 {
     if (check_output_china && out_of_china(lng, lat)) {
         return {lng, lat};

tests/test_basic.py

@@ -4,4 +4,4 @@
 
 
 def test_version():
-    assert m.__version__ == "0.1.0"
+    assert m.__version__ == "0.1.1"