Location fixes

Author: malted

src/api/map.rs

@@ -19,7 +19,7 @@ pub fn generate_url(is_dark: bool) -> String {
         .replace("\\n", "\n"); // fixes newlines in docker compose file env section.
 
     if let Some(loc) = LOCATION_STATE.lock().unwrap().as_ref() {
-        let center = format!("{}, {}, {}", loc.city, loc.state, loc.country);
+        let center = format!("{},{}", loc.lat, loc.lng);
         eprintln!("[map] center={center:?}, lat={}, lng={}", loc.lat, loc.lng);
         url.query_pairs_mut().append_pair("center", &center);
     }

src/api/mod.rs

@@ -78,7 +78,7 @@ fn handle_location(request: Request) {
     };
     let mut city = query_pairs.get("city").cloned().unwrap_or_default();
     let mut state_name = query_pairs.get("state").cloned().unwrap_or_default();
-    let country = query_pairs.get("country").cloned().unwrap_or_default();
+    let mut country = query_pairs.get("country").cloned().unwrap_or_default();
 
     match env::var("LOCATION_HIDDEN_CITY") {
         Ok(hidden_city) => {
@@ -88,10 +88,11 @@ fn handle_location(request: Request) {
                 city,
                 city.eq_ignore_ascii_case(&hidden_city)
             );
-            if city.eq_ignore_ascii_case(&hidden_city) {
+            if city.trim().eq_ignore_ascii_case(&hidden_city.trim()) {
                 eprintln!("[location] Hiding location: overriding to London");
                 city = "London".to_string();
                 state_name = "England".to_string();
+                country = "United Kingdom".to_string();
                 lat = 51.5074;
                 lng = -0.1278;
             }