github/recorder
1
0
Fork 0
mirror of https://github.com/owntracks/recorder.git synced 2026-08-27 16:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

for opencagedata reverse geo, obtain tzname from their data

Browse Source 
serve from cached entries if available, else use
	tzdatadb with time penalty
	addresses #444
This commit is contained in:
Jan-Piet Mens
2024-01-31 10:56:10 +01:00
parent 5933b45715
commit ab66a673a3
2 changed files with 46 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
geo.c
+27 -2
View File
@@ -179,9 +179,10 @@ static int revgeod_decode(UT_string *geodata, UT_string *addr, UT_string *cc, UT
return (1);
}
static int opencage_decode(UT_string *geodata, UT_string *addr, UT_string *cc, UT_string *locality)
static int opencage_decode(UT_string *geodata, UT_string *addr, UT_string *cc, UT_string *locality, UT_string *tzname)
{
JsonNode *json, *results, *address, *ac, *zeroth;
JsonNode *annotations, *timezone;
/*
* We are parsing this. I want the formatted in `addr' and
@@ -206,6 +207,14 @@ static int opencage_decode(UT_string *geodata, UT_string *addr, UT_string *cc, U
* },
* "results": [
* {
* "annotations" : {
* "timezone" : {
* "name" : "America/Cancun",
* "now_in_dst" : 0,
* "offset_sec" : -18000,
* "offset_string" : "-0500",
* "short_name" : "EST"
* },
* ...
* "components": {
* "city": "Sablonnières",
@@ -228,6 +237,18 @@ static int opencage_decode(UT_string *geodata, UT_string *addr, UT_string *cc, U
}
}
if ((annotations = json_find_member(zeroth, "annotations")) != NULL) {
if ((timezone = json_find_member(annotations, "timezone")) != NULL) {
JsonNode *tz;
// puts(json_stringify(timezone, NULL));
if ((tz = json_find_member(timezone, "name")) != NULL)
{
utstring_printf(tzname, "%s", tz->string_);
}
}
}
if ((ac = json_find_member(zeroth, "components")) != NULL) {
/*
@@ -277,6 +298,7 @@ JsonNode *revgeo(struct udata *ud, double lat, double lon, UT_string *addr, UT_s
static UT_string *url;
static UT_string *cbuf; /* Buffer for curl GET */
static UT_string *locality = NULL;
static UT_string *tzname = NULL;
long http_code;
CURLcode res;
int rc;
@@ -297,6 +319,7 @@ JsonNode *revgeo(struct udata *ud, double lat, double lon, UT_string *addr, UT_s
utstring_renew(url);
utstring_renew(cbuf);
utstring_renew(locality);
utstring_renew(tzname);
if (!ud->geokey || !*ud->geokey) {
utstring_printf(addr, "Unknown (%lf,%lf)", lat, lon);
@@ -344,7 +367,7 @@ JsonNode *revgeo(struct udata *ud, double lat, double lon, UT_string *addr, UT_s
rc = goog_decode(cbuf, addr, cc, locality);
break;
case OPENCAGE:
rc = opencage_decode(cbuf, addr, cc, locality);
rc = opencage_decode(cbuf, addr, cc, locality, tzname);
break;
case REVGEOD:
rc = revgeod_decode(cbuf, addr, cc, locality);
@@ -365,6 +388,8 @@ JsonNode *revgeo(struct udata *ud, double lat, double lon, UT_string *addr, UT_s
json_append_member(geo, "tst", json_mknumber((double)now));
json_append_member(geo, "locality", (utstring_len(locality) > 0) ?
json_mkstring(UB(locality)) : json_mknull());
json_append_member(geo, "tzname", (utstring_len(tzname) > 0) ?
json_mkstring(UB(tzname)) : json_mknull());
return (geo);
}
storage.c
+19 -9
View File
@@ -661,7 +661,7 @@ struct jparam {
static JsonNode *line_to_location(char *line)
{
JsonNode *json, *o, *j;
char *ghash;
char *ghash, *tzname = NULL;
char tstamp[64], *bp;
double lat, lon;
long tst;
@@ -721,19 +721,29 @@ static JsonNode *line_to_location(char *line)
json_append_member(o, "isotst", json_mkstring(isotime(tst)));
json_append_member(o, "disptst", json_mkstring(disptime(tst)));
/*
* If tzname is in the cached geo data, we've already added it
* to the outgoing JSON and we use it to construct isolocal.
* Otherwise determine the TZ name from the tzdatadb.
*/
if ((j = json_find_member(o, "tzname")) != NULL) {
tzname = j->string_;
json_append_member(o, "isolocal", json_mkstring(isolocal(tst, tzname)));
} else {
#ifdef WITH_TZ
if (zdb) {
char *tz_str = ZDHelperSimpleLookupString(zdb, lat, lon);
if (zdb) {
char *tz_str = ZDHelperSimpleLookupString(zdb, lat, lon);
if (tz_str) {
json_append_member(o, "tz", json_mkstring(tz_str));
if (tz_str) {
json_append_member(o, "tzname", json_mkstring(tz_str));
json_append_member(o, "isolocal", json_mkstring(isolocal(tst, tz_str)));
json_append_member(o, "isolocal", json_mkstring(isolocal(tst, tz_str)));
ZDHelperSimpleLookupStringFree(tz_str);
ZDHelperSimpleLookupStringFree(tz_str);
}
}
}
#endif
}
return (o);
}