Send OSM request only on frontend, take zoom into account

Mobile/lib/api.dart

@@ -57,7 +57,7 @@ Future<String?> request(BuildContext context, ApiService service, String method,
     return null;
   }
 
-  return response.body;
+  return utf8.decode(response.bodyBytes);
 }
 
 Future<bool> isLoggedIn(BuildContext context) async {

Mobile/lib/main.dart

@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'dart:math';
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:latlong2/latlong.dart';
@@ -49,17 +50,24 @@ class _MyHomePageState extends State<MyHomePage> {
   final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
   List<Favorite> _favorites = [];
   LatLng? _selectedPoint;
+  double _zoom = 7.0;
 
-  void _showLocation(TapPosition _, LatLng point) async {
+  void _onTap(TapPosition _, LatLng point) async {
     setState(() => _selectedPoint = point);
 
     final dynamic location;
     try {
       final response = await http.get(
-        Uri.parse('https://nominatim.openstreetmap.org/reverse.php?lat=${point.latitude}&lon=${point.longitude}&zoom=18&format=jsonv2'),
+        Uri.parse('https://nominatim.openstreetmap.org/reverse.php?lat=${point.latitude}&lon=${point.longitude}&zoom=${max(12, _zoom.ceil())}&format=jsonv2'),
         headers: {'User-Agent': 'SkanTravels/1.0'},
       );
 
+      if (mounted && response.statusCode != 200) {
+        ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Unable to fetch information about this location (HTTP ${response.statusCode})')));
+        debugPrint(response.body);
+        return;
+      }
+
       location = jsonDecode(response.body);
     } catch (_) {
       if (!mounted) return;
@@ -73,6 +81,14 @@ class _MyHomePageState extends State<MyHomePage> {
 
     if (!mounted) return;
 
+    if (location['name'] != null && location['display_name'] != null) {
+      await _showLocation(point, location['name'], location['display_name']);
+    }
+
+    setState(() => _selectedPoint = null);
+  }
+
+  Future<void> _showLocation(LatLng point, String name, String description) async {
     await showModalBottomSheet(
       barrierColor: Colors.black.withOpacity(0.3),
       context: context,
@@ -87,9 +103,9 @@ class _MyHomePageState extends State<MyHomePage> {
                 Expanded(child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
-                    Text(location['name'], style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 24)),
+                    Text(name, style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 24)),
                     const SizedBox(height: 10),
-                    Text(location['display_name']),
+                    Text(description),
                   ],
                 )),
                 Column(children: [
@@ -97,7 +113,7 @@ class _MyHomePageState extends State<MyHomePage> {
                       icon: const Icon(Icons.star),
                       iconSize: 32,
                       color: _favorites.where((fav) => fav.lat == point.latitude && fav.lng == point.longitude).isEmpty ? Colors.grey : Colors.yellow,
-                    onPressed: () => _toggleFavorite(point, location['name'], location['display_name'], setModalState, context)
+                      onPressed: () => _toggleFavorite(point, name, description, setModalState, context)
                   ),
                   const IconButton(icon: Icon(Icons.rate_review), iconSize: 32, onPressed: null),
                 ]),
@@ -107,8 +123,6 @@ class _MyHomePageState extends State<MyHomePage> {
         });
       },
     );
-
-    setState(() => _selectedPoint = null);
   }
 
   void _toggleFavorite(LatLng point, String name, String description, StateSetter setModalState, BuildContext context) async {
@@ -125,12 +139,19 @@ class _MyHomePageState extends State<MyHomePage> {
     if (!context.mounted) return;
 
     if (favorite == null) {
-      if (await api.request(context, api.ApiService.app, 'POST', '/favorites', {'lat': point.latitude, 'lng': point.longitude}) == null) {
+      final newFavorite = await api.request(
+          context, api.ApiService.app, 'POST', '/favorites',
+          {'lat': point.latitude, 'lng': point.longitude, 'name': name, 'description': description},
+      );
+
+      if (newFavorite == null) {
         navigator.pop();
         return;
       }
 
-      _fetchFavorites();
+      setState(() {
+        _favorites.add(Favorite.fromJson(jsonDecode(newFavorite)));
+      });
       setModalState(() {});
 
       return;
@@ -147,13 +168,13 @@ class _MyHomePageState extends State<MyHomePage> {
     setModalState(() {});
   }
 
-  void _fetchFavorites() async {
+  Future<void> _fetchFavorites() async {
     final response = await api.request(context, api.ApiService.app, 'GET', '/favorites', null);
     if (response == null) return;
 
     final List<dynamic> favorites = jsonDecode(response);
     setState(() {
-      _favorites = favorites.map((favorite) => Favorite(favorite['id'], favorite['user_id'], favorite['lat'], favorite['lng'], favorite['name'], favorite['description'])).toList();
+      _favorites = favorites.map((favorite) => Favorite.fromJson(favorite)).toList();
     });
   }
 
@@ -178,8 +199,9 @@ class _MyHomePageState extends State<MyHomePage> {
         body: FlutterMap(
           options: MapOptions(
             initialCenter: const LatLng(55.9397, 9.5156),
-            initialZoom: 7.0,
-            onTap: _showLocation,
+            initialZoom: _zoom,
+            onTap: _onTap,
+            onPositionChanged: (pos, _) => _zoom = pos.zoom,
           ),
           children: [
             openStreetMapTileLayer,
@@ -205,10 +227,18 @@ class _MyHomePageState extends State<MyHomePage> {
                   width: 30,
                   height: 50,
                   alignment: Alignment.center,
-                  child: const Stack(
+                  child: Stack(
                     children: [
-                      Icon(Icons.location_pin, size: 30, color: Colors.yellow),
-                      Icon(Icons.location_on_outlined, size: 30, color: Colors.black),
+                      IconButton(
+                        padding: const EdgeInsets.only(bottom: 10),
+                        icon: const Icon(Icons.location_pin, size: 30, color: Colors.yellow),
+                        onPressed: () => _showLocation(LatLng(favorite.lat, favorite.lng), favorite.name, favorite.description),
+                      ),
+                      IconButton(
+                          padding: const EdgeInsets.only(bottom: 10),
+                          icon: const Icon(Icons.location_on_outlined, size: 30, color: Colors.black),
+                          onPressed: () => _showLocation(LatLng(favorite.lat, favorite.lng), favorite.name, favorite.description),
+                      ),
                     ]
                   ),
                 )

Mobile/lib/models.dart

@@ -7,6 +7,17 @@ class Favorite {
   String description;
 
   Favorite(this.id, this.userId, this.lat, this.lng, this.name, this.description);
+
+  factory Favorite.fromJson(Map<String, dynamic> json) {
+    return Favorite(
+      json['id'],
+      json['user_id'],
+      json['lat'],
+      json['lng'],
+      json['name'],
+      json['description'],
+    );
+  }
 }
 
 class Login {

rust-backend/src/main.rs

@@ -56,39 +56,33 @@ fn get_favorites(db: MutexGuard<'_, rusqlite::Connection>, user_id: String) -> O
 struct CreateFavoriteRequest {
     lat: f64,
     lng: f64,
-}
-
-#[derive(Deserialize, Debug)]
-struct ReverseLookupResponse {
     name: String,
-    display_name: String,
+    description: String,
 }
 
 #[post("/favorites")]
 async fn create_favorite(auth: AuthorizedUser, data: web::Data<AppData>, input: web::Json<CreateFavoriteRequest>) -> impl Responder {
     let db = data.database.lock().unwrap();
 
-    let Ok(response) = reqwest::Client::new()
-        .get(format!("https://nominatim.openstreetmap.org/reverse.php?lat={}&lon={}&zoom=18&format=jsonv2", input.lat, input.lng))
-        .header("User-Agent", "SkanTravels/1.0")
-        .send().await
-        else { return HttpResponse::InternalServerError(); };
-
-    let Ok(response) = response.json::<ReverseLookupResponse>().await
-        else { return HttpResponse::InternalServerError(); };
-
     match db.execute(
         "INSERT INTO favorites (user_id, lat, lng, name, description) VALUES (:user_id, :lat, :lng, :name, :description)",
         &[
             (":user_id", &auth.user_id),
             (":lat", &input.lat.to_string()),
             (":lng", &input.lng.to_string()),
-            (":name", &response.name),
-            (":description", &response.display_name),
+            (":name", &input.name),
+            (":description", &input.description),
         ],
     ) {
-        Ok(_) => HttpResponse::Created(),
-        Err(_) => HttpResponse::InternalServerError(),
+        Ok(_) => HttpResponse::Created().json(Favorite {
+            id: db.last_insert_rowid(),
+            user_id: auth.user_id,
+            lat: input.lat,
+            lng: input.lng,
+            name: input.name.clone(),
+            description: input.description.clone(),
+        }),
+        Err(_) => HttpResponse::InternalServerError().finish(),
     }
 }
 

rust-backend/src/models.rs

@@ -4,7 +4,7 @@ use rusqlite::{Row, Error};
 
 #[derive(Serialize)]
 pub struct Favorite {
-    pub id: usize,
+    pub id: i64,
     pub user_id: String,
     pub lat: f64,
     pub lng: f64,