Port to Kotlin Multiplatform

build.gradle.kts

@@ -0,0 +1,83 @@
+//import groovy.json.JsonSlurper
+//import java.io.File
+//import java.net.URL
+//import java.util.Locale
+//
+//plugins {
+//    `java`
+//}
+//
+//repositories {
+//    mavenCentral()
+//    google()
+//}
+//
+//val downloadPresets by tasks.registering {
+//    doLast {
+//        val targetDir = "$projectDir/presets"
+//        val presetsUrl = URL("https://raw.githubusercontent.com/openstreetmap/id-tagging-schema/main/dist/presets.json")
+//        val contentsUrl = URL("https://api.github.com/repos/openstreetmap/id-tagging-schema/contents/dist/translations")
+//
+//        File("$targetDir/presets.json").outputStream().use { it.write(presetsUrl.openStream().readBytes()) }
+//
+//        val slurper = JsonSlurper()
+//        val contents = slurper.parse(contentsUrl, "UTF-8") as List<Map<String, Any>>
+//        contents.forEach {
+//            if (it["type"] == "file") {
+//                val language = it["name"].toString().substringBeforeLast(".")
+//                val translationsUrl = URL(it["download_url"].toString())
+//                val javaLanguage = bcp47LanguageTagToJavaLanguageTag(language)
+//                File("$targetDir/${javaLanguage}.json").outputStream().use { os ->
+//                    os.write(translationsUrl.openStream().readBytes())
+//                }
+//            }
+//        }
+//    }
+//}
+//
+//fun bcp47LanguageTagToJavaLanguageTag(bcp47: String): String {
+//    val locale = Locale.forLanguageTag(bcp47)
+//    var result = locale.language
+//    if (locale.country.isNotEmpty()) result += "-" + locale.country
+//    return result
+//}
+
+//publishing {
+//    repositories {
+//        maven {
+//            url = uri("https://github.com/westnordost/osmfeatures")
+//        }
+//    }
+//    publications {
+//        create<MavenPublication>("mavenJava") {
+//            groupId = "de.westnordost"
+//            artifactId = "osmfeatures"
+//            version = "5.2"
+//            from(components["java"])
+//
+//            pom {
+//                name.value("osmfeatures")
+//                description.value("Java library to translate OSM tags to and from localized names.")
+//                url.value("https://github.com/westnordost/osmfeatures")
+//                scm {
+//                    connection.value("https://github.com/westnordost/osmfeatures.git")
+//                    developerConnection.value("https://github.com/westnordost/osmfeatures.git")
+//                    url.value("https://github.com/westnordost/osmfeatures")
+//                }
+//                licenses {
+//                    license {
+//                        name.value("The Apache License, Version 2.0")
+//                        url.value("http://www.apache.org/licenses/LICENSE-2.0.txt")
+//                    }
+//                }
+//                developers {
+//                    developer {
+//                        id.value("westnordost")
+//                        name.value("Tobias Zwick")
+//                        email.value("[email protected]")
+//                    }
+//                }
+//            }
+//        }
+//    }
+//}

gradle/libs.versions.toml

@@ -0,0 +1,17 @@
+[versions]
+agp = "8.2.1"
+kotlin = "1.9.22"
+kotlinx-serialization-json = "1.6.0"
+normalize = "1.0.5"
+okio = "3.6.0"
+
+[libraries]
+kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
+kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization-json" }
+normalize = { module = "com.doist.x:normalize", version.ref = "normalize" }
+okio = { module = "com.squareup.okio:okio", version.ref = "okio" }
+
+
+[plugins]
+android-library = { id = "com.android.library", version.ref = "agp" }
+kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Mar 04 22:04:30 CET 2021
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+#Fri Dec 22 21:31:41 CET 2023
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

library-android/build.gradle

@@ -14,7 +14,7 @@ repositories {
 }
 
 dependencies {
-    //api (project(':library')) {
+    // api (project(':library')) {
     api ('de.westnordost:osmfeatures:5.2') {
         // it's already included in Android
         exclude group: 'org.json', module: 'json'
@@ -23,12 +23,11 @@ dependencies {
 
 android {
     compileSdkVersion 32
-
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 32
         versionCode 1
-        versionName project.version
+        versionName "1"
     }
 
     compileOptions {
@@ -37,18 +36,19 @@ android {
     }
 }
 
-task sourcesJar(type: Jar) {
+tasks.register('sourcesJar', Jar) {
     from android.sourceSets.main.java.srcDirs
     classifier = 'sources'
 }
 
-task javadoc(type: Javadoc) {
+tasks.register('javadoc', Javadoc) {
     source = android.sourceSets.main.java.srcDirs
     failOnError = false
     classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
 }
 
-task javadocJar(type: Jar, dependsOn: javadoc) {
+tasks.register('javadocJar', Jar) {
+    dependsOn javadoc
     from javadoc.destinationDir
     classifier = 'javadoc'
 }

library-android/src/main/java/de/westnordost/osmfeatures/AndroidFeatureDictionary.kt

@@ -0,0 +1,27 @@
+package de.westnordost.osmfeatures
+
+import android.content.res.AssetManager
+
+object AndroidFeatureDictionary {
+    /** Create a new FeatureDictionary which gets its data from the given directory in the app's asset folder.  */
+    fun create(assetManager: AssetManager, presetsBasePath: String): FeatureDictionary {
+        return create(assetManager, presetsBasePath, null)
+    }
+
+    /** Create a new FeatureDictionary which gets its data from the given directory in the app's
+     * asset folder. Optionally, the path to the brand presets can be specified.  */
+    fun create(
+        assetManager: AssetManager,
+        presetsBasePath: String,
+        brandPresetsBasePath: String?
+    ): FeatureDictionary {
+        val featureCollection: LocalizedFeatureCollection =
+            IDLocalizedFeatureCollection(AssetManagerAccess(assetManager, presetsBasePath))
+
+        val brandsFeatureCollection: PerCountryFeatureCollection? = if (brandPresetsBasePath != null
+        ) IDBrandPresetsFeatureCollection(AssetManagerAccess(assetManager, brandPresetsBasePath))
+        else null
+
+        return FeatureDictionary(featureCollection, brandsFeatureCollection)
+    }
+}

library-android/src/main/java/de/westnordost/osmfeatures/AssetManagerAccess.kt

@@ -0,0 +1,20 @@
+package de.westnordost.osmfeatures
+
+import android.content.res.AssetManager
+import java.io.File
+
+internal class AssetManagerAccess(assetManager: AssetManager, private val basePath: String) : FileAccessAdapter {
+    private val assetManager: AssetManager = assetManager
+
+    override fun exists(name: String): Boolean {
+        val files: Array<String> = assetManager.list(basePath) ?: return false
+        for (file in files) {
+            if (file == name) return true
+        }
+        return false
+    }
+
+    override fun open(name: String): okio.Source {
+        return assetManager.open(basePath + File.separator + name)
+    }
+}