diff --git a/OsmAnd-java/src/net/osmand/router/PrecalculatedRouteDirection.java b/OsmAnd-java/src/net/osmand/router/PrecalculatedRouteDirection.java index 3f8b2497d2..6896cfbc64 100644 --- a/OsmAnd-java/src/net/osmand/router/PrecalculatedRouteDirection.java +++ b/OsmAnd-java/src/net/osmand/router/PrecalculatedRouteDirection.java @@ -52,6 +52,13 @@ public class PrecalculatedRouteDirection { private PrecalculatedRouteDirection(PrecalculatedRouteDirection parent, int s1, int s2) { this.minSpeed = parent.minSpeed; this.maxSpeed = parent.maxSpeed; + boolean inverse = false; + if (s1 > s2) { + int tmp = s1; + s1 = s2; + s2 = tmp; + inverse = true; + } tms = new float[s2 - s1 + 1]; pointsX = new int[s2 - s1 + 1]; pointsY = new int[s2 - s1 + 1]; @@ -61,7 +68,7 @@ public class PrecalculatedRouteDirection { pointsY[shiftInd] = parent.pointsY[i]; // indexedPoints.registerObjectXY(parent.pointsX.get(i), parent.pointsY.get(i), pointsX.size() - 1); quadTree.insert(shiftInd, parent.pointsX[i], parent.pointsY[i]); - tms[shiftInd] = parent.tms[i] - parent.tms[s2]; + tms[shiftInd] = parent.tms[i] - parent.tms[inverse ? s1 : s2]; } } diff --git a/OsmAnd/no_translate.xml b/OsmAnd/no_translate.xml index a55605f15a..64e29fd757 100644 --- a/OsmAnd/no_translate.xml +++ b/OsmAnd/no_translate.xml @@ -6,7 +6,7 @@ €5,99 - OSM Live (Beta) + OsmAnd Live UA-28342846-2 10 true diff --git a/OsmAnd/res/drawable-hdpi/ic_action_point_add_destination.png b/OsmAnd/res/drawable-hdpi/ic_action_point_add_destination.png new file mode 100644 index 0000000000..38bbacbc8d Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_point_add_destination.png differ diff --git a/OsmAnd/res/drawable-large-hdpi/map_bicycle_location_lost.png b/OsmAnd/res/drawable-large-hdpi/map_bicycle_location_lost.png new file mode 100644 index 0000000000..fcaabf6ad0 Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_bicycle_location_lost.png differ diff --git a/OsmAnd/res/drawable-large-hdpi/map_bicycle_location_lost_night.png b/OsmAnd/res/drawable-large-hdpi/map_bicycle_location_lost_night.png new file mode 100644 index 0000000000..bab8271450 Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_bicycle_location_lost_night.png differ diff --git a/OsmAnd/res/drawable-large-hdpi/map_car_location_lost.png b/OsmAnd/res/drawable-large-hdpi/map_car_location_lost.png new file mode 100644 index 0000000000..3d8b63d148 Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_car_location_lost.png differ diff --git a/OsmAnd/res/drawable-large-hdpi/map_car_location_lost_night.png b/OsmAnd/res/drawable-large-hdpi/map_car_location_lost_night.png new file mode 100644 index 0000000000..0ce19dc964 Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_car_location_lost_night.png differ diff --git a/OsmAnd/res/drawable-large-hdpi/map_default_location_lost.png b/OsmAnd/res/drawable-large-hdpi/map_default_location_lost.png new file mode 100644 index 0000000000..224ab74273 Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_default_location_lost.png differ diff --git a/OsmAnd/res/drawable-large-hdpi/map_default_location_lost_night.png b/OsmAnd/res/drawable-large-hdpi/map_default_location_lost_night.png new file mode 100644 index 0000000000..b9db6a188c Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_default_location_lost_night.png differ diff --git a/OsmAnd/res/drawable-large-hdpi/map_mapillary_location.png b/OsmAnd/res/drawable-large-hdpi/map_mapillary_location.png new file mode 100644 index 0000000000..924f4e5dd1 Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_mapillary_location.png differ diff --git a/OsmAnd/res/drawable-large-hdpi/map_mapillary_location_view_angle.png b/OsmAnd/res/drawable-large-hdpi/map_mapillary_location_view_angle.png new file mode 100644 index 0000000000..6774933fcb Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_mapillary_location_view_angle.png differ diff --git a/OsmAnd/res/drawable-large-hdpi/map_mapillary_photo_dot.png b/OsmAnd/res/drawable-large-hdpi/map_mapillary_photo_dot.png new file mode 100644 index 0000000000..78e9ac93e4 Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_mapillary_photo_dot.png differ diff --git a/OsmAnd/res/drawable-large-hdpi/map_marker_direction_arrow_p1_light.png b/OsmAnd/res/drawable-large-hdpi/map_marker_direction_arrow_p1_light.png new file mode 100644 index 0000000000..c240b1e3b0 Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_marker_direction_arrow_p1_light.png differ diff --git a/OsmAnd/res/drawable-large-hdpi/map_marker_direction_arrow_p2_color.png b/OsmAnd/res/drawable-large-hdpi/map_marker_direction_arrow_p2_color.png new file mode 100644 index 0000000000..49148e34c7 Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_marker_direction_arrow_p2_color.png differ diff --git a/OsmAnd/res/drawable-large-hdpi/map_marker_direction_arrow_p3_shadow.png b/OsmAnd/res/drawable-large-hdpi/map_marker_direction_arrow_p3_shadow.png new file mode 100644 index 0000000000..326af03ff0 Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_marker_direction_arrow_p3_shadow.png differ diff --git a/OsmAnd/res/drawable-large-hdpi/map_measure_point_day.png b/OsmAnd/res/drawable-large-hdpi/map_measure_point_day.png new file mode 100644 index 0000000000..7de8a698ee Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_measure_point_day.png differ diff --git a/OsmAnd/res/drawable-large-hdpi/map_measure_point_move_day.png b/OsmAnd/res/drawable-large-hdpi/map_measure_point_move_day.png new file mode 100644 index 0000000000..4523d25c6c Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_measure_point_move_day.png differ diff --git a/OsmAnd/res/drawable-large-hdpi/map_pedestrian_location_lost.png b/OsmAnd/res/drawable-large-hdpi/map_pedestrian_location_lost.png new file mode 100644 index 0000000000..dfd5c4c658 Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_pedestrian_location_lost.png differ diff --git a/OsmAnd/res/drawable-large-hdpi/map_pedestrian_location_lost_night.png b/OsmAnd/res/drawable-large-hdpi/map_pedestrian_location_lost_night.png new file mode 100644 index 0000000000..0aef4663d1 Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_pedestrian_location_lost_night.png differ diff --git a/OsmAnd/res/drawable-large-hdpi/map_ruler_center_day.png b/OsmAnd/res/drawable-large-hdpi/map_ruler_center_day.png new file mode 100644 index 0000000000..6643e71e89 Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_ruler_center_day.png differ diff --git a/OsmAnd/res/drawable-large-hdpi/map_ruler_center_night.png b/OsmAnd/res/drawable-large-hdpi/map_ruler_center_night.png new file mode 100644 index 0000000000..f5dec35121 Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_ruler_center_night.png differ diff --git a/OsmAnd/res/drawable-large-hdpi/widget_hidden_day.png b/OsmAnd/res/drawable-large-hdpi/widget_hidden_day.png new file mode 100644 index 0000000000..c1fbaac609 Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/widget_hidden_day.png differ diff --git a/OsmAnd/res/drawable-large-hdpi/widget_hidden_night.png b/OsmAnd/res/drawable-large-hdpi/widget_hidden_night.png new file mode 100644 index 0000000000..058879480b Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/widget_hidden_night.png differ diff --git a/OsmAnd/res/drawable-large-hdpi/widget_live_monitoring_rec_big_day.png b/OsmAnd/res/drawable-large-hdpi/widget_live_monitoring_rec_big_day.png new file mode 100644 index 0000000000..4669962b98 Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/widget_live_monitoring_rec_big_day.png differ diff --git a/OsmAnd/res/drawable-large-hdpi/widget_live_monitoring_rec_big_night.png b/OsmAnd/res/drawable-large-hdpi/widget_live_monitoring_rec_big_night.png new file mode 100644 index 0000000000..bf20021550 Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/widget_live_monitoring_rec_big_night.png differ diff --git a/OsmAnd/res/drawable-large-hdpi/widget_live_monitoring_rec_small_day.png b/OsmAnd/res/drawable-large-hdpi/widget_live_monitoring_rec_small_day.png new file mode 100644 index 0000000000..5abf9287c4 Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/widget_live_monitoring_rec_small_day.png differ diff --git a/OsmAnd/res/drawable-large-hdpi/widget_live_monitoring_rec_small_night.png b/OsmAnd/res/drawable-large-hdpi/widget_live_monitoring_rec_small_night.png new file mode 100644 index 0000000000..ca380dac1e Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/widget_live_monitoring_rec_small_night.png differ diff --git a/OsmAnd/res/drawable-large-hdpi/widget_mapillary_day.png b/OsmAnd/res/drawable-large-hdpi/widget_mapillary_day.png new file mode 100644 index 0000000000..b3701cf8f0 Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/widget_mapillary_day.png differ diff --git a/OsmAnd/res/drawable-large-hdpi/widget_mapillary_night.png b/OsmAnd/res/drawable-large-hdpi/widget_mapillary_night.png new file mode 100644 index 0000000000..ce749dfc4d Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/widget_mapillary_night.png differ diff --git a/OsmAnd/res/drawable-large-hdpi/widget_ruler_circle_day.png b/OsmAnd/res/drawable-large-hdpi/widget_ruler_circle_day.png new file mode 100644 index 0000000000..ec5b244835 Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/widget_ruler_circle_day.png differ diff --git a/OsmAnd/res/drawable-large-hdpi/widget_ruler_circle_night.png b/OsmAnd/res/drawable-large-hdpi/widget_ruler_circle_night.png new file mode 100644 index 0000000000..a8370c2210 Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/widget_ruler_circle_night.png differ diff --git a/OsmAnd/res/drawable-large-hdpi/widget_ruler_location_day.png b/OsmAnd/res/drawable-large-hdpi/widget_ruler_location_day.png new file mode 100644 index 0000000000..e1542981d4 Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/widget_ruler_location_day.png differ diff --git a/OsmAnd/res/drawable-large-hdpi/widget_ruler_location_night.png b/OsmAnd/res/drawable-large-hdpi/widget_ruler_location_night.png new file mode 100644 index 0000000000..7f6575a9f7 Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/widget_ruler_location_night.png differ diff --git a/OsmAnd/res/drawable-large-xhdpi/map_bicycle_location_lost.png b/OsmAnd/res/drawable-large-xhdpi/map_bicycle_location_lost.png new file mode 100644 index 0000000000..35f3ecb1a4 Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_bicycle_location_lost.png differ diff --git a/OsmAnd/res/drawable-large-xhdpi/map_bicycle_location_lost_night.png b/OsmAnd/res/drawable-large-xhdpi/map_bicycle_location_lost_night.png new file mode 100644 index 0000000000..79b685dcc7 Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_bicycle_location_lost_night.png differ diff --git a/OsmAnd/res/drawable-large-xhdpi/map_car_location_lost.png b/OsmAnd/res/drawable-large-xhdpi/map_car_location_lost.png new file mode 100644 index 0000000000..bfd71b27a2 Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_car_location_lost.png differ diff --git a/OsmAnd/res/drawable-large-xhdpi/map_car_location_lost_night.png b/OsmAnd/res/drawable-large-xhdpi/map_car_location_lost_night.png new file mode 100644 index 0000000000..46a316ec88 Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_car_location_lost_night.png differ diff --git a/OsmAnd/res/drawable-large-xhdpi/map_default_location_lost.png b/OsmAnd/res/drawable-large-xhdpi/map_default_location_lost.png new file mode 100644 index 0000000000..5ad2db4c02 Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_default_location_lost.png differ diff --git a/OsmAnd/res/drawable-large-xhdpi/map_default_location_lost_night.png b/OsmAnd/res/drawable-large-xhdpi/map_default_location_lost_night.png new file mode 100644 index 0000000000..e396e0e66c Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_default_location_lost_night.png differ diff --git a/OsmAnd/res/drawable-large-xhdpi/map_mapillary_location.png b/OsmAnd/res/drawable-large-xhdpi/map_mapillary_location.png new file mode 100644 index 0000000000..839187b1a5 Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_mapillary_location.png differ diff --git a/OsmAnd/res/drawable-large-xhdpi/map_mapillary_location_view_angle.png b/OsmAnd/res/drawable-large-xhdpi/map_mapillary_location_view_angle.png new file mode 100644 index 0000000000..a0ff123f16 Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_mapillary_location_view_angle.png differ diff --git a/OsmAnd/res/drawable-large-xhdpi/map_mapillary_photo_dot.png b/OsmAnd/res/drawable-large-xhdpi/map_mapillary_photo_dot.png new file mode 100644 index 0000000000..ebcf88d01c Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_mapillary_photo_dot.png differ diff --git a/OsmAnd/res/drawable-large-xhdpi/map_marker_direction_arrow_p1_light.png b/OsmAnd/res/drawable-large-xhdpi/map_marker_direction_arrow_p1_light.png new file mode 100644 index 0000000000..fc124b5b45 Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_marker_direction_arrow_p1_light.png differ diff --git a/OsmAnd/res/drawable-large-xhdpi/map_marker_direction_arrow_p2_color.png b/OsmAnd/res/drawable-large-xhdpi/map_marker_direction_arrow_p2_color.png new file mode 100644 index 0000000000..1c8224fb24 Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_marker_direction_arrow_p2_color.png differ diff --git a/OsmAnd/res/drawable-large-xhdpi/map_marker_direction_arrow_p3_shadow.png b/OsmAnd/res/drawable-large-xhdpi/map_marker_direction_arrow_p3_shadow.png new file mode 100644 index 0000000000..19713355f9 Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_marker_direction_arrow_p3_shadow.png differ diff --git a/OsmAnd/res/drawable-large-xhdpi/map_measure_point_day.png b/OsmAnd/res/drawable-large-xhdpi/map_measure_point_day.png new file mode 100644 index 0000000000..6cc9922043 Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_measure_point_day.png differ diff --git a/OsmAnd/res/drawable-large-xhdpi/map_measure_point_move_day.png b/OsmAnd/res/drawable-large-xhdpi/map_measure_point_move_day.png new file mode 100644 index 0000000000..8b60890f7c Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_measure_point_move_day.png differ diff --git a/OsmAnd/res/drawable-large-xhdpi/map_pedestrian_location_lost.png b/OsmAnd/res/drawable-large-xhdpi/map_pedestrian_location_lost.png new file mode 100644 index 0000000000..5724c476a9 Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_pedestrian_location_lost.png differ diff --git a/OsmAnd/res/drawable-large-xhdpi/map_pedestrian_location_lost_night.png b/OsmAnd/res/drawable-large-xhdpi/map_pedestrian_location_lost_night.png new file mode 100644 index 0000000000..1a4dd14e4a Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_pedestrian_location_lost_night.png differ diff --git a/OsmAnd/res/drawable-large-xhdpi/map_ruler_center_day.png b/OsmAnd/res/drawable-large-xhdpi/map_ruler_center_day.png new file mode 100644 index 0000000000..95dc27a730 Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_ruler_center_day.png differ diff --git a/OsmAnd/res/drawable-large-xhdpi/map_ruler_center_night.png b/OsmAnd/res/drawable-large-xhdpi/map_ruler_center_night.png new file mode 100644 index 0000000000..6f3cf08e6a Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_ruler_center_night.png differ diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_hidden_day.png b/OsmAnd/res/drawable-large-xhdpi/widget_hidden_day.png new file mode 100644 index 0000000000..2544472c4b Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/widget_hidden_day.png differ diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_hidden_night.png b/OsmAnd/res/drawable-large-xhdpi/widget_hidden_night.png new file mode 100644 index 0000000000..c6bbf2fcee Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/widget_hidden_night.png differ diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_live_monitoring_rec_big_day.png b/OsmAnd/res/drawable-large-xhdpi/widget_live_monitoring_rec_big_day.png new file mode 100644 index 0000000000..012338139f Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/widget_live_monitoring_rec_big_day.png differ diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_live_monitoring_rec_big_night.png b/OsmAnd/res/drawable-large-xhdpi/widget_live_monitoring_rec_big_night.png new file mode 100644 index 0000000000..c1a5ce5880 Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/widget_live_monitoring_rec_big_night.png differ diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_live_monitoring_rec_small_day.png b/OsmAnd/res/drawable-large-xhdpi/widget_live_monitoring_rec_small_day.png new file mode 100644 index 0000000000..f85e569009 Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/widget_live_monitoring_rec_small_day.png differ diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_live_monitoring_rec_small_night.png b/OsmAnd/res/drawable-large-xhdpi/widget_live_monitoring_rec_small_night.png new file mode 100644 index 0000000000..5b909d04a7 Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/widget_live_monitoring_rec_small_night.png differ diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_mapillary_day.png b/OsmAnd/res/drawable-large-xhdpi/widget_mapillary_day.png new file mode 100644 index 0000000000..a251b970a6 Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/widget_mapillary_day.png differ diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_mapillary_night.png b/OsmAnd/res/drawable-large-xhdpi/widget_mapillary_night.png new file mode 100644 index 0000000000..2a975b9fe6 Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/widget_mapillary_night.png differ diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_ruler_circle_day.png b/OsmAnd/res/drawable-large-xhdpi/widget_ruler_circle_day.png new file mode 100644 index 0000000000..24ef5c68e2 Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/widget_ruler_circle_day.png differ diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_ruler_circle_night.png b/OsmAnd/res/drawable-large-xhdpi/widget_ruler_circle_night.png new file mode 100644 index 0000000000..54daa3d858 Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/widget_ruler_circle_night.png differ diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_ruler_location_day.png b/OsmAnd/res/drawable-large-xhdpi/widget_ruler_location_day.png new file mode 100644 index 0000000000..01a1c8f1d8 Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/widget_ruler_location_day.png differ diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_ruler_location_night.png b/OsmAnd/res/drawable-large-xhdpi/widget_ruler_location_night.png new file mode 100644 index 0000000000..a3694f5bda Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/widget_ruler_location_night.png differ diff --git a/OsmAnd/res/drawable-large/map_bicycle_location_lost.png b/OsmAnd/res/drawable-large/map_bicycle_location_lost.png new file mode 100644 index 0000000000..bebc1fa6ac Binary files /dev/null and b/OsmAnd/res/drawable-large/map_bicycle_location_lost.png differ diff --git a/OsmAnd/res/drawable-large/map_bicycle_location_lost_night.png b/OsmAnd/res/drawable-large/map_bicycle_location_lost_night.png new file mode 100644 index 0000000000..9ded796ac4 Binary files /dev/null and b/OsmAnd/res/drawable-large/map_bicycle_location_lost_night.png differ diff --git a/OsmAnd/res/drawable-large/map_car_location_lost.png b/OsmAnd/res/drawable-large/map_car_location_lost.png new file mode 100644 index 0000000000..7b80f695ae Binary files /dev/null and b/OsmAnd/res/drawable-large/map_car_location_lost.png differ diff --git a/OsmAnd/res/drawable-large/map_car_location_lost_night.png b/OsmAnd/res/drawable-large/map_car_location_lost_night.png new file mode 100644 index 0000000000..fba15e4b75 Binary files /dev/null and b/OsmAnd/res/drawable-large/map_car_location_lost_night.png differ diff --git a/OsmAnd/res/drawable-large/map_default_location_lost.png b/OsmAnd/res/drawable-large/map_default_location_lost.png new file mode 100644 index 0000000000..4ff643f9cd Binary files /dev/null and b/OsmAnd/res/drawable-large/map_default_location_lost.png differ diff --git a/OsmAnd/res/drawable-large/map_default_location_lost_night.png b/OsmAnd/res/drawable-large/map_default_location_lost_night.png new file mode 100644 index 0000000000..7d097bbc6a Binary files /dev/null and b/OsmAnd/res/drawable-large/map_default_location_lost_night.png differ diff --git a/OsmAnd/res/drawable-large/map_mapillary_location.png b/OsmAnd/res/drawable-large/map_mapillary_location.png new file mode 100644 index 0000000000..726e17ef31 Binary files /dev/null and b/OsmAnd/res/drawable-large/map_mapillary_location.png differ diff --git a/OsmAnd/res/drawable-large/map_mapillary_location_view_angle.png b/OsmAnd/res/drawable-large/map_mapillary_location_view_angle.png new file mode 100644 index 0000000000..09c1e823e2 Binary files /dev/null and b/OsmAnd/res/drawable-large/map_mapillary_location_view_angle.png differ diff --git a/OsmAnd/res/drawable-large/map_mapillary_photo_dot.png b/OsmAnd/res/drawable-large/map_mapillary_photo_dot.png new file mode 100644 index 0000000000..cb2a227bfe Binary files /dev/null and b/OsmAnd/res/drawable-large/map_mapillary_photo_dot.png differ diff --git a/OsmAnd/res/drawable-large/map_marker_direction_arrow_p1_light.png b/OsmAnd/res/drawable-large/map_marker_direction_arrow_p1_light.png new file mode 100644 index 0000000000..e7a0f04503 Binary files /dev/null and b/OsmAnd/res/drawable-large/map_marker_direction_arrow_p1_light.png differ diff --git a/OsmAnd/res/drawable-large/map_marker_direction_arrow_p2_color.png b/OsmAnd/res/drawable-large/map_marker_direction_arrow_p2_color.png new file mode 100644 index 0000000000..7507cf4c99 Binary files /dev/null and b/OsmAnd/res/drawable-large/map_marker_direction_arrow_p2_color.png differ diff --git a/OsmAnd/res/drawable-large/map_marker_direction_arrow_p3_shadow.png b/OsmAnd/res/drawable-large/map_marker_direction_arrow_p3_shadow.png new file mode 100644 index 0000000000..91a56c38a6 Binary files /dev/null and b/OsmAnd/res/drawable-large/map_marker_direction_arrow_p3_shadow.png differ diff --git a/OsmAnd/res/drawable-large/map_measure_point_day.png b/OsmAnd/res/drawable-large/map_measure_point_day.png new file mode 100644 index 0000000000..1fa0b49fcd Binary files /dev/null and b/OsmAnd/res/drawable-large/map_measure_point_day.png differ diff --git a/OsmAnd/res/drawable-large/map_measure_point_move_day.png b/OsmAnd/res/drawable-large/map_measure_point_move_day.png new file mode 100644 index 0000000000..255cb452b0 Binary files /dev/null and b/OsmAnd/res/drawable-large/map_measure_point_move_day.png differ diff --git a/OsmAnd/res/drawable-large/map_pedestrian_location_lost.png b/OsmAnd/res/drawable-large/map_pedestrian_location_lost.png new file mode 100644 index 0000000000..cce0ef4dda Binary files /dev/null and b/OsmAnd/res/drawable-large/map_pedestrian_location_lost.png differ diff --git a/OsmAnd/res/drawable-large/map_pedestrian_location_lost_night.png b/OsmAnd/res/drawable-large/map_pedestrian_location_lost_night.png new file mode 100644 index 0000000000..5d3ec7b8c5 Binary files /dev/null and b/OsmAnd/res/drawable-large/map_pedestrian_location_lost_night.png differ diff --git a/OsmAnd/res/drawable-large/map_ruler_center_day.png b/OsmAnd/res/drawable-large/map_ruler_center_day.png new file mode 100644 index 0000000000..b04370d5d7 Binary files /dev/null and b/OsmAnd/res/drawable-large/map_ruler_center_day.png differ diff --git a/OsmAnd/res/drawable-large/map_ruler_center_night.png b/OsmAnd/res/drawable-large/map_ruler_center_night.png new file mode 100644 index 0000000000..9303c15502 Binary files /dev/null and b/OsmAnd/res/drawable-large/map_ruler_center_night.png differ diff --git a/OsmAnd/res/drawable-large/widget_hidden_day.png b/OsmAnd/res/drawable-large/widget_hidden_day.png new file mode 100644 index 0000000000..878f75d39e Binary files /dev/null and b/OsmAnd/res/drawable-large/widget_hidden_day.png differ diff --git a/OsmAnd/res/drawable-large/widget_hidden_night.png b/OsmAnd/res/drawable-large/widget_hidden_night.png new file mode 100644 index 0000000000..22a2c39b3b Binary files /dev/null and b/OsmAnd/res/drawable-large/widget_hidden_night.png differ diff --git a/OsmAnd/res/drawable-large/widget_live_monitoring_rec_big_day.png b/OsmAnd/res/drawable-large/widget_live_monitoring_rec_big_day.png new file mode 100644 index 0000000000..978b2a32c7 Binary files /dev/null and b/OsmAnd/res/drawable-large/widget_live_monitoring_rec_big_day.png differ diff --git a/OsmAnd/res/drawable-large/widget_live_monitoring_rec_big_night.png b/OsmAnd/res/drawable-large/widget_live_monitoring_rec_big_night.png new file mode 100644 index 0000000000..e27396aeed Binary files /dev/null and b/OsmAnd/res/drawable-large/widget_live_monitoring_rec_big_night.png differ diff --git a/OsmAnd/res/drawable-large/widget_live_monitoring_rec_small_day.png b/OsmAnd/res/drawable-large/widget_live_monitoring_rec_small_day.png new file mode 100644 index 0000000000..a5ea3b2407 Binary files /dev/null and b/OsmAnd/res/drawable-large/widget_live_monitoring_rec_small_day.png differ diff --git a/OsmAnd/res/drawable-large/widget_live_monitoring_rec_small_night.png b/OsmAnd/res/drawable-large/widget_live_monitoring_rec_small_night.png new file mode 100644 index 0000000000..325637dd70 Binary files /dev/null and b/OsmAnd/res/drawable-large/widget_live_monitoring_rec_small_night.png differ diff --git a/OsmAnd/res/drawable-large/widget_mapillary_day.png b/OsmAnd/res/drawable-large/widget_mapillary_day.png new file mode 100644 index 0000000000..09301a1148 Binary files /dev/null and b/OsmAnd/res/drawable-large/widget_mapillary_day.png differ diff --git a/OsmAnd/res/drawable-large/widget_mapillary_night.png b/OsmAnd/res/drawable-large/widget_mapillary_night.png new file mode 100644 index 0000000000..342d1e7d04 Binary files /dev/null and b/OsmAnd/res/drawable-large/widget_mapillary_night.png differ diff --git a/OsmAnd/res/drawable-large/widget_ruler_circle_day.png b/OsmAnd/res/drawable-large/widget_ruler_circle_day.png new file mode 100644 index 0000000000..4d11b91379 Binary files /dev/null and b/OsmAnd/res/drawable-large/widget_ruler_circle_day.png differ diff --git a/OsmAnd/res/drawable-large/widget_ruler_circle_night.png b/OsmAnd/res/drawable-large/widget_ruler_circle_night.png new file mode 100644 index 0000000000..2b56d8a8d3 Binary files /dev/null and b/OsmAnd/res/drawable-large/widget_ruler_circle_night.png differ diff --git a/OsmAnd/res/drawable-large/widget_ruler_location_day.png b/OsmAnd/res/drawable-large/widget_ruler_location_day.png new file mode 100644 index 0000000000..3f3aaecf13 Binary files /dev/null and b/OsmAnd/res/drawable-large/widget_ruler_location_day.png differ diff --git a/OsmAnd/res/drawable-large/widget_ruler_location_night.png b/OsmAnd/res/drawable-large/widget_ruler_location_night.png new file mode 100644 index 0000000000..a5556b93ad Binary files /dev/null and b/OsmAnd/res/drawable-large/widget_ruler_location_night.png differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_point_add_destination.png b/OsmAnd/res/drawable-mdpi/ic_action_point_add_destination.png new file mode 100644 index 0000000000..c33ff18eca Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_action_point_add_destination.png differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_point_add_destination.png b/OsmAnd/res/drawable-xhdpi/ic_action_point_add_destination.png new file mode 100644 index 0000000000..7088895bf8 Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_action_point_add_destination.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_point_add_destination.png b/OsmAnd/res/drawable-xxhdpi/ic_action_point_add_destination.png new file mode 100644 index 0000000000..228662fc46 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_point_add_destination.png differ diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index 44d6962715..4908556794 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -2220,7 +2220,7 @@ Aktuell sind nur {2} MB verfügbar. Anzahl der Empfänger Bearbeitungen %1$s, Rang %2$s, Gesamtbearbeitungen %3$s OSM-Bearbeiter-Rangliste - OSM-Live-Abonnement + OsmAnd-Live-Abonnement Abonnieren Öffentlicher Name Meinen Namen nicht in Berichten anzeigen @@ -2232,7 +2232,7 @@ Aktuell sind nur {2} MB verfügbar. Bitte einen öffentlichen Namen eingeben Vielen Dank für Ihr Abonnement von Live Aktualisierungen! Abonnementeinstellungen - Bitte kaufen Sie zuerst ein OSM-Live-Abonnement + Bitte kaufen Sie zuerst ein OsmAnd-Live-Abonnement Teile Ihrer Spende werden an OSM-Mitwirkende weitergegeben, die diese Region bearbeiten Dieses Abonnement schaltet stündliche Updates für die gesamten weltweiten Karten frei. @@ -2297,7 +2297,7 @@ Wenn Sie OsmAnd und OSM lieben und unterstützen wollen, so ist dies die perfekt Zeit zwischen automatischen Ansagen Magnetische Peilung Ziel ist nicht festgelegt - OSM Live Navigation + OsmAnd Live Navigation Akkustand Karte bewegen, um die Position der Markierung zu verändern diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml index 58ad42f7dd..ca02c129e0 100644 --- a/OsmAnd/res/values-ru/strings.xml +++ b/OsmAnd/res/values-ru/strings.xml @@ -224,7 +224,7 @@ %s GPX трека(ов) выбрано Переместить курсор Текущий путь - Навигация OSM Live + Навигация OsmAnd Live Заряд батареи Переместите карту чтобы изменить положение курсора @@ -2151,7 +2151,7 @@ Пожалуйста, введите корректный адрес электронной почты Благодарим вас за подписку на автообновления! Параметры подписки - Пожалуйста сначала приобретите подписку OSM Live + Пожалуйста сначала приобретите подписку OsmAnd Live Эта подписка позволяет получать ежечасное обновление для всех карт мира. Часть доходов переводится сообществу OSM и выплачивается за каждый вклад в OSM. @@ -2242,8 +2242,8 @@ Индицировать звуком направление на целевую точку Тактильная индикация направления Индицировать вибрацией направление на целевую точку -Подписка OSM Live - Включить навигацию с учетом автообновлений OSM Live (Beta) +Подписка OsmAnd Live + Включить навигацию с учетом автообновлений OsmAnd Live Испанский (американский) Английский (Соединенное Королевство) Венгерский (официальный) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index d5c25b69ab..7d422a49c6 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -250,7 +250,7 @@ \u2022 Completely reworked map markers with guidelines and route planning\n\n \u2022 Measure distance tool offering snap to road feature and saving points as track\n\n - \u2022 OSM Live: bug fixes, fresh data on the server every 30 minutes, updates implemented into the navigation\n\n + \u2022 OsmAnd Live: bug fixes, fresh data on the server every 30 minutes, updates implemented into the navigation\n\n Auto-split recordings after gap Start new segment after gap of 6 min, new track after gap of 2 h, or new file after longer gap if date has changed. @@ -402,8 +402,8 @@ Indicate target point direction by sound Direction haptic feedback Indicate target point direction by vibration - Enable navigation for OSM Live changes (Beta) - OSM Live navigation + Enable navigation for OsmAnd Live changes + OsmAnd Live navigation Destination is not set Magnetic bearing Relative bearing @@ -488,7 +488,7 @@ Number of recipients Edits %1$s, rank %2$s, total edits %3$s OSM Editors ranking - OSM Live subscription + OsmAnd Live subscription Subscribe We need it to provide you information about contributions Public Name @@ -503,7 +503,7 @@ Thank you for subscribing to live updates! Part of your donation will be sent to OSM users who submit changes to the map in that region Subscription settings - Please purchase OSM Live subscription first + Please purchase OsmAnd Live subscription first This subscription enables hourly updates for all maps around the world. Part of the income goes back to the OSM community and is paid for each OSM contribution. If you love OsmAnd and OSM and want to support them, this is the perfect way to do it. @@ -700,6 +700,7 @@ GPX color GPX width GPX width + Dark yellow Red Translucent red Orange diff --git a/OsmAnd/src/net/osmand/plus/OsmandPlugin.java b/OsmAnd/src/net/osmand/plus/OsmandPlugin.java index 71affef9b3..10c9b40490 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandPlugin.java +++ b/OsmAnd/src/net/osmand/plus/OsmandPlugin.java @@ -330,6 +330,16 @@ public abstract class OsmandPlugin { return lst; } + public static List getEnabledVisiblePlugins() { + ArrayList lst = new ArrayList(allPlugins.size()); + for (OsmandPlugin p : allPlugins) { + if (p.isActive() && p.isVisible()) { + lst.add(p); + } + } + return lst; + } + public static List getNotEnabledPlugins() { ArrayList lst = new ArrayList(allPlugins.size()); for (OsmandPlugin p : allPlugins) { @@ -340,6 +350,16 @@ public abstract class OsmandPlugin { return lst; } + public static List getNotEnabledVisiblePlugins() { + ArrayList lst = new ArrayList(allPlugins.size()); + for (OsmandPlugin p : allPlugins) { + if (!p.isActive() && p.isVisible()) { + lst.add(p); + } + } + return lst; + } + @SuppressWarnings("unchecked") public static T getEnabledPlugin(Class clz) { for (OsmandPlugin lr : getEnabledPlugins()) { diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java index 42f94fdc75..9dc1aa75a4 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java @@ -81,11 +81,11 @@ public class DashPluginsFragment extends DashBaseFragment { private void initPlugins() { - List notActivePlugins = OsmandPlugin.getNotEnabledPlugins(); + List notActivePlugins = OsmandPlugin.getNotEnabledVisiblePlugins(); Collections.shuffle(notActivePlugins); plugins = new ArrayList(); Iterator nit = notActivePlugins.iterator(); - Iterator it = OsmandPlugin.getEnabledPlugins().iterator(); + Iterator it = OsmandPlugin.getEnabledVisiblePlugins().iterator(); addPluginsToLimit(nit, 1); addPluginsToLimit(it, 5); addPluginsToLimit(nit, 5); diff --git a/OsmAnd/src/net/osmand/plus/download/ui/LocalIndexesFragment.java b/OsmAnd/src/net/osmand/plus/download/ui/LocalIndexesFragment.java index e505d01157..076e6a4c7e 100644 --- a/OsmAnd/src/net/osmand/plus/download/ui/LocalIndexesFragment.java +++ b/OsmAnd/src/net/osmand/plus/download/ui/LocalIndexesFragment.java @@ -1218,7 +1218,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment implement } final IndexItem update = filesToUpdate.get(info.getFileName()); if (update != null) { - item = optionsMenu.getMenu().add(R.string.shared_string_download) + item = optionsMenu.getMenu().add(R.string.update_tile) .setIcon(iconsCache.getThemedIcon(R.drawable.ic_action_import)); item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { @Override diff --git a/OsmAnd/src/net/osmand/plus/helpers/ColorDialogs.java b/OsmAnd/src/net/osmand/plus/helpers/ColorDialogs.java index cc41d88242..c3da6d983e 100644 --- a/OsmAnd/src/net/osmand/plus/helpers/ColorDialogs.java +++ b/OsmAnd/src/net/osmand/plus/helpers/ColorDialogs.java @@ -28,6 +28,7 @@ import static android.util.TypedValue.COMPLEX_UNIT_DIP; public class ColorDialogs { public static int[] paletteColors = new int[] { + R.string.rendering_value_darkyellow_name, R.string.rendering_value_red_name, R.string.rendering_value_orange_name, R.string.rendering_value_yellow_name, @@ -41,6 +42,7 @@ public class ColorDialogs { }; public static int[] pallette = new int[] { + 0xb4eecc22, 0xb4d00d0d, 0xb4ff5020, 0xb4eeee10, @@ -54,6 +56,7 @@ public class ColorDialogs { }; public static String[] paletteColorTags = new String[] { + "darkyellow", "red", "orange", "yellow", diff --git a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java index 9b09af2ad0..42c9ebd0c1 100644 --- a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java +++ b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java @@ -156,8 +156,8 @@ public class OsmandMonitoringPlugin extends OsmandPlugin { } String txt = map.getString(R.string.monitoring_control_start); String subtxt = null; - int dn = R.drawable.widget_monitoring_rec_inactive_night; - int d = R.drawable.widget_monitoring_rec_inactive_day; + int dn; + int d; long last = lastUpdateTime; final boolean globalRecord = settings.SAVE_GLOBAL_TRACK_TO_GPX.get(); final boolean isRecording = app.getSavingTrackHelper().getIsRecording(); @@ -176,14 +176,25 @@ public class OsmandMonitoringPlugin extends OsmandPlugin { } } + final boolean liveMonitoringEnabled = liveMonitoringHelper.isLiveMonitoringEnabled(); if(globalRecord) { //indicates global recording (+background recording) - dn = R.drawable.widget_monitoring_rec_big_night; - d = R.drawable.widget_monitoring_rec_big_day; + if (liveMonitoringEnabled) { + dn = R.drawable.widget_live_monitoring_rec_big_night; + d = R.drawable.widget_live_monitoring_rec_big_day; + } else { + dn = R.drawable.widget_monitoring_rec_big_night; + d = R.drawable.widget_monitoring_rec_big_day; + } } else if (isRecording) { //indicates (profile-based, configured in settings) recording (looks like is only active during nav in follow mode) - dn = R.drawable.widget_monitoring_rec_small_night; - d = R.drawable.widget_monitoring_rec_small_day; + if (liveMonitoringEnabled) { + dn = R.drawable.widget_live_monitoring_rec_small_night; + d = R.drawable.widget_live_monitoring_rec_small_day; + } else { + dn = R.drawable.widget_monitoring_rec_small_night; + d = R.drawable.widget_monitoring_rec_small_day; + } } else { dn = R.drawable.widget_monitoring_rec_inactive_night; d = R.drawable.widget_monitoring_rec_inactive_day; @@ -194,24 +205,38 @@ public class OsmandMonitoringPlugin extends OsmandPlugin { if ((last != lastUpdateTime) && (globalRecord || isRecording)) { lastUpdateTime = last; //blink implementation with 2 indicator states (global logging + profile/navigation logging) - if (globalRecord) { - setIcons(R.drawable.widget_monitoring_rec_small_day, - R.drawable.widget_monitoring_rec_small_night); + if (liveMonitoringEnabled) { + dn = R.drawable.widget_live_monitoring_rec_small_night; + d = R.drawable.widget_live_monitoring_rec_small_day; } else { - setIcons(R.drawable.widget_monitoring_rec_small_day, - R.drawable.widget_monitoring_rec_small_night); + dn = R.drawable.widget_monitoring_rec_small_night; + d = R.drawable.widget_monitoring_rec_small_day; } - + setIcons(d, dn); + map.getMyApplication().runInUIThread(new Runnable() { @Override public void run() { + int dn; + int d; if (globalRecord) { - setIcons(R.drawable.widget_monitoring_rec_big_day, - R.drawable.widget_monitoring_rec_big_night); + if (liveMonitoringEnabled) { + dn = R.drawable.widget_live_monitoring_rec_big_night; + d = R.drawable.widget_live_monitoring_rec_big_day; + } else { + dn = R.drawable.widget_monitoring_rec_big_night; + d = R.drawable.widget_monitoring_rec_big_day; + } } else { - setIcons(R.drawable.widget_monitoring_rec_small_day, - R.drawable.widget_monitoring_rec_small_night); + if (liveMonitoringEnabled) { + dn = R.drawable.widget_live_monitoring_rec_small_night; + d = R.drawable.widget_live_monitoring_rec_small_day; + } else { + dn = R.drawable.widget_monitoring_rec_small_night; + d = R.drawable.widget_monitoring_rec_small_day; + } } + setIcons(d, dn); } }, 500); } diff --git a/OsmAnd/src/net/osmand/plus/views/PointLocationLayer.java b/OsmAnd/src/net/osmand/plus/views/PointLocationLayer.java index 860b0cc58f..508a8fbd03 100644 --- a/OsmAnd/src/net/osmand/plus/views/PointLocationLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/PointLocationLayer.java @@ -113,10 +113,9 @@ public class PointLocationLayer extends OsmandMapLayer implements ContextMenuLay } // draw bearing/direction/location if (isLocationVisible(box, lastKnownLocation)) { - boolean isBearing = lastKnownLocation.hasBearing(); Float heading = locationProvider.getHeading(); - if (heading != null && mapViewTrackingUtilities.isShowViewAngle()) { + if (!locationOutdated && heading != null && mapViewTrackingUtilities.isShowViewAngle()) { canvas.save(); canvas.rotate(heading - 180, locationX, locationY); @@ -125,7 +124,8 @@ public class PointLocationLayer extends OsmandMapLayer implements ContextMenuLay canvas.restore(); } - if (isBearing) { + boolean isBearing = lastKnownLocation.hasBearing(); + if (!locationOutdated && isBearing) { float bearing = lastKnownLocation.getBearing(); canvas.rotate(bearing - 90, locationX, locationY); canvas.drawBitmap(bearingIcon, locationX - bearingIcon.getWidth() / 2,