Commit graph

1158 commits

Author SHA1 Message Date
Vitaliy
3871b23155 Merge branch 'r3.9' 2021-02-09 15:41:51 +02:00
Vitaliy
1ededaec5a Get selectedGpxFile for route points 2021-02-09 02:02:19 +02:00
Dima-1
2efd0cad00 Add custom activity type 2021-02-08 18:27:18 +02:00
Dima-1
e261150279 Convert RouteActivityType to class 2021-02-08 16:41:10 +02:00
vshcherb
eb21102c82
Merge pull request #10732 from osmandapp/Tsearch
fix search
2021-02-08 12:48:36 +01:00
Dima-1
f20a8882bd Fix get activity type name and icon 2021-02-06 13:11:49 +02:00
Victor Shcherb
8a5ff11264 Fix search 2021-02-04 19:24:44 +01:00
max-klaus
b35e8ea6be Process xml namespaces for java 2021-02-04 16:46:51 +03:00
Dima-1
df3c171a9c Merge branch 'master' into travel_obf_gpx_profile
# Conflicts:
#	OsmAnd/res/values/strings.xml
2021-02-04 10:53:31 +02:00
Dima-1
e9b02ae74b Renew activity icon 2021-02-03 16:52:24 +02:00
Victor Shcherb
c4448a5dd8 Merge remote-tracking branch 'origin/r3.9' 2021-02-03 12:42:55 +01:00
Vitaliy
95cc20b022 Add check for available oauth request token 2021-02-03 11:52:51 +02:00
Dima-1
055c681f4b Add activity types 2021-02-02 23:34:57 +02:00
vshcherb
837b29401c
Merge pull request #10737 from osmandapp/fix_piste_type
Fix piste type
2021-02-02 20:55:44 +01:00
Dima-1
7f678334c2 Merge branch 'master' into travel_obf_gpx_profile 2021-02-02 17:05:05 +02:00
Victor Shcherb
bb9a057665 Add route activity type class 2021-02-02 15:40:48 +01:00
Dima-1
c517b730e4 Fix piste type 2021-02-01 23:40:35 +02:00
Victor Shcherb
816ed5722b Don't allow empty words 2021-02-01 19:49:06 +01:00
Victor Shcherb
3cb9ab9eff Try to separate how we read & search poi by exact multiword 2021-02-01 19:47:20 +01:00
Kseniia
016320795c fix search 2021-02-01 19:31:47 +02:00
nazar-kutz
17bfdad2c6 add roundabout info about exit number and turn angle 2021-02-01 10:56:17 +02:00
nazar-kutz
fbb1c770a1 implement OSRM turn types parsing 2021-02-01 10:10:50 +02:00
Dima-1
d8ff9fb1e7 Add route activity type 2021-01-30 17:02:37 +02:00
Dima-1
e150d39c61 rename 2021-01-29 13:56:10 +02:00
Dima-1
2ae5bb6301 refactoring 2021-01-29 13:45:09 +02:00
Dima-1
74ffdbeba5 refactoring 2021-01-29 13:40:01 +02:00
Dima-1
4aa877f7f6 Travel - vehicle mode 2021-01-29 10:50:05 +02:00
Dima-1
94b97e0318 Merge branch 'master' into travel_obf_gpx_track
# Conflicts:
#	OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelObfHelper.java
2021-01-27 11:22:24 +02:00
Victor Shcherb
3f69fcbe07 Fix extension for uploading images 2021-01-25 19:22:50 +01:00
vshcherb
522631c135
Update NetworkUtils.java 2021-01-25 19:14:34 +01:00
Dima-1
ac66073e12 Merge branch 'master' into travel_obf_gpx_track 2021-01-25 15:24:15 +02:00
Victor Shcherb
aeb099cb8a Change - to +: according to comment 2021-01-25 10:15:53 +01:00
Dima-1
b5f555d367 Merge branch 'master' into travel_obf_gpx_track
# Conflicts:
#	OsmAnd/src/net/osmand/plus/wikivoyage/explore/ExploreTabFragment.java
2021-01-25 10:56:26 +02:00
Vitaliy
a8406fda7d Merge branch 'master' into gpx_context_menu_description
# Conflicts:
#	OsmAnd/res/menu/track_menu_bottom_navigation.xml
#	OsmAnd/res/values/strings.xml
#	OsmAnd/src/net/osmand/plus/track/TrackMenuFragment.java
2021-01-25 02:43:12 +02:00
Dima-1
f1569fd5fb Travel GPX card 2021-01-24 23:48:41 +02:00
cepprice
101402a3c4 Add description card 2021-01-23 21:14:42 +05:00
Victor Shcherb
fd7af59cdd Change - to +: according to comment 2021-01-23 14:37:20 +01:00
Victor Shcherb
9072c97300 Add comments 2021-01-23 14:27:01 +01:00
Victor Shcherb
6906b04a53 Fix non-transitive comparision https://github.com/osmandapp/OsmAnd/issues/10626 2021-01-21 18:42:40 +01:00
Victor Shcherb
d7828b4bf0 fix bug cause roundabout based on circle is completely incorrect 2021-01-21 17:55:43 +01:00
Victor Shcherb
97e6395def fix bug cause roundabout based on circle is completely incorrect 2021-01-21 17:49:04 +01:00
vshcherb
b8787e4121
Merge pull request #10632 from osmandapp/T10571
Fix turn angle for roundabout
2021-01-21 15:08:36 +01:00
Kseniia
b523294d6d fix turn angle for roundabout 2021-01-21 15:49:04 +02:00
vshcherb
0ba936962e
Merge pull request #10630 from osmandapp/fix_travel_article_navigation
Fix travel guides navigation
2021-01-21 11:14:20 +01:00
Dima-1
bb10787d1c Fix travel guides navigation 2021-01-19 21:53:12 +02:00
Victor Shcherb
d416ef0a6a Fix crash with search navigation 2021-01-19 16:45:03 +01:00
vshcherb
981d374b80
Merge pull request #10587 from jensMF/fix_xml_schema_calculated_and_planned_routes
Add BaseCamp compatibility for planned Tracks and claculated routes exported to gpx
2021-01-18 01:26:36 +01:00
vshcherb
bead08eb24
Merge pull request #10600 from osmandapp/fix_coordinates_format
Fix #10517
2021-01-17 13:43:23 +01:00
Naumov Dmitry
bf5de1a4e2 Fix #10517 2021-01-17 16:54:17 +05:00
jensMF
f0d54c6217 fixed xml schema by changing the order of wpt rte and trk and adding the osmand namespace to the route and types extensions 2021-01-16 01:15:49 +01:00
Kseniia
85c0e66852 fix interpolation for alphabetic 2021-01-15 21:27:42 +02:00
vshcherb
67c122ce03
Merge pull request #10564 from osmandapp/T7525
Add condition for BuildingInterpolation.ALPHABETIC
2021-01-15 20:16:04 +01:00
Kseniia
d29c271471 fix interpolation for alphabetic 2021-01-15 21:13:18 +02:00
vshcherb
1d16ff216a
Update Building.java 2021-01-15 18:49:17 +01:00
vshcherb
c98ae20599
Update Building.java 2021-01-15 18:47:02 +01:00
Kseniia
d25981a18d fix interpolation for alphabetic 2021-01-15 19:35:20 +02:00
Dima-1
fd76a4054f Merge branch 'master' into travel_obf_gpx
# Conflicts:
#	OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelObfHelper.java
2021-01-14 14:06:50 +02:00
Kseniia
b57b7ef268 fix interpolation for alphabetic 2021-01-13 09:40:20 +02:00
Victor Shcherb
9251a6bb4a Fix https://github.com/osmandapp/OsmAnd/issues/10454 2021-01-12 18:33:43 +01:00
Kseniia
925e42546d add condition for BuildingInterpolation.ALPHABETIC 2021-01-12 17:52:03 +02:00
alex-osm
46005225fd
Merge pull request #10494 from osmandapp/fix_using_google_maps_links
Fix opening links to maps "geo:0,0"
2021-01-10 16:26:00 +03:00
max-klaus
75e5f7828a Fix gpx reading for travel obf 2021-01-10 14:12:50 +03:00
Skalii
3566ec7652 fix previous changes;
add new check;
2021-01-08 19:05:02 +02:00
Skalii
53b3addcb5 Merge remote-tracking branch 'origin/master' into fix_using_google_maps_links 2021-01-08 18:56:03 +02:00
vshcherb
0e991a5e87
Merge pull request #10542 from jensMF/fix_gpx_xml_schema_alternative
fix #1326 and #10209 by adding the XML namespace 'osmand' to the header and the writeExtensions function
2021-01-08 17:40:26 +01:00
Dima-1
279349919d Merge branch 'master' into travel_obf_gpx
# Conflicts:
#	OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelObfHelper.java
2021-01-08 13:31:56 +02:00
Dima-1
b86a696643 Fix travel obf gpx language 2021-01-08 13:26:40 +02:00
jensMF
71bbd868e2 added 'osmand' namespace to header and extensions in gpx files 2021-01-07 22:38:59 +01:00
Kseniia
80f083cf3a add condition for 0 planRoadDirection 2021-01-07 21:30:15 +02:00
Kseniia
371e60b3af add condition for 0 planRoadDirection 2021-01-07 21:28:35 +02:00
vshcherb
370d8155ee
Merge pull request #10539 from osmandapp/T8652
Add conditions for restrictions via ways
2021-01-07 11:22:43 +01:00
Kseniia
2c802717a9 add conditions for restrictions via ways 2021-01-07 12:15:51 +02:00
Kseniia
0361b6b773 add conditions for restrictions via ways 2021-01-07 12:11:49 +02:00
Dima-1
01938d8a45 Fix travel obf gpx 2021-01-06 19:32:13 +02:00
vshcherb
e74c72af73
Merge pull request #10518 from osmandapp/T9851
Add filterPoiByType()
2021-01-06 14:59:00 +01:00
Vitaliy
2ebbcb8a90 fix typo 2021-01-06 13:41:15 +02:00
Vitaliy
37bfc759b1 Update CachedOsmandIndexes after map download 2021-01-06 00:30:00 +02:00
Kseniia
3096f6f8fd refactoring 2021-01-06 00:05:21 +02:00
Kseniia
be80a4c574 refactoring 2021-01-05 23:29:26 +02:00
Kseniia
d74e57db84 refactoring 2021-01-05 22:49:39 +02:00
Victor Shcherb
f27c397835 Fix so we don't store old versions of indexes 2021-01-05 21:19:33 +01:00
Victor Shcherb
ae9fc3234c Update script 2021-01-05 17:36:30 +01:00
Kseniia
b9339cdab5 fix filter by building and internet poi 2021-01-05 15:11:14 +02:00
Kseniia
3e9ef3914b add filterPoiByType() 2021-01-04 10:08:10 +02:00
Skalii
0205628a48 rolled back previous changes;
fix address uri without lat & lon in searchRequest (example: geo:0,0?q=Van+Bleiswijkstraat+66,+2582+LG+The+Hague)
2020-12-31 15:15:17 +02:00
max-klaus
bf35f55072 Merge branch 'master' of github.com:osmandapp/Osmand 2020-12-30 15:57:26 +03:00
max-klaus
6236da3a02 Refactoring travel helpers 2020-12-30 15:53:50 +03:00
Kseniia
e32591c99e add frequantly word 2020-12-30 14:19:28 +02:00
Victor Shcherb
d2b0b3895b Fix #9704 2020-12-30 12:57:53 +01:00
Kseniia
a94e3ace11 #10230 Change leftTurn 2020-12-29 14:31:08 +02:00
Kseniia
cb5e2f0a8e #10230 Change leftTurn 2020-12-28 21:05:54 +02:00
Victor Shcherb
75e93d6ec7 names update 2020-12-23 12:02:42 +01:00
max-klaus
bbd7678425 Small fixes TravelObfHelper 2020-12-18 14:43:44 +03:00
Dima-1
6cfc51fedf Fix obf helper 2020-12-15 22:53:27 +02:00
Dima-1
094b8e04e0 Wikivoyage show in downloads Android 2020-12-08 22:19:54 +02:00
max-klaus
86e32e5cc3 Fix plan route (reading saved route) 2020-12-06 14:48:15 +03:00
MadWasp79
2a50f7d1d8 Wikivoyage to OBF migration: Show detailed articles. 2020-11-30 19:41:20 +02:00
MadWasp79
da678079eb Merge branch 'master' into wikivoyage_obf 2020-11-27 17:18:17 +02:00
MadWasp79
1f2b383dad Wikivoyage to OBF migration: Work in progress 3. Add missing fields. 2020-11-27 10:15:03 +02:00
simon
4035885842 Merge branch 'master' of git://github.com/osmandapp/Osmand into issue_251_android_add_photo_backend 2020-11-23 09:51:52 +02:00
Vitaliy
9056c7e97b Minor fixes 2020-11-23 03:27:09 +02:00
Vitaliy
bb0099d17a Merge branch 'masterOrig'
# Conflicts:
#	OsmAnd/src/net/osmand/plus/settings/backend/backup/SettingsHelper.java
2020-11-23 02:25:24 +02:00
Dima-1
a026824e08 Merge branch 'master' into add_dev_url
# Conflicts:
#	OsmAnd/build.gradle
#	OsmAnd/res/values/strings.xml
#	OsmAnd/src/net/osmand/plus/osmedit/oauth/OsmOAuthAuthorizationAdapter.java
#	OsmAnd/src/net/osmand/plus/osmedit/oauth/OsmOAuthHelper.java
2020-11-20 13:17:06 +02:00
TacoTheDank
608d93a8fa Performance: Replace '.equals("")' with '.isEmpty' 2020-11-19 15:23:35 -05:00
TacoTheDank
8a7f50f3a6 Performance: Set replaceable with EnumSet 2020-11-19 15:22:46 -05:00
TacoTheDank
0f9573e22e Performance: Redundant call to 'String.format()' 2020-11-19 15:22:27 -05:00
TacoTheDank
0fa24bdc8e Performance: Redundant 'Collection.addAll()' call 2020-11-19 15:22:11 -05:00
TacoTheDank
901827458f Performance: 'List.remove()' called in loop 2020-11-19 15:20:30 -05:00
TacoTheDank
6b16170168 Performance: Iteration over 'keySet()' may be optimized 2020-11-19 15:19:27 -05:00
TacoTheDank
270e7e873d Performance: 'Collection.toArray()' call style 2020-11-19 15:17:52 -05:00
TacoTheDank
a35050b2e7 Performance: Call to 'Arrays.asList()' with too few arguments 2020-11-19 15:15:54 -05:00
TacoTheDank
17b0b997eb Performance: Bulk operation can be used instead of iteration 2020-11-19 15:15:19 -05:00
Victor Shcherb
88edf800d0 Refactor & hide internal method about additional info 2020-11-19 16:37:00 +01:00
Victor Shcherb
3fc2dd89b9 Refactor & hide internal method about additional info 2020-11-19 15:58:31 +01:00
Victor Shcherb
bcea2e4e0e Add method for keys 2020-11-19 15:43:49 +01:00
Victor Shcherb
283673b6cf Format imports 2020-11-19 15:33:18 +01:00
Dima-1
89d43ece79 Use dev url 2020-11-17 23:15:14 +02:00
simon
a0534c7232 move started 2020-11-16 19:16:06 +02:00
Victor Shcherb
fd85ed7c42 Update city entities 2020-11-12 18:10:14 +01:00
Victor Shcherb
9b0a5da07f Fix bug with opening hours 2020-11-12 16:58:46 +01:00
Vitaliy
54337f5cf4 Change markers export time format 2020-11-11 14:30:57 +02:00
max-klaus
31f9895bb4 Fix #10112 2020-11-09 18:27:25 +03:00
Victor Shcherb
4a327a9834 Clean up gradle tasks / formatting 2020-11-04 15:36:51 +01:00
Dima-1
f3c4b59362 Fix & refactoring 2020-11-02 16:22:49 +02:00
Dima-1
aa1ab94612 Merge branch 'master' into imp_exp_voice
# Conflicts:
#	OsmAnd/src/net/osmand/plus/settings/backend/ExportSettingsType.java
#	OsmAnd/src/net/osmand/plus/settings/backend/backup/SettingsHelper.java
#	OsmAnd/src/net/osmand/plus/settings/fragments/ExportImportSettingsAdapter.java
#	OsmAnd/src/net/osmand/plus/settings/fragments/ImportDuplicatesFragment.java
2020-10-31 17:22:13 +02:00
Jan Backhaus
3f7a4ea568 Fixed MGRS decoding when still containing spaces. 2020-10-30 15:27:08 +01:00
Dima-1
b5f06cf3c1 Export voice 2020-10-29 18:09:09 +02:00
Jan Backhaus
436630c1e2 Added support for MGRS string flavoring for better readability ("32U PC 05573 97153" instead of "32UPC0557397153").
Dynamically adjustable accuracy included (also with letter overrolling correction on rounding).
2020-10-29 16:34:09 +01:00
Jan Backhaus
f1b1a471d0 Added MGRS coordinates support in details, widget, extended search and quick search. 2020-10-29 16:24:56 +01:00
Dima-1
6112b20a6d Merge branch 'master' into imp_exp_osm_note
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-10-28 09:34:40 +02:00
max-klaus
80f3101ba9
Merge branch 'master' into refactor_plan_route_approx 2020-10-25 18:46:31 +03:00
max-klaus
d97dfac152 Done except of (directions / reverse) 2020-10-25 18:33:40 +03:00
max-klaus
b1d714a62c Gpx approx refactor (first stage) 2020-10-24 20:55:22 +03:00
Dima-1
3bee12f626 Merge branch 'master' into imp_exp_osm_note 2020-10-21 15:56:41 +03:00
vshcherb
ffbf3477ba
Merge pull request #10038 from osmandapp/Category-names-poi
[bug] category names in user defined search converted to lowercase
2020-10-18 19:36:00 +02:00
Victor Shcherb
684f2b95d7 Fix java/C++ rendering rules property - should match types 2020-10-18 11:55:23 +02:00
androiddevkkotlin
63f06c3d39 [bug] category names in user defined search converted to lowercase 2020-10-18 12:52:16 +03:00
Victor Shcherb
0bc9008b9f Change order 2020-10-18 02:37:52 +02:00
Victor Shcherb
07c297a95a Fix parse complex properties 2020-10-18 02:28:44 +02:00
Victor Shcherb
28fdd139fb Fix empty progress 2020-10-17 15:15:08 +02:00
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