update osmunda

Author: sun-jiao

osmunda/src/main/java/moe/sunjiao/osmunda/Osmunda.kt

@@ -1,14 +1,27 @@
 package moe.sunjiao.osmunda
 
 import android.content.Context
+import android.database.sqlite.SQLiteDatabase
+import moe.sunjiao.osmunda.model.Address
+import moe.sunjiao.osmunda.model.SearchResult
 import java.io.File
 import java.io.FilenameFilter
 import java.util.*
 import kotlin.collections.ArrayList
 
-class Osmunda {
-    fun getDatabaseList(context: Context) : Array<File>?{
-        val path = File(context.filesDir.absolutePath.replace("files", "osmunda"))
-        return path.listFiles { dir, name -> name.toLowerCase(Locale.ROOT).endsWith(".sqlite") }
+class Osmunda(val context: Context) {
+
+    fun getDatabaseList() : Array<File>?{
+        return getOsmundaDir()
+            .listFiles { dir, name -> name.toLowerCase(Locale.ROOT).endsWith(".sqlite") }
+    }
+
+    fun getDatabaseByName(name : String): SQLiteDatabase{
+        return context.openOrCreateDatabase(getOsmundaDir().absolutePath + "/" + name + "sqlite", 0, null)
+    }
+
+    fun getOsmundaDir(): File{
+        return File(context.filesDir.absolutePath + "/osmunda")
     }
+    
 }

osmunda/src/main/java/moe/sunjiao/osmunda/model/Address.kt

@@ -5,24 +5,24 @@ import android.database.sqlite.SQLiteDatabase
 import java.sql.PreparedStatement
 
 class Address(databaseId: Long, database: SQLiteDatabase) {
-    var state: String? = null
-    var city: String? = null
-    var postcode: String? = null
-    var housenumber: String? = null
+    var state: String = ""
+    var city: String = ""
+    var postcode: String = ""
+    var housenumber: String = ""
 
-    var fullAddress: String? = null
-    var address_source: String? = null
-    var country: String? = null
-    var county: String? = null
-    var housename: String? = null
-    var unit: String? = null
-    var street: String? = null
-    var street_1: String? = null
-    var street_2: String? = null
-    var street_3: String? = null
+    var fullAddress: String = ""
+    var address_source: String = ""
+    var country: String = ""
+    var county: String = ""
+    var housename: String = ""
+    var unit: String = ""
+    var street: String = ""
+    var street_1: String = ""
+    var street_2: String = ""
+    var street_3: String = ""
 
-    var phone: String? = null
-    var website: String? = null
+    var phone: String = ""
+    var website: String = ""
 
     init {
         try {
@@ -78,6 +78,7 @@ class Address(databaseId: Long, database: SQLiteDatabase) {
         } catch (ex: Exception) {
             throw ex
         } finally {
+            fullAddress = housenumber + ", " + housename + ", " + street_3 + ", " + street_2 + ", " + street_1 + ", " + street + ", " + county + ", " + city + ", " + state + ", " + country + " (" + postcode + ", " + phone + ", " + website + ")"
         }
     }
 }

osmunda/src/main/java/moe/sunjiao/osmunda/reader/SQLiteWriter.kt

@@ -5,6 +5,7 @@ import android.content.Context
 import android.database.sqlite.SQLiteConstraintException
 import android.database.sqlite.SQLiteDatabase
 import android.util.Log
+import moe.sunjiao.osmunda.Osmunda
 import moe.sunjiao.osmunda.model.OsmType
 import org.openstreetmap.osmosis.core.domain.v0_6.*
 
@@ -23,8 +24,7 @@ class SQLiteWriter (context : Context, databaseName: String, private val commitF
     private var memberValuesList = ArrayList<ContentValues>()
 
     init{
-        database = context.openOrCreateDatabase(context.filesDir.absolutePath.replace("files", "osmunda")
-                + "/" + databaseName + ".sqlite", 0, null)
+        database = Osmunda(context).getDatabaseByName(databaseName)
         database.execSQL("CREATE TABLE IF NOT EXISTS \"nodes\" (\"id\" INTEGER PRIMARY KEY  NOT NULL , \"lat\" DOUBLE NOT NULL , \"lon\" DOUBLE NOT NULL , \"version\" INTEGER, \"timestamp\" DATETIME, \"uid\" INTEGER, \"user\" TEXT, \"changeset\" INTEGER)")
         database.execSQL("CREATE TABLE IF NOT EXISTS \"relation_members\" (\"type\" TEXT NOT NULL , \"member_id\" INTEGER NOT NULL , \"role\" TEXT, \"relation_id\" INTEGER NOT NULL,\"insert_id\" INTEGER NOT NULL, PRIMARY KEY( \"relation_id\",\"member_id\",\"insert_id\" ))")
         database.execSQL("CREATE TABLE IF NOT EXISTS \"relations\" (\"id\" INTEGER PRIMARY KEY  NOT NULL , \"user\" TEXT, \"uid\" INTEGER, \"version\" INTEGER, \"changeset\" INTEGER, \"timestamp\" BIGINT)")