From e52f23795d130e3a6f19c39d90c61a707c3de46e Mon Sep 17 00:00:00 2001 From: zmiao Date: Tue, 10 Mar 2020 00:01:34 +0200 Subject: [core] Introduce distance expression Add distance unit choices Fix cmake and add license Add support for LineString Features Add template to geometry helper function Only support line and point Rename geometry_within.cpp hpp file to geometry_util.cpp .hpp Remove incorrect indexFilter, fix pointSetsDistance Fix distance expression --- CMakeLists.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 583c3df593..6232c7df1a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -177,6 +177,7 @@ add_library( ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/comparison.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/compound_expression.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/dsl.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/distance.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/error.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/expression.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/find_zoom_curve.hpp @@ -569,6 +570,7 @@ add_library( ${PROJECT_SOURCE_DIR}/src/mbgl/style/expression/collator_expression.cpp ${PROJECT_SOURCE_DIR}/src/mbgl/style/expression/comparison.cpp ${PROJECT_SOURCE_DIR}/src/mbgl/style/expression/compound_expression.cpp + ${PROJECT_SOURCE_DIR}/src/mbgl/style/expression/distance.cpp ${PROJECT_SOURCE_DIR}/src/mbgl/style/expression/dsl.cpp ${PROJECT_SOURCE_DIR}/src/mbgl/style/expression/dsl_impl.hpp ${PROJECT_SOURCE_DIR}/src/mbgl/style/expression/expression.cpp @@ -758,8 +760,8 @@ add_library( ${PROJECT_SOURCE_DIR}/src/mbgl/util/font_stack.cpp ${PROJECT_SOURCE_DIR}/src/mbgl/util/geo.cpp ${PROJECT_SOURCE_DIR}/src/mbgl/util/geojson_impl.cpp - ${PROJECT_SOURCE_DIR}/src/mbgl/util/geometry_within.cpp - ${PROJECT_SOURCE_DIR}/src/mbgl/util/geometry_within.hpp + ${PROJECT_SOURCE_DIR}/src/mbgl/util/geometry_util.cpp + ${PROJECT_SOURCE_DIR}/src/mbgl/util/geometry_util.hpp ${PROJECT_SOURCE_DIR}/src/mbgl/util/grid_index.cpp ${PROJECT_SOURCE_DIR}/src/mbgl/util/grid_index.hpp ${PROJECT_SOURCE_DIR}/src/mbgl/util/hash.hpp @@ -974,6 +976,7 @@ target_link_libraries( Mapbox::Base::supercluster.hpp Mapbox::Base::shelf-pack-cpp Mapbox::Base::geojson-vt-cpp + Mapbox::Base::cheap-ruler-cpp mbgl-compiler-options mbgl-vendor-boost mbgl-vendor-csscolorparser -- cgit v1.2.1