xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove TagSet.EMTPTY

Browse Source
This commit is contained in:
Hannes Janetzek 2013-09-28 22:48:13 +02:00
parent 47e6602f9b
commit d771d70c3a
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vtm-extras/src/org/oscim/utils/overpass/OverpassAPIReader.java
View File

@ -212,7 +212,7 @@ public class OverpassAPIReader {
long id = 0; long id = 0;
double lat = 0, lon = 0; double lat = 0, lon = 0;
TagSet tags = TagSet.EMPTY_TAG_SET; TagSet tags = null;
while (jp.nextToken() != JsonToken.END_OBJECT) { while (jp.nextToken() != JsonToken.END_OBJECT) {
@ -242,7 +242,7 @@ public class OverpassAPIReader {
private void parseWay(JsonParser jp) throws JsonParseException, IOException { private void parseWay(JsonParser jp) throws JsonParseException, IOException {
long id = 0; long id = 0;
TagSet tags = TagSet.EMPTY_TAG_SET; TagSet tags = null;
ArrayList<OSMNode> wayNodes = new ArrayList<OSMNode>(); ArrayList<OSMNode> wayNodes = new ArrayList<OSMNode>();
while (jp.nextToken() != JsonToken.END_OBJECT) { while (jp.nextToken() != JsonToken.END_OBJECT) {
@ -277,7 +277,7 @@ public class OverpassAPIReader {
IOException { IOException {
long id = 0; long id = 0;
TagSet tags = TagSet.EMPTY_TAG_SET; TagSet tags = null;
ArrayList<TmpRelation> members = new ArrayList<TmpRelation>(); ArrayList<TmpRelation> members = new ArrayList<TmpRelation>();
while (jp.nextToken() != JsonToken.END_OBJECT) { while (jp.nextToken() != JsonToken.END_OBJECT) {
@ -332,8 +332,6 @@ public class OverpassAPIReader {
tags.add(new Tag(key, val, false)); tags.add(new Tag(key, val, false));
} }
if (tags == null)
return TagSet.EMPTY_TAG_SET;
return tags; return tags;
} }

1
vtm/src/org/oscim/core/TagSet.java
View File

@ -17,7 +17,6 @@ package org.oscim.core;
import java.util.Arrays; import java.util.Arrays;
public class TagSet { public class TagSet {
public static TagSet EMPTY_TAG_SET = new TagSet();
public Tag[] tags; public Tag[] tags;
public int numTags; public int numTags;