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

add writeTags method

Browse source
This commit is contained in:
Chumva 2018-07-31 11:04:30 +03:00
parent ab6434f3ba
commit b0ed02c597
1 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -225,16 +225,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$
for (String k : n.getTagKeySet()) { writeTags(n, ser);
String val = n.getTag(k);
if (val.length() == 0 || k.length() == 0 || EditPoiData.POI_TYPE_TAG.equals(k) ||
k.startsWith(EditPoiData.REMOVE_TAG_PREFIX) || k.contains(EditPoiData.REMOVE_TAG_PREFIX))
continue;
ser.startTag(null, "tag"); //$NON-NLS-1$
ser.attribute(null, "k", k); //$NON-NLS-1$
ser.attribute(null, "v", val); //$NON-NLS-1$
ser.endTag(null, "tag"); //$NON-NLS-1$
}
ser.endTag(null, "node"); //$NON-NLS-1$ ser.endTag(null, "node"); //$NON-NLS-1$
} }
@ -243,16 +234,19 @@ public class OpenstreetmapRemoteUtil implements OpenstreetmapUtil {
ser.startTag(null, "way"); //$NON-NLS-1$ ser.startTag(null, "way"); //$NON-NLS-1$
ser.attribute(null, "id", way.getId() + ""); //$NON-NLS-1$ //$NON-NLS-2$ ser.attribute(null, "id", way.getId() + ""); //$NON-NLS-1$ //$NON-NLS-2$
if (i != null) { if (i != null) {
// ser.attribute(null, "timestamp", i.getETimestamp());
// ser.attribute(null, "uid", i.getUid());
// ser.attribute(null, "user", i.getUser());
ser.attribute(null, "visible", i.getVisible()); //$NON-NLS-1$ ser.attribute(null, "visible", i.getVisible()); //$NON-NLS-1$
ser.attribute(null, "version", i.getVersion()); //$NON-NLS-1$ ser.attribute(null, "version", i.getVersion()); //$NON-NLS-1$
} }
ser.attribute(null, "changeset", changeSetId + ""); //$NON-NLS-1$ //$NON-NLS-2$ ser.attribute(null, "changeset", changeSetId + ""); //$NON-NLS-1$ //$NON-NLS-2$
for (String k : way.getTagKeySet()) { writeTags(way, ser);
String val = way.getTag(k); ser.endTag(null, "way"); //$NON-NLS-1$
}
private void writeTags(Entity entity, XmlSerializer ser)
throws IllegalArgumentException, IllegalStateException, IOException {
for (String k : entity.getTagKeySet()) {
String val = entity.getTag(k);
if (val.length() == 0 || k.length() == 0 || EditPoiData.POI_TYPE_TAG.equals(k) || if (val.length() == 0 || k.length() == 0 || EditPoiData.POI_TYPE_TAG.equals(k) ||
k.startsWith(EditPoiData.REMOVE_TAG_PREFIX) || k.contains(EditPoiData.REMOVE_TAG_PREFIX)) k.startsWith(EditPoiData.REMOVE_TAG_PREFIX) || k.contains(EditPoiData.REMOVE_TAG_PREFIX))
continue; continue;
@ -261,7 +255,6 @@ public class OpenstreetmapRemoteUtil implements OpenstreetmapUtil {
ser.attribute(null, "v", val); //$NON-NLS-1$ ser.attribute(null, "v", val); //$NON-NLS-1$
ser.endTag(null, "tag"); //$NON-NLS-1$ ser.endTag(null, "tag"); //$NON-NLS-1$
} }
ser.endTag(null, "way"); //$NON-NLS-1$
} }
private boolean isNewChangesetRequired() { private boolean isNewChangesetRequired() {
@ -436,13 +429,13 @@ public class OpenstreetmapRemoteUtil implements OpenstreetmapUtil {
if (!isWay && entity instanceof Node) { if (!isWay && entity instanceof Node) {
// check whether this is node (because id of node could be the same as relation) // check whether this is node (because id of node could be the same as relation)
if (MapUtils.getDistance(entity.getLatLon(), n.getLocation()) < 50) { if (MapUtils.getDistance(entity.getLatLon(), n.getLocation()) < 50) {
return replaceEditOsnTags(n, entity); return replaceEditOsmTags(n, entity);
} }
} else if (isWay && entity instanceof Way) { } else if (isWay && entity instanceof Way) {
LatLon loc = n.getLocation(); LatLon loc = n.getLocation();
entity.setLatitude(loc.getLatitude()); entity.setLatitude(loc.getLatitude());
entity.setLongitude(loc.getLongitude()); entity.setLongitude(loc.getLongitude());
return replaceEditOsnTags(n, entity); return replaceEditOsmTags(n, entity);
} }
} }
return null; return null;
@ -462,7 +455,7 @@ public class OpenstreetmapRemoteUtil implements OpenstreetmapUtil {
return null; return null;
} }
private Entity replaceEditOsnTags(Amenity amenity, Entity entity) { private Entity replaceEditOsmTags(Amenity amenity, Entity entity) {
PoiCategory type = amenity.getType(); PoiCategory type = amenity.getType();
String subType = amenity.getSubType(); String subType = amenity.getSubType();
if (type != null && subType != null) { if (type != null && subType != null) {