gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity
41381 commits 374 branches 100 tags 7.7 GiB
Commit graph

172 commits

Author SHA1 Message Date
Kiryl Kaveryn
7075452d26 [serdes] [kml] save KML track in the gxt:Track format if it has timestamps 
Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>

# Conflicts:
#	kml/types.hpp
 2024-09-03 17:50:20 +02:00
Kiryl Kaveryn
bcc2beaeab [serdes] [kml] merge the points during the validation instead of serialization 
It will fix the issue when we cannot get the marged points indexes to skip the same timestamps during the serialization process because timestamps count should be equal to the points in line count (or 0).

Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
 2024-09-03 17:50:20 +02:00
Kiryl Kaveryn
4a2135042d [kml] add timestamps vector to the MultiGeometry 
Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
 2024-09-03 17:50:20 +02:00
Alexander Borsuk
326945cba5 Declare kml 2.2 gx extension support to serialize recorded tracks 
Signed-off-by: Alexander Borsuk <me@alex.bio>
 2024-08-27 13:44:59 +02:00
Kiryl Kaveryn
1025e6c4d6 [kml] Refactored enums for cleaner style using C++20 features 
Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
 2024-08-25 15:56:32 +02:00
Kiryl Kaveryn
0a27dd0ef0 [kml] add GetRandomPredefinedColor to get a color for the recorded track 
Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
 2024-08-25 15:56:32 +02:00
Kiryl Kaveryn
69dcf787da [kml] [ios] add method to convert Predefined color to the RGB 
Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
 2024-08-25 15:56:32 +02:00
Sergiy Kozyr
a6ffd22028
Add support for KMB files generated with latest MapsMe (#8935) 
* Add support for KMB files generated with latest MapsMe app

Signed-off-by: Sergiy Kozyr <s.trump@gmail.com>

* Update kml/serdes_binary.hpp

Signed-off-by: Alexander Borsuk <170263+biodranik@users.noreply.github.com>

* Added KMB v9MM test case

Signed-off-by: Sergiy Kozyr <s.trump@gmail.com>

* Introduced V9MM version. It has the same format as V8MM but with extra flag in tracks data.

Signed-off-by: Sergiy Kozyr <s.trump@gmail.com>

* Inherit TrackDataV9MM from TrackDataV8MM

Signed-off-by: Sergiy Kozyr <s.trump@gmail.com>

* Apply suggestions from code review

Co-authored-by: Alexander Borsuk <170263+biodranik@users.noreply.github.com>
Signed-off-by: Sergiy Kozyr <s.trump@gmail.com>

* Reduced log level to warning

Signed-off-by: Sergiy Kozyr <s.trump@gmail.com>

* Changed V9MM format to read multiple geometries

Signed-off-by: Sergiy Kozyr <s.trump@gmail.com>

* Added KMB V9MM multi-geometry test case.

Signed-off-by: Sergiy Kozyr <s.trump@gmail.com>

* Update comment

Signed-off-by: Sergiy Kozyr <s.trump@gmail.com>

* Code cleanup.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>

---------

Signed-off-by: Sergiy Kozyr <s.trump@gmail.com>
Signed-off-by: Alexander Borsuk <170263+biodranik@users.noreply.github.com>
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
Co-authored-by: Alexander Borsuk <170263+biodranik@users.noreply.github.com>
Co-authored-by: Viktor Govako <viktor.govako@gmail.com>
 2024-08-15 09:54:28 +02:00
Alexander Borsuk
d555e629b1 [gpx] Correctly export modified bookmark name 
Signed-off-by: Alexander Borsuk <me@alex.bio>
 2024-08-11 19:04:07 +02:00
Viktor Govako
1d5013e892 Removed regex dependency. 
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
 2024-05-22 17:06:20 -03:00
Osyotr
621eaaf67a Remove liboauthcpp 
Signed-off-by: Osyotr <Osyotr@users.noreply.github.com>
 2024-05-20 08:59:19 -03:00
cyber-toad
ada5327b4a [gpx] Add gpx export to core 
Signed-off-by: cyber-toad <the.cyber.toad@proton.me>
 2024-05-06 00:32:15 +02:00
Osyotr
76dd632ec5
Devendor some thridparty deps (#7836) 
* Link with Qt6::Network on windows
* Make find_program(BASH) REQUIRED to prevent build-time errors
* Link more targets explicitly to pickup transitive dependencies
* Don't add unsupported flags on MSVC
  Drive-by: use add_compile_options instead of add_definitions to set -fno-omit-frame-pointer
* Move find_package(gflags) out of 3party
  GLOBAL flag for find_package has been added in CMake 3.24
* Don't hardcode paths to 3party/utfcpp
* Use system expat explicitly if needed
* Use system jansson explicitly if needed
* Use find_package(ZLIB) to find zlib
* Don't use vendored Freetype, ICU and HarfBuzz when WITH_SYSTEM_PROVIDED_3PARTY is set
* Find pugixml explicitly
* Fix typo in target name
* Update utfcpp include path
* Let CMake handle /DEBUG flag for MSVC

Signed-off-by: Osyotr <Osyotr@users.noreply.github.com>
 2024-04-07 00:50:34 +02:00
Alexander Borsuk
bf81661b1e [ios] Fixed XCode warnings 
Signed-off-by: Alexander Borsuk <me@alex.bio>
 2024-03-21 23:45:12 +01:00
Meenbeese
d7c4c99101 [tools] Migrate all the scripts to Python3 
Signed-off-by: Meenbeese <meenbeese@tutanota.com>
 2024-03-18 19:10:27 +02:00
cyber-toad
486a0bec60 [gpx] Support osmand color schema without # 
Signed-off-by: cyber-toad <the.cyber.toad@proton.me>
 2024-01-31 09:47:15 +02:00
S. Kozyr
1598a7cc44 Small changes according to PR comments 
Signed-off-by: S. Kozyr <s.trump@gmail.com>
 2023-10-03 00:39:32 +02:00
S. Kozyr
6ed4f78226 Fixed parsing category info for KMB V8MM format 
Signed-off-by: S. Kozyr <s.trump@gmail.com>
 2023-10-03 00:39:32 +02:00
Alexander Borsuk
516436d97b Fixes 
Signed-off-by: Alexander Borsuk <me@alex.bio>
 2023-10-03 00:39:32 +02:00
S. Kozyr
437b113fcf Added back const modificator 
Signed-off-by: S. Kozyr <s.trump@gmail.com>
 2023-10-03 00:39:32 +02:00
S. Kozyr
d9072768a0 Small fixes 
Signed-off-by: S. Kozyr <s.trump@gmail.com>
 2023-10-03 00:39:32 +02:00
S. Kozyr
768a315ed2 Fixed unit tests. Introduced TiestamlMillis type to read/write time in milliseconds. 
Signed-off-by: S. Kozyr <s.trump@gmail.com>
 2023-10-03 00:39:32 +02:00
S. Kozyr
a6dce28e6a Added KBM format version 8MM 
Signed-off-by: S. Kozyr <s.trump@gmail.com>
 2023-10-03 00:39:32 +02:00
S. Kozyr
9b339f0dfa Updated test data 
Signed-off-by: S. Kozyr <s.trump@gmail.com>
 2023-10-03 00:39:32 +02:00
S. Kozyr
de60518631 Revert "Hack to read new KMB format" 
This reverts commit 7d8811ba1a659856e15bdafa0f475a13a1940f04.

Signed-off-by: S. Kozyr <s.trump@gmail.com>
 2023-10-03 00:39:32 +02:00
S. Kozyr
ee2da0c682 Extended kml_to_kmb tool to export KMB version 8 
Signed-off-by: S. Kozyr <s.trump@gmail.com>
 2023-10-03 00:39:32 +02:00
S. Kozyr
b3c8932fa9 WIP. Versioning support in KML-to-KMB 
Signed-off-by: S. Kozyr <s.trump@gmail.com>
 2023-10-03 00:39:32 +02:00
S. Kozyr
3875d2dfef Fixed milliseconds to seconds conversion 
Signed-off-by: S. Kozyr <s.trump@gmail.com>
 2023-10-03 00:39:32 +02:00
S. Kozyr
ff3796f29d Fix compilation error 
Signed-off-by: S. Kozyr <s.trump@gmail.com>
 2023-10-03 00:39:32 +02:00
S. Kozyr
ad8ff6066d Updated unit tests to check updated V8 format. 
Signed-off-by: S. Kozyr <s.trump@gmail.com>
 2023-10-03 00:39:32 +02:00
S. Kozyr
2f55f3a4d5 Hack to read new KMB format 
Signed-off-by: S. Kozyr <s.trump@gmail.com>
 2023-10-03 00:39:32 +02:00
Alexander Borsuk
1cb6456bcc Fix GPX tracks imported with invisible color because of a bug 
https://github.com/organicmaps/organicmaps/issues/5800

Signed-off-by: Alexander Borsuk <me@alex.bio>
 2023-08-26 20:31:37 +02:00
Alexander Borsuk
67b74a906d [gpx] Correctly import colors for GPX tracks on some iOS devices 
Signed-off-by: Alexander Borsuk <me@alex.bio>
 2023-08-26 20:31:37 +02:00
Viktor Govako
e50889f35c [gpx][kml] Minor code cleanup. 
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
Signed-off-by: Alexander Borsuk <me@alex.bio>
 2023-08-26 20:31:37 +02:00
cyber-toad
c22b898463 [gpx] Fix for decs/cmt duplication 
Signed-off-by: cyber-toad <the.cyber.toad@proton.me>
 2023-08-21 23:35:28 +02:00
cyber-toad
2e279f7b15 [gpx] Support cmt tag 
Signed-off-by: cyber-toad <the.cyber.toad@proton.me>
 2023-08-09 22:53:05 -03:00
Jakob Mühldorfer
5d673def71 Treat GPX track segments as part of the singular track they belong to 
Signed-off-by: Jakob Mühldorfer <register@jmuehldorfer.de>
 2023-07-30 10:35:43 -03:00
Viktor Govako
a63e8bc2a1 [gpx] Remove duplicated code. 
Signed-off-by: cyber-toad <the.cyber.toad@proton.me>
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
 2023-07-28 09:52:06 -03:00
Alexander Borsuk
51099d9b1a Faster XML parsing 
Signed-off-by: Alexander Borsuk <me@alex.bio>
 2023-07-04 18:17:31 +02:00
cyber-toad
73b898476c [gpx] Extract altitude values from GPX 
Signed-off-by: cyber-toad <the.cyber.toad@proton.me>
 2023-07-03 09:46:35 +02:00
cyber-toad
37ee3e6028 [gpx] Support for OSMAnd color extension 
Signed-off-by: cyber-toad <the.cyber.toad@proton.me>
 2023-07-01 09:30:00 +02:00
cyber-toad
ea68c6c87a
[gpx] Support Garmin color schema (#5310) 2023-06-15 10:18:41 +02:00
Alexander Borsuk
1b1b206ff6 Fixed UB/assert when parsing GPX 
Signed-off-by: Alexander Borsuk <me@alex.bio>
 2023-06-14 06:44:25 +02:00
cyber-toad
dce7c2186d
[Draft] [gpx] Add gpx import (#5166) 
* [gpx][ios] Add GPX to OMaps.plist

Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>

* [gpx][android] Add GPX to AndroidManifest.xml

Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>

* [gpx] Add serdes_gpx

Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>

* [gpx] Add GPX to bookmark_helpers

Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>

* [gpx][android] Add GPX to Framework.cpp

Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>

* [gpx] Add GPX test

Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>

* [android] Adjust gpx filter
Signed-off-by: cyber-toad <the.cyber.toad@proton.me>

* [gpx] Update test and manifest
Signed-off-by: cyber-toad <the.cyber.toad@proton.me>

* [gpx] Apply code-review suggestions
Signed-off-by: cyber-toad <the.cyber.toad@proton.me>

* [gpx] Add basic parser tests for real gpx tracks
Signed-off-by: cyber-toad <the.cyber.toad@proton.me>

* [gpx] Remove unused code, add test for waypoints only
Signed-off-by: cyber-toad <the.cyber.toad@proton.me>

* [gpx] Support of gpx route (rte/rtept tag)
Signed-off-by: cyber-toad <the.cyber.toad@proton.me>

* [gpx] Rework parser to use string_view
Signed-off-by: cyber-toad <the.cyber.toad@proton.me>

* [gpx] Remove unsupported parameters

Signed-off-by: cyber-toad <the.cyber.toad@proton.me>

* [gpx] Add support for <color> tag

Signed-off-by: cyber-toad <the.cyber.toad@proton.me>

* [gpx] Fix name/description extraction
Signed-off-by: cyber-toad <the.cyber.toad@proton.me>

* [gpx] Implement code-review suggestions

Signed-off-by: cyber-toad <the.cyber.toad@proton.me>

* [gpx] Extract track & category names from file name

Signed-off-by: cyber-toad <the.cyber.toad@proton.me>

* [gpx] Implement code-review suggestions

Signed-off-by: cyber-toad <the.cyber.toad@proton.me>

---------

Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>
Signed-off-by: cyber-toad <the.cyber.toad@proton.me>
Co-authored-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>
 2023-06-04 19:14:43 +02:00
Alexander Borsuk
90fb327ad1 Review fixes 
Signed-off-by: Alexander Borsuk <me@alex.bio>
 2023-05-15 09:18:36 +02:00
Alexander Borsuk
a776d0be01 Review fixes 
Signed-off-by: Alexander Borsuk <me@alex.bio>
 2023-05-15 09:18:36 +02:00
Alexander Borsuk
914c338aec string_view for faster languages and KML processing 
Signed-off-by: Alexander Borsuk <me@alex.bio>
 2023-05-15 09:18:36 +02:00
Alexander Borsuk
2679b0d993 [kml] Do not save ASCII control symbols that are invalid for XML1.0 
Signed-off-by: Alexander Borsuk <me@alex.bio>
 2023-05-12 15:58:29 +02:00
Andrew Shkrob
9612beaaf0 [kml] Correctly import bookmarks with track data 
Closes: #3467

Signed-off-by: Andrew Shkrob <andrew.shkrob.social@yandex.by>
 2023-03-17 15:34:20 -03:00
Viktor Govako
e79d06f653 [kml] Valid gx:Track parsing. 
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
 2023-01-05 10:57:21 -03:00