Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Change gradient parameters names

Browse source
This commit is contained in:
Vitaliy 2020-07-07 10:24:29 +03:00
parent 03951910fd
commit 5f60f452c0
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
OsmAnd-java/src/main/java/net/osmand/GPXUtilities.java
View file

@ -1515,9 +1515,9 @@ public class GPXUtilities {
} }
public enum GradientScaleType { public enum GradientScaleType {
SPEED("gradientSpeedColor"), SPEED("gradient_speed_color"),
ALTITUDE("gradientAltitudeColor"), ALTITUDE("gradient_altitude_color"),
SLOPE("gradientSlopeColor"); SLOPE("gradient_slope_color");
private String typeName; private String typeName;
@ -1543,12 +1543,12 @@ public class GPXUtilities {
} }
public void setGradientScaleType(GradientScaleType gradientScaleType) { public void setGradientScaleType(GradientScaleType gradientScaleType) {
getExtensionsToWrite().put("gradientScaleType", gradientScaleType != null ? gradientScaleType.name() : null); getExtensionsToWrite().put("gradient_scale_type", gradientScaleType != null ? gradientScaleType.name() : null);
} }
public GradientScaleType getGradientScaleType() { public GradientScaleType getGradientScaleType() {
if (extensions != null) { if (extensions != null) {
String gradientScaleTypeName = extensions.get("gradientScaleType"); String gradientScaleTypeName = extensions.get("gradient_scale_type");
if (!Algorithms.isEmpty(gradientScaleTypeName)) { if (!Algorithms.isEmpty(gradientScaleTypeName)) {
try { try {
return GradientScaleType.valueOf(gradientScaleTypeName); return GradientScaleType.valueOf(gradientScaleTypeName);
@ -1575,25 +1575,25 @@ public class GPXUtilities {
public boolean isShowArrows() { public boolean isShowArrows() {
String showArrows = null; String showArrows = null;
if (extensions != null) { if (extensions != null) {
showArrows = extensions.get("showArrows"); showArrows = extensions.get("show_arrows");
} }
return Boolean.parseBoolean(showArrows); return Boolean.parseBoolean(showArrows);
} }
public void setShowArrows(boolean showArrows) { public void setShowArrows(boolean showArrows) {
getExtensionsToWrite().put("showArrows", String.valueOf(showArrows)); getExtensionsToWrite().put("show_arrows", String.valueOf(showArrows));
} }
public boolean isShowStartFinish() { public boolean isShowStartFinish() {
String showStartFinish = null; String showStartFinish = null;
if (extensions != null) { if (extensions != null) {
showStartFinish = extensions.get("showStartFinish"); showStartFinish = extensions.get("show_start_finish");
} }
return Boolean.parseBoolean(showStartFinish); return Boolean.parseBoolean(showStartFinish);
} }
public void setShowStartFinish(boolean showStartFinish) { public void setShowStartFinish(boolean showStartFinish) {
getExtensionsToWrite().put("showStartFinish", String.valueOf(showStartFinish)); getExtensionsToWrite().put("show_start_finish", String.valueOf(showStartFinish));
} }
} }

6
OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java
View file

@ -54,9 +54,9 @@ public class GpxSelectionHelper {
private static final String COLOR = "color"; private static final String COLOR = "color";
private static final String WIDTH = "width"; private static final String WIDTH = "width";
private static final String SELECTED_BY_USER = "selected_by_user"; private static final String SELECTED_BY_USER = "selected_by_user";
private static final String SHOW_ARROWS = "showArrows"; private static final String SHOW_ARROWS = "show_arrows";
private static final String GRADIENT_SCALE_TYPE = "gradientScaleType"; private static final String GRADIENT_SCALE_TYPE = "gradient_scale_type";
private static final String SHOW_START_FINISH = "showStartFinish"; private static final String SHOW_START_FINISH = "show_start_finish";
private OsmandApplication app; private OsmandApplication app;
@NonNull @NonNull