Commit graph

2166 commits

Author SHA1 Message Date
vshcherb
30f257dc8b
Merge pull request #7636 from osmandapp/routing_fix
fix for slow excluded id check
2019-10-08 15:31:29 +03:00
MadWasp79
a6c985043d add max width parameter 2019-10-08 12:43:02 +03:00
MadWasp79
534f03d558 clean up 2019-10-07 17:55:40 +03:00
MadWasp79
2ee126419f code clean-up 2019-10-07 13:23:30 +03:00
max-klaus
90daf2293e Added new download card 2019-10-04 18:39:14 +03:00
MadWasp79
c6be1a9c10 fix for slow excluded id check 2019-10-04 16:22:48 +03:00
max-klaus
c3b5928f63
Revert "Add "Download Map" Top Sheet card" 2019-10-02 15:37:41 +03:00
max-klaus
5cae32057a
Merge pull request #7580 from osmandapp/DownloadMap
Add "Download Map" Top Sheet card
2019-10-01 12:41:26 +03:00
max-klaus
104acd49af Fix #7406 2019-09-29 17:46:25 +03:00
Victor Shcherb
c20a8336c7 Fix issue with duplicate routes 2019-09-27 16:01:48 +02:00
Nazar
609f4d45ae Add "Download Map" Top Sheet card 2019-09-19 20:11:10 +03:00
Chumva
074c5c50d4 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into ProfileSettingsTest 2019-08-30 15:26:52 +03:00
Victor Shcherb
36a14dddd6 Change default zooms 2019-08-20 16:41:25 +02:00
Chumva
e1de1d53b3 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into ProfileSettingsTest 2019-08-19 09:46:25 +03:00
max-klaus
b71194d7fc Added introductory subscription support 2019-08-18 19:25:24 +03:00
Victor Shcherb
0199927f62 Fix issue with double count 2019-08-10 12:34:43 +03:00
madwasp79
ed7ed6d22a query fix 2019-08-09 16:56:27 +03:00
madwasp79
3f950ab57a Changes for tools/FixBaseMapRoads 2019-08-09 14:48:43 +03:00
Chumva
e54ab110c5 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into ProfileSettingsTest 2019-08-08 15:01:50 +03:00
Chumva
a4855199a5 Profile settings initial commit 2019-08-07 18:45:59 +03:00
max-klaus
e838582187 Fix regions layer 2019-08-07 14:10:40 +03:00
max-klaus
9e8b86beec Move OLC lib to gradle 2019-08-05 21:59:01 +03:00
Victor Shcherb
2137ad8ad7 Change roads to segments 2019-08-05 16:16:11 +02:00
Victor Shcherb
851a8ed86f Change roads to segments 2019-08-05 16:11:31 +02:00
Victor Shcherb
c0ecade925 Test new dbg format 2019-08-05 15:31:09 +02:00
Victor Shcherb
f7278f731f Test new dbg format 2019-08-05 15:24:26 +02:00
Victor Shcherb
cbbea56cf0 Improve cahcing for osmand regions 2019-08-04 01:38:29 +02:00
Victor Shcherb
f2c6e08fb3 Improve cahcing for osmand regions 2019-08-04 01:37:21 +02:00
max-klaus
4258c90014 Fix transport stop context menu. Fix top route badge press. 2019-08-03 19:17:47 +03:00
max-klaus
42788187c7 Fix transport context menu / routing 2019-07-31 21:03:49 +03:00
Victor Shcherb
963acad11f Improve Transport reader algorith (make it much faster?) 2019-07-31 00:56:54 +02:00
Victor Shcherb
57bea7dbc9 Fix NPE 2019-07-30 00:11:39 +02:00
Victor Shcherb
8b3441220e Merge branch 'r3.4'
Conflicts:
	OsmAnd-java/src/main/java/net/osmand/data/TransportStop.java
