Reverse to old getScaleRecursive-function in WmsLayerSource because o…

…f regression bug. Now correct scale and scale hint for sublayer are set
mapbender · Jul 17, 2017 · b07820a · b07820a
1 parent 6dc2fbc
commit b07820a
Showing 1 changed file with 28 additions and 3 deletions.
diff --git a/src/Mapbender/WmsBundle/Entity/WmsLayerSource.php b/src/Mapbender/WmsBundle/Entity/WmsLayerSource.php
@@ -643,7 +643,7 @@ public function getMinScale($recursive = true)
         }
 
         if ($recursive && $value === null && $this->getParent()) {
-            $value = $this->getParent()->getMinScale($recursive);
+            $value = $this->getScaleRecursive()->getMin();
         }
 
         $value === null ? null : floatval($value);
@@ -667,7 +667,7 @@ public function getMaxScale($recursive = true)
         }
 
         if ($recursive && $value === null && $this->getParent()) {
-            $value = $this->getParent()->getMinScale($recursive);
+            $value = $this->getScaleRecursive()->getMax();
         }
 
         $value === null ? null : floatval($value);
@@ -682,7 +682,32 @@ public function getMaxScale($recursive = true)
      */
     public function getScaleRecursive()
     {
-        return new MinMax($this->getMinScale(), $this->getMaxScale());
+        $scale  = $this->getScale();
+        $parent = $this->getParent();
+
+        if (!$scale && !$parent) {
+            return new MinMax();
+        } elseif (!$scale && $parent) {
+            $scale = $parent->getScale();
+        } else {
+            $hasMin = $scale->getMin() !== null;
+            $hasMax = $scale->getMax() !== null;
+            if ((!$hasMin || !$hasMax) && $parent) {
+                $parentScale = $parent->getScale();
+                if (!$parentScale) {
+                    return new MinMax(
+                        $hasMin ? $scale->getMin() : null,
+                        $hasMax ? $scale->getMax() : null
+                    );
+                }
+                $scale       = new MinMax(
+                    $hasMin ? $scale->getMin() : $parentScale->getMin(),
+                    $hasMax ? $scale->getMax() : $parentScale->getMax()
+                );
+            }
+        }
+        //var_dump($scale->getMin() );
+        return $scale;
     }
 
     /**