Some fixes.

This commit is contained in:
Malte Hübner 2017-06-08 22:55:20 +02:00
parent 240b348e67
commit d834667d8a
3 changed files with 5 additions and 4 deletions

View File

@ -14,7 +14,7 @@ class Canvas
protected $zoom = 0; protected $zoom = 0;
public function __construct(int $width, int $height, int $zoom, int $centerX, int $centerY) public function __construct(int $width, int $height, int $zoom, float $centerX, float $centerY)
{ {
$this->width = $width; $this->width = $width;
$this->height = $height; $this->height = $height;
@ -42,12 +42,12 @@ class Canvas
return $this->height; return $this->height;
} }
public function getCenterX(): int public function getCenterX(): float
{ {
return $this->centerX; return $this->centerX;
} }
public function getCenterY(): int public function getCenterY(): float
{ {
return $this->centerY; return $this->centerY;
} }

View File

@ -63,6 +63,7 @@ class MarkerPrinter
$markerFilename = ''; $markerFilename = '';
$markerShadow = ''; $markerShadow = '';
$matches = false; $matches = false;
$markerIndex = 0;
// check for marker type, get settings from markerPrototypes // check for marker type, get settings from markerPrototypes
if ($this->marker->getMarkerType()) { if ($this->marker->getMarkerType()) {

View File

@ -215,7 +215,7 @@ class Printer
public function copyrightNotice() public function copyrightNotice()
{ {
$logoImg = imagecreatefrompng($this->osmLogo); $logoImg = imagecreatefrompng($this->osmLogo);
imagecopy($this->canvas->getImage(), $logoImg, imagesx($this->image) - imagesx($logoImg), imagesy($this->image) - imagesy($logoImg), 0, 0, imagesx($logoImg), imagesy($logoImg)); imagecopy($this->canvas->getImage(), $logoImg, imagesx($this->canvas->getImage()) - imagesx($logoImg), imagesy($this->canvas->getImage()) - imagesy($logoImg), 0, 0, imagesx($logoImg), imagesy($logoImg));
} }
public function sendHeader() public function sendHeader()