wait #5563 @1

diff --git a/src/Links/ZoomLink.php b/src/Links/ZoomLink.php
index 70bcbdb32f3a549143e4633453d4ad7d7f98adc4..6822f5cc01288a29a8983114ca99349ae6181691 100644 (file)
--- a/src/Links/ZoomLink.php
+++ b/src/Links/ZoomLink.php
@@ -33,6 +33,7 @@ class ZoomLink extends NormalLink
     public function init()
     {
         $this->compiler->addJsLib('fluidbook-zoom', 'js/libs/fluidbook/links/fluidbook.links.zoom.js');
+        $this->maxzoom_default = $this->compiler->getSetting('zoomAreaDefaultZoomLevel', 2);
         parent::init();
     }
 
@@ -105,7 +106,7 @@ class ZoomLink extends NormalLink
     {
 
         $maxzoom = $attributes['maxzoom']; // Max zoom level might not always be set in the link editor
-        $maxzoom = max(2, min($maxzoom, 4.166666667));
+        $maxzoom = max(2, min($maxzoom, 20));
         if (!$maxzoom) {
             $maxzoom = 2;
         }

diff --git a/src/Links/ZoomProductLink.php b/src/Links/ZoomProductLink.php
index 334552bffe511fca8f6330fc83882b8f3c190044..9e80f5723136bfaf2b0a3ec0bc623196def455e0 100644 (file)
--- a/src/Links/ZoomProductLink.php
+++ b/src/Links/ZoomProductLink.php
@@ -4,8 +4,6 @@ namespace Fluidbook\Tools\Links;
 
 class ZoomProductLink extends ZoomLink
 {
-    protected $maxzoom_default = 2.5;
-
     public function __construct($id, $init, &$compiler)
     {
         $init['group'] = $init['to'];