Victor Shcherb
|
ac5a345455
|
Fix warning r3.7
|
2020-05-20 18:00:34 +02:00 |
|
Victor Shcherb
|
ae10663f55
|
Merge branch 'r3.7' of github.com:osmandapp/Osmand into r3.7
|
2020-05-20 17:28:51 +02:00 |
|
Victor Shcherb
|
1a71225c8a
|
Refactor and fix compilation
|
2020-05-20 17:28:44 +02:00 |
|
vshcherb
|
ed203001ff
|
Merge pull request #9019 from osmandapp/FixCME
Fix ConcurrentModificationException
|
2020-05-20 14:15:54 +02:00 |
|
Nazar-Kutz
|
62c114f36e
|
Fix ConcurrentModificationException
|
2020-05-20 14:10:07 +03:00 |
|
Nazar-Kutz
|
0b5db53bc5
|
Fix ConcurrentModificationException
|
2020-05-20 14:01:14 +03:00 |
|
Vitaliy
|
801c61f5ae
|
Add check for render file extension
|
2020-05-20 13:43:15 +03:00 |
|
vshcherb
|
5ccca873bd
|
Merge pull request #9020 from osmandapp/import_fixes
Check XML files during import
|
2020-05-20 12:02:03 +02:00 |
|
Nazar-Kutz
|
49d346771c
|
Fix ConcurrentModificationException
|
2020-05-20 12:33:10 +03:00 |
|
Vitaliy
|
7c86a40225
|
Move import dialog to separate class
|
2020-05-20 12:26:12 +03:00 |
|
Nazar-Kutz
|
43ba5d203f
|
Fix ConcurrentModificationException
|
2020-05-20 12:15:07 +03:00 |
|
Victor Shcherb
|
ca5448286a
|
Small refactoring transport
|
2020-05-19 18:40:48 +02:00 |
|
Vitaliy
|
31b408bbb3
|
Fix possible npe
|
2020-05-18 16:34:33 +03:00 |
|
vshcherb
|
392d69dd66
|
Merge pull request #8918 from osmandapp/create_custom_poi
custom poi types cache db
|
2020-05-18 15:23:05 +02:00 |
|
Victor Shcherb
|
c906fcab5b
|
Small refactoring
|
2020-05-18 15:20:30 +02:00 |
|
Victor Shcherb
|
e95aa4483b
|
Merge branch 'master' of github.com:osmandapp/Osmand
|
2020-05-18 13:15:58 +02:00 |
|
Victor Shcherb
|
35c7ec20c3
|
Update icon name
|
2020-05-18 13:15:50 +02:00 |
|
Dima-1
|
a8db838530
|
Merge branch 'master' into Fix_default_color_favorites
# Conflicts:
# OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
|
2020-05-18 12:00:36 +03:00 |
|
Dima-1
|
a5f40100c8
|
Fix favorites default icon and background
|
2020-05-18 11:53:12 +03:00 |
|
veliymolfar
|
3a800d2520
|
refactor poi cache db
|
2020-05-18 11:24:41 +03:00 |
|
Victor Shcherb
|
b06f746d7a
|
Fix multi route planner
|
2020-05-17 21:05:33 +02:00 |
|
Victor Shcherb
|
500cd84903
|
Update transport route planner #8986
|
2020-05-17 19:46:55 +02:00 |
|
Victor Shcherb
|
9a7fcbd7b8
|
Fix error #7365
|
2020-05-17 14:40:04 +02:00 |
|
vshcherb
|
36ae49de65
|
Merge pull request #8978 from osmandapp/route_merge
Route merge
|
2020-05-17 13:24:16 +02:00 |
|
Victor Shcherb
|
684e2d3d36
|
Fix routing
|
2020-05-17 13:21:59 +02:00 |
|
Victor Shcherb
|
7589610a27
|
Fix routing
|
2020-05-16 22:55:40 +02:00 |
|
Victor Shcherb
|
30fe9c8698
|
Add more info
|
2020-05-16 22:41:21 +02:00 |
|
Victor Shcherb
|
ee1f8c683b
|
Optimize drawing geometry
|
2020-05-16 22:35:30 +02:00 |
|
Victor Shcherb
|
f529dfad5d
|
Optimize drawing geometry
|
2020-05-16 22:24:08 +02:00 |
|
Victor Shcherb
|
a01a4ad63e
|
Fix broken geometry
|
2020-05-16 21:28:00 +02:00 |
|
Victor Shcherb
|
0d96394a0e
|
Udpate planner
|
2020-05-16 20:15:16 +02:00 |
|
Victor Shcherb
|
15ce3fa998
|
Add incomplete stops to cached indexes
|
2020-05-16 19:57:11 +02:00 |
|
Victor Shcherb
|
a00011693a
|
clean up
|
2020-05-16 17:18:58 +02:00 |
|
Victor Shcherb
|
a52767bdb3
|
clean up
|
2020-05-16 17:17:04 +02:00 |
|
Victor Shcherb
|
7319a235c0
|
Lazy loading reading
|
2020-05-16 17:12:34 +02:00 |
|
Victor Shcherb
|
4873ab04a9
|
Update transport rotues
|
2020-05-16 16:51:51 +02:00 |
|
Victor Shcherb
|
e5bd6cb065
|
Update transport rotues
|
2020-05-16 16:49:17 +02:00 |
|
Victor Shcherb
|
52fec9c7cc
|
Update transport rotues
|
2020-05-16 16:48:01 +02:00 |
|
Victor Shcherb
|
b456c41b34
|
Update transport rotues
|
2020-05-16 16:33:59 +02:00 |
|
Victor Shcherb
|
99503fdec5
|
Update transport rotues
|
2020-05-16 16:03:54 +02:00 |
|
Victor Shcherb
|
87f49ed3d9
|
Transport route
|
2020-05-15 17:27:59 +02:00 |
|
Victor Shcherb
|
082a24a21a
|
Fix upgrade process
|
2020-05-15 15:51:54 +02:00 |
|
MadWasp79
|
9fe736957d
|
clear garbage
|
2020-05-15 14:57:06 +03:00 |
|
MadWasp79
|
3c655c4f98
|
fixes
|
2020-05-15 14:39:42 +03:00 |
|
MadWasp79
|
3ec03040ea
|
merge route parts implementation
|
2020-05-15 14:36:31 +03:00 |
|
veliymolfar
|
ccc98d8c87
|
Merge branches 'create_custom_poi' and 'master' of https://github.com/osmandapp/Osmand into create_custom_poi
|
2020-05-15 12:42:46 +03:00 |
|
Dima-1
|
beb6a1805f
|
Fix #8926 Default color of Favorites changed to black
|
2020-05-14 19:06:37 +03:00 |
|
MadWasp79
|
d3d55cec4b
|
combine routes WIP
|
2020-05-14 10:18:21 +03:00 |
|
Vitaliy
|
630999f26e
|
Fix #8593
|
2020-05-13 17:42:48 +03:00 |
|
vshcherb
|
183bcb7b03
|
Merge pull request #8946 from osmandapp/minor_fixes
Fix possible StringIndexOutOfBoundsException
|
2020-05-13 16:33:37 +02:00 |
|
Victor Shcherb
|
733dfc3027
|
Add road shield
|
2020-05-13 15:45:45 +02:00 |
|
MadWasp79
|
3aafda798b
|
Merge branch 'master' into route_merge
|
2020-05-13 15:12:45 +03:00 |
|
MadWasp79
|
7699e2061c
|
add reading of incomplete routes. Add cache - work in progress
|
2020-05-13 15:09:30 +03:00 |
|
Vitaliy
|
dee6476797
|
Remove unnecessary sort
|
2020-05-12 21:57:52 +03:00 |
|
Vitaliy
|
0e12424179
|
Fix possible StringIndexOutOfBoundsException
|
2020-05-12 13:37:10 +03:00 |
|
MadWasp79
|
8e56faabd1
|
Merge branch 'master' into route_merge
|
2020-05-12 12:45:18 +03:00 |
|
MadWasp79
|
2c8824341a
|
work in progress
|
2020-05-12 12:42:12 +03:00 |
|
Victor Shcherb
|
07385b53c3
|
Add obf file
|
2020-05-12 11:23:29 +02:00 |
|
Victor Shcherb
|
4526ae6426
|
Fix out of memory crash with map generation
|
2020-05-11 18:20:48 +02:00 |
|
Victor Shcherb
|
713b86d2fb
|
Remove profile based constants use speed to replicate their values cause speed could be configured - #8749
|
2020-05-11 14:31:03 +02:00 |
|
MadWasp79
|
87a7b42f66
|
work in project, crude merge working
|
2020-05-08 16:40:58 +03:00 |
|
veliymolfar
|
c02a7820fa
|
custom poi types cache db
|
2020-05-08 11:29:36 +03:00 |
|
Dima-1
|
dfdd6d5729
|
Fix black color favorite icon.
|
2020-05-06 18:17:42 +03:00 |
|
Vitaliy
|
5a3d0675f2
|
Fix #8817
|
2020-05-04 12:51:18 +03:00 |
|
Victor Shcherb
|
b821db8357
|
Merge branch 'master' of github.com:osmandapp/Osmand
|
2020-05-01 17:42:00 +02:00 |
|
Victor Shcherb
|
3e6733d538
|
Fix issue #8835
|
2020-05-01 17:41:39 +02:00 |
|
vshcherb
|
9fc4b1281d
|
Merge pull request #8876 from osmandapp/pt_static_fix
fix static fields
|
2020-05-01 16:12:38 +02:00 |
|
MadWasp79
|
70ad2b36a6
|
fix static fields
|
2020-05-01 17:08:06 +03:00 |
|
vshcherb
|
cd4296b27a
|
Merge pull request #8875 from osmandapp/poi_edit_location_fix_8839
fix edit poi location #8839
|
2020-05-01 15:44:25 +02:00 |
|
Victor Shcherb
|
27c19e483b
|
Update transport route / add new method
|
2020-05-01 15:25:02 +02:00 |
|
MadWasp79
|
9ec38f6341
|
string format fix
|
2020-05-01 16:19:46 +03:00 |
|
max-klaus
|
4d498f4e10
|
Merge branch 'master' into create_custom_poi
|
2020-04-28 18:14:41 +03:00 |
|
MadWasp79
|
dd9e9ec9f2
|
add native pt setting to dev plugin
fix no result crash
|
2020-04-28 16:26:08 +03:00 |
|
veliymolfar
|
5204a2a15a
|
read poi categories/types from obf
|
2020-04-27 13:43:10 +03:00 |
|
MadWasp79
|
937fedc1bf
|
Merge branch 'master' into tp_to_native
|
2020-04-23 19:02:33 +03:00 |
|
MadWasp79
|
aa36bff8c6
|
remove unused fields
|
2020-04-23 14:47:52 +03:00 |
|
Vitaliy
|
f750a7732f
|
Download description in progress
|
2020-04-22 21:39:44 +03:00 |
|
MadWasp79
|
580efa0cc0
|
Merge branch 'master' into tp_to_native
|
2020-04-21 11:52:45 +03:00 |
|
Vitaliy
|
2967b8f140
|
Merge branch 'master' of https://github.com/osmandapp/Osmand into custom_downloads
# Conflicts:
# OsmAnd/res/values/strings.xml
# OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java
|
2020-04-20 17:12:05 +03:00 |
|
Reimar Döffinger
|
2cc239b842
|
Change memoryLimitation variable to long.
Otherwise it overflows to a negative value and gives
out of memory errors if set to 2GB or higher.
|
2020-04-19 23:39:46 +02:00 |
|
MadWasp79
|
9cc7a4f6d5
|
comment unused fields in pt result conversion
|
2020-04-17 17:29:42 +03:00 |
|
Vitaliy
|
4ca1925ac5
|
Merge branch 'master' of https://github.com/osmandapp/Osmand into custom_downloads
# Conflicts:
# OsmAnd/res/values/strings.xml
|
2020-04-16 18:10:19 +03:00 |
|
Vitaliy
|
309da9c907
|
Merge branch 'master' of https://github.com/osmandapp/Osmand into Wiki
# Conflicts:
# OsmAnd/res/values-it/strings.xml
# OsmAnd/res/values-zh-rTW/strings.xml
|
2020-04-16 16:18:09 +03:00 |
|
Nazar-Kutz
|
81089f916d
|
Small fixes
|
2020-04-16 14:54:20 +03:00 |
|
Nazar-Kutz
|
9cc0d0b77a
|
Fix POI categories order
|
2020-04-16 11:51:37 +03:00 |
|
Nazar-Kutz
|
447682d319
|
Wikipedia fixes (After review) p.2
|
2020-04-16 11:12:40 +03:00 |
|
Vitaliy
|
ac60edda8d
|
Add gpx download type
|
2020-04-14 23:49:09 +03:00 |
|
MadWasp79
|
a128455d7e
|
cleaning
|
2020-04-14 14:59:33 +03:00 |
|
Nazar-Kutz
|
989417ffab
|
Wikipedia Poi Fixes (After review)
|
2020-04-14 09:58:58 +03:00 |
|
Victor Shcherb
|
6aab0d9f0a
|
Improve gpx parsing
|
2020-04-13 13:06:29 +02:00 |
|
Victor Shcherb
|
ec63b4ce11
|
Small fixes
|
2020-04-12 19:21:32 +02:00 |
|
Victor Shcherb
|
9cc1da2fb6
|
Add small method
|
2020-04-12 14:08:14 +02:00 |
|
MadWasp79
|
2c4402631e
|
testing
|
2020-04-10 15:52:40 +03:00 |
|
MadWasp79
|
53d64e8306
|
alpha
|
2020-04-08 18:29:22 +03:00 |
|
vshcherb
|
d2b1f577c0
|
Merge branch 'master' into WikipediaDashboard
|
2020-04-08 14:59:47 +02:00 |
|
Nazar-Kutz
|
3d3da9ee8e
|
Wikipedia Poi (Fixes 1)
|
2020-04-08 12:15:20 +03:00 |
|
MadWasp79
|
db28739267
|
debugging
|
2020-04-06 15:12:29 +03:00 |
|
MadWasp79
|
91967e9ead
|
interface to native
|
2020-04-03 10:39:35 +03:00 |
|
max-klaus
|
2e487bf47d
|
Fix export route to gpx issue
|
2020-04-01 10:55:23 +03:00 |
|
Vitaliy
|
ddf505025e
|
Fix rendering file extension and remove import xml file dialog
|
2020-03-31 21:31:29 +03:00 |
|
Nazar-Kutz
|
7b268cd9d9
|
Add Wikipedia POI separate screen and logic
|
2020-03-31 12:41:49 +03:00 |
|
MadWasp79
|
0ca08b7581
|
Merge branch 'master' into tp_to_native
|
2020-03-30 11:14:47 +03:00 |
|
Vitaliy
|
88d4365e86
|
Merge branch 'master' of https://github.com/osmandapp/Osmand into custom_plugins
# Conflicts:
# OsmAnd/res/values/strings.xml
|
2020-03-30 10:43:31 +03:00 |
|
Victor Shcherb
|
04ec715d95
|
Fix #8590
|
2020-03-27 18:33:33 +01:00 |
|
Victor Shcherb
|
644038889e
|
Dont index borough
|
2020-03-26 19:42:01 +01:00 |
|
Vitaliy
|
b774ccc51d
|
Merge branch 'master' of https://github.com/osmandapp/Osmand into custom_plugins
# Conflicts:
# OsmAnd/res/values/strings.xml
# OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java
|
2020-03-26 11:09:53 +02:00 |
|
Vitaliy
|
0c52eeef18
|
Fix check for render and router plugin items
|
2020-03-25 22:02:05 +02:00 |
|
max-klaus
|
67a9205157
|
Merge branch 'master' into FIx_8032_Customize_fav_icons_tmp
|
2020-03-25 20:59:00 +03:00 |
|
max-klaus
|
7b3aea100d
|
Refactor
|
2020-03-25 20:55:23 +03:00 |
|
Victor Shcherb
|
8e6028c6a4
|
Fix #8584
|
2020-03-24 21:46:13 +01:00 |
|
madwasp79
|
3a2a8466c2
|
PT native implementation
|
2020-03-24 18:02:23 +02:00 |
|
Dima-1
|
59e4284d00
|
Add gpx wptpt editor
|
2020-03-24 12:14:33 +02:00 |
|
Vitaliy
|
3e81b5926e
|
Merge branch 'master' into custom_plugins
# Conflicts:
# OsmAnd/res/values/strings.xml
# OsmAnd/src/net/osmand/plus/OsmandPlugin.java
# OsmAnd/src/net/osmand/plus/SettingsHelper.java
# OsmAnd/src/net/osmand/plus/quickaction/QuickActionRegistry.java
# OsmAnd/src/net/osmand/plus/settings/ExportProfileBottomSheet.java
|
2020-03-23 13:41:47 +02:00 |
|
max-klaus
|
249d1b60d7
|
Added RESOURCES type to import/export
|
2020-03-22 19:04:43 +03:00 |
|
max-klaus
|
d518c29d0f
|
Hide gpx options for new gpx routing
|
2020-03-20 11:23:30 +03:00 |
|
max-klaus
|
8710881eea
|
Added point names to route gpx
|
2020-03-19 21:43:19 +03:00 |
|
max-klaus
|
b499315837
|
Merge branch 'master' of github.com:osmandapp/Osmand
|
2020-03-19 12:54:49 +03:00 |
|
max-klaus
|
0f2490c747
|
Fix gpx route importing (read ele)
|
2020-03-19 12:54:39 +03:00 |
|
Victor Shcherb
|
c7bbb80213
|
Fix npe
|
2020-03-18 16:33:46 +01:00 |
|
max-klaus
|
5335d7c3e0
|
Remove elevation tags from gpx
|
2020-03-17 22:26:52 +03:00 |
|
max-klaus
|
056468be1b
|
Fix segment indexes
|
2020-03-17 21:16:49 +03:00 |
|
max-klaus
|
8be3628037
|
Fix start / end loop
|
2020-03-17 19:46:09 +03:00 |
|
max-klaus
|
dc170e54ce
|
Merge branch 'master' into gpx_route
|
2020-03-17 18:48:12 +03:00 |
|
max-klaus
|
95087d3b88
|
Fix gpx to route fixes
|
2020-03-17 18:38:56 +03:00 |
|
max-klaus
|
0e9148ce5b
|
Fix turn lanes write/read
|
2020-03-15 23:51:16 +03:00 |
|
max-klaus
|
03e67d495b
|
Fixed gpx to route feature
|
2020-03-15 19:17:38 +03:00 |
|
max-klaus
|
86f4cf45f7
|
Gpx to route in progress
|
2020-03-14 21:18:30 +03:00 |
|
Dima-1
|
9a0a518948
|
Add buttons
|
2020-03-12 19:08:19 +02:00 |
|
MadWasp79
|
48af2bdd88
|
wip-1
|
2020-03-12 11:05:02 +02:00 |
|
max-klaus
|
2bbb8b212d
|
Truncate route date
|
2020-03-11 21:37:46 +03:00 |
|
max-klaus
|
d69553bdd8
|
Optimize xml output
|
2020-03-10 11:29:10 +03:00 |
|
Victor Shcherb
|
13c1fec075
|
Fix issue #8649
|
2020-03-09 17:08:31 +01:00 |
|
max-klaus
|
0fb78ed4f6
|
Added lanes to gpx export. Write route segments to gpx.
|
2020-03-07 23:34:18 +03:00 |
|
Dima-1
|
c670aa2d8b
|
Merge branch 'master' into FIx_8032_Customize_fav_icons_tmp
# Conflicts:
# OsmAnd/res/values/strings.xml
# OsmAnd/src/net/osmand/data/FavouritePoint.java
|
2020-03-06 11:28:40 +02:00 |
|
Yan
|
17708d6932
|
Fix rendering_exception leading to "Could not draw chosen area"
Exception was caused by additionalTypes being null.
Occured when zooming out.
|
2020-03-05 00:21:42 +01:00 |
|
Denis Kolomiets
|
59f479098a
|
quick fix for npe
|
2020-03-04 16:18:36 +02:00 |
|
Dima-1
|
dcdca35a4f
|
Merge branch 'master' into FIx_8032_Customize_fav_icons_tmp
# Conflicts:
# OsmAnd/res/layout/favorites_list_item.xml
|
2020-03-03 14:14:15 +02:00 |
|
Vitaliy
|
145faf5168
|
Add import rendering files
|
2020-03-02 15:39:58 +02:00 |
|
Vitaliy
|
2bc1b51806
|
Fix possible npe
|
2020-03-02 15:38:56 +02:00 |
|
vshcherb
|
3987b9a25b
|
Merge pull request #8568 from osmandapp/polycenter_fix
fix multipolygon center for map and poi
|
2020-02-28 12:45:54 +02:00 |
|
max-klaus
|
fd997ad521
|
Added 28 Free Street search test
|
2020-02-27 18:46:38 +03:00 |
|
Victor Shcherb
|
b72f83f319
|
Improve search
|
2020-02-27 15:53:01 +02:00 |
|
Victor Shcherb
|
3485dc86c7
|
Test fix
|
2020-02-27 15:47:37 +02:00 |
|
max-klaus
|
fa77b30a13
|
Fix #8471
|
2020-02-27 16:37:05 +03:00 |
|
Victor Shcherb
|
e0498b4ba5
|
Disable test
|
2020-02-26 18:31:55 +02:00 |
|
Victor Shcherb
|
c734cb6256
|
Fix 3.6 Search
|
2020-02-26 18:30:54 +02:00 |
|
vshcherb
|
eeeda95f2c
|
Merge pull request #8569 from osmandapp/minor_fixes
Minor fixes
|
2020-02-26 17:59:06 +02:00 |
|
Vitaliy
|
09f735eec9
|
Fix several possible npe
|
2020-02-26 17:04:31 +02:00 |
|
MadWasp79
|
628b3167c6
|
refactoring
|
2020-02-26 15:50:41 +02:00 |
|
MadWasp79
|
6a56535c9f
|
fix multipolygon center for map and poi
|
2020-02-26 15:38:27 +02:00 |
|