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

Fix #7030

Browse source
This commit is contained in:
Chumva 2019-06-24 18:12:40 +03:00
parent b067b66aa6
commit e6afe2aa0f
1 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
OsmAnd/src/net/osmand/plus/osmedit/OpenstreetmapRemoteUtil.java
View file

@ -48,6 +48,8 @@ import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import gnu.trove.list.array.TLongArrayList;
public class OpenstreetmapRemoteUtil implements OpenstreetmapUtil { public class OpenstreetmapRemoteUtil implements OpenstreetmapUtil {
private static final long NO_CHANGESET_ID = -1; private static final long NO_CHANGESET_ID = -1;
@ -242,6 +244,7 @@ public class OpenstreetmapRemoteUtil implements OpenstreetmapUtil {
} }
ser.attribute(null, "changeset", changeSetId + ""); //$NON-NLS-1$ //$NON-NLS-2$ ser.attribute(null, "changeset", changeSetId + ""); //$NON-NLS-1$ //$NON-NLS-2$
writeNodesIds(way, ser);
writeTags(way, ser); writeTags(way, ser);
ser.endTag(null, "way"); //$NON-NLS-1$ ser.endTag(null, "way"); //$NON-NLS-1$
} }
@ -260,6 +263,18 @@ public class OpenstreetmapRemoteUtil implements OpenstreetmapUtil {
} }
} }
private void writeNodesIds(Way way, XmlSerializer ser)
throws IllegalArgumentException, IllegalStateException, IOException {
for (int i = 0; i < way.getNodeIds().size(); i++) {
long nodeId = way.getNodeIds().get(i);
if (nodeId != 0) {
ser.startTag(null, "nd"); //$NON-NLS-1$
ser.attribute(null, "ref", String.valueOf(nodeId)); //$NON-NLS-1$
ser.endTag(null, "nd"); //$NON-NLS-1$
}
}
}
private boolean isNewChangesetRequired() { private boolean isNewChangesetRequired() {
// first commit // first commit
if (changeSetId == NO_CHANGESET_ID) { if (changeSetId == NO_CHANGESET_ID) {
@ -383,7 +398,19 @@ public class OpenstreetmapRemoteUtil implements OpenstreetmapUtil {
} }
} }
n.replaceTags(updatedTags); n.replaceTags(updatedTags);
if (!isWay && MapUtils.getDistance(n.getLatLon(), entity.getLatLon()) < 10) { if (isWay) {
Way foundWay = (Way) entity;
Way currentWay = (Way) n;
TLongArrayList nodeIds = foundWay.getNodeIds();
if (nodeIds != null) {
for (int i = 0; i < nodeIds.size(); i++) {
long nodeId = nodeIds.get(i);
if (nodeId != 0) {
currentWay.addNode(nodeId);
}
}
}
} else if (MapUtils.getDistance(n.getLatLon(), entity.getLatLon()) < 10) {
// avoid shifting due to round error // avoid shifting due to round error
n.setLatitude(entity.getLatitude()); n.setLatitude(entity.getLatitude());
n.setLongitude(entity.getLongitude()); n.setLongitude(entity.getLongitude());