feat: Add filter for "user felt"

Resolves: https://gitlab.steamware.net/eqn/eqn.ios/-/issues/81
2025-02-20 15:17:36 +01:00
parent 1b50f4fd17
commit a167c989cc
12 changed files with 33 additions and 1 deletions
@@ -21,6 +21,7 @@ class SeismicFiltersViewController: UIViewController, UITableViewDelegate, UITab
        case magnitudoMinima
        case sismiRilevanti
        case sismiTutti
+        case sismiPercepiti
    }
    
    weak var delegate: SeismicFiltersViewControllerDelegate?
@@ -40,6 +41,7 @@ class SeismicFiltersViewController: UIViewController, UITableViewDelegate, UITab
        SettingItem(type: .slider, title: NSLocalizedString("filter_minimum_magnitude", comment: "")),
        SettingItem(type: .enable, title: NSLocalizedString("filter_show_relevant", comment: "")),
        SettingItem(type: .enable, title: NSLocalizedString("filter_show_all", comment: "")),
+        SettingItem(type: .enable, title: NSLocalizedString("filter_show_felt", comment: ""))
    ]
    
    private let initialFilterType = EQNSeismic.shared.filterOption
@@ -148,6 +150,12 @@ class SeismicFiltersViewController: UIViewController, UITableViewDelegate, UITab
                cell.valueChanged = { [weak self] enabled in
                    self?.onChangeFilterOption(enabled, filter: .worldWide)
                }
+            case .sismiPercepiti:
+                let isCurrentFilter = currentFilterType == .userFelt
+                cell.toggleSwitch.isOn = isCurrentFilter
+                cell.valueChanged = { [weak self] enabled in
+                    self?.onChangeFilterOption(enabled, filter: .userFelt)
+                }
            default:
                break
            }
@@ -199,6 +199,7 @@ class SeismicNetworksMapDetailViewController: EQNBaseMapViewController {
        case .inRadius: NSLocalizedString("filter_area", comment: "")
        case .positionRelevant: NSLocalizedString("filter_relevant", comment: "")
        case .worldWide: NSLocalizedString("filter_all", comment: "")
+        case .userFelt: NSLocalizedString("filter_felt", comment: "")
        }
        seismicsFilterLabel.text = text
    }
@@ -15,6 +15,7 @@ import Foundation
        case inRadius
        case positionRelevant
        case worldWide
+        case userFelt
    }
    
    enum Sort: Int {
@@ -173,11 +174,15 @@ import Foundation
                    } else if magnitude < 1.5 && distance > 20 {
                        keep = false
                    }
-                } else {
+                } else if filterOption == .worldWide {
                    //filtro che mostra tutti i sismi a livello mondiale di magnitudo>=2
                    if magnitude < 2 {
                        keep = false
                    }
+                } else if filterOption == .userFelt {
+                    if seismic.userNumber.intValue == 0 {
+                        keep = false
+                    }
                }
            }
            
@@ -33,6 +33,7 @@
 "filter_show_area" = "إظهار كافة الزلازل ضمن دائرة نصف قطرها:";
 "filter_show_relevant" = "إظهار الزلازل ذات الصلة بموقعي فقط";
 "filter_show_all" = "عرض جميع الزلازل على مستوى العالم (M≥2)";
+"filter_show_felt" = "إظهار الزلازل التي يشعر بها المستخدمون فقط";
 "filter_minimum_magnitude" = "والحجم الأدنى:";
 "main_understood" = "مفهوم";
 "options_low_magnitude" = "الانتباه إلى أن ليست كل الشبكات الزلزالية توفر بيانات الزلازل التي تقل عن 2.0 درجة. علاوة على ذلك ، فإنك تزيد بشكل كبير من نقل البيانات واستخدام البطارية بسبب الإخطارات. ما لم يتم تصنيع جهازك حديثا ، ستلاحظ أيضا تباطؤا عاما.";
@@ -53,6 +54,7 @@
 "filter_area" = "الزلازل المعروضة: في دائرة نصف قطرها";
 "filter_relevant" = "الزلازل المعروضة: ذات صلة";
 "filter_all" = "الزلازل المعروضة: الكل";
