From d771d70c3a11a7ecd76f6ce2c064e5172a8105ec Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Sat, 28 Sep 2013 22:48:13 +0200 Subject: [PATCH] remove TagSet.EMTPTY --- .../src/org/oscim/utils/overpass/OverpassAPIReader.java | 8 +++----- vtm/src/org/oscim/core/TagSet.java | 1 - 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/vtm-extras/src/org/oscim/utils/overpass/OverpassAPIReader.java b/vtm-extras/src/org/oscim/utils/overpass/OverpassAPIReader.java index 921c509d..09d574b1 100644 --- a/vtm-extras/src/org/oscim/utils/overpass/OverpassAPIReader.java +++ b/vtm-extras/src/org/oscim/utils/overpass/OverpassAPIReader.java @@ -212,7 +212,7 @@ public class OverpassAPIReader { long id = 0; double lat = 0, lon = 0; - TagSet tags = TagSet.EMPTY_TAG_SET; + TagSet tags = null; while (jp.nextToken() != JsonToken.END_OBJECT) { @@ -242,7 +242,7 @@ public class OverpassAPIReader { private void parseWay(JsonParser jp) throws JsonParseException, IOException { long id = 0; - TagSet tags = TagSet.EMPTY_TAG_SET; + TagSet tags = null; ArrayList wayNodes = new ArrayList(); while (jp.nextToken() != JsonToken.END_OBJECT) { @@ -277,7 +277,7 @@ public class OverpassAPIReader { IOException { long id = 0; - TagSet tags = TagSet.EMPTY_TAG_SET; + TagSet tags = null; ArrayList members = new ArrayList(); while (jp.nextToken() != JsonToken.END_OBJECT) { @@ -332,8 +332,6 @@ public class OverpassAPIReader { tags.add(new Tag(key, val, false)); } - if (tags == null) - return TagSet.EMPTY_TAG_SET; return tags; } diff --git a/vtm/src/org/oscim/core/TagSet.java b/vtm/src/org/oscim/core/TagSet.java index 04135465..15af4e59 100644 --- a/vtm/src/org/oscim/core/TagSet.java +++ b/vtm/src/org/oscim/core/TagSet.java @@ -17,7 +17,6 @@ package org.oscim.core; import java.util.Arrays; public class TagSet { - public static TagSet EMPTY_TAG_SET = new TagSet(); public Tag[] tags; public int numTags;