mvglasow
|
38e98df6cc
|
Merge commit '05cc660641' into traffic
# Conflicts:
# CMakeLists.txt
# android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
# android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.hpp
# android/sdk/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp
# android/sdk/src/main/cpp/app/organicmaps/sdk/util/Config.cpp
# libs/indexer/data_source.hpp
# libs/indexer/feature.hpp
# libs/indexer/ftypes_matcher.hpp
# libs/map/framework.cpp
# libs/map/traffic_manager.cpp
# libs/routing/absent_regions_finder.cpp
# libs/routing/edge_estimator.hpp
# libs/routing/index_router.cpp
# libs/routing/index_router.hpp
# libs/routing/routing_session.hpp
# libs/routing_common/num_mwm_id.hpp
# libs/traffic/traffic_info.cpp
# qt/mainwindow.hpp
# qt/preferences_dialog.cpp
# tools/openlr/helpers.hpp
# tools/openlr/openlr_decoder.cpp
# tools/openlr/openlr_decoder.hpp
# tools/openlr/openlr_stat/openlr_stat.cpp
# tools/openlr/router.hpp
# tools/openlr/score_candidate_paths_getter.cpp
# tools/openlr/score_candidate_paths_getter.hpp
# xcode/CoMaps.xcworkspace/contents.xcworkspacedata
|
2025-09-10 21:22:40 +03:00 |
|
Viktor Govako
|
b85c11ea5a
|
[feature] Added RouteRelation and linked it with FeatureType.
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
|
2025-08-23 08:32:06 +02:00 |
|
Henry Sternberg
|
c59b63d784
|
[routing] OSM tag based time and turn penalties
Signed-off-by: Henry Sternberg <dev@bluelightmaps.com>
Co-Authored-By: eisa01 <eisa01@gmail.com>
Co-Authored-By: x7z4w <x7z4w@noreply.codeberg.org>
Co-Authored-By: Yannik Bloscheck <git@yannikbloscheck.com>
|
2025-08-17 19:40:00 +02:00 |
|
mvglasow
|
0106dc3fe5
|
[traffic] Remove unused constants
Signed-off-by: mvglasow <michael -at- vonglasow.com>
|
2025-07-29 20:39:05 +03:00 |
|
Konstantin Pastbin
|
e3e4a1985a
|
Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)
To expand with full Organic Maps and Maps.ME commits history run:
git remote add om-historic [om-historic.git repo url]
git fetch --tags om-historic
git replace squashed-history historic-commits
|
2025-05-08 21:10:51 +07:00 |
|