Commit graph

2540 commits

Author SHA1 Message Date
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
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
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
Victor Shcherb
f4d0145d59 Fix timings 2020-07-13 00:09:10 +02:00