andrey/album
1
0
Fork 0
Code Issues 10 Pull Requests Packages Projects Releases Wiki Activity

Use serde_json and improve error handling.

Browse Source
This commit is contained in:
Rasmus Kaj 2018-10-27 18:21:35 +02:00
parent 08050811e3
commit 54bf4113f1
3 changed files with 126 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@ -34,3 +34,4 @@ mime = "0.2.6"
regex = "*"
slug = "0.1"
reqwest = "0.9"
serde_json = "1.0"

124
src/fetch_places.rs
View File

@ -1,8 +1,8 @@
use diesel;
use diesel::prelude::*;
use models::Coord;
use reqwest::Client;
use rustc_serialize::json::{self, Json};
use reqwest::{self, Client};
use serde_json::Value;
use slug::slugify;
pub fn update_image_places(c: &PgConnection, image: i32) -> Result<(), Error> {
@ -20,16 +20,14 @@ pub fn update_image_places(c: &PgConnection, image: i32) -> Result<(), Error> {
Err(err) => Err(Error::Db(image, err))?,
};
debug!("Should get places for #{} at {:?}", image, coord);
let client = Client::new();
match client
let data = Client::new()
.post("https://overpass.kumi.systems/api/interpreter")
.body(format!("[out:json];is_in({},{});out;", coord.x, coord.y))
.send()
{
Ok(mut response) => {
if response.status().is_success() {
let data = Json::from_reader(&mut response)
.map_err(|e| Error::Json(image, e))?;
.and_then(|r| r.error_for_status())
.and_then(|mut r| r.json::<Value>())
.map_err(|e| Error::Server(image, e))?;
if let Some(elements) = data
.as_object()
.and_then(|o| o.get("elements"))
@ -45,11 +43,9 @@ pub fn update_image_places(c: &PgConnection, image: i32) -> Result<(), Error> {
use schema::places::dsl::*;
places
.filter(
osm_id.eq(Some(t_osm_id)).or(
place_name
.eq(name)
.and(osm_id.is_null()),
),
osm_id
.eq(Some(t_osm_id))
.or(place_name.eq(name).and(osm_id.is_null())),
)
.first::<Place>(c)
.or_else(|_| {
@ -62,21 +58,13 @@ pub fn update_image_places(c: &PgConnection, image: i32) -> Result<(), Error> {
))
.get_result::<Place>(c)
.or_else(|_| {
let name = format!(
"{} ({})",
name, level
);
let name = format!("{} ({})", name, level);
diesel::insert_into(places)
.values((
place_name.eq(&name),
slug.eq(&slugify(
&name,
)),
osm_id.eq(Some(
t_osm_id,
)),
osm_level
.eq(Some(level)),
slug.eq(&slugify(&name)),
osm_id.eq(Some(t_osm_id)),
osm_level.eq(Some(level)),
))
.get_result::<Place>(c)
})
@ -84,17 +72,11 @@ pub fn update_image_places(c: &PgConnection, image: i32) -> Result<(), Error> {
.map_err(|e| Error::Db(image, e))?
};
if place.osm_id.is_none() {
debug!(
"Matched {:?} by name, update osm info",
place
);
debug!("Matched {:?} by name, update osm info", place);
use schema::places::dsl::*;
diesel::update(places)
.filter(id.eq(place.id))
.set((
osm_id.eq(Some(t_osm_id)),
osm_level.eq(level),
))
.set((osm_id.eq(Some(t_osm_id)), osm_level.eq(level)))
.execute(c)
.map_err(|e| Error::Db(image, e))?;
}
@ -104,73 +86,51 @@ pub fn update_image_places(c: &PgConnection, image: i32) -> Result<(), Error> {
.filter(photo_id.eq(image))
.filter(place_id.eq(place.id));
if q.first::<PhotoPlace>(c).is_ok() {
debug!(
"Photo #{} already has {:?}",
image, place.id
);
debug!("Photo #{} already has {:?}", image, place.id);
} else {
diesel::insert_into(photo_places)
.values((
photo_id.eq(image),
place_id.eq(place.id),
))
.values((photo_id.eq(image), place_id.eq(place.id)))
.execute(c)
.map_err(|e| Error::Db(image, e))?;
}
}
}
}
} else {
warn!("Bad response from overpass: {:?}", response);
}
}
Err(err) => {
warn!("Failed to get overpass info: {}", err);
}
}
Ok(())
}
fn osm_id(obj: &Json) -> Option<i64> {
obj.find("id").and_then(|o| o.as_i64())
fn osm_id(obj: &Value) -> Option<i64> {
obj.get("id").and_then(|o| o.as_i64())
}
fn name_and_level(obj: &Json) -> Option<(&str, i16)> {
if let Some(tags) = obj.find("tags") {
fn name_and_level(obj: &Value) -> Option<(&str, i16)> {
if let Some(tags) = obj.get("tags") {
let name = tags
.find("name:sv")
//.or_else(|| tags.find("name:en"))
.or_else(|| tags.find("name"))
.and_then(|o| o.as_string());
.get("name:sv")
//.or_else(|| tags.get("name:en"))
.or_else(|| tags.get("name"))
.and_then(|o| o.as_str());
let level = tags
.find("admin_level")
.and_then(|o| o.as_string())
.and_then(|s| s.parse().ok())
.or_else(|| {
match tags.find("leisure").and_then(|o| o.as_string()) {
.get("admin_level")
.and_then(|o| o.as_str())
.and_then(|l| l.parse().ok())
.or_else(|| match tags.get("leisure").and_then(|o| o.as_str()) {
Some("garden") => Some(18),
Some("nature_reserve") => Some(12),
Some("park") => Some(14),
Some("playground") => Some(16),
_ => None,
}
})
.or_else(|| {
match tags.find("tourism").and_then(|o| o.as_string()) {
.or_else(|| match tags.get("tourism").and_then(|o| o.as_str()) {
Some("attraction") => Some(16),
Some("theme_park") | Some("zoo") => Some(14),
_ => None,
}
})
.or_else(|| {
match tags.find("boundary").and_then(|o| o.as_string()) {
.or_else(|| match tags.get("boundary").and_then(|o| o.as_str()) {
Some("national_park") => Some(14),
_ => None,
}
})
.or_else(|| {
match tags.find("building").and_then(|o| o.as_string()) {
.or_else(|| match tags.get("building").and_then(|o| o.as_str()) {
Some("church") => Some(20),
Some("exhibition_center") => Some(20),
Some("industrial") => Some(20),
@ -180,36 +140,28 @@ fn name_and_level(obj: &Json) -> Option<(&str, i16)> {
Some("university") => Some(20),
Some("yes") => Some(20),
_ => None,
}
})
.or_else(|| {
match tags.find("landuse").and_then(|o| o.as_string()) {
.or_else(|| match tags.get("landuse").and_then(|o| o.as_str()) {
Some("industrial") => Some(11),
Some("residential") => Some(11),
_ => None,
}
})
.or_else(|| {
match tags.find("highway").and_then(|o| o.as_string()) {
.or_else(|| match tags.get("highway").and_then(|o| o.as_str()) {
Some("pedestrian") => Some(15), // torg
Some("rest_area") => Some(16),
_ => None,
}
})
.or_else(|| {
match tags.find("public_transport").and_then(|o| o.as_string())
{
match tags.get("public_transport").and_then(|o| o.as_str()) {
Some("station") => Some(18),
_ => None,
}
})
.or_else(|| {
match tags.find("amenity").and_then(|o| o.as_string()) {
.or_else(|| match tags.get("amenity").and_then(|o| o.as_str()) {
Some("exhibition_center") => Some(20),
Some("place_of_worship") => Some(15),
Some("university") => Some(12),
_ => None,
}
});
if let (Some(name), Some(level)) = (name, level) {
debug!("{} is level {}", name, level);
@ -228,5 +180,5 @@ fn name_and_level(obj: &Json) -> Option<(&str, i16)> {
pub enum Error {
NoPosition(i32),
Db(i32, diesel::result::Error),
Json(i32, json::ParserError),
Server(i32, reqwest::Error),
}

1
src/main.rs
View File

@ -24,6 +24,7 @@ extern crate rand;
extern crate regex;
extern crate reqwest;
extern crate rustc_serialize;
extern crate serde_json;
extern crate slug;
extern crate time;
extern crate typemap;