diff --git a/cmake/alp_add_unittest.cmake b/cmake/alp_add_unittest.cmake index a2908947..1cdcbfaa 100644 --- a/cmake/alp_add_unittest.cmake +++ b/cmake/alp_add_unittest.cmake @@ -20,7 +20,7 @@ find_package(Qt6 REQUIRED COMPONENTS Test) if (NOT TARGET Catch2) alp_add_git_repository(catch2 URL https://github.com/catchorg/Catch2.git COMMITISH v3.5.1) endif() -alp_add_git_repository(qml_catch2_console URL https://github.com/AlpineMapsOrg/qml_catch2_console.git COMMITISH fcf6dafe6c95ac5b5436b0dfe634341c3a37513a DO_NOT_ADD_SUBPROJECT) +alp_add_git_repository(qml_catch2_console URL https://github.com/AlpineMapsOrg/qml_catch2_console.git COMMITISH 33430766f7f896db523b72c76c49eeb427ee9c63 DO_NOT_ADD_SUBPROJECT) if (EMSCRIPTEN AND ALP_ENABLE_THREADING) target_compile_options(Catch2 PRIVATE -pthread) diff --git a/nucleus/map_label/setup.h b/nucleus/map_label/setup.h index d770df18..8c0efc5b 100644 --- a/nucleus/map_label/setup.h +++ b/nucleus/map_label/setup.h @@ -73,12 +73,8 @@ SchedulerHolder scheduler(TileLoadServicePtr tile_service, const tile::utils::Aa Q_UNUSED(thread); #ifdef ALP_ENABLE_THREADING -#ifdef __EMSCRIPTEN__ // make request from main thread on webassembly due to QTBUG-109396 - tile_service->moveToThread(QCoreApplication::instance()->thread()); -#else if (thread) tile_service->moveToThread(thread); -#endif if (thread) scheduler->moveToThread(thread); #endif diff --git a/nucleus/picker/PickerManager.cpp b/nucleus/picker/PickerManager.cpp index 6d761662..69fd9411 100644 --- a/nucleus/picker/PickerManager.cpp +++ b/nucleus/picker/PickerManager.cpp @@ -72,6 +72,8 @@ void PickerManager::eval_pick(uint32_t value) for (const auto& key_value : poi->attributes.asKeyValueRange()) { picked.properties[key_value.first] = key_value.second; } + if (!picked.properties.contains("ele")) + picked.properties["ele"] = std::round(poi->lat_long_alt.z); picked.properties["type"] = to_string(poi->type); picked.properties["latitude"] = poi->lat_long_alt.x; picked.properties["longitude"] = poi->lat_long_alt.y; diff --git a/nucleus/tile/setup.h b/nucleus/tile/setup.h index 7a4432cb..3348a803 100644 --- a/nucleus/tile/setup.h +++ b/nucleus/tile/setup.h @@ -75,12 +75,8 @@ inline GeometrySchedulerHolder geometry_scheduler(TileLoadServicePtr tile_servic Q_UNUSED(thread); #ifdef ALP_ENABLE_THREADING -#ifdef __EMSCRIPTEN__ // make request from main thread on webassembly due to QTBUG-109396 - tile_service->moveToThread(QCoreApplication::instance()->thread()); -#else if (thread) tile_service->moveToThread(thread); -#endif if (thread) scheduler->moveToThread(thread); #endif