Release 0.8.1

Bump addressable from 2.7.0 to 2.8.0

Gemfile.lock

@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (3.0.2)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     atomos (0.1.3)
     aws-eventstream (1.1.0)
@@ -125,7 +125,7 @@ GEM
     naturally (2.2.0)
     os (1.1.1)
     plist (3.5.0)
-    public_suffix (4.0.5)
+    public_suffix (4.0.6)
     rake (13.0.1)
     representable (3.0.4)
       declarative (< 0.1.0)
@@ -154,6 +154,7 @@ GEM
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
+    unf_ext (0.0.7.7)
     unf_ext (0.0.7.7-x64-mingw32)
     unicode-display_width (1.7.0)
     word_wrap (1.0.0)
@@ -170,6 +171,7 @@ GEM
 
 PLATFORMS
   x64-mingw32
+  x86_64-linux
 
 DEPENDENCIES
   fastlane

README.md

@@ -3,7 +3,7 @@ EVMap [![Build Status](https://travis-ci.org/johan12345/EVMap.svg?branch=master)
 
 <img src="https://raw.githubusercontent.com/johan12345/EVMap/master/_img/feature_graphic.svg" width=700 alt="Logo"/>
 
-Android app to access the goingelectric.de electric vehicle charging station directory.
+Android app to find electric vehicle charging stations.
 
 <a href="https://play.google.com/store/apps/details?id=net.vonforst.evmap" target="_blank">
 <img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png" alt="Get it on Google Play" height="100"/></a>
@@ -14,7 +14,7 @@ Features
 --------
 
 - [Material Design](https://material.io/)
-- Shows all charging stations from the community-maintained [GoingElectric.de](https://www.goingelectric.de/stromtankstellen/) directory
+- Shows all charging stations from the community-maintained [GoingElectric.de](https://www.goingelectric.de/stromtankstellen/) and [Open Charge Map](https://openchargemap.org) directories
 - Realtime availability information (beta)
 - Search places
 - Favorites list, also with availability information

_img/connectors/connector_ccs_typ1.svg

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Ebene_5" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+	viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-width:1.7;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#000000;stroke-width:0.5;stroke-miterlimit:10;}
+</style>
+	<circle cx="9" cy="18.7" r="1.4" />
+	<circle cx="15" cy="18.7" r="1.4" />
+	<path class="st0" d="M8.9,16.1h6.2c1.5,0,2.7,1.2,2.7,2.7l0,0c0,1.5-1.2,2.7-2.7,2.7H8.9c-1.5,0-2.7-1.2-2.7-2.7l0,0
+	C6.2,17.3,7.4,16.1,8.9,16.1z" />
+	<g>
+	<circle cx="14.7" cy="6.4" r="1.3" />
+		<circle cx="15.3" cy="10.5" r="0.8" />
+		<circle cx="8.7" cy="10.5" r="0.8" />
+		<circle cx="9.3" cy="6.4" r="1.3" />
+		<circle cx="12" cy="13.1" r="1.3" />
+		<circle class="st1" cx="12" cy="9.1" r="6.3" />
+		<rect x="11" y="15.4" width="2" height="1.3" />
+		<line class="st2" x1="10.9" y1="1.3" x2="13.1" y2="1.3" />
+		<polygon points="13.1,0.9 13.1,2.4 14.5,3.1 13.8,1 	" />
+		<polygon points="10.9,0.9 10.9,2.4 9.5,3.1 10.2,1 	" />
+</g>
+</svg>

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "net.vonforst.evmap"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 48
-        versionName "0.8.0"
+        versionCode 49
+        versionName "0.8.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricApi.kt

@@ -142,15 +142,10 @@ class GoingElectricApiWrapper(
         val minPower = filters?.getSliderValue("min_power")
         val minConnectors = filters?.getSliderValue("min_connectors")
 
-        val connectorsVal = filters?.getMultipleChoiceValue("connectors")
-        if (connectorsVal != null) {
-            if (connectorsVal.values.isEmpty() && !connectorsVal.all) {
-                // no connectors chosen
-                return Resource.success(emptyList())
-            }
-            connectorsVal.values = connectorsVal.values.mapNotNull {
-                GEChargepoint.convertTypeToGE(it)
-            }.toMutableSet()
+        var connectorsVal = filters?.getMultipleChoiceValue("connectors")
+        if (connectorsVal != null && connectorsVal.values.isEmpty() && !connectorsVal.all) {
+            // no connectors chosen
+            return Resource.success(emptyList())
         }
         val connectors = formatMultipleChoice(connectorsVal)
 
@@ -241,15 +236,10 @@ class GoingElectricApiWrapper(
         val minPower = filters?.getSliderValue("min_power")
         val minConnectors = filters?.getSliderValue("min_connectors")
 
-        val connectorsVal = filters?.getMultipleChoiceValue("connectors")
-        if (connectorsVal != null) {
-            if (connectorsVal.values.isEmpty() && !connectorsVal.all) {
-                // no connectors chosen
-                return Resource.success(emptyList())
-            }
-            connectorsVal.values = connectorsVal.values.mapNotNull {
-                GEChargepoint.convertTypeToGE(it)
-            }.toMutableSet()
+        var connectorsVal = filters?.getMultipleChoiceValue("connectors")
+        if (connectorsVal != null && connectorsVal.values.isEmpty() && !connectorsVal.all) {
+            // no connectors chosen
+            return Resource.success(emptyList())
         }
         val connectors = formatMultipleChoice(connectorsVal)
 

app/src/main/java/net/vonforst/evmap/model/FiltersModel.kt

@@ -48,6 +48,8 @@ sealed class FilterValue : BaseObservable(), Equatable {
     abstract val key: String
     var dataSource: String = ""
     var profile: Long = FILTERS_CUSTOM
+
+    abstract fun hasSameValueAs(other: FilterValue): Boolean
 }
 
 @Entity(
@@ -62,7 +64,11 @@ sealed class FilterValue : BaseObservable(), Equatable {
 data class BooleanFilterValue(
     override val key: String,
     var value: Boolean
-) : FilterValue()
+) : FilterValue() {
+    override fun hasSameValueAs(other: FilterValue): Boolean {
+        return other is BooleanFilterValue && other.value == this.value
+    }
+}
 
 @Entity(
     foreignKeys = [ForeignKey(
@@ -78,23 +84,14 @@ data class MultipleChoiceFilterValue(
     var values: MutableSet<String>,
     var all: Boolean
 ) : FilterValue() {
-    override fun equals(other: Any?): Boolean {
-        if (other == null || other !is MultipleChoiceFilterValue) return false
-        if (key != other.key) return false
 
-        return if (all) {
-            other.all
+    override fun hasSameValueAs(other: FilterValue): Boolean {
+        return other is MultipleChoiceFilterValue && if (other.all) {
+            this.all
         } else {
-            !other.all && values == other.values
+            !this.all && other.values == this.values
         }
     }
-
-    override fun hashCode(): Int {
-        var result = key.hashCode()
-        result = 31 * result + all.hashCode()
-        result = 31 * result + if (all) 0 else values.hashCode()
-        return result
-    }
 }
 
 @Entity(
@@ -109,7 +106,11 @@ data class MultipleChoiceFilterValue(
 data class SliderFilterValue(
     override val key: String,
     var value: Int
-) : FilterValue()
+) : FilterValue() {
+    override fun hasSameValueAs(other: FilterValue): Boolean {
+        return other is SliderFilterValue && other.value == this.value
+    }
+}
 
 data class FilterWithValue<T : FilterValue>(val filter: Filter<T>, val value: T) : Equatable
 

app/src/main/java/net/vonforst/evmap/storage/FilterValueDao.kt

@@ -65,7 +65,10 @@ abstract class FilterValueDao {
                 )
                 for (source in sources) {
                     addSource(source) {
-                        value = sources.mapNotNull { it.value }.flatten()
+                        val values = sources.map { it.value }
+                        if (values.all { it != null }) {
+                            value = values.filterNotNull().flatten()
+                        }
                     }
                 }
             }

app/src/main/java/net/vonforst/evmap/storage/PreferenceDataSource.kt

@@ -105,7 +105,12 @@ class PreferenceDataSource(val context: Context) {
         }
 
     var chargepriceMyVehicles: Set<String>
-        get() = sp.getStringSet("chargeprice_my_vehicle", emptySet())!!
+        get() = try {
+            sp.getStringSet("chargeprice_my_vehicle", emptySet())!!
+        } catch (e: ClassCastException) {
+            // backwards compatibility
+            sp.getString("chargeprice_my_vehicle", null)?.let { setOf(it) } ?: emptySet()
+        }
         set(value) {
             sp.edit().putStringSet("chargeprice_my_vehicle", value).apply()
         }

app/src/main/java/net/vonforst/evmap/viewmodel/ChargepriceViewModel.kt

@@ -165,7 +165,7 @@ class ChargepriceViewModel(application: Application, chargepriceApiKey: String)
     }
 
     private fun getChargepricePlugType(chargepoint: Chargepoint): String {
-        val index = charger.value!!.chargepoints.indexOf(chargepoint)
+        val index = charger.value!!.chargepointsMerged.indexOf(chargepoint)
         val type = charger.value!!.chargepriceData!!.plugTypes?.get(index) ?: chargepoint.type
         return type
     }

app/src/main/java/net/vonforst/evmap/viewmodel/FilterViewModel.kt

@@ -93,11 +93,13 @@ class FilterViewModel(application: Application) : AndroidViewModel(application)
     }
 
     suspend fun saveFilterValues() {
-        filtersWithValue.value?.forEach {
+        filtersWithValue.value?.map {
             val value = it.value
             value.profile = FILTERS_CUSTOM
             value.dataSource = prefs.dataSource
-            db.filterValueDao().insert(value)
+            value
+        }?.let {
+            db.filterValueDao().insert(*it.toTypedArray())
         }
 
         // set selected profile
@@ -113,11 +115,13 @@ class FilterViewModel(application: Application) : AndroidViewModel(application)
         }
 
         // save filter values
-        filtersWithValue.value?.forEach {
+        filtersWithValue.value?.map {
             val value = it.value
             value.profile = profileId
             value.dataSource = prefs.dataSource
-            db.filterValueDao().insert(value)
+            value
+        }?.let {
+            db.filterValueDao().insert(*it.toTypedArray())
         }
 
         // set selected profile

app/src/main/java/net/vonforst/evmap/viewmodel/MapViewModel.kt

@@ -124,7 +124,7 @@ class MapViewModel(application: Application) : AndroidViewModel(application) {
             value = 0
             addSource(filtersWithValue) { filtersWithValue ->
                 value = filtersWithValue.count {
-                    it.filter.defaultValue() != it.value
+                    !it.value.hasSameValueAs(it.filter.defaultValue())
                 }
             }
         }
@@ -287,9 +287,11 @@ class MapViewModel(application: Application) : AndroidViewModel(application) {
         if (filterStatus.value == FILTERS_CUSTOM) return
 
         db.filterValueDao().deleteFilterValuesForProfile(FILTERS_CUSTOM, prefs.dataSource)
-        filterValues.value?.forEach {
+        filterValues.value?.map {
             it.profile = FILTERS_CUSTOM
-            db.filterValueDao().insert(it)
+            it
+        }?.let {
+            db.filterValueDao().insert(*it.toTypedArray())
         }
     }
 

fastlane/metadata/android/de-DE/changelogs/49.txt

@@ -0,0 +1,3 @@
+- Abstürze behoben
+- Problem mit Filter nach Anschlüssen behoben
+- Wechsel zwischen Karte und Filteransicht beschleunigt

fastlane/metadata/android/en-US/changelogs/49.txt

@@ -0,0 +1,3 @@
+- Fixed crashes
+- Fixed problem when filtering by connectors
+- Improved performance when switching between map and filters view