VladPolskiy/openstreetmap-mod_tile-python-implementation
1
0
Fork 0
mirror of https://github.com/openstreetmap/mod_tile.git synced 2025-08-03 01:16:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pre-load fonts so map's local font cache is populated (#334)

Browse Source
This commit is contained in:
Tom Hughes
2023-09-21 08:52:04 +01:00
committed by GitHub
parent 24a5752d93
commit aa6e968bce
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/gen_tile.cpp
View File

@ -300,14 +300,19 @@ static enum protoCmd render(struct xmlmapconfig * map, int x, int y, int z, char
mapnik::image_32 buf(render_size_tx * map->tilesize, render_size_ty * map->tilesize); mapnik::image_32 buf(render_size_tx * map->tilesize, render_size_ty * map->tilesize);
try { try {
Map map_parameterized = map->map;
if (map->parameterize_function) { if (map->parameterize_function) {
map->parameterize_function(map_parameterized, options); Map map_parameterized = map->map;
}
mapnik::agg_renderer<mapnik::image_32> ren(map_parameterized, buf, map->scale); map->parameterize_function(map_parameterized, options);
ren.apply();
map_parameterized.load_fonts();
mapnik::agg_renderer<mapnik::image_32> ren(map_parameterized, buf, map->scale);
ren.apply();
} else {
mapnik::agg_renderer<mapnik::image_32> ren(map->map, buf, map->scale);
ren.apply();
}
} catch (std::exception const& ex) { } catch (std::exception const& ex) {
g_logger(G_LOG_LEVEL_ERROR, "failed to render TILE %s %d %d-%d %d-%d", map->xmlname, z, x, x + render_size_tx - 1, y, y + render_size_ty - 1); g_logger(G_LOG_LEVEL_ERROR, "failed to render TILE %s %d %d-%d %d-%d", map->xmlname, z, x, x + render_size_tx - 1, y, y + render_size_ty - 1);
g_logger(G_LOG_LEVEL_ERROR, " reason: %s", ex.what()); g_logger(G_LOG_LEVEL_ERROR, " reason: %s", ex.what());
@ -421,6 +426,10 @@ void *render_thread(void * arg)
try { try {
mapnik::load_map(maps[iMaxConfigs].map, maps[iMaxConfigs].xmlfile); mapnik::load_map(maps[iMaxConfigs].map, maps[iMaxConfigs].xmlfile);
if (!maps[iMaxConfigs].parameterize_function) {
maps[iMaxConfigs].map.load_fonts();
}
/* If we have more than 10 rendering threads configured, we need to fix /* If we have more than 10 rendering threads configured, we need to fix
* up the mapnik datasources to support larger postgres connection pools * up the mapnik datasources to support larger postgres connection pools
*/ */