mirror
/
geostat
kopia lustrzana https://gitlab.com/tomaszg/geostat
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Code changes for two new maps

sql-rework
Tomasz Golinski 2019-09-15 12:20:21 +02:00
rodzic 6a41deb9a8
commit 325af6efba
4 zmienionych plików z 10 dodań i 0 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
README.md
Wyświetl plik

@ -48,3 +48,5 @@ run `meson build; cd build; ninja`. You might need to set `CXX` variable to poin
Map of Poland `Poland.png` comes from `https://pl.wikipedia.org/wiki/Plik:Poland_location_map.svg` and is licensed under CC-BY-SA and GNU FDL.
Map of Poland `Poland_relief.png` comes from `https://commons.wikimedia.org/wiki/File:Relief_Map_of_Poland.svg` and is licensed under CC-BY-SA.
Map of Europe `Europe.png` comes from `https://pl.wikipedia.org/wiki/Plik:Europe_location_map.svg` and is licensed under PD.
Map of Podlaskie Voivodeship `Podlaskie.png` comes from `https://commons.wikimedia.org/wiki/File:Podlaskie_Voivodeship_location_map.svg` and is licensed under CC-BY-SA.
Map of Pomorskie Voivodeship `Pomorskie.png` comes from `https://commons.wikimedia.org/wiki/File:Pomeranian_Voivodeship_location_map.svg` and is licensed under CC-BY-SA.

4
geostat.cpp
Wyświetl plik

@ -154,6 +154,10 @@ int main(int argc, char** argv) {
chosen_map = &Poland;
else if (heat_map == "Europe")
chosen_map = &Europe;
else if (heat_map == "Podlaskie")
chosen_map = &Podlaskie;
else if (heat_map == "Pomorskie")
chosen_map = &Pomorskie;
else {
std::cout << "Map " << heat_map << " not found.\n";
std::exit(EXIT_FAILURE);

2
maps.h
Wyświetl plik

@ -27,3 +27,5 @@ public:
const Map Poland(1000, 972, 48.7, 55.2, 13.8, 24.5, "Poland.png");
const Map Poland_relief(1000, 972, 48.7, 55.2, 13.8, 24.5, "Poland_relief.png");
const Map Europe(1249, 1024, 28, 82, -25, 54, "Europe.png");
const Map Podlaskie(727, 1024, 52.17, 54.5, 21.45, 24.1, "Podlaskie.png");
const Map Pomorskie(1000, 785, 53.40, 54.92, 16.65, 19.75, "Pomorskie.png");

2
meson.build
Wyświetl plik

@ -21,3 +21,5 @@ executable('geostat', src, dependencies : [curl_dep, json_dep, magick_dep], link
configure_file(input: 'Poland.png', output: 'Poland.png', copy: true)
configure_file(input: 'Poland_relief.png', output: 'Poland_relief.png', copy: true)
configure_file(input: 'Europe.png', output: 'Europe.png', copy: true)
configure_file(input: 'Podlaskie.png', output: 'Podlaskie.png', copy: true)
configure_file(input: 'Pomorskie.png', output: 'Pomorskie.png', copy: true)