2019-07-29 16:28:30 +02:00
Victor Shcherb
464778d336 Finish algorith to load for transport router 2019-07-29 16:27:23 +02:00
Victor Shcherb
e5e2829137 Finish algorith to load for transport router 2019-07-29 16:17:27 +02:00
Victor Shcherb
5827eff2bc Finish algorith to load for transport router 2019-07-29 16:13:55 +02:00
Victor Shcherb
7854ee01dd Important changes for transport stop generation
Conflicts:
	OsmAnd-java/src/main/java/net/osmand/data/TransportStop.java
2019-07-29 15:37:46 +02:00
Victor Shcherb
ac7cfffdd4 Important changes for transport stop generation 2019-07-29 15:36:38 +02:00
Victor Shcherb
3904d82342 Temporary refactoring 2019-07-29 15:36:19 +02:00
Victor Shcherb
0ce5b2f212 Fix transport stop compare 2019-07-29 10:08:35 +02:00
Victor Shcherb
221dc057e7 Fix transport stop compare 2019-07-29 10:07:26 +02:00
Victor Shcherb
d388eb7500 Merge branch 'r3.4' into transport_live_new 2019-07-29 10:00:34 +02:00
Victor Shcherb
ad6321a89e Change transport compare and add helper methods 2019-07-28 23:57:51 +02:00
Victor Shcherb
1e3a6493f8 Fix slight deviation for transport stops 2019-07-28 20:47:17 +03:00
Victor Shcherb
78d3d6179f Fix slight deviation for transport stops 2019-07-28 19:11:17 +02:00
Victor Shcherb
fafa1146fd Merge branch 'r3.4' 2019-07-26 10:41:44 +02:00
Victor Shcherb
c791c4a054 Fix issue with conditional opening hours 2019-07-26 10:41:36 +02:00
Victor Shcherb
2623e93d58 Merge branch 'r3.4' 2019-07-26 00:28:28 +02:00
Victor Shcherb
e613c1a7a7 Fix #7322 2019-07-26 00:28:06 +02:00
crimean
caaaf0b3c3 Added year to opening hours parser 2019-07-25 13:53:15 +03:00
crimean
4d8fcc5238 Added year to opening hours parser 2019-07-25 13:45:04 +03:00
crimean
6282cf520f Added year to opening hours parser 2019-07-25 13:44:23 +03:00
Chumva
1cbba16e19 Merge branch 'GpxStatisticImprovements' 2019-07-23 16:38:46 +03:00
Chumva
32c9dd8ea9 Fix #7054 2019-07-23 16:10:35 +03:00
crimean
678f9f7bc0 Working on transport stop merge 2019-07-22 21:50:03 +03:00
crimean
ae983725c6 Fix compareStop 2019-07-22 17:53:50 +03:00
Victor Shcherb
c35f174f60 Merge remote-tracking branch 'origin/transport_live_new' 2019-07-22 15:57:45 +02:00
crimean
9425cfb6e8 Live updates for transport 2019-07-22 16:48:41 +03:00
vshcherb
dfe3576cac
Merge pull request #7302 from osmandapp/conditionalRouting
Implement conditional restrictions
2019-07-22 12:04:03 +02:00
Victor Shcherb
fce78cf8a5 Merge branch 'master' of github.com:osmandapp/Osmand 2019-07-21 22:34:11 +02:00
Victor Shcherb
6d7bb74874 Merge branch 'conditionalRouting' 2019-07-21 22:33:29 +02:00
Victor Shcherb
8e0c1524ee Fix npe 2019-07-21 21:29:43 +02:00
Victor Shcherb
5c6229f47b Fix native integration for conditional time 2019-07-21 21:25:57 +02:00
Victor Shcherb
6a39d99d4c Fix field for copy 2019-07-21 16:46:08 +02:00
Victor Shcherb
589ce11be2 Fix typo 2019-07-21 16:36:49 +02:00
Victor Shcherb
718f79a9cd Adapt / prepare for text values for altitude 2019-07-21 15:40:09 +02:00
Victor Shcherb
5b9e711e2a Simplify tags 2019-07-21 15:12:42 +02:00
Victor Shcherb
918495b2ad Add conditional tags to geocoding 2019-07-21 14:09:04 +02:00
Victor Shcherb
446e991ca5 Implement conditional restrictions 2019-07-21 13:56:27 +02:00
Victor Shcherb
f2f84210e7 Implement conditional restrictions 2019-07-21 13:54:46 +02:00
Chumva
e7bb115e29 Fix import gpx files to custom folders
(cherry picked from commit caac552822)
2019-07-20 14:47:06 +03:00
crimean
806b7374d9 Fix gpx email writing 2019-07-20 14:06:20 +03:00
crimean
f20d4a6a87 Fix gpx email writing 2019-07-20 14:05:50 +03:00
Chumva
caac552822 Fix import gpx files to custom folders 2019-07-17 17:20:38 +03:00
crimean
459236c3a1 Fix travel UI 2019-07-17 11:11:36 +03:00
crimean
51bf9f51cc Fix travel UI 2019-07-17 11:11:11 +03:00
crimean
bbba770fc2 Fix #6914 2019-07-16 14:45:32 +03:00
crimean
78e7bb4d3d Fix #6914 2019-07-16 14:44:56 +03:00
Chumva
56778e1724 Merge remote-tracking branch 'origin/r3.4' 2019-07-16 13:03:13 +03:00
Chumva
68ea16b12e Fix gpx bounds parsing for old version 2019-07-13 18:40:58 +03:00
crimean
0c1018f09b Added fileOffset to TransportRoute 2019-07-13 18:08:29 +03:00
crimean
bade74ee40 Added fileOffset to TransportRoute 2019-07-13 18:07:51 +03:00
Victor Shcherb
b436272ae5 Merge branch 'r3.4' 2019-07-12 18:13:45 +02:00
Victor Shcherb
c45a766c9e Improve fix 2019-07-12 18:13:11 +02:00
crimean
8f031a379e Fix gpx import 2019-07-12 19:06:27 +03:00
crimean
18eafa3719 Fix gpx import 2019-07-12 19:05:57 +03:00
Victor Shcherb
d5909154ba Update route details 2019-07-10 15:43:22 +02:00
crimean
6cdfc14432 Transport route menu fix 2019-07-10 15:53:21 +03:00
crimean
c5b0db7786 Transport route menu fix 2019-07-10 15:52:20 +03:00
crimean
6a7b4fe8d5 Transport route/stop fixes 2019-07-09 21:30:13 +03:00
crimean
f277ac7ccf Transport route/stop fixes 2019-07-09 21:29:39 +03:00
Victor Shcherb
7dbbc4ff78 Merge remote-tracking branch 'origin/r3.4' 2019-07-09 17:36:52 +02:00
Chumva
f500c4597f Add check for referencesToRoutes 2019-07-09 18:20:48 +03:00
Victor Shcherb
aa1b256a39 Merge branch 'r3.4'
Conflicts:
	OsmAnd-java/src/main/java/net/osmand/router/RoutePlannerFrontEnd.java
