From 4a67ffd956fd53d822b5b8900aadc4876527d32a Mon Sep 17 00:00:00 2001
From: johan12345 <johan.forstner@gmail.com>
Date: Thu, 20 Apr 2023 20:22:44 +0200
Subject: [PATCH] OpenChargeMap: do not show addressInfo.relatedUrl if it is
 identical to operatorInfo.websiteUrl

---
 .../vonforst/evmap/api/openchargemap/OpenChargeMapModel.kt  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/net/vonforst/evmap/api/openchargemap/OpenChargeMapModel.kt b/app/src/main/java/net/vonforst/evmap/api/openchargemap/OpenChargeMapModel.kt
index 6b0e6e7d..9caf1b03 100644
--- a/app/src/main/java/net/vonforst/evmap/api/openchargemap/OpenChargeMapModel.kt
+++ b/app/src/main/java/net/vonforst/evmap/api/openchargemap/OpenChargeMapModel.kt
@@ -75,11 +75,15 @@ data class OCMChargepoint(
             operatorId?.toString(),
             connections.map { "${it.connectionTypeId},${it.currentTypeId}" }),
         operatorInfo?.websiteUrl,
-        addressInfo.relatedUrl,
+        if (operatorInfo?.websiteUrl?.withoutTrailingSlash() != addressInfo.relatedUrl?.withoutTrailingSlash()) addressInfo.relatedUrl else null,
         Instant.now(),
         isDetailed
     )
 
+    private fun String.withoutTrailingSlash(): String {
+        return this.replace(Regex("/$"), "")
+    }
+
     private fun convertFaultReport(): FaultReport? {
         if (statusTypeId in faultStatuses || connections.any { it.statusTypeId in faultStatuses }) {
             if (userComments != null) {