Merge commit '20c9fc5f' into traffic-2025072304

# Conflicts:
#	android/app/src/main/res/xml/prefs_main.xml
#	qt/CMakeLists.txt

qt/CMakeLists.txt

@@ -70,17 +70,18 @@ target_link_libraries(${PROJECT_NAME}
   qt_common
   map
   gflags::gflags
+  location_service
   traffxml
 )
 
 if (BUILD_DESIGNER)
   target_link_libraries(${PROJECT_NAME} generator)
-  set(BUNDLE_NAME "OMaps.Designer")
-  set(BUNDLE_DISPLAY_NAME "Organic Maps Designer")
+  set(BUNDLE_NAME "CoMaps.Designer")
+  set(BUNDLE_DISPLAY_NAME "CoMaps Designer")
   set(BUNDLE_ICON designer.icns)
 else()
-  set(BUNDLE_NAME "OMaps")
-  set(BUNDLE_DISPLAY_NAME "Organic Maps Desktop")
+  set(BUNDLE_NAME "CoMaps")
+  set(BUNDLE_DISPLAY_NAME "CoMaps Desktop")
   set(BUNDLE_ICON mac.icns)
 endif()
 
@@ -108,6 +109,7 @@ endfunction()
 
 copy_resources(
   countries-strings
+  fonts
   resources-default
   resources-mdpi_light
   resources-hdpi_light
@@ -125,41 +127,26 @@ copy_resources(
   countries.txt
   drules_proto_default_light.bin
   drules_proto_default_dark.bin
+  drules_proto_outdoors_light.bin
+  drules_proto_outdoors_dark.bin
   drules_proto_vehicle_light.bin
   drules_proto_vehicle_dark.bin
   editor.config
-  fonts_blacklist.txt
-  fonts_whitelist.txt
   packed_polygons.bin
   patterns.txt
   transit_colors.txt
   types.txt
-  unicode_blocks.txt
   World.mwm
   WorldCoasts.mwm
-
-  00_NotoNaskhArabic-Regular.ttf
-  00_NotoSansBengali-Regular.ttf
-  00_NotoSansHebrew-Regular.ttf
-  00_NotoSansMalayalam-Regular.ttf
-  00_NotoSansThai-Regular.ttf
-  00_NotoSerifDevanagari-Regular.ttf
-  01_dejavusans.ttf
-  02_droidsans-fallback.ttf
-  03_jomolhari-id-a3d.ttf
-  04_padauk.ttf
-  05_khmeros.ttf
-  06_code2000.ttf
-  07_roboto_medium.ttf
 )
 
 install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/)
-install(DIRECTORY ${OMIM_ROOT}/data DESTINATION ${CMAKE_INSTALL_PREFIX}/share/organicmaps/)
+install(DIRECTORY ${OMIM_ROOT}/data DESTINATION ${CMAKE_INSTALL_PREFIX}/share/comaps/)
 
 if (PLATFORM_LINUX)
-  install(FILES ${OMIM_ROOT}/packaging/app.organicmaps.desktop.metainfo.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo/)
-  install(FILES ${OMIM_ROOT}/qt/res/app.organicmaps.desktop.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications/)
-  install(FILES ${OMIM_ROOT}/qt/res/logo.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/512x512/apps/ RENAME organicmaps.png)
+  install(FILES ${OMIM_ROOT}/packaging/app.comaps.desktop.metainfo.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo/)
+  install(FILES ${OMIM_ROOT}/qt/res/app.comaps.desktop.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications/)
+  install(FILES ${OMIM_ROOT}/qt/res/logo.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/512x512/apps/ RENAME comaps.png)
 endif()
 
 if (NOT PLATFORM_LINUX)

qt/about.cpp

@@ -15,7 +15,8 @@
 #include <QtWidgets/QVBoxLayout>
 
 AboutDialog::AboutDialog(QWidget * parent)
-  : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
+  : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint |
+            Qt::WindowMaximizeButtonHint | Qt::WindowCloseButtonHint)
 {
   QIcon icon(":/ui/logo.png");
   setWindowIcon(icon);
@@ -64,4 +65,6 @@ AboutDialog::AboutDialog(QWidget * parent)
   }
   else
     setLayout(hBox);
+
+  adjustSize();
 }

qt/main.cpp

@@ -110,7 +110,7 @@ int main(int argc, char * argv[])
 
   Platform & platform = GetPlatform();
 
-  LOG(LINFO, ("Organic Maps", platform.Version(), "built with QT:", QT_VERSION_STR, "runtime QT:", qVersion(),
+  LOG(LINFO, ("CoMaps", platform.Version(), "built with QT:", QT_VERSION_STR, "runtime QT:", qVersion(),
     "detected CPU cores:", platform.CpuCores()));
 
   gflags::SetUsageMessage("Desktop application.");
@@ -133,14 +133,14 @@ int main(int argc, char * argv[])
   UNUSED_VALUE(mainGuard);
 
   QApplication app(argc, argv);
-  app.setDesktopFileName("app.organicmaps.desktop");
+  app.setDesktopFileName("app.comaps.desktop");
   platform.SetupMeasurementSystem();
 
 
 #ifdef BUILD_DESIGNER
-    QApplication::setApplicationName("Organic Maps Designer");
+    QApplication::setApplicationName("CoMaps Designer");
 #else
-    QApplication::setApplicationName("Organic Maps");
+    QApplication::setApplicationName("CoMaps");
 #endif
 
 
@@ -263,6 +263,6 @@ int main(int argc, char * argv[])
   }
 #endif // BUILD_DESIGNER
 
-  LOG_SHORT(LINFO, ("Organic Maps finished with code", returnCode));
+  LOG_SHORT(LINFO, ("Finished with code", returnCode));
   return returnCode;
 }

