Commit graph

2641 commits

Author SHA1 Message Date
Dima-1
d676cb3d55 Export OSM Note, OSM Edit 2020-10-16 19:21:03 +03:00
Vitaliy
87609c43c1 Merge branch 'r3.8' 2020-10-12 12:47:00 +03:00
max-klaus
f39e7dd753
Merge pull request #9966 from osmandapp/import_fixes
Proper content-handling on import
2020-10-09 17:35:00 +03:00
simon
79b542384d conflict resolved 2020-10-09 14:24:15 +03:00
simon
1f986e92e0 osm stream file upload 2020-10-09 14:22:28 +03:00
Vitaliy
b63250078c Merge branch 'master' into import_fixes
# Conflicts:
#	OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java
2020-10-09 13:53:23 +03:00
yogiks
e6c8d5e750
Add Kannada 2020-10-08 19:31:02 +05:30
simon
0f3070f160 Merge branch 'master' of git://github.com/osmandapp/Osmand into issue_175_osmedit_use_oauth 2020-10-08 15:44:00 +03:00
simon
bde5ae822b stream improvements 2020-10-08 15:43:57 +03:00
simon
e8fc5959de conflict resolved 2020-10-08 12:09:32 +03:00
Alexander Sytnyk
b201f147ac #9621 Add validation for the online tracking link 2020-10-07 14:23:34 +03:00
Vitaliy
27b235cb39 Add import with file signature check 2020-10-07 03:17:16 +03:00
simon
a5776ae07a cleanup 2020-10-06 10:30:10 +03:00
simon
0948476bf8 style issues fixed 2020-10-05 09:54:25 +03:00
simon
33f933e89d logout added 2020-10-02 16:00:03 +03:00
simon
689ebf5b75 oauth finished 2020-10-02 14:59:10 +03:00
MadWasp79
b594076f14 #9853 fix calc time in android 2020-10-01 14:03:06 +03:00
Vitaliy
c2146eb441 Merge branch 'r3.8' into plan_route_fixes 2020-09-25 13:20:20 +03:00
max-klaus
a0005dccbb Fix countWords npe 2020-09-25 11:48:14 +03:00
max-klaus
b69b30a030 Fix countWords npe 2020-09-25 11:47:46 +03:00
Vitaliy
95af82e531 Select current navigation profile in attach roads 2020-09-23 23:18:44 +03:00
max-klaus
02faad80ae Fix initial search radius for nearest POIs 2020-09-22 19:53:56 +03:00
max-klaus
c65e91561f Fix initial search radius for nearest POIs 2020-09-22 19:53:19 +03:00
vshcherb
5a880e3956
Merge pull request #9866 from osmandapp/9844_oneway_is_not_respected
Issue 9844 oneway is not respected
2020-09-22 16:36:26 +02:00
simon
71827daeea test added 2020-09-22 17:32:25 +03:00
simon
5252d179d0 test added 2020-09-22 17:32:18 +03:00
simon
69a93078e1 exclude duplicated dialog fixed 2020-09-22 13:04:03 +03:00
simon
593112561d exclude duplicated dialog fixed 2020-09-22 13:02:19 +03:00
max-klaus
dcc3c09d75 Fix geocoding 2020-09-21 17:07:05 +03:00
max-klaus
b7a6d89b18 Fix route to gpx issues 2020-09-19 19:18:22 +03:00
simon
69ab36293e navigation fixed 2020-09-18 17:12:09 +03:00
simon
c99f7d5b0e null ptr crash fixed 2020-09-18 13:27:05 +03:00
vshcherb
076f91e760
Merge pull request #9820 from osmandapp/plan_a_route_executor_bugfix
Plan a route executor multiple calculations bug fix
2020-09-16 21:15:48 +02:00
simon
8403fbf062 executor pla a route bug fix 2020-09-16 12:29:38 +03:00
max-klaus
a11dd191ae Fix latLon formatting in search 2020-09-16 12:12:20 +03:00
Vitaliy
454ab23eed Refactor createUniqueFileName 2020-09-15 01:57:21 +03:00
max-klaus
bb65803201 Added .wpt.chart and .3d.chart support 2020-09-12 14:20:31 +03:00
Victor Shcherb
ce31948e71 Adjust progress 2020-09-10 10:29:50 +02:00
Victor Shcherb
f944ef5e64 Fix progress bar gpx approximation 2020-09-09 18:45:17 +02:00
Victor Shcherb
0fe5a22bcc Fix #9777 2020-09-09 13:33:45 +02:00
max-klaus
53f21ba8ff Fix elevation of exported gpx files 2020-09-04 17:11:49 +03:00
max-klaus
b094bd32c2 Fixed reverse gpx route 2020-09-01 19:03:26 +03:00
Dima-1
3e6a495139 SaveAsNewTrack UI 2020-08-25 23:01:17 +03:00
max-klaus
7907e72781 Fix / refactor save gpx (plan route) 2020-08-23 20:07:30 +03:00
max-klaus
efa6c6fb4c Fix lose profile after move point. Refactor snap to road. 2020-08-22 16:18:21 +03:00
vshcherb
133e8a25ef
Merge pull request #9646 from androiddevkotlin/street_complete_parsing
Fix #9532
2020-08-21 10:29:35 +02:00
max-klaus
c4553823f3 Merge branch 'master' of github.com:osmandapp/Osmand 2020-08-20 22:03:41 +03:00
max-klaus
71419a41e9 Fixed save/open gpx file (plan route) 2020-08-20 21:55:47 +03:00
sergdevosm
9dbcf312df Casting to an int implicitly 2020-08-20 21:07:51 +03:00
Victor Shcherb
d21386168e Parse coordinates from google url 2020-08-20 17:18:39 +02:00
Vitaliy
f3f7916fbc Minor fixes 2020-08-20 13:15:06 +03:00
Vitaliy
fde90d40d4 Merge branch 'master' into follow_track 2020-08-20 12:27:52 +03:00
Vitaliy
50fdbf741c
Merge pull request #9651 from osmandapp/Fix_9585
Fix #9585 (Show photos from Wikimedia Commons)
2020-08-20 10:31:04 +03:00
sergdevosm
274760e9d2 Fix #9532 2020-08-19 21:40:58 +03:00
Vitaliy
66e8634bea Follow track second part 2020-08-17 23:18:43 +03:00
Guillaume Gonnet
4406b60c6d Allow custom "user-agent" for tile download 2020-08-17 18:35:12 +02:00
Nazar-Kutz
30f245ce24 Fix #9585 (Show photos from Wikimedia Commons) 2020-08-17 15:01:38 +03:00
Dima-1
c382b6d92d Merge branch 'master' into fix_plan_route_option
# Conflicts:
#	OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java
#	OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
#	OsmAnd/src/net/osmand/plus/measurementtool/command/MeasurementModeCommand.java
2020-08-17 14:17:26 +03:00
max-klaus
66f0b4cd77 Fix read / write gpx route extensions 2020-08-16 18:26:22 +03:00
sergdevosm
4a24787da3 Fix #9532 2020-08-16 18:02:07 +03:00
max-klaus
fa3ee647e8 Merge branch 'master' of github.com:osmandapp/Osmand 2020-08-14 17:35:02 +03:00
max-klaus
ea83bc6d5d Finished gpx approximation 2020-08-14 17:18:16 +03:00
Victor Shcherb
56bc3a14c2 Fix strange problems with empty set 2020-08-13 14:18:15 +02:00
Dima-1
4a40813edc Merge branch 'master' into fix_plan_route_option
# Conflicts:
#	OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
2020-08-12 17:04:39 +03:00
Dima-1
25f564393b Fix plan route options 2020-08-12 16:50:54 +03:00
max-klaus
2ab38a54b5 Gpx approximation in progress 2020-08-11 23:03:13 +03:00
Victor Shcherb
43db22fa79 Fix map creation 2020-08-10 15:23:43 +02:00
max-klaus
355d6bb309 WIP - Gpx approximation 2020-08-08 19:35:57 +03:00
max-klaus
50ca6bd41c Merge branch 'master' of github.com:osmandapp/Osmand 2020-08-04 21:37:00 +03:00
max-klaus
151f2f31c6 Refactor route / gpx geometry 2020-08-04 21:36:14 +03:00
vshcherb
a7010faa16
Merge pull request #9557 from osmandapp/seq_parsing
sequence parsing finishing
2020-08-03 12:31:45 +02:00
MadWasp79
03ed195fcb sequence parsing finishing 2020-08-03 12:21:23 +03:00
max-klaus
1e22187dde
Merge pull request #9549 from osmandapp/track_appearance
Track appearance custom colors
2020-08-01 16:23:27 +03:00
Vitaliy
c334cfa62e Remove unnecessary method 2020-08-01 15:53:41 +03:00
Victor Shcherb
0a0709441c Fix rendering rule storage 2020-07-31 17:12:09 +02:00
Victor Shcherb
725fa98d7a Fix rendering rule storage 2020-07-31 17:00:46 +02:00
Victor Shcherb
7b10a094ef Fix #9529 2020-07-31 14:09:46 +02:00
Victor Shcherb
0a77312535 Introduce relation group back 2020-07-31 13:08:15 +02:00
Victor Shcherb
1114a91be7 introduce new methods 2020-07-29 18:29:44 +02:00
Victor Shcherb
ea08f604b6 Fix sorting for tags 2020-07-29 14:37:11 +02:00
Victor Shcherb
17e1af1e51 Fix sorting for tags 2020-07-28 13:44:29 +02:00
Victor Shcherb
4b5bf45471 Initial refactoring for route-road, route-bicycle, etc 2020-07-28 11:10:43 +02:00
Victor Shcherb
4c91c95721 Add information about header section size 2020-07-27 12:10:21 +02:00
max-klaus
af17e524d2 Fix #9209 2020-07-23 19:21:01 +03:00
Victor Shcherb
43308cbfd7 Add gpx points to approximation 2020-07-22 17:05:09 +02:00
max-klaus
620433fe85
Merge pull request #9469 from osmandapp/track_appearance
Track appearance
2020-07-21 13:55:24 +03:00
Victor Shcherb
cfff07567d Add autoclose 2020-07-21 12:43:21 +02:00
Vitaliy
de5e161095 Track appearance fixes 2020-07-20 17:37:45 +03:00
Vitaliy
5be8902e02 Merge branch 'master' into track_appearance
# Conflicts:
#	OsmAnd/res/values-ru/strings.xml
#	OsmAnd/res/values/strings.xml
#	OsmAnd/src/net/osmand/plus/views/GPXLayer.java
#	OsmAnd/src/net/osmand/plus/views/RouteLayer.java
2020-07-20 17:30:15 +03:00
Victor Shcherb
0d8c3e6604 Add close because full stream is read 2020-07-19 17:42:11 +02:00
Vitaliy
4b4100cf0d Merge branch 'master' into track_appearance 2020-07-16 13:50:13 +03:00
Dima-1
10e5005e5a Merge branch 'master' into plan_a_route 2020-07-16 12:08:16 +03:00
Dima-1
255f52f52c Change Measure distance -> Plan a route 2020-07-16 12:03:16 +03:00
Vitaliy
bd54b829ef Add solid gradient scale type and track coloring card 2020-07-14 15:00:34 +03:00
vshcherb
8da0811ca4
Merge pull request #9440 from osmandapp/tag_to_text
fix for osmand_ele tags as text
2020-07-14 13:57:13 +02:00
Vitaliy
67d2166d0f Move GpxSplitType and GradientScaleType to android module 2020-07-14 11:49:44 +03:00
MadWasp79
a89ec4b10e fix for osmand_ele tags as text 2020-07-13 18:17:11 +03:00
Vitaliy
7a18f2e5ca Remove unnecessary annotations 2020-07-13 12:29:56 +03:00
Vitaliy
9de83eed83 Merge branch 'master' into gpx_appearance 2020-07-13 12:25:58 +03:00
Vitaliy
b7c1fe6ba7 Remove unnecessary setters from GpxDataItem 2020-07-13 12:03:20 +03:00