pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Do not show "Routing options enabled" when using ruler (#7074)

Browse source 
* Do not show "Routing options enabled"  when using ruler

Signed-off-by: Diogo Rodrigues <dmfrodrigues2000@gmail.com>

* Also add check to RoutingPlanController

Signed-off-by: Diogo Rodrigues <dmfrodrigues2000@gmail.com>

---------

Signed-off-by: Diogo Rodrigues <dmfrodrigues2000@gmail.com>
This commit is contained in:
Diogo Rodrigues 2024-02-18 23:10:51 +00:00 • committed by GitHub
parent 66b717dc83
commit 5323d9323d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/app/src/main/java/app/organicmaps/routing/RoutingController.java
View file

@ -198,7 +198,7 @@ public class RoutingController
private boolean isDrivingOptionsBuildError()
{
return !ResultCodesHelper.isMoreMapsNeeded(mLastResultCode) && RoutingOptions.hasAnyOptions();
return !ResultCodesHelper.isMoreMapsNeeded(mLastResultCode) && RoutingOptions.hasAnyOptions() && !isRulerRouterType();
}
private void setState(State newState)

2
android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java
View file

@ -306,7 +306,7 @@ public class RoutingPlanController extends ToolbarController
{
mDrivingOptionsBtnContainer.addOnLayoutChangeListener(mDriverOptionsLayoutListener);
UiUtils.show(mDrivingOptionsBtnContainer);
boolean hasAnyOptions = RoutingOptions.hasAnyOptions();
boolean hasAnyOptions = RoutingOptions.hasAnyOptions() && !isRulerType();
UiUtils.showIf(hasAnyOptions, mDrivingOptionsImage);
TextView title = mDrivingOptionsBtnContainer.findViewById(R.id.driving_options_btn_title);
title.setText(hasAnyOptions ? R.string.change_driving_options_btn

2
iphone/Maps/Core/Routing/MWMRouter.mm
View file

@ -575,7 +575,7 @@ char const *kRenderAltitudeImagesQueueLabel = "mapsme.mwmrouter.renderAltitudeIm
}
+ (BOOL)hasActiveDrivingOptions {
return [MWMRoutingOptions new].hasOptions;
return [MWMRoutingOptions new].hasOptions && self.type != MWMRouterTypeRuler;
}
+ (void)avoidRoadTypeAndRebuild:(MWMRoadType)type {