change default mapnik fontdir_recurse to true

openstreetmap · Sep 4, 2024 · 40a1684 · 40a1684
1 parent 80fe693
commit 40a1684
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/backend-mapnik/renderd.cc b/backend-mapnik/renderd.cc
@@ -227,7 +227,7 @@ RenderDaemon::RenderDaemon(int argc, char **argv) :
 #endif
 
     tmp = getenv("TIREX_BACKEND_CFG_fontdir_recurse");
-    bool fr = tmp ? atoi(tmp) : false;
+    bool fr = tmp ? atoi(tmp) : true;
     tmp = getenv("TIREX_BACKEND_CFG_fontdir");
     if (tmp) loadFonts(tmp, fr);
 

diff --git a/debian/etc/tirex/renderer/mapnik.conf b/debian/etc/tirex/renderer/mapnik.conf
@@ -42,8 +42,8 @@ plugindir=/usr/share/tirex/mapnik/input
 #  throw an exception.
 fontdir=/usr/share/fonts/truetype
 
-#  Set this to 1 if you want fonts loaded recursively from directories
-#  inside the mapnik_fontdir directory. Defaults to 0.
-fontdir_recurse=1
+#  Set this to 0 if you don't want fonts loaded recursively from directories
+#  inside the mapnik_fontdir directory. Defaults to 1, meaning do recurse.
+#fontdir_recurse=1
 
 #-- THE END ------------------------------------------------------------------
diff --git a/etc/renderer/mapnik.conf.dist b/etc/renderer/mapnik.conf.dist
@@ -42,8 +42,8 @@ plugindir=/usr/lib/mapnik/3.0/input
 #  throw an exception.
 fontdir=/usr/lib/mapnik/fonts
 
-#  Set this to 1 if you want fonts loaded recursively from directories
-#  inside the mapnik_fontdir directory. Defaults to 0.
-#fontdir_recurse=0
+#  Set this to 0 if you don't want fonts loaded recursively from directories
+#  inside the mapnik_fontdir directory. Defaults to 1, meaning do recurse.
+#fontdir_recurse=1
 
 #-- THE END ------------------------------------------------------------------