kleper/staticmaplite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More fixes for extramarkerprinter.

Browse Source
This commit is contained in:
Malte Hübner 2018-02-17 11:59:51 +01:00
parent 8778daddf3
commit b03ce8ce38
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/ElementPrinter/Marker/ExtraMarkerPrinter.php
View File

@ -3,11 +3,12 @@
namespace StaticMapLite\ElementPrinter\Marker; namespace StaticMapLite\ElementPrinter\Marker;
use Imagine\Gd\Font; use Imagine\Gd\Font;
use Imagine\Image\AbstractFont;
use Imagine\Image\Box; use Imagine\Image\Box;
use Imagine\Image\FontInterface;
use Imagine\Image\ImageInterface; use Imagine\Image\ImageInterface;
use Imagine\Image\ImagineInterface; use Imagine\Image\ImagineInterface;
use Imagine\Image\Point; use Imagine\Image\Point;
use Imagine\Image\Point\Center;
use StaticMapLite\Canvas\Canvas; use StaticMapLite\Canvas\Canvas;
use StaticMapLite\Element\Marker\AbstractMarker; use StaticMapLite\Element\Marker\AbstractMarker;
use StaticMapLite\Element\Marker\ExtraMarker; use StaticMapLite\Element\Marker\ExtraMarker;
@ -15,6 +16,12 @@ use StaticMapLite\Util;
class ExtraMarkerPrinter class ExtraMarkerPrinter
{ {
/** @var int $iconOffsetX */
protected $iconOffsetX = 0;
/** @var int $iconOffsetY */
protected $iconOffsetY = -12;
/** @var ImagineInterface $imagine */ /** @var ImagineInterface $imagine */
protected $imagine; protected $imagine;
@ -97,7 +104,7 @@ class ExtraMarkerPrinter
$markerImage = $extramarkers->crop($point, $box); $markerImage = $extramarkers->crop($point, $box);
//$this->writeMarker($markerImage); $this->writeMarker($markerImage);
return $markerImage; return $markerImage;
} }
@ -105,21 +112,24 @@ class ExtraMarkerPrinter
protected function writeMarker(ImageInterface $markerImage): ExtraMarkerPrinter protected function writeMarker(ImageInterface $markerImage): ExtraMarkerPrinter
{ {
$text = json_decode(sprintf('"&#x%s;"', $this->marker->getAwesome())); $text = json_decode(sprintf('"&#x%s;"', $this->marker->getAwesome()));
$font = $this->getFont($markerImage);
$bbox = imagettfbbox($fontSize, 0, $fontFile, $text); $textBox = $font->box($text);
$textCenterPosition = new Center($textBox);
$imageCenterPosition = new Center($markerImage->getSize());
$centeredTextPosition = new Point(
$imageCenterPosition->getX() - $textCenterPosition->getX() + $this->iconOffsetX,
$imageCenterPosition->getY() - $textCenterPosition->getY() + $this->iconOffsetY
);
$x = $bbox[0] + (imagesx($markerImage) / 2) - ($bbox[4] / 2) + 3; $markerImage->draw()->text($text, $font, $centeredTextPosition);
$y = 42;
imagettftext($markerImage, $fontSize, 0, $x, $y, $white, $fontFile, $text);
return $this; return $this;
} }
protected function getFont(ImageInterface $markerImage): FontInterface protected function getFont(ImageInterface $markerImage): AbstractFont
{ {
$fontColor = $markerImage->palette()->color('white'); $fontColor = $markerImage->palette()->color('fff');
$fontSize = 20; $fontSize = 20;
$fontFilename = __DIR__.'/../../../fonts/fontawesome-webfont.ttf'; $fontFilename = __DIR__.'/../../../fonts/fontawesome-webfont.ttf';