drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-23 06:33:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,645 Commits 96 Branches 23 Tags
d82b545e30fa93a38a31420e79c69fc3e5cea895
Commit Graph

37 Commits

Author SHA1 Message Date
mvglasow
bf36c875d5 Merge commit 'eb264889e3' into traffic 2025-10-10 18:40:35 +03:00
Wojciech Sipak
9c9c9c8b8b [cmake] remove shaders_compiler dead code 
Signed-off-by: Wojciech Sipak <wsipak@protonmail.com>
 2025-09-21 19:31:15 +02:00
Séverin Lemaignan
f8d786958a [generator] retrieve socket:* OSM tags used by amenity:charging_station 
Currently support the following socket types:
- type 1
- type 1 combo
- type 2 (wired or wo/ cable)
- type 2 combo
- chademo
- nacs

This commit also adds initial display of the socket types and power
the to Qt desktop app.

Signed-off-by: Séverin Lemaignan <severin@guakamole.org>
 2025-09-18 22:09:52 +02:00
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
Alexander Borsuk
a28d5d15ce [drape] Fixed signed/unsigned comparison warning by changing Resize interface to uint32_t 
Signed-off-by: Alexander Borsuk <me@alex.bio>
 2025-08-22 19:01:09 +07:00
Osyotr
e00d5d33b2 Add missing include 
Signed-off-by: Osyotr <Osyotr@users.noreply.github.com>
 2025-08-18 09:07:05 +02:00
Konstantin Pastbin
bfffa1fff4 Format all C++ and Java code via clang-format 
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
 2025-08-17 14:32:37 +07:00
renderexpert
b23c2ba3e3 [Drape] Remove GLES2-related code 
Signed-off-by: renderexpert <expert@renderconsulting.co.uk>
 2025-08-17 08:30:56 +02:00
mvglasow
90d7cadc3f Merge commit '211e3fb4' into traffic 
# Conflicts:
#	android/app/src/main/cpp/CMakeLists.txt
#	android/app/src/main/java/app/organicmaps/sdk/util/Config.java
#	android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
#	android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java
#	android/sdk/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp
#	indexer/ftypes_matcher.hpp
#	iphone/Maps/Maps.xcodeproj/project.pbxproj
 2025-08-16 18:04:14 +03:00
Konstantin Pastbin
0a96a23ca0 [desktop] Fix Mac icon file location 
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
 2025-08-16 01:43:47 +07:00
Andrei Shkrob
0f744e7cf2 [desktop] Organize desktop resources 
Signed-off-by: Andrei Shkrob <github@shkrob.dev>
 2025-08-16 00:12:24 +07:00
Alexander Borsuk
76d7ef146c Removed SignedRound and replaced std::round with std::lround where needed 
Also see https://clang.llvm.org/extra/clang-tidy/checks/bugprone/incorrect-roundings.html

Signed-off-by: Alexander Borsuk <me@alex.bio>
 2025-08-11 14:58:45 +02:00
