Add world map

README.md

@@ -32,7 +32,7 @@ Generate HTML stats from Opencaching data or GPX files.
 	-H file		render a heat map to a file
 	-s n		stamp size for a heat map (default = 15)
 	-e		use exponential to flatten the heat map
-	-m map		chosen map: Poland, Poland_relief, Poland_big, Europe or a name of voivodeship (default = Poland)
+	-m map		chosen map: Poland, Poland_relief, Poland_big, Europe, World or a name of voivodeship (default = Poland)
 	-h		display this help screen
 ```
 
@@ -69,6 +69,8 @@ run `meson build; cd build; ninja`. You might need to set `CXX` variable to poin
 
 * Map of Europe `Europe.png` comes from https://pl.wikipedia.org/wiki/Plik:Europe_location_map.svg and is licensed under PD.
 
+* Map of the World `World.png` comes from https://commons.wikimedia.org/wiki/File:World_location_map.svg and is licensed under PD.
+
 * Maps of Voivodeships of Poland come from https://commons.wikimedia.org/wiki/File:Podlaskie_Voivodeship_location_map.svg, https://commons.wikimedia.org/wiki/File:Pomeranian_Voivodeship_location_map.svg, https://pl.wikipedia.org/wiki/Plik:Kuyavian-Pomeranian_Voivodeship_location_map.svg, https://pl.wikipedia.org/wiki/Plik:Warmian-Masurian_Voivodeship_location_map.svg, https://pl.wikipedia.org/wiki/Plik:Masovian_Voivodeship_location_map.svg, https://pl.wikipedia.org/wiki/Plik:Lesser_Poland_Voivodeship_location_map.svg, https://pl.wikipedia.org/wiki/Plik:Greater_Poland_Voivodeship_location_map.svg, https://pl.wikipedia.org/wiki/Plik:Opole_Voivodeship_location_map.svg, https://pl.wikipedia.org/wiki/Plik:Lower_Silesian_Voivodeship_location_map.svg, https://pl.wikipedia.org/wiki/Plik:Silesian_Voivodeship_location_map.svg, https://pl.wikipedia.org/wiki/Plik:Lublin_Voivodeship_location_map.svg, https://pl.wikipedia.org/wiki/Plik:Subcarpathian_Voivodeship_location_map.svg, https://pl.wikipedia.org/wiki/Plik:West_Pomeranian_Voivodeship_location_map.svg, https://pl.wikipedia.org/wiki/Plik:%C5%9Awi%C4%99tokrzyskie_Voivodeship_location_map.svg, https://pl.wikipedia.org/wiki/Plik:Lubusz_Voivodeship_location_map.svg, https://pl.wikipedia.org/wiki/Plik:%C5%81%C3%B3d%C5%BA_Voivodeship_location_map.svg and are licensed under CC-BY-SA.
 
 * CSS tricks used to render histograms are based on https://css-tricks.com/making-charts-with-css and collapsibles are based on https://alligator.io/css/collapsible.

geostat.cpp

@@ -29,7 +29,7 @@ void show_usage() {
 	std::cout << "\t-H file\t\trender a heat map to a file\n";
 	std::cout << "\t-s n\t\tstamp size for a heat map (default = 15)\n";
 	std::cout << "\t-e\t\tuse exponential to flatten the heat map\n";
-	std::cout << "\t-m map\t\tchosen map: Poland, Poland_relief, Poland_big, Europe or a name of voivodeship (default = Poland)\n";
+	std::cout << "\t-m map\t\tchosen map: Poland, Poland_relief, Poland_big, Europe, World or a name of voivodeship (default = Poland)\n";
 	std::cout << "\t-h\t\tdisplay this help screen\n";
 	std::exit(EXIT_FAILURE);
 }

geostat_cli.cpp

@@ -31,7 +31,7 @@ void show_usage() {
 	std::cout << "\t-H file\t\trender a heat map to a file\n";
 	std::cout << "\t-s n\t\tstamp size for a heat map (default = 15)\n";
 	std::cout << "\t-e\t\tuse exponential to flatten the heat map\n";
-	std::cout << "\t-m map\t\tchosen map: Poland, Poland_relief, Poland_big, Europe or a name of voivodeship (default = Poland)\n";
+	std::cout << "\t-m map\t\tchosen map: Poland, Poland_relief, Poland_big, Europe, World or a name of voivodeship (default = Poland)\n";
 	std::cout << "\t-L\t\tprint all caches\n";
 	std::cout << "\t-T\t\tprint D/T matrix\n";
 	std::cout << "\t-O\t\tprint owner count for found caches\n";

maps.h

@@ -30,7 +30,6 @@ const std::map<std::string, Map> maps = {
 	{ "Poland", Map(1000, 972, 48.7, 55.2, 13.8, 24.5, "Poland.png") },
 	{ "Poland_relief", Map(1000, 972, 48.7, 55.2, 13.8, 24.5, "Poland_relief.png") },
 	{ "Poland_big", Map(2560, 2488, 48.7, 55.2, 13.8, 24.5, "Poland_big.png") },
-	{ "Europe", Map(1249, 1024, 28, 82, -25, 54, "Europe.png") },
 	{ "Podlaskie", Map(727, 1024, 52.17, 54.5, 21.45, 24.1, "Podlaskie.png") },
 	{ "Pomorskie", Map(1000, 785, 53.40, 54.92, 16.65, 19.75, "Pomorskie.png") },
 	{ "Kujawsko-Pomorskie", Map(1122, 1024, 52.28, 53.83, 17.16, 19.88, "Kujawsko-Pomorskie.png") },
@@ -46,5 +45,8 @@ const std::map<std::string, Map> maps = {
 	{ "Zachodniopomorskie", Map(974, 1024, 52.58, 54.65, 13.95, 17.10, "Zachodniopomorskie.png") },
 	{ "Swietokrzyskie", Map(1181, 1024, 50.1, 51.4, 19.6, 22, "Swietokrzyskie.png") },
 	{ "Lubuskie", Map(761, 1024, 51.33, 53.18, 14.4, 16.6, "Lubuskie.png") },
-	{ "Lodzkie", Map(1073, 1024, 50.78, 52.45, 17.95, 20.75, "Lodzkie.png") }
+	{ "Lodzkie", Map(1073, 1024, 50.78, 52.45, 17.95, 20.75, "Lodzkie.png") },
+
+	{ "Europe", Map(1249, 1024, 28, 82, -25, 54, "Europe.png") },
+	{ "World", Map(1280, 640, -90, 90, -180, 180, "World.png") },
 };

meson.build

@@ -26,7 +26,6 @@ executable('geodb', src_db, dependencies : [sqlite_dep, json_dep, curl_dep], ins
 configure_file(input: 'Poland.png', output: 'Poland.png', copy: true, install: true, install_dir: '.')
 configure_file(input: 'Poland_big.png', output: 'Poland_big.png', copy: true, install: true, install_dir: '.')
 configure_file(input: 'Poland_relief.png', output: 'Poland_relief.png', copy: true, install: true, install_dir: '.')
-configure_file(input: 'Europe.png', output: 'Europe.png', copy: true, install: true, install_dir: '.')
 configure_file(input: 'Podlaskie.png', output: 'Podlaskie.png', copy: true, install: true, install_dir: '.')
 configure_file(input: 'Pomorskie.png', output: 'Pomorskie.png', copy: true, install: true, install_dir: '.')
 configure_file(input: 'Malopolskie.png', output: 'Malopolskie.png', copy: true, install: true, install_dir: '.')
@@ -44,4 +43,7 @@ configure_file(input: 'Slaskie.png', output: 'Slaskie.png', copy: true, install:
 configure_file(input: 'Swietokrzyskie.png', output: 'Swietokrzyskie.png', copy: true, install: true, install_dir: '.')
 configure_file(input: 'Zachodniopomorskie.png', output: 'Zachodniopomorskie.png', copy: true, install: true, install_dir: '.')
 
+configure_file(input: 'Europe.png', output: 'Europe.png', copy: true, install: true, install_dir: '.')
+configure_file(input: 'World.png', output: 'World.png', copy: true, install: true, install_dir: '.')
+
 configure_file(input: 'geo.css', output: 'geo.css', copy: true, install: true, install_dir: '.')