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

Fix #4849

Browse source
This commit is contained in:
Alexander Sytnyk 2017-12-18 18:44:15 +02:00
parent fd884e38a5
commit 1a32ce290e
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,20 +1,7 @@
package net.osmand.plus.osmedit; package net.osmand.plus.osmedit;
import java.io.BufferedReader; import android.util.Xml;
import java.io.BufferedWriter; import android.widget.Toast;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.StringWriter;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.text.MessageFormat;
import java.util.LinkedHashMap;
import java.util.Map;
import net.osmand.PlatformUtil; import net.osmand.PlatformUtil;
import net.osmand.data.Amenity; import net.osmand.data.Amenity;
@ -37,8 +24,21 @@ import org.apache.commons.logging.Log;
import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlSerializer; import org.xmlpull.v1.XmlSerializer;
import android.util.Xml; import java.io.BufferedReader;
import android.widget.Toast; import java.io.BufferedWriter;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.StringWriter;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.text.MessageFormat;
import java.util.LinkedHashMap;
import java.util.Map;
public class OpenstreetmapRemoteUtil implements OpenstreetmapUtil { public class OpenstreetmapRemoteUtil implements OpenstreetmapUtil {
@ -330,7 +330,7 @@ public class OpenstreetmapRemoteUtil implements OpenstreetmapUtil {
Node entity = (Node) st.getRegisteredEntities().get(id); Node entity = (Node) st.getRegisteredEntities().get(id);
// merge non existing tags // merge non existing tags
for (String rtag : entity.getTagKeySet()) { for (String rtag : entity.getTagKeySet()) {
if (!n.getTagKeySet().contains(rtag)) { if (!n.getTagKeySet().contains(rtag) && !n.getTagKeySet().contains("----" + rtag)) {
n.putTagNoLC(rtag, entity.getTag(rtag)); n.putTagNoLC(rtag, entity.getTag(rtag));
} }
} }