|
@@ -3,7 +3,6 @@
|
|
|
namespace MapBundle\Entity;
|
|
|
|
|
|
use Doctrine\ORM\Mapping as ORM;
|
|
|
-use DeviceBundle\Interfaces\DeviceInterface;
|
|
|
use ExtraDataBundle\Entity\Traits\ExtraDataTrait;
|
|
|
|
|
|
/**
|
|
@@ -39,7 +38,7 @@ class Location
|
|
|
{
|
|
|
return array(
|
|
|
'mapId' => $this->mapId,
|
|
|
- 'extraData' => json_decode($this->extraData),
|
|
|
+ 'extraData' => $this->jsonExtraData(),
|
|
|
);
|
|
|
}
|
|
|
|
|
@@ -52,22 +51,6 @@ class Location
|
|
|
{
|
|
|
return $this->id;
|
|
|
}
|
|
|
-
|
|
|
- /**
|
|
|
- * @return DeviceInterface
|
|
|
- */
|
|
|
- public function getDevice()
|
|
|
- {
|
|
|
- return $this->device;
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * @param DeviceInterface $device
|
|
|
- */
|
|
|
- public function setDevice(DeviceInterface $device)
|
|
|
- {
|
|
|
- $this->device = $device;
|
|
|
- }
|
|
|
|
|
|
/**
|
|
|
* Set mapId
|