diff --git a/common.h b/common.h index a528ce5..ed35911 100644 --- a/common.h +++ b/common.h @@ -5,6 +5,24 @@ #include +const std::string ocpl_url = "https://opencaching.pl/okapi/"; +const std::string ocde_url = "https://www.opencaching.de/okapi/"; +const std::string ocus_url = "http://www.opencaching.us/okapi/"; +const std::string ocnl_url = "http://www.opencaching.nl/okapi/"; +const std::string ocro_url = "http://www.opencaching.ro/okapi/"; +const std::string ocuk_url = "https://opencache.uk/okapi/"; + +const std::string flag_pl = "https://wiki.opencaching.eu/images/b/b7/Oc-pl.png"; +const std::string flag_de = "https://wiki.opencaching.eu/images/c/c1/Oc-de.png"; +const std::string flag_us = "https://wiki.opencaching.eu/images/f/fb/Oc-us.png"; +const std::string flag_nl = "https://wiki.opencaching.eu/images/4/4b/Oc-nl.png"; +const std::string flag_ro = "https://wiki.opencaching.eu/images/4/4f/Oc-ro.png"; +const std::string flag_uk = "https://wiki.opencaching.eu/images/5/58/Oc-org-uk.png"; + +const std::string Database_pl = "ocpl.sqlite"; +const std::string Database_de = "ocde.sqlite"; +const std::string Database_us = "ocus.sqlite"; + void htmlencode(std::string& data); void show_histogram(const Caches& cc, std::string Cache::*ptr, const std::string& caption, bool html = 0, bool sort_by_val = 1); diff --git a/geodb.cpp b/geodb.cpp index 8d7b1ba..10efd17 100644 --- a/geodb.cpp +++ b/geodb.cpp @@ -1,6 +1,7 @@ #include "debug.h" #include "ocdb.h" #include "okapi.h" +#include "common.h" #include "config_user_key.h" @@ -12,16 +13,6 @@ using json = nlohmann::json; -const std::string Database_pl = "ocpl.sqlite"; -const std::string Database_de = "ocde.sqlite"; -const std::string Database_us = "ocus.sqlite"; -const std::string ocpl_url = "https://opencaching.pl/okapi/"; -const std::string ocde_url = "https://www.opencaching.de/okapi/"; -const std::string ocus_url = "http://www.opencaching.us/okapi/"; -// const std::string ocnl_url = "http://www.opencaching.nl/okapi/"; -// const std::string ocro_url = "http://www.opencaching.ro/okapi/"; -// const std::string ocuk_url = "https://opencache.uk/okapi/"; - int main(int argc, char** argv) { std::string Dump_path; std::string Database; diff --git a/geofriends.cpp b/geofriends.cpp index 6a8b80b..dcf65fa 100644 --- a/geofriends.cpp +++ b/geofriends.cpp @@ -13,7 +13,6 @@ void show_usage() { } int main(int argc, char** argv) { - std::string ocpl_url = "https://opencaching.pl/okapi/"; #include "config_user.h" diff --git a/geolist.cpp b/geolist.cpp index dab10b4..968f1d4 100644 --- a/geolist.cpp +++ b/geolist.cpp @@ -13,12 +13,6 @@ void show_usage() { } int main(int argc, char** argv) { - std::string ocpl_url = "https://opencaching.pl/okapi/"; - std::string ocde_url = "https://www.opencaching.de/okapi/"; - std::string ocus_url = "http://www.opencaching.us/okapi/"; - std::string ocnl_url = "http://www.opencaching.nl/okapi/"; - std::string ocro_url = "http://www.opencaching.ro/okapi/"; - std::string ocuk_url = "https://opencache.uk/okapi/"; #include "config_user.h" diff --git a/geostat.cpp b/geostat.cpp index 9a5f2ab..8a290a2 100644 --- a/geostat.cpp +++ b/geostat.cpp @@ -73,17 +73,6 @@ int main(int argc, char** argv) { std::string ocro_user_profile; std::string ocuk_user_profile; - std::string ocpl_url = "https://opencaching.pl/okapi/"; - std::string ocde_url = "https://www.opencaching.de/okapi/"; - std::string ocus_url = "http://www.opencaching.us/okapi/"; - std::string ocnl_url = "http://www.opencaching.nl/okapi/"; - std::string ocro_url = "http://www.opencaching.ro/okapi/"; - std::string ocuk_url = "https://opencache.uk/okapi/"; - - const std::string Database_pl = "ocpl.sqlite"; - const std::string Database_de = "ocde.sqlite"; - const std::string Database_us = "ocus.sqlite"; - // std::string gpx_file; #include "config_user.h" @@ -400,17 +389,17 @@ int main(int argc, char** argv) { std::cout << "
\n"; std::cout << "

Geocaching stats for user profiles:

\n"; if (!ocpl_user.empty()) - std::cout << "\"OCpl\" " << ocpl_user << "
\n"; + std::cout << "\"OCpl\" " << ocpl_user << "
\n"; if (!ocde_user.empty()) - std::cout << "\"OCde\" " << ocde_user << "
\n"; + std::cout << "\"OCde\" " << ocde_user << "
\n"; if (!ocus_user.empty()) - std::cout << "\"OCna\" " << ocus_user << "
\n"; + std::cout << "\"OCna\" " << ocus_user << "
\n"; if (!ocnl_user.empty()) - std::cout << "\"OCnl\" " << ocnl_user << "
\n"; + std::cout << "\"OCnl\" " << ocnl_user << "
\n"; if (!ocro_user.empty()) - std::cout << "\"OCro\" " << ocro_user << "
\n"; + std::cout << "\"OCro\" " << ocro_user << "
\n"; if (!ocuk_user.empty()) - std::cout << "\"OCuk\" " << ocuk_user << "
\n"; + std::cout << "\"OCuk\" " << ocuk_user << "
\n"; if (time_filter) { std::cout << "for time range " << std::put_time(std::localtime(&start_time), "%x") << "—" << std::put_time(std::localtime(&end_time), "%x"); diff --git a/geostat_cli.cpp b/geostat_cli.cpp index 5630f17..8bef4c9 100644 --- a/geostat_cli.cpp +++ b/geostat_cli.cpp @@ -70,17 +70,6 @@ int main(int argc, char** argv) { std::string ocro_user; std::string ocuk_user; - std::string ocpl_url = "https://opencaching.pl/okapi/"; - std::string ocde_url = "https://www.opencaching.de/okapi/"; - std::string ocus_url = "http://www.opencaching.us/okapi/"; - std::string ocnl_url = "http://www.opencaching.nl/okapi/"; - std::string ocro_url = "http://www.opencaching.ro/okapi/"; - std::string ocuk_url = "https://opencache.uk/okapi/"; - - const std::string Database_pl = "ocpl.sqlite"; - const std::string Database_de = "ocde.sqlite"; - const std::string Database_us = "ocus.sqlite"; - std::string gpx_file; #include "config_user.h"