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

Merge pull request #9440 from osmandapp/tag_to_text

Browse source 
fix for osmand_ele tags as text
This commit is contained in:
vshcherb 2020-07-14 13:57:13 +02:00 committed by GitHub
commit 8da0811ca4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
OsmAnd-java/src/main/java/net/osmand/binary/RouteDataObject.java
View file

@ -1,12 +1,15 @@
package net.osmand.binary; package net.osmand.binary;
import net.osmand.Location; import net.osmand.Location;
import net.osmand.PlatformUtil;
import net.osmand.binary.BinaryMapRouteReaderAdapter.RouteRegion; import net.osmand.binary.BinaryMapRouteReaderAdapter.RouteRegion;
import net.osmand.binary.BinaryMapRouteReaderAdapter.RouteTypeRule; import net.osmand.binary.BinaryMapRouteReaderAdapter.RouteTypeRule;
import net.osmand.util.Algorithms; import net.osmand.util.Algorithms;
import net.osmand.util.MapUtils; import net.osmand.util.MapUtils;
import net.osmand.util.TransliterationHelper; import net.osmand.util.TransliterationHelper;
import org.apache.commons.logging.Log;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.Arrays; import java.util.Arrays;
@ -34,7 +37,7 @@ public class RouteDataObject {
public int[] nameIds; public int[] nameIds;
// mixed array [0, height, cumulative_distance height, cumulative_distance, height, ...] - length is length(points)*2 // mixed array [0, height, cumulative_distance height, cumulative_distance, height, ...] - length is length(points)*2
public float[] heightDistanceArray = null; public float[] heightDistanceArray = null;
private static final Log LOG = PlatformUtil.getLog(RouteDataObject.class);
public RouteDataObject(RouteRegion region) { public RouteDataObject(RouteRegion region) {
this.region = region; this.region = region;
} }
@ -56,6 +59,7 @@ public class RouteDataObject {
this.pointsY = copy.pointsY; this.pointsY = copy.pointsY;
this.types = copy.types; this.types = copy.types;
this.names = copy.names; this.names = copy.names;
this.nameIds = copy.nameIds;
this.restrictions = copy.restrictions; this.restrictions = copy.restrictions;
this.restrictionsVia = copy.restrictionsVia; this.restrictionsVia = copy.restrictionsVia;
this.pointTypes = copy.pointTypes; this.pointTypes = copy.pointTypes;
@ -426,12 +430,19 @@ public class RouteDataObject {
int[] opointsX = pointsX; int[] opointsX = pointsX;
int[] opointsY = pointsY; int[] opointsY = pointsY;
int[][] opointTypes = pointTypes; int[][] opointTypes = pointTypes;
String[][] opointNames = pointNames;
int[][] opointNameTypes = pointNameTypes;
pointsX = new int[pointsX.length + 1]; pointsX = new int[pointsX.length + 1];
pointsY = new int[pointsY.length + 1]; pointsY = new int[pointsY.length + 1];
boolean insTypes = this.pointTypes != null && this.pointTypes.length > pos; boolean insTypes = this.pointTypes != null && this.pointTypes.length > pos;
boolean insNames = this.pointNames != null && this.pointNames.length > pos;
if (insTypes) { if (insTypes) {
pointTypes = new int[opointTypes.length + 1][]; pointTypes = new int[opointTypes.length + 1][];
} }
if (insNames) {
pointNames = new String[opointNames.length + 1][];
pointNameTypes = new int[opointNameTypes.length +1][];
}
int i = 0; int i = 0;
for (; i < pos; i++) { for (; i < pos; i++) {
pointsX[i] = opointsX[i]; pointsX[i] = opointsX[i];
@ -439,18 +450,32 @@ public class RouteDataObject {
if (insTypes) { if (insTypes) {
pointTypes[i] = opointTypes[i]; pointTypes[i] = opointTypes[i];
} }
if (insNames) {
pointNames[i] = opointNames[i];
pointNameTypes[i] = opointNameTypes[i];
}
} }
pointsX[i] = x31; pointsX[i] = x31;
pointsY[i] = y31; pointsY[i] = y31;
if (insTypes) { if (insTypes) {
pointTypes[i] = null; pointTypes[i] = null;
} }
if (insNames) {
pointNames[i] = null;
pointNameTypes[i] = null;
}
for (i = i + 1; i < pointsX.length; i++) { for (i = i + 1; i < pointsX.length; i++) {
pointsX[i] = opointsX[i - 1]; pointsX[i] = opointsX[i - 1];
pointsY[i] = opointsY[i - 1]; pointsY[i] = opointsY[i - 1];
if (insTypes && i < pointTypes.length) { if (insTypes && i < pointTypes.length) {
pointTypes[i] = opointTypes[i - 1]; pointTypes[i] = opointTypes[i - 1];
} }
if (insNames && i < pointNames.length) {
pointNames[i] = opointNames[i - 1];
}
if (insNames && i < pointNameTypes.length) {
pointNameTypes[i] = opointNameTypes[i - 1];
}
} }
} }