Skip to content

fixes #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adam-ce merged 3 commits into from
Aug 13, 2025
Merged

fixes #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d24e881
update qml console
adam-ce Jul 6, 2025
717c5d3
fix #54 (fetching tiles in scheduler thread doesn't work on webassembly)
adam-ce Jul 6, 2025
960056f
fix handling of peaks with no ele (#166)
adam-ce Jul 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/alp_add_unittest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 0 additions & 4 deletions nucleus/map_label/setup.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions nucleus/picker/PickerManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 0 additions & 4 deletions nucleus/tile/setup.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down