Simplify area queries

src/command/add_area.rs

@@ -7,7 +7,7 @@ use crate::{model::Area, Error, Result};
 use rusqlite::Connection;
 use serde_json::{Map, Value};
 
-pub async fn run(conn: &mut Connection) -> Result<()> {
+pub async fn run(conn: &Connection) -> Result<()> {
     println!("Adding area");
     let mut tags = HashMap::new();
 
@@ -99,8 +99,8 @@ pub async fn run(conn: &mut Connection) -> Result<()> {
         Some(_) => Err(Error::Other(
             "Area with this url_alias already exists".into(),
         ))?,
-        None => Area::insert(&tags, &conn)?,
-    }
+        None => Area::insert(&tags, conn)?,
+    };
 
     Ok(())
 }

src/command/fix_tags.rs

@@ -1,5 +1,3 @@
-use std::collections::HashMap;
-
 use rusqlite::Connection;
 use serde_json::Value;
 use tracing::warn;
@@ -16,8 +14,8 @@ pub fn run(conn: &Connection) -> Result<()> {
             if geo_json.is_string() {
                 warn!(area.id, "Found improperly formatted geo_json tag");
                 let unescaped = geo_json.as_str().unwrap().replace("\\\"", "\"");
-                let geo_json: HashMap<String, Value> = serde_json::from_str(&unescaped)?;
-                Area::insert_tag_as_json_obj(area.id, "geo_json", &geo_json, &conn)?;
+                let geo_json: Value = serde_json::from_str(&unescaped)?;
+                Area::set_tag(area.id, "geo_json", &geo_json, &conn)?;
                 warn!(area.id, "Fixed geo_json tag");
             }
         }

src/command/generate_android_icons.rs

@@ -122,6 +122,10 @@ impl OverpassElement {
             icon_id = "home"
         }
 
+        if landuse == "farmyard" {
+            icon_id = "agriculture"
+        }
+
         if building == "commercial" {
             icon_id = "business"
         }

src/command/import_countries.rs

@@ -47,8 +47,8 @@ pub fn run(path: &str, conn: &mut Connection) -> Result<()> {
 
             match Area::select_by_url_alias(&json.id, &tx)? {
                 Some(area) => {
-                    Area::merge_tags(area.id, &json.tags, &tx)?;
-                    info!(json.id, "Merged tags into an existing area");
+                    Area::patch_tags(area.id, &json.tags, &tx)?;
+                    info!(json.id, "Patched tags for an existing area");
                 }
                 None => {
                     Area::insert(&json.tags, &tx)?;

src/controller/area_v2.rs

@@ -163,7 +163,7 @@ async fn patch_by_url_alias(
 
     match Area::select_by_url_alias(&area_url_alias, &conn)? {
         Some(area) => {
-            Area::merge_tags(area.id, &args.tags, &conn)?;
+            Area::patch_tags(area.id, &args.tags, &conn)?;
         }
         None => {
             return Err(ApiError::new(
@@ -192,7 +192,7 @@ async fn patch_tags(
     );
 
     match Area::select_by_url_alias(&url_alias, &conn)? {
-        Some(area) => Area::merge_tags(area.id, &args, &conn)?,
+        Some(area) => Area::patch_tags(area.id, &args, &conn)?,
         None => {
             return Err(ApiError::new(
                 404,
@@ -228,9 +228,9 @@ async fn post_tags(
     match area {
         Some(area) => {
             if args.value.len() > 0 {
-                Area::insert_tag_as_str(area.id, &args.name, &args.value, &conn)?;
+                Area::set_tag(area.id, &args.name, &args.value.clone().into(), &conn)?;
             } else {
-                Area::delete_tag(area.id, &args.name, &conn)?;
+                Area::remove_tag(area.id, &args.name, &conn)?;
             }
 
             Ok(HttpResponse::Created())

src/error.rs

@@ -1,4 +1,4 @@
-use std::{collections::HashMap, fmt::Display};
+use std::{collections::HashMap, fmt::Display, num::TryFromIntError};
 
 use actix_web::{http::header::ContentType, HttpResponse, ResponseError};
 use reqwest::StatusCode;
@@ -12,6 +12,7 @@ pub enum Error {
     Reqwest(reqwest::Error),
     Serde(serde_json::Error),
     Api(ApiError),
+    DbTableRowNotFound,
     Other(String),
 }
 
@@ -25,6 +26,7 @@ impl Display for Error {
             Error::Reqwest(err) => err.fmt(f),
             Error::Serde(err) => err.fmt(f),
             Error::Api(err) => err.fmt(f),
+            Error::DbTableRowNotFound => write!(f, "DbTableRowNotFound"),
             Error::Other(err) => write!(f, "{}", err),
         }
     }
@@ -66,6 +68,12 @@ impl From<Error> for std::io::Error {
     }
 }
 
+impl From<TryFromIntError> for Error {
+    fn from(_: TryFromIntError) -> Self {
+        Error::Other("Integer casting failed".into())
+    }
+}
+
 #[derive(Debug)]
 pub struct ApiError {
     pub http_code: StatusCode,