Alexander Borsuk
30718e106e ADL for AlmostEqual* and use math:: instead of base:: (#9634) 
* ADL for AlmostEqual* and use math:: instead of base::

Signed-off-by: Alexander Borsuk <me@alex.bio>
 2025-08-11 14:58:45 +02:00
Harry Bond
1e358375c6 [desktop] change id to app.comaps.comaps 
apparently app.comaps.qt is no good either. this one is confirmed fine

Signed-off-by: Harry Bond <me@hbond.xyz>
 2025-08-10 14:40:15 +01:00
Harry Bond
607191503c [desktop] Change ID from .desktop to .qt 
required to publish on Flathub, and .desktop is a file extension anyway so it's a bad idea
also some improvements to metadata structure, and add branding colours
and fix the welcome message in qt

Signed-off-by: Harry Bond <me@hbond.xyz>
 2025-08-10 10:06:24 +02:00
Andrei Shkrob
8f5c8a5bd7 [data] Refactor resources folder 
Signed-off-by: Andrei Shkrob <github@shkrob.dev>
 2025-08-08 20:47:41 +07:00
Viktor Govako
905a823490 [desktop] Removed redundant NightMode setting. 
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
 2025-08-07 13:39:05 +02:00
mvglasow
034856f033 Merge commit '20c9fc5f' into traffic-2025072304 
# Conflicts:
#	android/app/src/main/res/xml/prefs_main.xml
#	qt/CMakeLists.txt
 2025-07-28 18:27:49 +03:00
mvglasow
dcab6ee5a0 [qt] Keep traffic URL editable even when source is disabled 
Signed-off-by: mvglasow <michael -at- vonglasow.com>
 2025-07-28 00:33:26 +03:00
mvglasow
bebac8d8a7 [traffxml] Remove openlr dependency, disable OpenLrV3TraffDecoder 
Signed-off-by: mvglasow <michael -at- vonglasow.com>
 2025-07-28 00:33:25 +03:00
mvglasow
03d6847be3 [traffic][qt] Make HttpTraffSource configurable from Qt GUI 
Signed-off-by: mvglasow <michael -at- vonglasow.com>
 2025-07-28 00:33:25 +03:00
mvglasow
bb410fc3bc [traffxml] Add module 
Signed-off-by: mvglasow <michael -at- vonglasow.com>
 2025-07-28 00:33:19 +03:00
mvglasow
7b420def17 [qt] Link against openlr library 
Signed-off-by: mvglasow <michael -at- vonglasow.com>
 2025-07-28 00:33:19 +03:00
mvglasow
932dda6552 Revert "[desktop] Disable traffic switch and TrafficManager initialization." 
This reverts commit 16ad61f4c8ebd22bdc282496122db49a5243f02f.
 2025-07-28 00:33:18 +03:00
mvglasow
6f2f61b30a Revert "[qt] Remove defunct Traffic layer button" 
This reverts commit df2541e1bf12abca329becdac8de7c92f0893b03.
 2025-07-28 00:33:08 +03:00
Yannik Bloscheck
3f79a3bece [desktop] Updating icons to the new logo 
Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
 2025-07-20 15:53:17 +02:00
Jean-Baptiste
b4f115a8fa [desktop] Add Panoramax link on the place page 
Signed-off-by: Jean-Baptiste Charron <jeanbaptiste.charron@outlook.fr>
Co-authored by: Harry Bond <me@hbond.xyz>
 2025-06-27 05:19:47 +02:00
Francesco Gazzetta
99a0f3973e [desktop] Change Organic Maps to CoMaps in metainfo.xml and .desktop files 2025-06-19 10:47:28 +02:00
cyber-toad
45bba5fb5e [routing] Add possibility to save routes as tracks 
Signed-off-by: cyber-toad <the.cyber.toad@proton.me>
 2025-06-07 17:34:29 +02:00
Viktor Govako
8ec407528f [qt] Added missing _outdoors_ files to the bundle. 
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
 2025-06-07 15:00:45 +02:00
Harry Bond
b0355319bd [core][qt] Handle Mastodon and Bluesky 
Signed-off-by: Harry Bond <me@hbond.xyz>
 2025-06-01 12:05:12 +02:00
rayzex_gt
57fefda452 Fix "About" dialog window flags on desktop. (#10586) 
* Update about.cpp

On desktop, on Linux, when I open the "About" dialog, I can:
1: Minimize the app by pressing "minimize" button in the dialog;
2: Maximisze the dialog;
3: Close the dialog.

When building the app on Windows, I can do neither of those things.

I suggest setting those Window flags explicitly to achieve same behaviour across platforms.

Signed-off-by: rayzex_gt <62294693+gezawatt@users.noreply.github.com>

* Only adding an essential fix.

Only adding an essential button to the window (the "X" close button) to avoid soft-locking the user on Windows when opening the dialog.

Signed-off-by: rayzex_gt <62294693+gezawatt@users.noreply.github.com>

* Added an explicit "Maximize window" and "Close window" flags.

Signed-off-by: rayzex_gt <62294693+gezawatt@users.noreply.github.com>

* Added ajustSize(); at the end of "About" window constructor.

Added an "ajustSize();" method call at the end of the "About" window constructor.

Now height() and width() methods show correct window size.

Now it also would be possible to call setFixedSize() if needed.

Signed-off-by: rayzex_gt <62294693+gezawatt@users.noreply.github.com>

---------

Signed-off-by: rayzex_gt <62294693+gezawatt@users.noreply.github.com>
 2025-05-29 09:49:07 +02:00
Konstantin Pastbin
5cc244de6b [desktop] Rebrand desktop apps 
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
 2025-05-23 14:59:58 +07:00
Konstantin Pastbin
54ab965822 [cmake] Rebrand desktop version to CoMaps 
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
 2025-05-19 20:55:34 +07:00
Andrew Shkrob
ef6ffa299d [data] Move fonts into a separate folder 
Signed-off-by: Andrew Shkrob <andrew.shkrob.social@yandex.by>
 2025-05-19 10:52:42 +02:00
Ferenc Géczi
5110867b38 [platform] Separete the location_service lib 
Signed-off-by: Ferenc Géczi <ferenc.gm@gmail.com>
 2025-05-18 13:36:53 +00: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