Device Location merging improved.

1Weather/Model/LocationManager.swift

@@ -126,8 +126,10 @@ public class LocationManager {
             // This may happen if a location is added from a push notification.
             // This may happen if a location is added from a push notification.
         }
         }
         if location.deviceLocation {
         if location.deviceLocation {
-            if locations.first?.deviceLocation == true {
-                locations[0] = location
+            if let firstLocation = locations.first, firstLocation.deviceLocation {
+                if firstLocation != location {
+                    locations[0] = location
+                }
             }
             }
             else {
             else {
                 locations = [location] + locations
                 locations = [location] + locations
@@ -208,6 +210,7 @@ public class LocationManager {
             log.error("Geo lookup: no coordinates present: \(partialLocation)")
             log.error("Geo lookup: no coordinates present: \(partialLocation)")
             var location: Location? = nil
             var location: Location? = nil
             if partialLocation.deviceLocation {
             if partialLocation.deviceLocation {
+                log.debug("Adding a placeholder empty device location.")
                 location = Location(deviceLocation: true, timeZone: TimeZone.current)
                 location = Location(deviceLocation: true, timeZone: TimeZone.current)
             }
             }
             completion(location)
             completion(location)

1Weather/Model/ModelObjects/Location.swift

@@ -69,8 +69,8 @@ public struct Location {
 
 
 extension Location: Equatable, Hashable {
 extension Location: Equatable, Hashable {
     public static func == (lhs: Self, rhs: Self) -> Bool {
     public static func == (lhs: Self, rhs: Self) -> Bool {
-        if lhs.deviceLocation && rhs.deviceLocation {
-            return true
+        guard lhs.deviceLocation == rhs.deviceLocation else {
+            return false
         }
         }
         if let lCoordinates = lhs.coordinates, let rCoordinates = rhs.coordinates {
         if let lCoordinates = lhs.coordinates, let rCoordinates = rhs.coordinates {
             return lCoordinates == rCoordinates
             return lCoordinates == rCoordinates
@@ -79,10 +79,8 @@ extension Location: Equatable, Hashable {
     }
     }
     
     
     public func hash(into hasher: inout Hasher) {
     public func hash(into hasher: inout Hasher) {
-        if deviceLocation {
-            hasher.combine(deviceLocation)
-        }
-        else if let coordinates = self.coordinates {
+        hasher.combine(deviceLocation)
+        if let coordinates = self.coordinates {
             hasher.combine(coordinates)
             hasher.combine(coordinates)
         }
         }
         else {
         else {