Changeset 457

Timestamp:

11/14/08 18:40:18 (2 months ago)

Author:

armin

Message:

patch by TRaffin for zoomtorectangle if the rectangle is not in the same proportions as the map

Files:

• pmapper/trunk/incphp/map/map.php (modified) (1 diff)

pmapper/trunk/incphp/map/map.php

@@ -486 +486 @@
-
-                $pixext = ms_newrectObj();
+                
+                // Modified by Thomas RAFFIN (SIRAP)
+                // If the rectangle is not in the same proportions as the map,
+                // To leave the coeff Y / X unghanged, we need to made $geoNewCoeff = $geo0Coeff... 
+                                $geo0Coeff = $this->mapheight / $this->mapwidth;
+                                $geoNewDeltaX = $pix_maxx - $pix_minx;
+                                $geoNewDeltaY = $pix_maxy - $pix_miny;
+                                $geoNewCoeff = $geoNewDeltaY / $geoNewDeltaX;
+                                if ($geoNewCoeff < $geo0Coeff) {
+                                        $newDeltaYCorrected = $geo0Coeff * $geoNewDeltaX;
+                                        $newDeltaYToAdd = ($newDeltaYCorrected - $geoNewDeltaY) / 2;
+                                        $pix_miny -= $newDeltaYToAdd;
+                                        $pix_maxy += $newDeltaYToAdd;
+                                } else {
+                                        $newDeltaXCorrected = $geoNewDeltaY / $geo0Coeff;
+                                        $newDeltaXToAdd = ($newDeltaXCorrected - $geoNewDeltaX) / 2;
+                                        $pix_minx -= $newDeltaXToAdd;
+                                        $pix_maxx += $newDeltaXToAdd;
+                                }
+
-                $pixext->setextent($pix_minx,$pix_miny,$pix_maxx,$pix_maxy);
-            }