Use static method instead of many derived profiles calling

jj10133 · May 17, 2022 · 35d5507 · 35d5507
1 parent 0f8b569
commit 35d5507
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 43 deletions.
diff --git a/OsmAnd-java/src/main/java/net/osmand/router/GeneralRouter.java b/OsmAnd-java/src/main/java/net/osmand/router/GeneralRouter.java
@@ -226,17 +226,6 @@ public Map<String, RoutingParameter> getParameters() {
 		return parameters;
 	}
 
-	public Map<String, RoutingParameter> getParameters(String derivedProfile) {
-		Map<String, RoutingParameter> parameters = new HashMap<>();
-		for (Entry<String, RoutingParameter> entry : getParameters().entrySet()) {
-			String[] profiles = entry.getValue().getProfiles();
-			if (profiles == null || Algorithms.equalsToAny(derivedProfile, (Object[]) profiles)) {
-				parameters.put(entry.getKey(), entry.getValue());
-			}
-		}
-		return parameters;
-	}
-
 	public void addAttribute(String k, String v) {
 		attributes.put(k, v);
 		if (k.equals("restrictionsAware")) {
@@ -393,8 +382,6 @@ public float defineObstacle(RouteDataObject road, int point, boolean dir) {
 		return 0;
 	}
 
-	TIntArrayList filteredRules = new TIntArrayList();
-
 	@Override
 	public float defineRoutingObstacle(RouteDataObject road, int point, boolean dir) {
 		int[] pointTypes = road.getPointTypes(point);

diff --git a/OsmAnd-java/src/main/java/net/osmand/util/Algorithms.java b/OsmAnd-java/src/main/java/net/osmand/util/Algorithms.java
@@ -542,17 +542,6 @@ public static boolean endsWithAny(String s, String ... args) {
 		return false;
 	}
 
-	public static boolean equalsToAny(Object o, Object ... args) {
-		if (o != null && args != null && args.length > 0) {
-			for (Object arg : args) {
-				if (objectEquals(o, arg)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
 	public static String capitalizeFirstLetterAndLowercase(String s) {
 		if (s != null && s.length() > 1) {
 			// not very efficient algorithm

diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteOptionsBottomSheet.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteOptionsBottomSheet.java
@@ -48,6 +48,7 @@
 import net.osmand.plus.routing.GPXRouteParams.GPXRouteParamsBuilder;
 import net.osmand.plus.routing.RouteService;
 import net.osmand.plus.routing.RoutingHelper;
+import net.osmand.plus.routing.RoutingHelperUtils;
 import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.plus.settings.backend.OsmAndAppCustomization;
 import net.osmand.plus.settings.backend.OsmandSettings;
@@ -723,8 +724,7 @@ private List<RoutingParameter> getReliefParameters() {
 		List<RoutingParameter> reliefFactorParameters = new ArrayList<>();
 		GeneralRouter router = app.getRouter(applicationMode);
 		if (router != null) {
-			String derivedProfile = applicationMode.getDerivedProfile();
-			Map<String, RoutingParameter> parameters = router.getParameters(derivedProfile);
+			Map<String, RoutingParameter> parameters = RoutingHelperUtils.getParametersForDerivedProfile(applicationMode, router);
 			for (Map.Entry<String, RoutingParameter> entry : parameters.entrySet()) {
 				RoutingParameter routingParameter = entry.getValue();
 				if (RELIEF_SMOOTHNESS_FACTOR.equals(routingParameter.getGroup())) {

diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/RoutingOptionsHelper.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/RoutingOptionsHelper.java
@@ -32,6 +32,7 @@
 import net.osmand.plus.routing.GPXRouteParams.GPXRouteParamsBuilder;
 import net.osmand.plus.routing.RouteService;
 import net.osmand.plus.routing.RoutingHelper;
+import net.osmand.plus.routing.RoutingHelperUtils;
 import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.settings.backend.preferences.CommonPreference;
@@ -451,8 +452,7 @@ public LocalRoutingParameter getRoutingParameterInnerById(ApplicationMode am, St
 		}
 
 		LocalRoutingParameter rp;
-		String derivedProfile = am.getDerivedProfile();
-		Map<String, GeneralRouter.RoutingParameter> parameters = rm.getParameters(derivedProfile);
+		Map<String, GeneralRouter.RoutingParameter> parameters = RoutingHelperUtils.getParametersForDerivedProfile(am, rm);
 		GeneralRouter.RoutingParameter routingParameter = parameters.get(parameterId);
 
 		if (routingParameter != null) {
@@ -532,8 +532,7 @@ public List<LocalRoutingParameter> getRoutingParametersInner(ApplicationMode am)
 		if (rm == null || (rparams != null && !rparams.isCalculateOsmAndRoute()) && !rparams.getFile().hasRtePt()) {
 			return list;
 		}
-		String derivedProfile = am.getDerivedProfile();
-		Map<String, GeneralRouter.RoutingParameter> parameters = rm.getParameters(derivedProfile);
+		Map<String, GeneralRouter.RoutingParameter> parameters = RoutingHelperUtils.getParametersForDerivedProfile(am, rm);
 		for (GeneralRouter.RoutingParameter r : parameters.values()) {
 			if (r.getType() == GeneralRouter.RoutingParameterType.BOOLEAN) {
 				if ("relief_smoothness_factor".equals(r.getGroup())) {
@@ -623,8 +622,7 @@ public List<GeneralRouter.RoutingParameter> getAvoidRoutingPrefsForAppMode(Appli
 		List<GeneralRouter.RoutingParameter> avoidParameters = new ArrayList<GeneralRouter.RoutingParameter>();
 		GeneralRouter router = app.getRouter(applicationMode);
 		if (router != null) {
-			String derivedProfile = applicationMode.getDerivedProfile();
-			Map<String, GeneralRouter.RoutingParameter> parameters = router.getParameters(derivedProfile);
+			Map<String, GeneralRouter.RoutingParameter> parameters = RoutingHelperUtils.getParametersForDerivedProfile(applicationMode, router);
 			for (Map.Entry<String, GeneralRouter.RoutingParameter> e : parameters.entrySet()) {
 				String param = e.getKey();
 				GeneralRouter.RoutingParameter routingParameter = e.getValue();
@@ -641,8 +639,7 @@ public GeneralRouter.RoutingParameter getRoutingPrefsForAppModeById(ApplicationM
 		GeneralRouter.RoutingParameter parameter = null;
 
 		if (router != null) {
-			String derivedProfile = applicationMode.getDerivedProfile();
-			parameter = router.getParameters(derivedProfile).get(parameterId);
+			parameter = RoutingHelperUtils.getParameterForDerivedProfile(parameterId, applicationMode, router);
 		}
 
 		return parameter;

diff --git a/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java b/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
@@ -763,9 +763,8 @@ protected RouteCalculationResult findVectorMapsRoute(final RouteCalculationParam
 
 	private RoutingConfiguration initOsmAndRoutingConfig(Builder config, final RouteCalculationParams params, OsmandSettings settings,
 	                                                     GeneralRouter generalRouter) throws IOException, FileNotFoundException {
-		String derivedProfile = params.mode.getDerivedProfile();
 		Map<String, String> paramsR = new LinkedHashMap<String, String>();
-		for (Map.Entry<String, RoutingParameter> e : generalRouter.getParameters(derivedProfile).entrySet()) {
+		for (Map.Entry<String, RoutingParameter> e : RoutingHelperUtils.getParametersForDerivedProfile(params.mode, generalRouter).entrySet()) {
 			String key = e.getKey();
 			RoutingParameter pr = e.getValue();
 			String vl;
@@ -795,6 +794,7 @@ private RoutingConfiguration initOsmAndRoutingConfig(Builder config, final Route
 		if (maxSpeed > 0) {
 			paramsR.put(GeneralRouter.MAX_SPEED, String.valueOf(maxSpeed));
 		}
+		String derivedProfile = params.mode.getDerivedProfile();
 		if (!Algorithms.isEmpty(derivedProfile)) {
 			paramsR.put("profile_"+ derivedProfile, String.valueOf(true));
 		}

diff --git a/OsmAnd/src/net/osmand/plus/routing/RoutingHelperUtils.java b/OsmAnd/src/net/osmand/plus/routing/RoutingHelperUtils.java
@@ -8,9 +8,16 @@
 import net.osmand.data.QuadRect;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.helpers.TargetPointsHelper;
+import net.osmand.plus.settings.backend.ApplicationMode;
+import net.osmand.router.GeneralRouter;
+import net.osmand.router.GeneralRouter.RoutingParameter;
 import net.osmand.util.MapUtils;
 
+import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 
 public class RoutingHelperUtils {
 
@@ -177,4 +184,20 @@ public static void checkAndUpdateStartLocation(@NonNull OsmandApplication app, L
 			checkAndUpdateStartLocation(app, newStartLocation, force);
 		}
 	}
+
+	public static RoutingParameter getParameterForDerivedProfile(@NonNull String id, @NonNull ApplicationMode appMode, @NonNull GeneralRouter router) {
+		return getParametersForDerivedProfile(appMode, router).get(id);
+	}
+
+	public static Map<String, RoutingParameter> getParametersForDerivedProfile(@NonNull ApplicationMode appMode, @NonNull GeneralRouter router) {
+		String derivedProfile = appMode.getDerivedProfile();
+		Map<String, RoutingParameter> parameters = new HashMap<>();
+		for (Entry<String, RoutingParameter> entry : router.getParameters().entrySet()) {
+			String[] profiles = entry.getValue().getProfiles();
+			if (profiles == null || Arrays.asList(profiles).contains(derivedProfile)) {
+				parameters.put(entry.getKey(), entry.getValue());
+			}
+		}
+		return parameters;
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/routing/TransportRoutingHelper.java b/OsmAnd/src/net/osmand/plus/routing/TransportRoutingHelper.java
@@ -23,6 +23,7 @@
 import net.osmand.plus.settings.backend.preferences.CommonPreference;
 import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.router.GeneralRouter;
+import net.osmand.router.GeneralRouter.RoutingParameter;
 import net.osmand.router.NativeTransportRoutingResult;
 import net.osmand.router.RouteCalculationProgress;
 import net.osmand.router.RoutingConfiguration;
@@ -489,7 +490,8 @@ private List<TransportRouteResult> calculateRouteImpl(TransportRouteCalculationP
 			String derivedProfile = params.mode.getDerivedProfile();
 			GeneralRouter router = config.getRouter(params.mode.getRoutingProfile());
 			OsmandSettings settings = params.ctx.getSettings();
-			for (Map.Entry<String, GeneralRouter.RoutingParameter> e : router.getParameters(derivedProfile).entrySet()) {
+			Map<String, RoutingParameter> parameters = RoutingHelperUtils.getParametersForDerivedProfile(params.mode, router);
+			for (Map.Entry<String, GeneralRouter.RoutingParameter> e : parameters.entrySet()) {
 				String key = e.getKey();
 				GeneralRouter.RoutingParameter pr = e.getValue();
 				String vl;

diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ElevationDateBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ElevationDateBottomSheet.java
@@ -10,6 +10,7 @@
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 
+import net.osmand.plus.routing.RoutingHelperUtils;
 import net.osmand.plus.utils.AndroidUtils;
 import net.osmand.PlatformUtil;
 import net.osmand.plus.utils.ColorUtilities;
@@ -80,8 +81,7 @@ public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
 		GeneralRouter router = app.getRouter(appMode);
-		String derivedProfile = appMode.getDerivedProfile();
-		Map<String, RoutingParameter> routingParameterMap = router.getParameters(derivedProfile);
+		Map<String, RoutingParameter> routingParameterMap = RoutingHelperUtils.getParametersForDerivedProfile(appMode, router);
 		RoutingParameter parameter = routingParameterMap.get(USE_HEIGHT_OBSTACLES);
 		if (parameter != null) {
 			useHeightPref = app.getSettings().getCustomRoutingBooleanProperty(parameter.getId(), parameter.getDefaultBoolean());

diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java
@@ -29,6 +29,7 @@
 import net.osmand.plus.plugins.development.OsmandDevelopmentPlugin;
 import net.osmand.plus.routing.RouteService;
 import net.osmand.plus.routing.RoutingHelper;
+import net.osmand.plus.routing.RoutingHelperUtils;
 import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.settings.backend.preferences.BooleanPreference;
@@ -210,8 +211,7 @@ private void setupRoutingPrefs() {
 			GeneralRouter router = app.getRouter(am);
 			clearParameters();
 			if (router != null) {
-				String derivedProfile = am.getDerivedProfile();
-				Map<String, RoutingParameter> parameters = router.getParameters(derivedProfile);
+				Map<String, RoutingParameter> parameters = RoutingHelperUtils.getParametersForDerivedProfile(am, router);
 				if (!am.isDerivedRoutingFrom(ApplicationMode.CAR)) {
 					screen.addPreference(fastRoute);
 				}

diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/VehicleParametersFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/VehicleParametersFragment.java
@@ -19,6 +19,7 @@
 
 import com.google.android.material.slider.Slider;
 
+import net.osmand.plus.routing.RoutingHelperUtils;
 import net.osmand.plus.utils.AndroidUtils;
 import net.osmand.plus.utils.OsmAndFormatter;
 import net.osmand.plus.R;
@@ -63,9 +64,8 @@ protected void setupPreferences() {
 		if (routeService == RouteService.OSMAND) {
 			GeneralRouter router = app.getRouter(mode);
 			if (router != null) {
-				String derivedProfile = mode.getDerivedProfile();
 				GeneralRouterProfile routerProfile = router.getProfile();
-				Map<String, RoutingParameter> parameters = router.getParameters(derivedProfile);
+				Map<String, RoutingParameter> parameters = RoutingHelperUtils.getParametersForDerivedProfile(mode, router);
 				setupCustomRoutingPropertyPref(parameters.get(VEHICLE_HEIGHT), routerProfile);
 				setupCustomRoutingPropertyPref(parameters.get(VEHICLE_WEIGHT), routerProfile);
 				setupCustomRoutingPropertyPref(parameters.get(VEHICLE_WIDTH), routerProfile);