[gnome-shell] dateMenu: Try harder finding a reasonable weather location name

[Florian Müllner <fmuellner src gnome org>]

commit 784c0b7e4b6cab7a7b5893872d417dcb74ed81df
Author: Florian Müllner <fmuellner gnome org>
Date:   Wed Nov 20 22:15:26 2019 +0100

    dateMenu: Try harder finding a reasonable weather location name
    
    Weather stations can have unwieldy long names, which don't fit the
    limited space we have available. City names are usually more suitable,
    so use the name of the nearest city instead if possible.
    
    https://gitlab.gnome.org/GNOME/gnome-shell/issues/1927

 js/ui/dateMenu.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/js/ui/dateMenu.js b/js/ui/dateMenu.js
index 4595d6cfb2..1e630897bc 100644
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@@ -388,7 +388,12 @@ class WeatherSection extends St.Button {
         }
 
         let info = this._weatherClient.info;
-        this._titleLocation.text = info.get_location().get_name();
+        let loc = info.get_location();
+        if (loc.get_level() !== GWeather.LocationLevel.CITY && loc.has_coords()) {
+            let world = GWeather.Location.get_world();
+            loc = world.find_nearest_city(...loc.get_coords());
+        }
+        this._titleLocation.text = loc.get_name();
 
         if (this._weatherClient.loading) {
             this._setStatusLabel(_("Loading…"));