+"filter_felt" = "الزلازل المعروضة: شعرت";
 "liveview_unknown_location" = "موقفك غير معروف. تمكين موقع الهاتف الذكي من تكوين الهاتف الذكي";
 "map_number" = "تم الكشف عن زلزال بواسطة %@ الهواتف الذكية";
 "permission_location_no" = "لقد اخترت منع التطبيق من قراءة موقع الجهاز. لن تستلم تنبيهات وإشعارات في الوقت الفعلي";
@@ -33,6 +33,7 @@
 "filter_show_area" = "Εμφάνιση όλων των σεισμών σε ακτίνα:";
 "filter_show_relevant" = "Εμφάνιση μόνο των σχετικών σεισμών σε σχέση με την τοποθεσία μου";
 "filter_show_all" = "Εμφάνιση όλων των σεισμών παγκοσμίως (M≥2)";
+"filter_show_felt" = "Εμφάνιση μόνο των σεισμών που αισθάνθηκαν οι χρήστες";
 "filter_minimum_magnitude" = "και ελάχιστο μέγεθος:";
 "main_understood" = "Κατάλαβα";
 "options_low_magnitude" = "Λάβε υπόψη ότι δεν παρέχουν όλα τα σεισμικά δίκτυα δεδομένα για σεισμούς με μέγεθος κάτω από 2.0. Επίσης, αυξάνεις σημαντικά την μεταφορά δεδομένων και την χρήση μπαταρίας λόγω κοινοποιήσεων. Αν η συσκευή σου δεν είναι πρόσφατης κατασκευής, θα παρατηρήσεις επίσης μια γενική επιβράδυνση.";
@@ -53,6 +54,7 @@
 "filter_area" = "Εμφανίζονται σεισμοί: στην ακτίνα";
 "filter_relevant" = "Εμφανίζονται σεισμοί: σχετικοί";
 "filter_all" = "Εμφανίζονται σεισμοί: όλοι (M≥2)";
+"filter_felt" = "Εμφανίζονται σεισμοί: αισθητοί";
 "liveview_unknown_location" = "Η θέση σου είναι άγνωστη. Ενεργοποίησε την τοποθεσία του smartphone από την διαμόρφωση του smartphone";
 "map_number" = "Ανιχνεύθηκε δόνηση από %@ smartphone";
 "permission_location_no" = "Έχεις επιλέξει να αποτρέπεις την εφαρμογή από την ανάγνωση της τοποθεσίας της συσκευής. ΔΕΝ θα λαμβάνεις κοινοποιήσεις και ειδοποιήσεις σε πραγματικό χρόνο";
@@ -33,6 +33,7 @@
 "filter_show_area" = "Show all earthquakes within a radius of:";
 "filter_show_relevant" = "Show only the relevant earthquakes with respect to my location";
 "filter_show_all" = "Show all earthquakes globally (M≥2)";
+"filter_show_felt" = "Show only the earthquakes felt by the users";
 "filter_minimum_magnitude" = "and minimum magnitude:";
 "main_understood" = "Understood";
 "options_low_magnitude" = "Beware that not all seismic networks provide earthquake data below magnitude 2.0. Moreover, you significantly increase the data transfer and the battery usage due to notifications. Unless your device is recently manufactured, you will also notice a general slowdown.";
@@ -53,6 +54,7 @@
 "filter_area" = "Quakes shown: in the radius";
 "filter_relevant" = "Quakes shown: relevant";
 "filter_all" = "Quakes shown: all (M≥2)";
+"filter_felt" = "Quakes shown: felt";
 "liveview_unknown_location" = "Your position is unknown. Enable smartphone location from smartphone configuration";
 "map_number" = "Quake detected by %@ smartphones";
 "permission_location_no" = "You have chosen to prevent the app from reading the location of the device. You will NOT receive real-time notifications and alerts";
@@ -33,6 +33,7 @@
 "filter_show_area" = "Mostrar todos los sismos en un radio de:";
 "filter_show_relevant" = "Mostrar solo los sismos relevantes con respecto a mi ubicación";
 "filter_show_all" = "Mostrar todos los sismos globalmente (M≥2)";
+"filter_show_felt" = "Mostrar solo los sismos sentidos por los usuarios";
 "filter_minimum_magnitude" = "y magnitud mínima:";
 "main_understood" = "Entendido";
 "options_low_magnitude" = "Tenga en cuenta que no todas las redes sísmicas proporcionan datos para sismos de magnitud inferior a 2.0. Además, aumenta significativamente la transferencia de datos con el servidor y el uso de la batería debido a la mayor cantidad de notificaciones. Si tu dispositivo no se ha fabricado recientemente, también notará una desaceleración general de la aplicación.";
