move OSMData to utils

src/org/oscim/core/osm/Bound.java

@@ -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 <http://www.gnu.org/licenses/>.
- */
-package org.oscim.core.osm;
-
-public class Bound {
-
-}

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 <http://www.gnu.org/licenses/>.
  */
-package org.oscim.core.osm;
+package org.oscim.utils.osm;
 
 import java.util.Collection;
 

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 <http://www.gnu.org/licenses/>.
  */
-package org.oscim.core.osm;
+package org.oscim.utils.osm;
 
 import org.oscim.core.TagSet;
 

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 <http://www.gnu.org/licenses/>.
  */
-package org.oscim.core.osm;
+package org.oscim.utils.osm;
 
 public class OSMMember {
 	public enum MemberType{

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 <http://www.gnu.org/licenses/>.
  */
-package org.oscim.core.osm;
+package org.oscim.utils.osm;
 
 import org.oscim.core.TagSet;
 

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 <http://www.gnu.org/licenses/>.
  */
-package org.oscim.core.osm;
+package org.oscim.utils.osm;
 
 import java.util.ArrayList;
 import java.util.List;

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 <http://www.gnu.org/licenses/>.
  */
-package org.oscim.core.osm;
+package org.oscim.utils.osm;
 
 import java.util.List;
 

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

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 {
 

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;