Commit graph

2533 commits

Author SHA1 Message Date
Dima-1
94b97e0318 Merge branch 'master' into travel_obf_gpx_track
# Conflicts:
#	OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelObfHelper.java
2021-01-27 11:22:24 +02:00
Victor Shcherb
3f69fcbe07 Fix extension for uploading images 2021-01-25 19:22:50 +01:00
vshcherb
522631c135
Update NetworkUtils.java 2021-01-25 19:14:34 +01:00
Dima-1
ac66073e12 Merge branch 'master' into travel_obf_gpx_track 2021-01-25 15:24:15 +02:00
Victor Shcherb
aeb099cb8a Change - to +: according to comment 2021-01-25 10:15:53 +01:00
Dima-1
b5f555d367 Merge branch 'master' into travel_obf_gpx_track
# Conflicts:
#	OsmAnd/src/net/osmand/plus/wikivoyage/explore/ExploreTabFragment.java
2021-01-25 10:56:26 +02:00
Vitaliy
a8406fda7d Merge branch 'master' into gpx_context_menu_description
# Conflicts:
#	OsmAnd/res/menu/track_menu_bottom_navigation.xml
#	OsmAnd/res/values/strings.xml
#	OsmAnd/src/net/osmand/plus/track/TrackMenuFragment.java
2021-01-25 02:43:12 +02:00
Dima-1
f1569fd5fb Travel GPX card 2021-01-24 23:48:41 +02:00
cepprice
101402a3c4 Add description card 2021-01-23 21:14:42 +05:00
Victor Shcherb
fd7af59cdd Change - to +: according to comment 2021-01-23 14:37:20 +01:00
Victor Shcherb
9072c97300 Add comments 2021-01-23 14:27:01 +01:00
Victor Shcherb
6906b04a53 Fix non-transitive comparision https://github.com/osmandapp/OsmAnd/issues/10626 2021-01-21 18:42:40 +01:00
Victor Shcherb
d7828b4bf0 fix bug cause roundabout based on circle is completely incorrect 2021-01-21 17:55:43 +01:00
Victor Shcherb
97e6395def fix bug cause roundabout based on circle is completely incorrect 2021-01-21 17:49:04 +01:00
vshcherb
b8787e4121
Merge pull request #10632 from osmandapp/T10571
Fix turn angle for roundabout
2021-01-21 15:08:36 +01:00
Kseniia
b523294d6d fix turn angle for roundabout 2021-01-21 15:49:04 +02:00
vshcherb
0ba936962e
Merge pull request #10630 from osmandapp/fix_travel_article_navigation
Fix travel guides navigation
2021-01-21 11:14:20 +01:00
Dima-1
bb10787d1c Fix travel guides navigation 2021-01-19 21:53:12 +02:00
Victor Shcherb
d416ef0a6a Fix crash with search navigation 2021-01-19 16:45:03 +01:00
vshcherb
981d374b80
Merge pull request #10587 from jensMF/fix_xml_schema_calculated_and_planned_routes
Add BaseCamp compatibility for planned Tracks and claculated routes exported to gpx
2021-01-18 01:26:36 +01:00
vshcherb
bead08eb24
Merge pull request #10600 from osmandapp/fix_coordinates_format
Fix #10517
2021-01-17 13:43:23 +01:00
Naumov Dmitry
bf5de1a4e2 Fix #10517 2021-01-17 16:54:17 +05:00
jensMF
f0d54c6217 fixed xml schema by changing the order of wpt rte and trk and adding the osmand namespace to the route and types extensions 2021-01-16 01:15:49 +01:00
Kseniia
85c0e66852 fix interpolation for alphabetic 2021-01-15 21:27:42 +02:00
vshcherb
67c122ce03
Merge pull request #10564 from osmandapp/T7525
Add condition for BuildingInterpolation.ALPHABETIC
2021-01-15 20:16:04 +01:00
Kseniia
d29c271471 fix interpolation for alphabetic 2021-01-15 21:13:18 +02:00
vshcherb
1d16ff216a
Update Building.java 2021-01-15 18:49:17 +01:00
vshcherb
c98ae20599
Update Building.java 2021-01-15 18:47:02 +01:00
Kseniia
d25981a18d fix interpolation for alphabetic 2021-01-15 19:35:20 +02:00
Dima-1
fd76a4054f Merge branch 'master' into travel_obf_gpx
# Conflicts:
#	OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelObfHelper.java
2021-01-14 14:06:50 +02:00
Kseniia
b57b7ef268 fix interpolation for alphabetic 2021-01-13 09:40:20 +02:00
Victor Shcherb
9251a6bb4a Fix https://github.com/osmandapp/OsmAnd/issues/10454 2021-01-12 18:33:43 +01:00
Kseniia
925e42546d add condition for BuildingInterpolation.ALPHABETIC 2021-01-12 17:52:03 +02:00
alex-osm
46005225fd
Merge pull request #10494 from osmandapp/fix_using_google_maps_links
Fix opening links to maps "geo:0,0"
2021-01-10 16:26:00 +03:00
max-klaus
75e5f7828a Fix gpx reading for travel obf 2021-01-10 14:12:50 +03:00
Skalii
3566ec7652 fix previous changes;
add new check;
2021-01-08 19:05:02 +02:00
Skalii
53b3addcb5 Merge remote-tracking branch 'origin/master' into fix_using_google_maps_links 2021-01-08 18:56:03 +02:00
vshcherb
0e991a5e87
Merge pull request #10542 from jensMF/fix_gpx_xml_schema_alternative
fix #1326 and #10209 by adding the XML namespace 'osmand' to the header and the writeExtensions function
2021-01-08 17:40:26 +01:00
Dima-1
279349919d Merge branch 'master' into travel_obf_gpx
# Conflicts:
#	OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelObfHelper.java
2021-01-08 13:31:56 +02:00
Dima-1
b86a696643 Fix travel obf gpx language 2021-01-08 13:26:40 +02:00
jensMF
71bbd868e2 added 'osmand' namespace to header and extensions in gpx files 2021-01-07 22:38:59 +01:00
vshcherb
9673a14c0a
Merge pull request #10541 from osmandapp/T8652
Add condition for 0 planRoadDirection
2021-01-07 20:32:38 +01:00
Kseniia
80f083cf3a add condition for 0 planRoadDirection 2021-01-07 21:30:15 +02:00
Kseniia
371e60b3af add condition for 0 planRoadDirection 2021-01-07 21:28:35 +02:00
Victor Shcherb
3f731c4e50 Fix tests 2021-01-07 12:06:35 +01:00
Victor Shcherb
d9e76169fe Make tests to go all possible combinations 2021-01-07 11:52:50 +01:00
Victor Shcherb
6e584b4913 Fix plan route direction 2021-01-07 11:28:53 +01:00
vshcherb
370d8155ee
Merge pull request #10539 from osmandapp/T8652
Add conditions for restrictions via ways
2021-01-07 11:22:43 +01:00
Kseniia
2c802717a9 add conditions for restrictions via ways 2021-01-07 12:15:51 +02:00
Kseniia
0361b6b773 add conditions for restrictions via ways 2021-01-07 12:11:49 +02:00