Merge branch 'release/0.1.2'

.gitmodules

@@ -2,3 +2,7 @@
 	path = gn_mobile_core
 	url = https://github.com/PnX-SI/gn_mobile_core.git
 	branch = develop
+[submodule "gn_mobile_maps"]
+	path = gn_mobile_maps
+	url = https://github.com/PnX-SI/gn_mobile_maps.git
+	branch = develop

README.md

@@ -2,9 +2,19 @@
 
 ## Upgrade git sub modules
 
-Do **NOT** modify directly `commons` and `viewpager`. Any changes should be made from
-[gn_mobile_core](https://github.com/PnX-SI/gn_mobile_core) git repository.
+Do **NOT** modify directly any git sub modules (e.g. `commons`, `viewpager` and `maps`).
+Any changes should be made from each underlying git repository:
+
+* `commons`: [gn_mobile_core](https://github.com/PnX-SI/gn_mobile_core) git repository
+* `viewpager`: [gn_mobile_core](https://github.com/PnX-SI/gn_mobile_core) git repository
+* `maps`: [gn_mobile_maps](https://github.com/PnX-SI/gn_mobile_maps) git repository
 
 ```bash
 ./upgrade_submodules.sh
-```
+```
+
+## Troubleshooting
+
+* Kotlin error, Redeclaration from class within imported module:
+
+  clean project from menu *Build -> Clean Project*, then rebuild project.

build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.31'
+    ext.kotlin_version = '1.3.41'
 
     repositories {
         google()
@@ -10,7 +10,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'com.android.tools.build:gradle:3.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gn_mobile_occtax.iml

@@ -8,7 +8,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />

maps

@@ -0,0 +1 @@
+gn_mobile_maps/maps

occtax/build.gradle

@@ -2,11 +2,16 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
-version = "0.0.7"
+version = "0.1.2"
 
 android {
     compileSdkVersion 28
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     defaultConfig {
         applicationId "fr.geonature.occtax"
         minSdkVersion 21
@@ -43,15 +48,16 @@ dependencies {
 
     implementation project(':commons')
     implementation project(':viewpager')
+    implementation project(':maps')
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.1"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.2.1"
 
-    implementation 'androidx.core:core-ktx:1.2.0-alpha01'
+    implementation 'androidx.core:core-ktx:1.2.0-alpha02'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'com.google.android.material:material:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha06'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0-beta01'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.preference:preference:1.0.0'
     implementation 'com.l4digital.fastscroll:fastscroll:2.0.1'

occtax/src/main/java/fr/geonature/occtax/input/Input.kt

@@ -4,6 +4,7 @@ import android.os.Parcel
 import android.os.Parcelable
 import fr.geonature.commons.input.AbstractInput
 import fr.geonature.commons.input.AbstractInputTaxon
+import org.locationtech.jts.geom.Geometry
 
 /**
  * Describes a current input.
@@ -12,8 +13,20 @@ import fr.geonature.commons.input.AbstractInputTaxon
  */
 class Input : AbstractInput {
 
+    var geometry: Geometry? = null
+
     constructor() : super("occtax")
-    constructor(source: Parcel) : super(source)
+    constructor(source: Parcel) : super(source) {
+        this.geometry = source.readSerializable() as Geometry?
+    }
+
+    override fun writeToParcel(dest: Parcel,
+                               flags: Int) {
+        super.writeToParcel(dest,
+                            flags)
+
+        dest.writeSerializable(geometry)
+    }
 
     override fun getTaxaFromParcel(source: Parcel): List<AbstractInputTaxon> {
         val inputTaxa = source.createTypedArrayList(InputTaxon.CREATOR)

occtax/src/main/java/fr/geonature/occtax/input/io/OnInputJsonReaderListenerImpl.kt

@@ -5,6 +5,7 @@ import android.util.JsonToken
 import fr.geonature.commons.input.AbstractInput
 import fr.geonature.commons.input.io.InputJsonReader
 import fr.geonature.commons.util.IsoDateUtils
+import fr.geonature.maps.jts.geojson.io.GeoJsonReader
 import fr.geonature.occtax.input.Input
 import fr.geonature.occtax.input.InputTaxon
 import java.util.Date
@@ -14,15 +15,17 @@ import java.util.Date
  *
  * @author [S. Grimault](mailto:[email protected])
  */
-class OnInputJsonReaderListenerImpl : InputJsonReader.OnInputJsonReaderListener {
+class OnInputJsonReaderListenerImpl : InputJsonReader.OnInputJsonReaderListener<Input> {
 
-    override fun createInput(): AbstractInput {
+    private val geoJsonReader = GeoJsonReader()
+
+    override fun createInput(): Input {
         return Input()
     }
 
     override fun readAdditionalInputData(reader: JsonReader,
                                          keyName: String,
-                                         input: AbstractInput) {
+                                         input: Input) {
         when (keyName) {
             "geometry" -> readGeometry(reader,
                                        input)
@@ -33,12 +36,14 @@ class OnInputJsonReaderListenerImpl : InputJsonReader.OnInputJsonReaderListener
     }
 
     private fun readGeometry(reader: JsonReader,
-                             input: AbstractInput) {
-        reader.beginObject()
-
-        // TODO: read geometry object
-
-        reader.endObject()
+                             input: Input) {
+        when (reader.peek()) {
+            JsonToken.NULL -> reader.nextNull()
+            JsonToken.BEGIN_OBJECT -> {
+                input.geometry = geoJsonReader.readGeometry(reader)
+            }
+            else -> reader.skipValue()
+        }
     }
 
     private fun readProperties(reader: JsonReader,

occtax/src/main/java/fr/geonature/occtax/input/io/OnInputJsonWriterListenerImpl.kt

@@ -1,38 +1,46 @@
 package fr.geonature.occtax.input.io
 
 import android.util.JsonWriter
-import fr.geonature.commons.input.AbstractInput
 import fr.geonature.commons.input.AbstractInputTaxon
 import fr.geonature.commons.input.io.InputJsonWriter
 import fr.geonature.commons.util.IsoDateUtils
+import fr.geonature.maps.jts.geojson.io.GeoJsonWriter
+import fr.geonature.occtax.input.Input
 
 /**
  * Default implementation of [InputJsonWriter.OnInputJsonWriterListener].
  *
  * @author [S. Grimault](mailto:[email protected])
  */
-class OnInputJsonWriterListenerImpl : InputJsonWriter.OnInputJsonWriterListener {
+class OnInputJsonWriterListenerImpl : InputJsonWriter.OnInputJsonWriterListener<Input> {
+
+    private val geoJsonWriter = GeoJsonWriter()
 
     override fun writeAdditionalInputData(writer: JsonWriter,
-                                          input: AbstractInput) {
+                                          input: Input) {
         writeGeometry(writer,
                       input)
         writeProperties(writer,
                         input)
     }
 
     private fun writeGeometry(writer: JsonWriter,
-                              input: AbstractInput) {
+                              input: Input) {
         writer.name("geometry")
-            .beginObject()
 
-        // TODO: write geometry object
+        val geometry = input.geometry
 
-        writer.endObject()
+        if (geometry == null) {
+            writer.nullValue()
+        }
+        else {
+            geoJsonWriter.writeGeometry(writer,
+                                        geometry)
+        }
     }
 
     private fun writeProperties(writer: JsonWriter,
-                                input: AbstractInput) {
+                                input: Input) {
         writer.name("properties")
             .beginObject()
 
@@ -54,7 +62,7 @@ class OnInputJsonWriterListenerImpl : InputJsonWriter.OnInputJsonWriterListener
     }
 
     private fun writeDate(writer: JsonWriter,
-                          input: AbstractInput) {
+                          input: Input) {
         val dateToIsoString = IsoDateUtils.toIsoDateString(input.date)
         writer.name("date_min")
             .value(dateToIsoString)
@@ -63,7 +71,7 @@ class OnInputJsonWriterListenerImpl : InputJsonWriter.OnInputJsonWriterListener
     }
 
     private fun writeInputObserverIds(writer: JsonWriter,
-                                      input: AbstractInput) {
+                                      input: Input) {
         writer.name("observers")
             .beginArray()
 
@@ -74,7 +82,7 @@ class OnInputJsonWriterListenerImpl : InputJsonWriter.OnInputJsonWriterListener
     }
 
     private fun writeInputTaxa(writer: JsonWriter,
-                               input: AbstractInput) {
+                               input: Input) {
         writer.name("t_occurrences_occtax")
             .beginArray()
 

occtax/src/main/java/fr/geonature/occtax/settings/AppSettings.kt

@@ -0,0 +1,53 @@
+package fr.geonature.occtax.settings
+
+import android.os.Parcel
+import android.os.Parcelable
+import fr.geonature.commons.settings.IAppSettings
+import fr.geonature.maps.settings.MapSettings
+
+/**
+ * Global internal settings.
+ *
+ * @author [S. Grimault](mailto:[email protected])
+ */
+data class AppSettings(var mapSettings: MapSettings? = null) : IAppSettings {
+
+    private constructor(source: Parcel) : this(source.readParcelable(MapSettings::class.java.classLoader) as MapSettings)
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    override fun writeToParcel(dest: Parcel?,
+                               flags: Int) {
+        dest?.writeParcelable(
+                mapSettings,
+                0
+        )
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as AppSettings
+
+        if (mapSettings != other.mapSettings) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return mapSettings.hashCode()
+    }
+
+    companion object CREATOR : Parcelable.Creator<AppSettings> {
+        override fun createFromParcel(parcel: Parcel): AppSettings {
+            return AppSettings(parcel)
+        }
+
+        override fun newArray(size: Int): Array<AppSettings?> {
+            return arrayOfNulls(size)
+        }
+    }
+}

occtax/src/main/java/fr/geonature/occtax/settings/io/OnAppSettingsJsonReaderListenerImpl.kt

@@ -0,0 +1,40 @@
+package fr.geonature.occtax.settings.io
+
+import android.util.JsonReader
+import android.util.JsonToken
+import fr.geonature.commons.settings.io.AppSettingsJsonReader
+import fr.geonature.maps.settings.io.MapSettingsReader
+import fr.geonature.occtax.settings.AppSettings
+
+/**
+ * Default implementation of [AppSettingsJsonReader.OnAppSettingsJsonReaderListener].
+ *
+ * @author [S. Grimault](mailto:[email protected])
+ */
+class OnAppSettingsJsonReaderListenerImpl : AppSettingsJsonReader.OnAppSettingsJsonReaderListener<AppSettings> {
+
+    override fun createAppSettings(): AppSettings {
+        return AppSettings()
+    }
+
+    override fun readAdditionalAppSettingsData(reader: JsonReader,
+                                               keyName: String,
+                                               appSettings: AppSettings) {
+        when (keyName) {
+            "map" -> {
+                if (reader.peek() == JsonToken.BEGIN_OBJECT) {
+                    readMapSettings(reader,
+                                    appSettings)
+                }
+                else {
+                    reader.skipValue()
+                }
+            }
+        }
+    }
+
+    private fun readMapSettings(reader: JsonReader,
+                                appSettings: AppSettings) {
+        appSettings.mapSettings = MapSettingsReader().read(reader)
+    }
+}