Merge branch 'develop'

kosratdev · Apr 29, 2023 · 47b730b · 47b730b
2 parents c8596b9 + 7f58abc
commit 47b730b
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Example/Tests/LocationTests.swift b/Example/Tests/LocationTests.swift
@@ -91,7 +91,7 @@ class LocationTests: XCTestCase {
         XCTAssertEqual("Zarayan".mapper(countryCode: "IQ"), "Darbandikhan")
         XCTAssertEqual("Atrish".mapper(countryCode: "IQ"), "Duhok")
         XCTAssertEqual("Choman".mapper(countryCode: "IQ"), "Erbil")
-        XCTAssertEqual("Byara".mapper(countryCode: "IQ"), "Khurmal")
+        XCTAssertEqual("Byara".mapper(countryCode: "IQ"), "Halabja")
         XCTAssertEqual("Hajiawa".mapper(countryCode: "IQ"), "Ranya")
         XCTAssertEqual("Taza Khurmatu".mapper(countryCode: "IQ"), "Kirkuk")
         XCTAssertEqual("Khalakan".mapper(countryCode: "IQ"), "Ranya")

diff --git a/MuslimData.podspec b/MuslimData.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'MuslimData'
-  s.version          = '1.2.4'
+  s.version          = '1.3.0'
   s.summary          = 'Islamic library (Prayer Times [fixed and calculated], Names of Allah, and Azkars).'
 
 # This description is used to generate tags and improve search results.

diff --git a/MuslimData/Assets/cityMapper.json b/MuslimData/Assets/cityMapper.json
@@ -11,8 +11,7 @@
         "Ranya": ["Hajiawa", "Sarkapkan", "Khalakan", "Taqtaq", "Hizop", "Chwarqurna"],
         "Chamchamal": ["Takiya", "Takiay Jabari", "Shorsh", "Aghjalar", "Sangaw"],
         "Darbandikhan": ["Zalan", "Gapilon", "Chwarta", "Barzinjah", "Zarayan", "Halebjai Taza","Qara Dagh", "Khanaqin"],
-        "Halabja": ["Garmk", "Penjwen", "Nalparez", "Said Sadiq", "Sirwan", "Pshta"],
-        "Khurmal": ["Byara", "Tawella", "Gokhlan", "Balkha"]
+        "Halabja": ["Garmk", "Penjwen", "Nalparez", "Said Sadiq", "Sirwan", "Pshta", "Byara", "Tawella", "Gokhlan", "Balkha", "Khurmal"],
     },
     "IR":{
         "Sanandaj": ["Kamyaran", "Divandarreh", "Dehgolan", "Qorveh"],

diff --git a/MuslimData/Assets/muslim_db_v1.2.1.db → MuslimData/Assets/muslim_db_v1.2.2.db b/MuslimData/Assets/muslim_db_v1.2.1.db → MuslimData/Assets/muslim_db_v1.2.2.db
diff --git a/MuslimData/Classes/DB Helper/DBHelper.swift b/MuslimData/Classes/DB Helper/DBHelper.swift
@@ -19,7 +19,7 @@ class DBHelper {
     private init() {
         var configuration = Configuration()
         configuration.readonly = true
-        let databaseURL = Bundle(for: DBHelper.self).path(forResource: "muslim_db_v1.2.1", ofType: "db")!
+        let databaseURL = Bundle(for: DBHelper.self).path(forResource: "muslim_db_v1.2.2", ofType: "db")!
         dbPool = try? DatabasePool(path: databaseURL, configuration: configuration)
 
         // Be a nice iOS citizen, and don’t consume too much memory