Merge branch 'release/0.3.2'

PnX-SI · Jun 9, 2020 · 9adbca6 · 9adbca6
2 parents 48f5b7d + 2694b3d
commit 9adbca6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/gn_mobile_maps b/gn_mobile_maps
diff --git a/occtax/build.gradle b/occtax/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
-version = "0.3.1"
+version = "0.3.2"
 
 android {
     compileSdkVersion 29

diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/TaxaFragment.kt b/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/TaxaFragment.kt
@@ -79,8 +79,8 @@ class TaxaFragment : Fragment(),
                                     selectedFilters.asSequence()
                                         .filter { filter -> filter.type == Filter.FilterType.AREA_OBSERVATION }
                                         .map { filter -> filter.value as FilterAreaObservation.AreaObservation }
-                                        .map { areaObsevation ->
-                                            when (areaObsevation.type) {
+                                        .map { areaObservation ->
+                                            when (areaObservation.type) {
                                                 FilterAreaObservation.AreaObservationType.MORE_THAN_DURATION -> "red"
                                                 FilterAreaObservation.AreaObservationType.LESS_THAN_DURATION -> "grey"
                                                 else -> "none"
@@ -89,7 +89,7 @@ class TaxaFragment : Fragment(),
                                 val filterByTaxonomy =
                                     selectedFilters.find { filter -> filter.type == Filter.FilterType.TAXONOMY }?.value as Taxonomy?
 
-                                if (filterByAreaObservation.isNotEmpty()) {
+                                if (filterByAreaObservation.isNotEmpty() && !selectedFeatureId.isNullOrBlank()) {
                                     (it as TaxonWithArea.Filter).byAreaColors(*filterByAreaObservation.toTypedArray())
                                 }
 
@@ -102,7 +102,7 @@ class TaxaFragment : Fragment(),
                         requireContext(),
                         buildUri(
                             Taxon.TABLE_NAME,
-                            if (selectedFeatureId == null) "" else "area/$selectedFeatureId"
+                            if (selectedFeatureId.isNullOrBlank()) "" else "area/$selectedFeatureId"
                         ),
                         null,
                         taxonFilter.first,

diff --git a/occtax/version.properties b/occtax/version.properties
@@ -1,2 +1,2 @@
-#Sun Jun 07 17:06:01 CEST 2020
-VERSION_CODE=1850
+#Tue Jun 09 21:03:32 CEST 2020
+VERSION_CODE=1860