From 5c25b036a4c19cdca6a1d2e969a5d0384af82cd3 Mon Sep 17 00:00:00 2001 From: Jannis Portmann Date: Fri, 23 Jul 2021 22:25:56 +0200 Subject: [PATCH] Revert "Save cooridnates as GeoJSON in database" This reverts commit ddb815d1b46b4e0366bb55659597a5cad3bb94c0. --- migrations/Version20210715135559.php | 33 ------------------------- migrations/Version20210715142350.php | 35 --------------------------- migrations/Version20210715142732.php | 36 ---------------------------- src/Controller/OfferController.php | 11 ++------- src/Entity/Offering.php | 17 ------------- 5 files changed, 2 insertions(+), 130 deletions(-) delete mode 100644 migrations/Version20210715135559.php delete mode 100644 migrations/Version20210715142350.php delete mode 100644 migrations/Version20210715142732.php diff --git a/migrations/Version20210715135559.php b/migrations/Version20210715135559.php deleted file mode 100644 index 3ea2340..0000000 --- a/migrations/Version20210715135559.php +++ /dev/null @@ -1,33 +0,0 @@ -addSql('ALTER TABLE offering ADD coordinates TEXT DEFAULT NULL'); - $this->addSql('COMMENT ON COLUMN offering.coordinates IS \'(DC2Type:array)\''); - } - - public function down(Schema $schema): void - { - // this down() migration is auto-generated, please modify it to your needs - $this->addSql('CREATE SCHEMA public'); - $this->addSql('ALTER TABLE offering DROP coordinates'); - } -} diff --git a/migrations/Version20210715142350.php b/migrations/Version20210715142350.php deleted file mode 100644 index ef51b4a..0000000 --- a/migrations/Version20210715142350.php +++ /dev/null @@ -1,35 +0,0 @@ -addSql('ALTER TABLE offering ADD coordinate JSON DEFAULT NULL'); - $this->addSql('ALTER TABLE offering DROP coordinates'); - } - - public function down(Schema $schema): void - { - // this down() migration is auto-generated, please modify it to your needs - $this->addSql('CREATE SCHEMA public'); - $this->addSql('ALTER TABLE offering ADD coordinates TEXT DEFAULT NULL'); - $this->addSql('ALTER TABLE offering DROP coordinate'); - $this->addSql('COMMENT ON COLUMN offering.coordinates IS \'(DC2Type:array)\''); - } -} diff --git a/migrations/Version20210715142732.php b/migrations/Version20210715142732.php deleted file mode 100644 index bb54fde..0000000 --- a/migrations/Version20210715142732.php +++ /dev/null @@ -1,36 +0,0 @@ -addSql('ALTER TABLE offering ALTER coordinate TYPE TEXT'); - $this->addSql('ALTER TABLE offering ALTER coordinate DROP DEFAULT'); - $this->addSql('COMMENT ON COLUMN offering.coordinate IS \'(DC2Type:object)\''); - } - - public function down(Schema $schema): void - { - // this down() migration is auto-generated, please modify it to your needs - $this->addSql('CREATE SCHEMA public'); - $this->addSql('ALTER TABLE offering ALTER coordinate TYPE JSON'); - $this->addSql('ALTER TABLE offering ALTER coordinate DROP DEFAULT'); - $this->addSql('COMMENT ON COLUMN offering.coordinate IS NULL'); - } -} diff --git a/src/Controller/OfferController.php b/src/Controller/OfferController.php index 1268d18..345a13a 100644 --- a/src/Controller/OfferController.php +++ b/src/Controller/OfferController.php @@ -13,8 +13,6 @@ use App\Service\DistanceCalculator; use App\Service\OfferPhotoHelper; use Doctrine\ORM\EntityManagerInterface; -use Location\Coordinate; -use Location\Formatter\Coordinate\GeoJSON; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -40,7 +38,7 @@ class OfferController extends AbstractController } #[Route('/new', name: 'new_offer')] - public function newOffer(Request $request, string $photoDir, OfferPhotoHelper $offerPhotoHelper, PlzToCoordinate $plzconverter): Response + public function newOffer(Request $request, string $photoDir, OfferPhotoHelper $offerPhotoHelper): Response { $offer = new Offering(); $form = $this->createForm(OfferingFormType::class, $offer); @@ -52,11 +50,6 @@ class OfferController extends AbstractController $offer->setByUser($user); $offer->setCreatedAt(new \DateTime()); - if ($offerPlz = $form['zipCode']->getData()) { - $coordinate = $plzconverter->convertPlzToCoordinate($offerPlz); - $offer->setCoordinate($coordinate->format(new GeoJSON())); - } - if ($photo = $form['photo']->getData()) { $offerPhotoHelper->uploadOfferPhoto($photoDir, $photo, $offer); } @@ -88,7 +81,7 @@ class OfferController extends AbstractController if (isset($userPlz)) { - $distance = $distanceCalculator->calculateDistance($plzconverter->convertPlzToCoordinate($offerPlz), $plzconverter->convertPlzToCoordinate($userPlz)); + $distance = $distanceCalculator->calculateDistance($plzconverter->getCoordinates($offerPlz), $plzconverter->getCoordinates($userPlz)); } return $this->render('app/offer.html.twig', [ diff --git a/src/Entity/Offering.php b/src/Entity/Offering.php index 62a9d96..6f8ac66 100644 --- a/src/Entity/Offering.php +++ b/src/Entity/Offering.php @@ -51,11 +51,6 @@ class Offering */ private $description; - /** - * @ORM\Column(type="object", nullable=true) - */ - private $coordinate; - public function getId(): ?int { return $this->id; @@ -137,16 +132,4 @@ class Offering { return (string) $this-getTitle(); } - - public function getCoordinate() - { - return $this->coordinate; - } - - public function setCoordinate($coordinate): self - { - $this->coordinate = $coordinate; - - return $this; - } }