@@ -53,6 +54,7 @@
 "filter_area" = "Sismos mostrados: en el radio";
 "filter_relevant" = "Sismos mostrados: relevantes";
 "filter_all" = "Sismos mostrados: todos (M≥2)";
+"filter_felt" = "Sismos mostrados: sentidos";
 "liveview_unknown_location" = "Tu posición es desconocida. Habilitar la ubicación del smartphone desde la página de configuración del smartphone";
 "map_number" = "Sismo detectado por %@ smartphones";
 "permission_location_no" = "Ha elegido evitar que la aplicación lea la ubicación de tu dispositivo. NO recibirá notificaciones y alertas en tiempo real";
@@ -33,6 +33,7 @@
 "filter_show_area" = "Afficher tous les tremblements de terre dans un rayon de :";
 "filter_show_relevant" = "Afficher uniquement les tremblements de terre pertinents par rapport à ma position";
 "filter_show_all" = "Afficher tous les tremblements de terre globalement (M≥2)";
+"filter_show_felt" = "Afficher uniquement les tremblements de terre ressentis par les utilisateurs";
 "filter_minimum_magnitude" = "et magnitude minimale :";
 "main_understood" = "J'ai compris";
 "options_low_magnitude" = "Attention, les réseaux sismiques ne fournissent pas tous des données pour des séismes de magnitude inférieure à 2,0. De plus, vous augmentez significativement le transfert de données et l'utilisation de la batterie en raison du plus grand nombre de notifications. Sauf si votre appareil est de fabrication récente, vous remarquerez également un ralentissement général.";
@@ -53,6 +54,7 @@
 "filter_area" = "Séismes affichés : dans le rayon";
 "filter_relevant" = "Séismes affichés : pertinents";
 "filter_all" = "Séismes affichés : tous (M≥2)";
+"filter_felt" = "Séismes affichés : ressentis";
 "liveview_unknown_location" = "Votre position est inconnue. Activez la localisation à partir de la page de configuration de votre appareil";
 "map_number" = "Séisme détecté par %@ smartphones";
 "permission_location_no" = "Vous avez choisi d'empêcher l'app de lire la position de votre appareil. Vous ne recevrez PAS de notifications et d'alertes en temps réel";
@@ -33,6 +33,7 @@
 "filter_show_area" = "Prikaži sve potrese u radijusu od:";
 "filter_show_relevant" = "Prikaži samo relevantne potrese s obzirom na moju lokaciju";
 "filter_show_all" = "Prikaži sve potrese globalno (M≥2)";
+"filter_show_felt" = "Prikaži samo potrese koje su korisnici osjetili";
 "filter_minimum_magnitude" = "i minimalna veličina:";
 "main_understood" = "Razumijem";
 "options_low_magnitude" = "Imajte na umu da ne pružaju sve seizmološke mreže podatke o potresima jačine ispod 2,0. Štoviše, znatno povećavate prijenos podataka i upotrebu baterije zbog obavijesti. Ako vaš uređaj nije nedavno proizveden, primijetit ćete i opće usporavanje.";
@@ -53,6 +54,7 @@
 "filter_area" = "Prikazani potresi: u polumjeru";
 "filter_relevant" = "Prikazani potresi: relevantni";
 "filter_all" = "Prikazani potresi: svi (M≥2)";
+"filter_felt" = "Prikazani potresi: osjetili";
 "liveview_unknown_location" = "Vaš položaj nije poznat. Omogući lokaciju u konfiguraciji pametnog telefona";
 "map_number" = "Potres je otkrio sljedeći broj pametnih telefona: %@";
 "permission_location_no" = "Odlučili ste onemogućiti aplikaciji očitavanje lokacije uređaja. NEĆETE primati obavijesti i upozorenja u stvarnom vremenu";
@@ -33,6 +33,7 @@
 "filter_show_area" = "Tampilkan semua gempa dalam radius:";
 "filter_show_relevant" = "Tampilkan hanya gempa bumi yang relevan dengan lokasi saya";
 "filter_show_all" = "Tampilkan semua gempa bumi secara global (M≥2)";
