From e8ffbd79f2792f0f5f2cfad9e7286ba4acc6db66 Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Sun, 2 Jun 2013 10:26:11 +0200 Subject: [PATCH] move OSMData to utils --- src/org/oscim/core/osm/Bound.java | 19 ------------------- .../oscim/{core => utils}/osm/OSMData.java | 2 +- .../oscim/{core => utils}/osm/OSMElement.java | 2 +- .../oscim/{core => utils}/osm/OSMMember.java | 2 +- .../oscim/{core => utils}/osm/OSMNode.java | 2 +- .../{core => utils}/osm/OSMRelation.java | 2 +- src/org/oscim/{core => utils}/osm/OSMWay.java | 2 +- src/org/oscim/utils/osmpbf/OsmPbfParser.java | 12 ++++++------ src/org/oscim/utils/osmpbf/OsmPbfReader.java | 2 +- .../utils/overpass/OverpassAPIReader.java | 14 +++++++------- 10 files changed, 20 insertions(+), 39 deletions(-) delete mode 100644 src/org/oscim/core/osm/Bound.java rename src/org/oscim/{core => utils}/osm/OSMData.java (98%) rename src/org/oscim/{core => utils}/osm/OSMElement.java (98%) rename src/org/oscim/{core => utils}/osm/OSMMember.java (97%) rename src/org/oscim/{core => utils}/osm/OSMNode.java (97%) rename src/org/oscim/{core => utils}/osm/OSMRelation.java (97%) rename src/org/oscim/{core => utils}/osm/OSMWay.java (97%) diff --git a/src/org/oscim/core/osm/Bound.java b/src/org/oscim/core/osm/Bound.java deleted file mode 100644 index 9f92a885..00000000 --- a/src/org/oscim/core/osm/Bound.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright 2013 Hannes Janetzek - * - * This program is free software: you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free Software - * Foundation, either version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License along with - * this program. If not, see . - */ -package org.oscim.core.osm; - -public class Bound { - -} diff --git a/src/org/oscim/core/osm/OSMData.java b/src/org/oscim/utils/osm/OSMData.java similarity index 98% rename from src/org/oscim/core/osm/OSMData.java rename to src/org/oscim/utils/osm/OSMData.java index 6d9d10ec..4cb31ce2 100644 --- a/src/org/oscim/core/osm/OSMData.java +++ b/src/org/oscim/utils/osm/OSMData.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.oscim.core.osm; +package org.oscim.utils.osm; import java.util.Collection; diff --git a/src/org/oscim/core/osm/OSMElement.java b/src/org/oscim/utils/osm/OSMElement.java similarity index 98% rename from src/org/oscim/core/osm/OSMElement.java rename to src/org/oscim/utils/osm/OSMElement.java index 5edc36e7..a3ffa421 100644 --- a/src/org/oscim/core/osm/OSMElement.java +++ b/src/org/oscim/utils/osm/OSMElement.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.oscim.core.osm; +package org.oscim.utils.osm; import org.oscim.core.TagSet; diff --git a/src/org/oscim/core/osm/OSMMember.java b/src/org/oscim/utils/osm/OSMMember.java similarity index 97% rename from src/org/oscim/core/osm/OSMMember.java rename to src/org/oscim/utils/osm/OSMMember.java index ddf0e26d..25a89ce2 100644 --- a/src/org/oscim/core/osm/OSMMember.java +++ b/src/org/oscim/utils/osm/OSMMember.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.oscim.core.osm; +package org.oscim.utils.osm; public class OSMMember { public enum MemberType{ diff --git a/src/org/oscim/core/osm/OSMNode.java b/src/org/oscim/utils/osm/OSMNode.java similarity index 97% rename from src/org/oscim/core/osm/OSMNode.java rename to src/org/oscim/utils/osm/OSMNode.java index 52af395c..ca386772 100644 --- a/src/org/oscim/core/osm/OSMNode.java +++ b/src/org/oscim/utils/osm/OSMNode.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.oscim.core.osm; +package org.oscim.utils.osm; import org.oscim.core.TagSet; diff --git a/src/org/oscim/core/osm/OSMRelation.java b/src/org/oscim/utils/osm/OSMRelation.java similarity index 97% rename from src/org/oscim/core/osm/OSMRelation.java rename to src/org/oscim/utils/osm/OSMRelation.java index 4a54763e..40d5347d 100644 --- a/src/org/oscim/core/osm/OSMRelation.java +++ b/src/org/oscim/utils/osm/OSMRelation.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.oscim.core.osm; +package org.oscim.utils.osm; import java.util.ArrayList; import java.util.List; diff --git a/src/org/oscim/core/osm/OSMWay.java b/src/org/oscim/utils/osm/OSMWay.java similarity index 97% rename from src/org/oscim/core/osm/OSMWay.java rename to src/org/oscim/utils/osm/OSMWay.java index ecb66ab5..7ffe1e39 100644 --- a/src/org/oscim/core/osm/OSMWay.java +++ b/src/org/oscim/utils/osm/OSMWay.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.oscim.core.osm; +package org.oscim.utils.osm; import java.util.List; diff --git a/src/org/oscim/utils/osmpbf/OsmPbfParser.java b/src/org/oscim/utils/osmpbf/OsmPbfParser.java index 8c972b76..044b13cd 100644 --- a/src/org/oscim/utils/osmpbf/OsmPbfParser.java +++ b/src/org/oscim/utils/osmpbf/OsmPbfParser.java @@ -9,13 +9,13 @@ import org.openstreetmap.osmosis.osmbinary.BinaryParser; import org.openstreetmap.osmosis.osmbinary.Osmformat; import org.oscim.core.Tag; import org.oscim.core.TagSet; -import org.oscim.core.osm.OSMData; -import org.oscim.core.osm.OSMMember; -import org.oscim.core.osm.OSMNode; -import org.oscim.core.osm.OSMRelation; -import org.oscim.core.osm.OSMWay; +import org.oscim.utils.osm.OSMData; +import org.oscim.utils.osm.OSMMember; +import org.oscim.utils.osm.OSMNode; +import org.oscim.utils.osm.OSMRelation; +import org.oscim.utils.osm.OSMWay; -import android.util.Log; +import org.oscim.backend.Log; /** * Class that reads and parses binary files and sends the contained entities to diff --git a/src/org/oscim/utils/osmpbf/OsmPbfReader.java b/src/org/oscim/utils/osmpbf/OsmPbfReader.java index 1d14dd52..3b530404 100644 --- a/src/org/oscim/utils/osmpbf/OsmPbfReader.java +++ b/src/org/oscim/utils/osmpbf/OsmPbfReader.java @@ -18,7 +18,7 @@ import java.io.IOException; import java.io.InputStream; import org.openstreetmap.osmosis.osmbinary.file.BlockInputStream; -import org.oscim.core.osm.OSMData; +import org.oscim.utils.osm.OSMData; public class OsmPbfReader { diff --git a/src/org/oscim/utils/overpass/OverpassAPIReader.java b/src/org/oscim/utils/overpass/OverpassAPIReader.java index 1d4355ae..6ceba44d 100644 --- a/src/org/oscim/utils/overpass/OverpassAPIReader.java +++ b/src/org/oscim/utils/overpass/OverpassAPIReader.java @@ -33,13 +33,13 @@ import java.util.zip.InflaterInputStream; import org.oscim.core.Tag; import org.oscim.core.TagSet; -import org.oscim.core.osm.Bound; -import org.oscim.core.osm.OSMData; -import org.oscim.core.osm.OSMElement; -import org.oscim.core.osm.OSMMember; -import org.oscim.core.osm.OSMNode; -import org.oscim.core.osm.OSMRelation; -import org.oscim.core.osm.OSMWay; +import org.oscim.utils.osm.Bound; +import org.oscim.utils.osm.OSMData; +import org.oscim.utils.osm.OSMElement; +import org.oscim.utils.osm.OSMMember; +import org.oscim.utils.osm.OSMNode; +import org.oscim.utils.osm.OSMRelation; +import org.oscim.utils.osm.OSMWay; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParseException;