From 7469319708f7536ec698bd8cf9188974cfa1e237 Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@git-test.afi-sa.fr>
Date: Sat, 19 Oct 2013 14:55:17 +0000
Subject: [PATCH] =?UTF-8?q?Optimisation=20g=C3=A9n=C3=A9ration=20tuiles:?=
=?UTF-8?q?=204s=20pour=20g=C3=A9n=C3=A9rer,=2014Mo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
scripts/leaflet/create_tiles.php | 10 +++++-----
scripts/leaflet/index.html | 7 ++++---
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/scripts/leaflet/create_tiles.php b/scripts/leaflet/create_tiles.php
index 7c44ea7f07f..c4f0973ed4b 100644
--- a/scripts/leaflet/create_tiles.php
+++ b/scripts/leaflet/create_tiles.php
@@ -5,6 +5,7 @@ function createTilesSubcommand($zoom_level, $tile_width, $tiles_dir) {
return
'\( mpr:output'.
' -resize '.$size.
+ ' -quality 50'.
' -write mpr:output'.
' -crop '.$tile_width.'x'.$tile_width.
' -set filename:f "'.$tiles_dir.'tile_%[fx:page.y/'.$tile_width.']_%[fx:page.x/'.$tile_width.'].jpg"'.
@@ -13,12 +14,12 @@ function createTilesSubcommand($zoom_level, $tile_width, $tiles_dir) {
}
-function createSetOfTilesForZoomLevels($min_zoom, $max_zoom, $tiles_dir) {
+function createSetOfTilesForZoomLevels($min_zoom, $max_zoom, $tiles_dir, $tile_size) {
$tile_commands = array_map(
- function($zoom_level) use ($tiles_dir) {
+ function($zoom_level) use ($tiles_dir, $tile_size) {
$tiles_dir_for_zoom_level = $tiles_dir .'/'. ($zoom_level + 1).'/';
is_dir($tiles_dir_for_zoom_level) || mkdir($tiles_dir_for_zoom_level, 0777, true);
- return createTilesSubcommand($zoom_level, 256, $tiles_dir_for_zoom_level);
+ return createTilesSubcommand($zoom_level, $tile_size, $tiles_dir_for_zoom_level);
},
array_reverse(range($min_zoom, $max_zoom))
);
@@ -26,6 +27,5 @@ function createSetOfTilesForZoomLevels($min_zoom, $max_zoom, $tiles_dir) {
system('convert big.jpg -write mpr:output '.implode(' ',$tile_commands));
}
-createSetOfTilesForZoomLevels(5, 5, './tiles');
-createSetOfTilesForZoomLevels(0, 4, './tiles');
+createSetOfTilesForZoomLevels(0, 4, './tiles', 128);
?>
\ No newline at end of file
diff --git a/scripts/leaflet/index.html b/scripts/leaflet/index.html
index c81dcd02531..c502174a806 100644
--- a/scripts/leaflet/index.html
+++ b/scripts/leaflet/index.html
@@ -26,14 +26,15 @@
<script>
var map = L.map('map', {
- maxZoom: 6,
+ maxZoom: 5,
minZoom: 2,
crs: L.CRS.Simple
- }).setView([0, 0], 4);
+ }).setView([-45, 40], 3);
L.tileLayer('/tiling/tiles/{z}/tile_{y}_{x}.jpg', {
attribution: 'Bible de Souvigny',
- noWrap: true
+ noWrap: true,
+ tileSize: 128
}).addTo(map);
</script>
--
GitLab