+"filter_show_felt" = "Hanya menampilkan gempa bumi yang dirasakan oleh pengguna";
 "filter_minimum_magnitude" = "dan besaran minimum:";
 "main_understood" = "Paham";
 "options_low_magnitude" = "Harap diperhatikan bahwa tidak semua jaringan seismik menyediakan data gempa di bawah magnitudo 2,0 SR. Selain itu, pemberitahuan yang diaktifkan akan menambah transfer data dan penggunaan baterai secara signifikan. Perangkat juga mungkin berjalan lebih lambat, kecuali jika perangkat Anda tergolong baru diproduksi.";
@@ -53,6 +54,7 @@
 "filter_area" = "Gempa yang ditampilkan: dalam radius";
 "filter_relevant" = "Gempa bumi yang ditampilkan: relevan";
 "filter_all" = "Gempa bumi ditampilkan: semua (M≥2)";
+"filter_felt" = "Gempa yang ditampilkan: terasa";
 "liveview_unknown_location" = "Posisi Anda tidak diketahui. Aktifkan lokasi smartphone dari konfigurasi smartphone";
 "map_number" = "Gempa terdeteksi oleh %@ smartphone";
 "permission_location_no" = "Anda telah memilih untuk mencegah aplikasi membaca lokasi perangkat. Anda TIDAK akan menerima pemberitahuan dan peringatan secara real time";
@@ -33,6 +33,7 @@
 "filter_show_area" = "Mostra tutti i sismi nel raggio di:";
 "filter_show_relevant" = "Mostra solo i sismi rilevanti rispetto alla mia posizione";
 "filter_show_all" = "Mostra tutti i sismi a livello globale (M≥2)";
+"filter_show_felt" = "Mostra solo i sismi percepiti dagli utenti";
 "filter_minimum_magnitude" = "e magnitudo minima:";
 "main_understood" = "Ho capito";
 "options_low_magnitude" = "Considera che non tutte le reti sismiche forniscono dati per sismi sotto magnitudo 2.0. Inoltre, incrementi significativamente il trasferimento dati con il server e l'utilizzo batteria dovuto al maggior numero di notifiche. Se il tuo dispositivo non è di recente fabbricazione, noterai anche un generale rallentamento dell'app.";
@@ -53,6 +54,7 @@
 "filter_area" = "Sismi mostrati: nel raggio";
 "filter_relevant" = "Sismi mostrati: rilevanti";
 "filter_all" = "Sismi mostrati: tutti (M≥2)";
+"filter_felt" = "Sismi mostrati: percepiti";
 "liveview_unknown_location" = "La tua posizione è sconosciuta. Abilita la localizzazione dalla pagina di configurazione del tuo dispositivo";
 "map_number" = "Sisma rilevato da %@ smartphone";
 "permission_location_no" = "Hai scelto di impedire alla app di leggere la posizione del tuo dispositivo. NON riceverai notifiche ed allerte in tempo reale.";
@@ -33,6 +33,7 @@
 "filter_show_area" = "Aşağıdaki yarıçap içindeki tüm depremleri göster:";
 "filter_show_relevant" = "Konumuma göre yalnızca ilgili depremleri göster";
 "filter_show_all" = "Dünyadaki tüm depremleri göster (M≥2)";
+"filter_show_felt" = "Sadece kullanıcıların hissettiği depremleri göster";
 "filter_minimum_magnitude" = "ve minimum büyüklük:";
 "main_understood" = "Anladım";
 "options_low_magnitude" = "Tüm sismik ağların 2.0'nin altında büyüklüğe sahip depremlerin verilerini sağlamadığını unutmayın. Ayrıca, bildirimler nedeniyle veri aktarımınız ve pil kullanımınız önemli ölçüde artar. Cihazınız yakın zamanda üretilmediği sürece, genel bir yavaşlama da fark edersiniz.";
@@ -53,6 +54,7 @@
 "filter_area" = "Gösterilen depremler: yarıçap içinde";
 "filter_relevant" = "Gösterilen depremler: alakalı";
 "filter_all" = "Gösterilen depremler: tümü (M≥2)";
+"filter_felt" = "Gösterilen depremler: hissedildi";
 "liveview_unknown_location" = "Konumunuz bilinmiyor. Akıllı telefon yapılandırmasından akıllı telefon konumunu etkinleştirin";
 "map_number" = "%@ akıllı telefon tarafından tespit edilen deprem";
 "permission_location_no" = "Uygulamanın cihazın konumunu okumasını engellemeyi seçtiniz. Gerçek zamanlı bildirim ve uyarılar ALMAYACAKSINIZ";