From 9d0a00db937e9ed80b73641839e51ea4acc1ed89 Mon Sep 17 00:00:00 2001 From: Alexander Borsuk Date: Sun, 26 Mar 2023 11:34:15 +0200 Subject: [PATCH 1/3] Red color for outdated position arrow instead of greyish-blue Signed-off-by: Alexander Borsuk --- data/styles/clear/style-clear/style.mapcss | 2 +- data/styles/clear/style-night/style.mapcss | 2 +- data/styles/vehicle/style-clear/style.mapcss | 2 +- data/styles/vehicle/style-night/style.mapcss | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/styles/clear/style-clear/style.mapcss b/data/styles/clear/style-clear/style.mapcss index 776f2c7404..41136447a9 100644 --- a/data/styles/clear/style-clear/style.mapcss +++ b/data/styles/clear/style-clear/style.mapcss @@ -51,7 +51,7 @@ colors RouteFake-color: #A8A8A8; RouteFakeOutline-color: #717171; Arrow3D-color: #50AAFF; - Arrow3DObsolete-color: #82AAC8; + Arrow3DObsolete-color: #E80C13; Arrow3DObsolete-opacity: 0.72; Arrow3DShadow-color: #3C3C3C; Arrow3DShadow-opacity: 0.24; diff --git a/data/styles/clear/style-night/style.mapcss b/data/styles/clear/style-night/style.mapcss index 378b96eca1..384ebb9b4a 100644 --- a/data/styles/clear/style-night/style.mapcss +++ b/data/styles/clear/style-night/style.mapcss @@ -51,7 +51,7 @@ colors RouteFake-color: #A8A8A8; RouteFakeOutline-color: #717171; Arrow3D-color: #41C8FF; - Arrow3DObsolete-color: #82AAC8; + Arrow3DObsolete-color: #D61818; Arrow3DObsolete-opacity: 0.72; Arrow3DShadow-color: #3C3C3C; Arrow3DShadow-opacity: 0.24; diff --git a/data/styles/vehicle/style-clear/style.mapcss b/data/styles/vehicle/style-clear/style.mapcss index 69400d2db2..b8b38294fa 100644 --- a/data/styles/vehicle/style-clear/style.mapcss +++ b/data/styles/vehicle/style-clear/style.mapcss @@ -51,7 +51,7 @@ colors RouteFake-color: #A8A8A8; RouteFakeOutline-color: #717171; Arrow3D-color: #50AAFF; - Arrow3DObsolete-color: #82AAC8; + Arrow3DObsolete-color: #E80C13; Arrow3DObsolete-opacity: 0.72; Arrow3DShadow-color: #3C3C3C; Arrow3DShadow-opacity: 0.24; diff --git a/data/styles/vehicle/style-night/style.mapcss b/data/styles/vehicle/style-night/style.mapcss index 69c025afc9..2306f4d9af 100644 --- a/data/styles/vehicle/style-night/style.mapcss +++ b/data/styles/vehicle/style-night/style.mapcss @@ -51,7 +51,7 @@ colors RouteFake-color: #A8A8A8; RouteFakeOutline-color: #717171; Arrow3D-color: #41C8FF; - Arrow3DObsolete-color: #82AAC8; + Arrow3DObsolete-color: #D61818; Arrow3DObsolete-opacity: 0.72; Arrow3DShadow-color: #3C3C3C; Arrow3DShadow-opacity: 0.24; -- 2.45.3 From ff0ad232f3369cc0ec9db391fb64bab6dc090c5d Mon Sep 17 00:00:00 2001 From: Alexander Borsuk Date: Sun, 26 Mar 2023 11:37:11 +0200 Subject: [PATCH 2/3] [styles] Regenerated Signed-off-by: Alexander Borsuk --- data/colors.txt | 3 ++- data/drules_proto_clear.bin | Bin 324092 -> 324092 bytes data/drules_proto_clear.txt | 2 +- data/drules_proto_dark.bin | Bin 322424 -> 322424 bytes data/drules_proto_dark.txt | 2 +- data/drules_proto_vehicle_clear.bin | Bin 241177 -> 241177 bytes data/drules_proto_vehicle_clear.txt | 2 +- data/drules_proto_vehicle_dark.bin | Bin 240013 -> 240013 bytes data/drules_proto_vehicle_dark.txt | 2 +- 9 files changed, 6 insertions(+), 5 deletions(-) diff --git a/data/colors.txt b/data/colors.txt index b952df9b39..795ef1e14e 100644 --- a/data/colors.txt +++ b/data/colors.txt @@ -344,7 +344,8 @@ 872415231 1074860288 1090519039 -1216522952 +1221990424 +1223166995 1292174597 1292964096 1293171732 diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index bf357fd9e4f82e8497949a26110114bd699f68c4..8f749f76648207344896503e89c6e66419630460 100644 GIT binary patch delta 28 kcmezKSoqIl;f5B*7N!>FEiC(AuuPt@;Q02#FIX%&0na)OlmGw# delta 28 kcmezKSoqIl;f5B*7N!>FEiC(Au$;Ksb!7YD7c7>X0Me`t?EnA( diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index 7884605050..f89c02b17c 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -103037,7 +103037,7 @@ colors { } value { name: "Arrow3DObsolete" - color: 1216522952 + color: 1223166995 } value { name: "Arrow3DOutline" diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 456005ea682474a3e53762597d24b331fce2fc1e..8d6ed2f64ddad6f761f2841097b299047bdfeb74 100644 GIT binary patch delta 28 kcmexyP58$(;f5B*7N!>FEiC4bSY~XvacsNwBNkgu0K}>ct^fc4 delta 28 kcmexyP58$(;f5B*7N!>FEiC4bSWaB+I& delta 26 icmbPvhi~Q`zJ?aY7N#xCcb2f6xY~7O`-3ISmYe{mbPPBE diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt index e9253626de..080b5da4c3 100644 --- a/data/drules_proto_vehicle_clear.txt +++ b/data/drules_proto_vehicle_clear.txt @@ -71760,7 +71760,7 @@ colors { } value { name: "Arrow3DObsolete" - color: 1216522952 + color: 1223166995 } value { name: "Arrow3DOutline" diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index 47fcd150e886770d4567d6d123a63d5b0cb3d09f..b98d4e04ef649d13d7f0a87e457eb9488cfdc2a2 100644 GIT binary patch delta 26 icmeCZ%-4IFuc3vpg=q`3&jOYi8*Uui9 Date: Sun, 26 Mar 2023 12:29:12 +0200 Subject: [PATCH 3/3] Change position arrow color to outdated after 10 seconds of missing GPS instead of 30 seconds Signed-off-by: Alexander Borsuk --- drape_frontend/my_position_controller.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drape_frontend/my_position_controller.cpp b/drape_frontend/my_position_controller.cpp index 207b959bff..3f12c98259 100644 --- a/drape_frontend/my_position_controller.cpp +++ b/drape_frontend/my_position_controller.cpp @@ -29,7 +29,7 @@ double const kGpsBearingLifetimeSec = 5.0; double const kMaxPendingLocationTimeSec = 60.0; double const kMaxTimeInBackgroundSec = 60.0 * 60 * 30; // 30 hours before starting detecting position again double const kMaxNotFollowRoutingTimeSec = 20.0; -double const kMaxUpdateLocationInvervalSec = 30.0; +double const kMaxUpdateLocationInvervalSec = 10.0; // It is important to see that GPS was lost ASAP. double const kMaxBlockAutoZoomTimeSec = 10.0; int const kZoomThreshold = 10; -- 2.45.3