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

Move maps to separate dir in target dir, create separate meson.build for that dir

sql-rework
Tomasz Golinski 2020-04-02 22:13:06 +02:00
rodzic 77b30761f6
commit 1fde534d34
3 zmienionych plików z 38 dodań i 34 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
heat.cpp
Wyświetl plik

@ -9,6 +9,9 @@
#include <vector>
#include <string>
#include <assert.h>
#include <filesystem>
std::filesystem::path MAPS_DIR = "maps";
Heat::Heat(const Map* m) : mp(m) {
assert(mp);
@ -38,7 +41,7 @@ void Heat::generate(const std::string& filename, const pCaches& points, int stam
throw 0;
heatmap_free(hm);
Magick::Image contour(mp->map_file);
Magick::Image contour(MAPS_DIR / mp->map_file);
Magick::Image heatmap(mp->size_x, mp->size_y, "RGBA", Magick::CharPixel, &image[0]);
contour.composite(heatmap, 0, 0, Magick::OverCompositeOp);
@ -47,7 +50,7 @@ void Heat::generate(const std::string& filename, const pCaches& points, int stam
}
void Heat::generate_path(const std::string& filename, const Date_Caches& sorted) {
Magick::Image contour(mp->map_file);
Magick::Image contour(MAPS_DIR / mp->map_file);
contour.strokeColor("black");
contour.strokeWidth(2);

31
maps/meson.build 100644
Wyświetl plik

@ -0,0 +1,31 @@
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_powiaty.png', output: 'Poland_powiaty.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: '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: '.')
configure_file(input: 'Warminsko-Mazurskie.png', output: 'Warminsko-Mazurskie.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'Kujawsko-Pomorskie.png', output: 'Kujawsko-Pomorskie.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'Mazowieckie.png', output: 'Mazowieckie.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'Wielkopolskie.png', output: 'Wielkopolskie.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'Dolnoslaskie.png', output: 'Dolnoslaskie.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'Lubelskie.png', output: 'Lubelskie.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'Lodzkie.png', output: 'Lodzkie.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'Lubuskie.png', output: 'Lubuskie.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'Opolskie.png', output: 'Opolskie.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'Podkarpackie.png', output: 'Podkarpackie.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'Slaskie.png', output: 'Slaskie.png', copy: true, install: true, install_dir: '.')
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: 'Benelux.png', output: 'Benelux.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'France.png', output: 'France.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'Germany.png', output: 'Germany.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'Romania.png', output: 'Romania.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'UK.png', output: 'UK.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'USA.png', output: 'USA.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: '.')

34
meson.build
Wyświetl plik

@ -22,37 +22,7 @@ executable('geostat', src, dependencies : [curl_dep, json_dep, magick_dep, sqlit
executable('geostat_cli', src_cli, dependencies : [curl_dep, json_dep, magick_dep, sqlite_dep], link_args: link, install: true)
executable('geodb', src_db, dependencies : [sqlite_dep, json_dep, curl_dep], install: true)
configure_file(input: 'maps/Poland.png', output: 'Poland.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'maps/Poland_big.png', output: 'Poland_big.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'maps/Poland_powiaty.png', output: 'Poland_powiaty.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'maps/Poland_relief.png', output: 'Poland_relief.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'maps/Podlaskie.png', output: 'Podlaskie.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'maps/Pomorskie.png', output: 'Pomorskie.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'maps/Malopolskie.png', output: 'Malopolskie.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'maps/Warminsko-Mazurskie.png', output: 'Warminsko-Mazurskie.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'maps/Kujawsko-Pomorskie.png', output: 'Kujawsko-Pomorskie.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'maps/Mazowieckie.png', output: 'Mazowieckie.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'maps/Wielkopolskie.png', output: 'Wielkopolskie.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'maps/Dolnoslaskie.png', output: 'Dolnoslaskie.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'maps/Lubelskie.png', output: 'Lubelskie.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'maps/Lodzkie.png', output: 'Lodzkie.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'maps/Lubuskie.png', output: 'Lubuskie.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'maps/Opolskie.png', output: 'Opolskie.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'maps/Podkarpackie.png', output: 'Podkarpackie.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'maps/Slaskie.png', output: 'Slaskie.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'maps/Swietokrzyskie.png', output: 'Swietokrzyskie.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'maps/Zachodniopomorskie.png', output: 'Zachodniopomorskie.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'maps/Benelux.png', output: 'Benelux.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'maps/France.png', output: 'France.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'maps/Germany.png', output: 'Germany.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'maps/Romania.png', output: 'Romania.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'maps/UK.png', output: 'UK.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'maps/USA.png', output: 'USA.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'maps/Europe.png', output: 'Europe.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'maps/World.png', output: 'World.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'rating-star.png', output: 'rating-star.png', copy: true, install: true, install_dir: '.')
configure_file(input: 'geo.css', output: 'geo.css', copy: true, install: true, install_dir: '.')
subdir('maps')