qt/mainwindow.cpp

@@ -648,7 +648,7 @@ void MainWindow::OnUploadEditsMenuItem()
   {
     auto & editor = osm::Editor::Instance();
     if (editor.HaveMapEditsOrNotesToUpload())
-      editor.UploadChanges(token, {{"created_by", "Organic Maps " OMIM_OS_NAME}});
+      editor.UploadChanges(token, {{"created_by", "CoMaps " OMIM_OS_NAME}});
   }
 }
 

qt/mainwindow.hpp

@@ -6,7 +6,7 @@
 #include "storage/storage_defines.hpp"
 
 #include "platform/location.hpp"
-#include "platform/location_service.hpp"
+#include "platform/location_service/location_service.hpp"
 
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QMainWindow>

qt/place_page_dialog_developer.cpp

@@ -113,8 +113,11 @@ PlacePageDialogDeveloper::PlacePageDialogDeveloper(QWidget * parent, place_page:
     case PropID::FMD_CONTACT_TWITTER:
     case PropID::FMD_CONTACT_VK:
     case PropID::FMD_CONTACT_LINE:
+    case PropID::FMD_CONTACT_FEDIVERSE:
+    case PropID::FMD_CONTACT_BLUESKY:
     case PropID::FMD_WIKIPEDIA:
     case PropID::FMD_WIKIMEDIA_COMMONS:
+    case PropID::FMD_PANORAMAX:
       isLink = true;
       break;
     default:

qt/place_page_dialog_user.cpp

@@ -218,6 +218,8 @@ PlacePageDialogUser::PlacePageDialogUser(QWidget * parent, place_page::Info cons
       addSocialNetworkWidget("Twitter", feature::Metadata::EType::FMD_CONTACT_TWITTER);
       addSocialNetworkWidget("VK", feature::Metadata::EType::FMD_CONTACT_VK);
       addSocialNetworkWidget("Line", feature::Metadata::EType::FMD_CONTACT_LINE);
+      addSocialNetworkWidget("Mastodon", feature::Metadata::EType::FMD_CONTACT_FEDIVERSE);
+      addSocialNetworkWidget("Bluesky", feature::Metadata::EType::FMD_CONTACT_BLUESKY);
     }
 
     if (auto wikimedia_commons = info.GetMetadata(feature::Metadata::EType::FMD_WIKIMEDIA_COMMONS); !wikimedia_commons.empty())
@@ -231,6 +233,17 @@ PlacePageDialogUser::PlacePageDialogUser(QWidget * parent, place_page::Info cons
       data->addWidget(value, row++, 1);
     }
 
+    if (auto panoramax = info.GetMetadata(feature::Metadata::EType::FMD_PANORAMAX); !panoramax.empty())
+    {
+      data->addWidget(new QLabel("Panoramax Picture"), row, 0);
+
+      QLabel * value = new QLabel(QString::fromStdString("<a href='https://api.panoramax.xyz/?pic=" + std::string(panoramax) + "'>Panoramax Image</a>"));
+      value->setOpenExternalLinks(true);
+      value->setTextInteractionFlags(Qt::TextBrowserInteraction);
+
+      data->addWidget(value, row++, 1);
+    }
+
     // Level fragment
     if (auto level = info.GetMetadata(feature::Metadata::EType::FMD_LEVEL); !level.empty())
       addEntry("Level", std::string(level));

qt/res/app.comaps.desktop.desktop

@@ -1,15 +1,15 @@
 [Desktop Entry]
 Type=Application
 Version=1.0
-Name=Organic Maps
+Name=CoMaps
 Comment=Detailed Offline Maps of the World
 Comment[ast]=Mapes detallaos del mundu ensin conexón
 Comment[ca]=Mapes detallats del món sense connexió
 Comment[es]=Mapas detallados del mundo sin conexión
 Comment[ru]=Подробная оффлайновая карта мира
-Icon=organicmaps
-TryExec=OMaps
-Exec=OMaps
+Icon=comaps
+TryExec=CoMaps
+Exec=CoMaps
 Categories=Maps;Education;Geography;Geoscience;Qt;
-Keywords=Map;Maps;Offline Maps;OMaps;Organic Maps;OrganicMaps;OSM;OpenStreetMap;
+Keywords=Map;Maps;Offline Maps;CoMaps;OSM;OpenStreetMap;
 X-KDE-FormFactor=desktop;tablet;handset;

qt/routing_turns_visualizer.cpp

@@ -4,7 +4,7 @@ namespace qt
 {
 void RoutingTurnsVisualizer::Visualize(RoutingManager & routingManager, df::DrapeApi & drape)
 {
-  auto const & polyline = routingManager.GetRoutePolylineForTests().GetPolyline();
+  auto const & polyline = routingManager.GetRoutePolyline().GetPolyline();
   auto const & turns = routingManager.GetTurnsOnRouteForTests();
 
   for (auto const & turn : turns)