67 lines
3.8 KiB
Diff
67 lines
3.8 KiB
Diff
--- vfrnav-20230429/src/metartaf.cc.orig 2025-01-07 13:51:24.837306522 +0100
|
|
+++ vfrnav-20230429/src/metartaf.cc 2025-01-07 13:53:02.445841777 +0100
|
|
@@ -497,7 +497,7 @@
|
|
"from metar where " + get_querycoord(bbox, tran) + ") T1 where T1.observation_time in "
|
|
"(select T2.observation_time from metar T2 where T2.station_id = T1.station_id "
|
|
"order by T2.observation_time desc limit " +
|
|
- tran.quote(metarhistory) + ")", "Metar Taf Set METAR"));
|
|
+ tran.quote(metarhistory) + ")", std::string_view{"Metar Taf Set METAR"}));
|
|
for (pqxx::result::const_iterator ri(r.begin()), re(r.end()); ri != re; ++ri) {
|
|
std::pair<result_t::iterator,bool> ins(result.insert(Station(ri[0].as<std::string>(),
|
|
Point(ri[2].as<Point::coord_t>(), ri[1].as<Point::coord_t>()),
|
|
@@ -513,7 +513,7 @@
|
|
"from taf where " + get_querycoord(bbox, tran) + ") T1 where T1.issue_time in "
|
|
"(select T2.issue_time from taf T2 where T2.station_id = T1.station_id "
|
|
"order by T2.issue_time desc limit " +
|
|
- tran.quote(tafhistory) + ")", "Metar Taf Set TAF"));
|
|
+ tran.quote(tafhistory) + ")", std::string_view{"Metar Taf Set TAF"}));
|
|
for (pqxx::result::const_iterator ri(r.begin()), re(r.end()); ri != re; ++ri) {
|
|
std::pair<result_t::iterator,bool> ins(result.insert(Station(ri[0].as<std::string>(),
|
|
Point(ri[2].as<Point::coord_t>(), ri[1].as<Point::coord_t>()),
|
|
@@ -556,7 +556,7 @@
|
|
q += "valid_from <= " + tran.quote(tmax) + " and valid_to >= " + tran.quote(tmin);
|
|
if (!false)
|
|
std::cerr << "pg: sigmet query " << q << std::endl;
|
|
- pqxx::result r(tran.exec(q, "Briefing Pack SIGMET"));
|
|
+ pqxx::result r(tran.exec(q, std::string_view{"Briefing Pack SIGMET"}));
|
|
for (pqxx::result::const_iterator ri(r.begin()), re(r.end()); ri != re; ++ri) {
|
|
if (!false)
|
|
std::cerr << "pg: sigmet for " << ri[0].as<std::string>() << " seq " << ri[8].as<std::string>()
|
|
--- vfrnav-20230429/carto/osm.cc.orig 2025-01-07 13:55:20.693183894 +0100
|
|
+++ vfrnav-20230429/carto/osm.cc 2025-01-07 13:56:31.305848028 +0100
|
|
@@ -1783,7 +1783,7 @@
|
|
"ST_AsBinary(ST_Transform(way,4326)) from planet_osm_point where way && " + get_queryrect(tran));
|
|
if (false)
|
|
std::cerr << "OSM query: " << qstr << std::endl;
|
|
- pqxx::result r(tran.exec(qstr, "Briefing Pack OSM"));
|
|
+ pqxx::result r(tran.exec(qstr, std::string_view{"Briefing Pack OSM"}));
|
|
for (pqxx::result::const_iterator ri(r.begin()), re(r.end()); ri != re; ++ri) {
|
|
Tags tags;
|
|
tags.add_pg(to_str(ri[69]));
|
|
@@ -1894,7 +1894,7 @@
|
|
"ST_AsBinary(ST_Transform(way,4326)) from planet_osm_line where way && " + get_queryrect(tran));
|
|
if (false)
|
|
std::cerr << "OSM query: " << qstr << std::endl;
|
|
- pqxx::result r(tran.exec(qstr, "Briefing Pack OSM"));
|
|
+ pqxx::result r(tran.exec(qstr, std::string_view{"Briefing Pack OSM"}));
|
|
for (pqxx::result::const_iterator ri(r.begin()), re(r.end()); ri != re; ++ri) {
|
|
Tags tags;
|
|
tags.add_pg(to_str(ri[68]));
|
|
@@ -2005,7 +2005,7 @@
|
|
"ST_AsBinary(ST_Transform(way,4326)) from planet_osm_roads where way && " + get_queryrect(tran));
|
|
if (false)
|
|
std::cerr << "OSM query: " << qstr << std::endl;
|
|
- pqxx::result r(tran.exec(qstr, "Briefing Pack OSM"));
|
|
+ pqxx::result r(tran.exec(qstr, std::string_view{"Briefing Pack OSM"}));
|
|
for (pqxx::result::const_iterator ri(r.begin()), re(r.end()); ri != re; ++ri) {
|
|
Tags tags;
|
|
tags.add_pg(to_str(ri[68]));
|
|
@@ -2116,7 +2116,7 @@
|
|
"ST_AsBinary(ST_Transform(way,4326)) from planet_osm_polygon where way && " + get_queryrect(tran));
|
|
if (false)
|
|
std::cerr << "OSM query: " << qstr << std::endl;
|
|
- pqxx::result r(tran.exec(qstr, "Briefing Pack OSM"));
|
|
+ pqxx::result r(tran.exec(qstr, std::string_view{"Briefing Pack OSM"}));
|
|
for (pqxx::result::const_iterator ri(r.begin()), re(r.end()); ri != re; ++ri) {
|
|
Tags tags;
|
|
tags.add_pg(to_str(ri[68]));
|