2019-07-09 11:01:00 +02:00
Victor Shcherb
5b9d3cc126 Update map markers params 2019-07-09 10:59:02 +02:00
Victor Shcherb
94297c88e7 Fix #5922 2019-07-08 18:42:41 +02:00
Victor Shcherb
d2234f6e57 Fix #5922 2019-07-08 18:29:04 +02:00
Victor Shcherb
e01d4f1de8 Fix #5922 2019-07-08 18:28:30 +02:00
Victor Shcherb
03ff085914 Fix #7175 2019-07-08 14:31:18 +02:00
Chumva
091119d06c Add check for empty or single undefined partition 2019-07-08 15:21:59 +03:00
Victor Shcherb
92daf0c8b2 Keep lit as additional 2019-07-08 14:19:54 +02:00
Victor Shcherb
80587b5c9d Add lit to tag 2019-07-08 13:40:01 +02:00
Victor Shcherb
f6e4080b72 Fix sorting 2019-07-08 12:07:02 +02:00
Victor Shcherb
9d813d068c Fix user property name 2019-07-08 11:47:58 +02:00
Victor Shcherb
c73f5f8220 Fix sorting undefined 2019-07-08 11:40:56 +02:00
Chumva
eb8e7dedc1 Fix route info translations 2019-07-08 12:39:43 +03:00
Chumva
90e8a16ad8 Fix compilation 2019-07-08 09:53:12 +03:00
Victor Shcherb
4d91f9b451 Add additional tags 2019-07-08 01:30:33 +02:00
Victor Shcherb
f62a349b47 Fix issues 2019-07-08 01:22:41 +02:00
Victor Shcherb
6a9e6b89a0 Fix small issues 2019-07-08 00:47:57 +02:00
Victor Shcherb
8232b8e998 Fix npes 2019-07-08 00:37:20 +02:00
Victor Shcherb
907b380433 Fix small issues 2019-07-08 00:13:37 +02:00
Victor Shcherb
461a54ece3 Fix compilation errors 2019-07-07 23:13:36 +02:00
crimean
a43dae3a58 Fix compilation 2019-07-07 20:58:44 +03:00
Victor Shcherb
8406e7b20a Fix RouteStatisticsHelper 2019-07-07 19:43:13 +02:00
Victor Shcherb
9d945c90b1 Fix route details 2019-07-07 19:31:38 +02:00
crimean
a3957c150d Refactoring route details statistics 2019-07-07 19:30:01 +03:00
Victor Shcherb
727b6ba399 Improve radius level math 2019-07-07 15:15:49 +02:00
crimean
91e9b9e9cb Fix #6240 2019-07-07 12:05:25 +03:00
Chumva
444f6c02a5 Add support for gpx metadata bounds 2019-07-05 14:13:24 +03:00
Chumva
ef178c7b0d Add support for gpx metadata author and copyright 2019-07-05 13:53:33 +03:00
Chumva
3cb65019c0 Add support for gpx metadata time and keywords 2019-07-05 10:11:46 +03:00
Chumva
884bec9d77 Add support for metadata link 2019-07-04 14:27:59 +03:00
Chumva
f21019af9e Remove unnecessary check for stop exits 2019-07-03 13:49:45 +03:00
Chumva
9777dae8b4 Fix stops with same exits 2019-07-03 12:25:07 +03:00
Chumva
410e2a55f4 Fix #6894 2019-07-03 10:31:47 +03:00
vshcherb
a18c3c8b83
Merge pull request #7116 from osmandapp/issue_7076
Issue 7076
2019-06-27 17:35:37 +02:00
Alexey
e027a31176
Merge pull request #7113 from osmandapp/Fix_7079
Fix #7079
2019-06-27 16:42:20 +03:00
madwasp79
ed50f6a3a8 Merge branch 'master' into issue_7076
# Conflicts:
#	OsmAnd/res/values/strings.xml
2019-06-27 15:25:45 +03:00
madwasp79
fa424cb561 #7076 - added info in current location in context menu 2019-06-27 15:23:52 +03:00
crimean
651688b3af Fix #7022 2019-06-27 14:51:06 +03:00
Chumva
411f8d73ff Fix #7079 2019-06-27 11:48:12 +03:00
Victor Shcherb
3556205c00 Add edit tag icon #6931 2019-06-26 18:47:07 +02:00
Victor Shcherb
e0878f4f04 Add params 2019-06-25 16:15:34 +02:00
Victor Shcherb
92ebc7380e Split 2 methods into different 2019-06-25 16:07:18 +02:00
Victor Shcherb
fd5d7fc517 Update min speed definition 2019-06-25 15:56:21 +02:00
crimean
9ac93f824e Implemented default speed adjusting 2019-06-25 13:41:49 +03:00
crimean
b067b66aa6 Working on min/max/def speed 2019-06-24 15:03:53 +03:00
Chumva
49481e227b Fix #6930 2019-06-24 11:59:33 +03:00
Victor Shcherb
05425ccab6 Add property to exclude resources 2019-06-11 10:37:29 +02:00
Victor Shcherb
99edaef8f6 Add property to exclude resources 2019-06-11 10:33:32 +02:00
Victor Shcherb
aae6a4af30 Make code more documented 2019-06-10 12:13:25 +02:00
crimean
ff5900b8e5 Fix #7021 2019-06-09 13:59:00 +03:00
crimean
d01ed8c6ef Fix transport stop reader 2019-06-08 15:55:00 +03:00
Victor Shcherb
7d58cf110d Fix tests 2019-06-08 12:40:19 +03:00
Victor Shcherb
8834258e80 Fix tests 2019-06-08 12:21:33 +03:00
Victor Shcherb
21d2da32f3 Fix issue with pedestrian routing where multiple footways and highways available around skyscraper 2019-06-08 12:01:02 +03:00
Victor Shcherb
c2f51cd832 Fix gpx utilities 2019-05-29 15:15:38 +02:00
Alexey
781d4e1c53
Merge pull request #6968 from osmandapp/app_profiles
App profiles
2019-05-23 15:01:28 +03:00
Victor Shcherb
28a5b90294 Make public 2019-05-22 18:24:29 +03:00
madwasp79
29f44c6bc0 PR clean up 2019-05-22 16:21:10 +03:00
madwasp79
a7168d400b PR clean up 2019-05-22 14:21:40 +03:00
madwasp79
a560dff59d cleaning code 2 2019-05-21 17:26:49 +03:00
madwasp79
cd8959d114 Merge branch 'master' into app_profiles
# Conflicts:
#	OsmAnd/res/values/strings.xml
2019-05-21 16:37:22 +03:00
madwasp79
c6230dd8c0 refactoring profile reading 2019-05-21 16:28:14 +03:00
madwasp79
ab0e7f0f1c refactoring custom routing calculation params 2019-05-21 15:13:14 +03:00
madwasp79
9916b72555 Add Straight Line and BRouter (if installed) to Routing Types list.
Extracted string resources, refactoring and general clean up of code
Add RouteService to ApplicationMode (to set straight line for AIRCRAFT mode
2019-05-20 16:30:46 +03:00
madwasp79
d70dfd129b changing route reading
fix getRouting method (now it looks for routing profile name, not application profile stringKey
2019-05-16 17:24:48 +03:00
Chumva
698c1bb6b0 Improve coordinates formatting 2019-05-15 18:16:59 +03:00
Chumva
32c56a693e Add topbar coordinates widget 2019-05-15 13:17:07 +03:00
madwasp79
be56a5a120 Merge branch 'master' into app_profiles 2019-05-15 10:20:46 +03:00
madwasp79
998e04181c Fix issue where routing profiles with equal names being overwritten 2019-05-14 15:42:00 +03:00
madwasp79
bd34a38e7d correctly shows names of files with custom routing profiles 2019-05-13 12:51:20 +03:00
madwasp79
0f7f1b6e89 ui and behavioral fixes 2019-05-13 11:51:53 +03:00
madwasp79
2a51b39e68 Read and parse all routing files from .../files/routing/ 2019-05-08 13:09:29 +03:00
madwasp79
6c500b6c11 Updating (rewrite on edit) of profiles.
Check if profile saved before switching to screen or map settings
Creates dedicated folder for routing.xml
2019-05-03 13:50:30 +03:00
madwasp79
08d28d65ed Setting navigation profile to application profile. Work in progress. Need testing. 2019-05-02 16:27:38 +03:00
Victor Shcherb
ce2c219352 Fix bearing 2019-04-26 13:20:33 +03:00
Chumva
a8dc66f9f5 Merge branch 'r3.3' 2019-04-23 15:56:26 +03:00
Chumva
de89766dbd Fix #6853 2019-04-23 15:39:50 +03:00
crimean
7cf1598753 Merge branch 'r3.3' 2019-04-22 12:17:24 +03:00
crimean
20fbb15380 Introduce getPixDensity method 2019-04-22 10:54:47 +03:00
crimean
f473a8cf93 Merge branch 'r3.3' 2019-04-14 23:20:23 +03:00
crimean
2fb3484612 Fix #6826' 2019-04-14 23:20:08 +03:00
Victor Shcherb
a983fcc82c Format code 2019-04-12 18:23:05 +02:00
vshcherb
37919b2f77
Merge pull request #6671 from hvdwolf/master
REDO: avoid test failing on non en-US default-locale (#6106)
2019-04-12 18:22:00 +02:00
crimean
688d193803 Fix alternative name for poi additionals. Turn on search tests. 2019-04-08 20:39:10 +03:00
crimean
2611dbf829 Fix unknown PT geometry color 2019-04-05 20:59:49 +03:00
crimean
8a0304f99f Draw straight line between stops if no geometry found (PT) 2019-04-05 19:49:25 +03:00
crimean
32b80eeb3b Fix OLC search 2019-04-04 13:45:48 +03:00
crimean
15a3dc170c Fix OLC with locality 2019-04-02 18:12:52 +03:00
crimean
e7c2bd150b Fix #6599 2019-04-01 18:11:01 +03:00
crimean
51be2bb3f8 Fix PT route details - added boarding time. Few UI fixes. 2019-03-23 11:33:27 +03:00
vshcherb
c452d8429d
Merge pull request #6705 from osmandapp/azimuth_6345
Add azimuth to measurement tool #6345
2019-03-19 12:18:40 +01:00
madwasp79
5bf210883d pr fix 2019-03-18 18:21:14 +02:00
madwasp79
d700221eb0 pr fix 2019-03-18 17:43:20 +02:00
Victor Shcherb
f89bae4595 Parse as float to avoid issues with custom user input 2019-03-18 15:58:25 +01:00
madwasp79
d7948a7316 Show azimuth from last point in measurement tool and in points list 2019-03-18 16:11:04 +02:00
Victor Shcherb
0c8ce1270a Make parameter 0-based maxnumber of changes 2019-03-17 17:06:30 +01:00
Victor Shcherb
7933c74faf Add boarding time for all transports 2019-03-17 14:19:26 +01:00
Victor Shcherb
fc9e4e03c2 Update routing and add parameters to configuration 2019-03-17 14:15:54 +01:00
Victor Shcherb
a607b5c636 Update routing and add parameters to configuration 2019-03-17 14:09:41 +01:00
Chumva
83e02f1dc6 removed unnecessary changes 2019-03-16 00:18:36 +02:00
Chumva
4259dea0fe remove unnecessary log 2019-03-15 19:14:54 +02:00
Chumva
cb23520a0a Fix min max values for steepness and improve ui 2019-03-15 19:12:50 +02:00
Victor Shcherb
a0b6e40c1f Merge branch 'r3.3' of github.com:osmandapp/Osmand into r3.3 2019-03-15 17:39:37 +01:00
Victor Shcherb
d2ab470e65 Fix critical issue with PT 2019-03-15 17:38:55 +01:00
crimean
b3551ac82b Merge branch 'r3.3' of https://github.com/osmandapp/Osmand into r3.3 2019-03-15 19:07:02 +03:00
crimean
6c542058b1 Fix PT details time 2019-03-15 19:06:51 +03:00
Victor Shcherb
bb509f9ab6 Try to speedup pt calculation 2019-03-15 14:41:13 +01:00