Commit graph

2217 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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