Drop support of GPX files from geostat web version temporarily

sql-rework
Tomasz Golinski 2020-02-29 23:19:45 +01:00
rodzic d961ae6dab
commit b5fc394a6e
3 zmienionych plików z 13 dodań i 14 usunięć

Wyświetl plik

@ -25,7 +25,6 @@ Generate HTML stats from Opencaching data or GPX files.
-n user user for opencaching.nl
-r user user for opencaching.ro
-k user user for opencaching.uk
-g file use specified gpx file
-q use local SQLite file with dump of OC database
-i timestamp start date
-f timestamp finish date

Wyświetl plik

@ -1,5 +1,5 @@
#include "okapi.h"
#include "gpx.h"
// #include "gpx.h"
#include "cache.h"
#include "debug.h"
#include "heat.h"
@ -22,7 +22,7 @@ void show_usage() {
std::cout << "\t-n user\t\tuser for opencaching.nl\n";
std::cout << "\t-r user\t\tuser for opencaching.ro\n";
std::cout << "\t-k user\t\tuser for opencaching.uk\n";
std::cout << "\t-g file\t\tuse specified gpx file\n";
// std::cout << "\t-g file\t\tuse specified gpx file\n";
std::cout << "\t-q\t\tuse local SQLite file with dump of OC database\n";
std::cout << "\t-i timestamp\tstart date\n";
std::cout << "\t-f timestamp\tfinish date\n";
@ -75,21 +75,21 @@ int main(int argc, char** argv) {
const std::string Database = "ocpl.sqlite";
std::string gpx_file;
// std::string gpx_file;
#include "config_user.h"
if (argc == 1) show_usage();
int o;
while ((o = getopt(argc, argv, "qNQg:o::p:d:u:n:r:k:i:f:H:s:m:eth?")) != -1)
while ((o = getopt(argc, argv, "qNQo::p:d:u:n:r:k:i:f:H:s:m:eth?")) != -1)
switch (o) {
// case 'd':
// Debug::set_debug_level(get_num('d',optarg));
// break;
case 'g':
gpx_file = optarg;
break;
// case 'g':
// gpx_file = optarg;
// break;
case 'o':
use_oc = 1;
if (optarg) {
@ -214,11 +214,11 @@ int main(int argc, char** argv) {
}
}
if (!gpx_file.empty()) {
GPX gpxfile(gpx_file);
Caches tmp = gpxfile.get_user_caches();
std::copy(tmp.begin(), tmp.end(), std::back_inserter(cc));
}
// if (!gpx_file.empty()) {
// GPX gpxfile(gpx_file);
// Caches tmp = gpxfile.get_user_caches();
// std::copy(tmp.begin(), tmp.end(), std::back_inserter(cc));
// }
if (use_ocpl_db) {
OCdb db(Database);

Wyświetl plik

@ -14,7 +14,7 @@ if not magick_dep.found()
endif
link = ['-lgpx', '-lheatmap']
src = ['geostat.cpp', 'okapi.cpp', 'gpx.cpp', 'cache.cpp', 'debug.cpp', 'heat.cpp', 'ocdb.cpp', 'common.cpp']
src = ['geostat.cpp', 'okapi.cpp', 'cache.cpp', 'debug.cpp', 'heat.cpp', 'ocdb.cpp', 'common.cpp']
src_cli = ['geostat_cli.cpp', 'okapi.cpp', 'gpx.cpp', 'cache.cpp', 'debug.cpp', 'heat.cpp', 'ocdb.cpp', 'common.cpp']
src_db = ['geodb.cpp', 'debug.cpp', 'ocdb.cpp', 'okapi.cpp', 'cache.cpp', 'common.cpp']