Update index name

[airbundle] / Controller / LocationController.php

diff --git a/Controller/LocationController.php b/Controller/LocationController.php
index 33c205041cc67278b047d369ab1afda7a1a777ca..46d81019e281bc2238323327f588028936252389 100644 (file)
--- a/Controller/LocationController.php
+++ b/Controller/LocationController.php
@@ -30,7 +30,7 @@ class LocationController extends DefaultController {
         */
        public function cities(Request $request): Response {
                //Add cities
         */
        public function cities(Request $request): Response {
                //Add cities

-               $this->context['cities'] = $this->doctrine->getRepository(Location::class)->findCitiesAsArray($this->period);
+               $this->context['cities'] = $this->doctrine->getRepository(Location::class)->findCitiesAsArray($this->period, 0);

 
                //Add dances
                $this->context['dances'] = $this->doctrine->getRepository(Dance::class)->findNamesAsArray();
 
                //Add dances
                $this->context['dances'] = $this->doctrine->getRepository(Dance::class)->findNamesAsArray();


@@ -44,12 +44,11 @@ class LocationController extends DefaultController {
                //Add city multi
                foreach($this->context['cities'] as $id => $city) {
                        //Add city multi
                //Add city multi
                foreach($this->context['cities'] as $id => $city) {
                        //Add city multi

-                       #$this->osm->getMultiImage($city['link'], $city['osm'], $this->modified->getTimestamp(), $city['latitude'], $city['longitude'], $city['locations'], $this->osm->getMultiZoom($city['latitude'], $city['longitude'], $city['locations'], 16));
-                       $this->context['cities'][$id]['multimap'] = $this->map->getMultiMap($city['multimap'], $this->modified->getTimestamp(), $city['latitude'], $city['longitude'], $city['locations'], $this->map->getMultiZoom($city['latitude'], $city['longitude'], $city['locations']));
+                       $this->context['cities'][$id]['multimap'] = $this->map->getMultiMap($city['multimap'], $this->modified->getTimestamp(), $city['locations']);

                }
 
                //With logged user
                }
 
                //With logged user

-               if ($this->isGranted('IS_AUTHENTICATED_REMEMBERED')) {
+               if ($this->checker->isGranted('IS_AUTHENTICATED_REMEMBERED')) {

                        //Set last modified
                        $response->setLastModified(new \DateTime('-1 year'));
 
                        //Set last modified
                        $response->setLastModified(new \DateTime('-1 year'));
 


@@ -75,7 +74,7 @@ class LocationController extends DefaultController {
                }
 
                //Set section
                }
 
                //Set section

-               $this->context['title'] = $this->translator->trans('Libre Air cities');
+               $this->context['title']['page'] = $this->translator->trans('Libre Air cities');

 
                //Set description
                $this->context['description'] = $this->translator->trans('Libre Air city list');
 
                //Set description
                $this->context['description'] = $this->translator->trans('Libre Air city list');


@@ -129,7 +128,7 @@ class LocationController extends DefaultController {
                }
 
                //Add calendar
                }
 
                //Add calendar

-               $this->context['calendar'] = $this->doctrine->getRepository(Session::class)->findAllByPeriodAsArray($this->period, $request->getLocale(), !$this->isGranted('IS_AUTHENTICATED_REMEMBERED'), floatval($latitude), floatval($longitude));
+               $this->context['calendar'] = $this->doctrine->getRepository(Session::class)->findAllByPeriodAsCalendarArray($this->period, !$this->checker->isGranted('IS_AUTHENTICATED_REMEMBERED'), floatval($latitude), floatval($longitude));

 
                //Set dances
                $this->context['dances'] = [];
 
                //Set dances
                $this->context['dances'] = [];


@@ -147,7 +146,7 @@ class LocationController extends DefaultController {
                }
 
                //Add locations
                }
 
                //Add locations

-               $this->context['locations'] = $this->doctrine->getRepository(Location::class)->findAllByLatitudeLongitudeAsArray(floatval($latitude), floatval($longitude), $this->period);
+               $this->context['locations'] = $this->doctrine->getRepository(Location::class)->findAllByLatitudeLongitudeAsArray(floatval($latitude), floatval($longitude), $this->period, 0);

 
                //Set modified
                //XXX: dance modified is already computed inside calendar modified
 
                //Set modified
                //XXX: dance modified is already computed inside calendar modified


@@ -157,7 +156,7 @@ class LocationController extends DefaultController {
                $response = new Response();
 
                //With logged user
                $response = new Response();
 
                //With logged user

-               if ($this->isGranted('IS_AUTHENTICATED_REMEMBERED')) {
+               if ($this->checker->isGranted('IS_AUTHENTICATED_REMEMBERED')) {

                        //Set last modified
                        $response->setLastModified(new \DateTime('-1 year'));
 
                        //Set last modified
                        $response->setLastModified(new \DateTime('-1 year'));
 


@@ -183,7 +182,7 @@ class LocationController extends DefaultController {
                }
 
                //Add multi
                }
 
                //Add multi

-               $this->context['multimap'] = $this->map->getMultiMap($this->context['city']['multimap'], $this->modified->getTimestamp(), $latitude, $longitude, $this->context['locations'], $this->map->getMultiZoom($latitude, $longitude, $this->context['locations']));
+               $this->context['multimap'] = $this->map->getMultiMap($this->context['city']['multimap'], $this->modified->getTimestamp(), $this->context['locations']);

 
                //Set keywords
                $this->context['keywords'] = [
 
                //Set keywords
                $this->context['keywords'] = [


@@ -206,13 +205,13 @@ class LocationController extends DefaultController {
                        $dances = implode($this->translator->trans(' and '), array_filter(array_merge([implode(', ', array_slice($dances, 0, -1))], array_slice($dances, -1)), 'strlen'));
 
                        //Set title
                        $dances = implode($this->translator->trans(' and '), array_filter(array_merge([implode(', ', array_slice($dances, 0, -1))], array_slice($dances, -1)), 'strlen'));
 
                        //Set title

-                       $this->context['title'] = $this->translator->trans('%dances% %city%', ['%dances%' => $dances, '%city%' => $this->context['city']['in']]);
+                       $this->context['title']['page'] = $this->translator->trans('%dances% %city%', ['%dances%' => $dances, '%city%' => $this->context['city']['in']]);

 
                        //Set description
                        $this->context['description'] = $this->translator->trans('%dances% indoor and outdoor calendar %city%', ['%dances%' => $dances, '%city%' => $this->context['city']['in']]);
                } else {
                        //Set title
 
                        //Set description
                        $this->context['description'] = $this->translator->trans('%dances% indoor and outdoor calendar %city%', ['%dances%' => $dances, '%city%' => $this->context['city']['in']]);
                } else {
                        //Set title

-                       $this->context['title'] = $this->translator->trans('Dance %city%', ['%city%' => $this->context['city']['in']]);
+                       $this->context['title']['page'] = $this->translator->trans('Dance %city%', ['%city%' => $this->context['city']['in']]);

 
                        //Set description
                        $this->context['description'] = $this->translator->trans('Indoor and outdoor dance calendar %city%', ['%city%' => $this->context['city']['in']]);
 
                        //Set description
                        $this->context['description'] = $this->translator->trans('Indoor and outdoor dance calendar %city%', ['%city%' => $this->context['city']['in']]);


@@ -245,7 +244,7 @@ class LocationController extends DefaultController {
                $response = new Response();
 
                //With logged user
                $response = new Response();
 
                //With logged user

-               if ($this->isGranted('IS_AUTHENTICATED_REMEMBERED')) {
+               if ($this->checker->isGranted('IS_AUTHENTICATED_REMEMBERED')) {

                        //Set last modified
                        $response->setLastModified(new \DateTime('-1 year'));
 
                        //Set last modified
                        $response->setLastModified(new \DateTime('-1 year'));
 


@@ -270,23 +269,11 @@ class LocationController extends DefaultController {
                        }
                }
 
                        }
                }
 

-               //Set latitudes
-               $latitudes = array_map(function ($v) { return $v['latitude']; }, $this->context['locations']);
-
-               //Set latitude
-               $latitude = round(array_sum($latitudes)/count($latitudes), 6);
-
-               //Set longitudes
-               $longitudes = array_map(function ($v) { return $v['longitude']; }, $this->context['locations']);
-
-               //Set longitude
-               $longitude = round(array_sum($longitudes)/count($longitudes), 6);
-

                //Add multi map
                //Add multi map

-               $this->context['multimap'] = $this->map->getMultiMap($this->translator->trans('Libre Air locations sector map'), $this->modified->getTimestamp(), $latitude, $longitude, $this->context['locations'], $this->map->getMultiZoom($latitude, $longitude, $this->context['locations']));
+               $this->context['multimap'] = $this->map->getMultiMap($this->translator->trans('Libre Air locations sector map'), $this->modified->getTimestamp(), $this->context['locations']);

 
                //Set title
 
                //Set title

-               $this->context['title'] = $this->translator->trans('Libre Air locations');
+               $this->context['title']['page'] = $this->translator->trans('Libre Air locations');

 
                //Set description
                $this->context['description'] = $this->translator->trans('Libre Air location list');
 
                //Set description
                $this->context['description'] = $this->translator->trans('Libre Air location list');


@@ -300,7 +287,7 @@ class LocationController extends DefaultController {
                ];
 
                //Create location forms for role_admin
                ];
 
                //Create location forms for role_admin

-               if ($this->isGranted('ROLE_ADMIN')) {
+               if ($this->checker->isGranted('ROLE_ADMIN')) {

                        //Fetch all locations
                        $locations = $this->doctrine->getRepository(Location::class)->findAll();
 
                        //Fetch all locations
                        $locations = $this->doctrine->getRepository(Location::class)->findAll();
 


@@ -342,7 +329,7 @@ class LocationController extends DefaultController {
                                        $this->addFlash('notice', $this->translator->trans('Location %id% updated', ['%id%' => $location['id']]));
 
                                        //Redirect to cleanup the form
                                        $this->addFlash('notice', $this->translator->trans('Location %id% updated', ['%id%' => $location['id']]));
 
                                        //Redirect to cleanup the form

-                                       return $this->redirectToRoute('rapsys_air_location', ['location' => $location['id']]);
+                                       return $this->redirectToRoute('rapsysair_location', ['location' => $location['id']]);

                                }
 
                                //Add form to context
                                }
 
                                //Add form to context


@@ -379,7 +366,7 @@ class LocationController extends DefaultController {
                                $this->addFlash('notice', $this->translator->trans('Location created'));
 
                                //Redirect to cleanup the form
                                $this->addFlash('notice', $this->translator->trans('Location created'));
 
                                //Redirect to cleanup the form

-                               return $this->redirectToRoute('rapsys_air_location', ['location' => $data->getId()]);
+                               return $this->redirectToRoute('rapsysair_location', ['location' => $data->getId()]);

                        }
 
                        //Add form to context
                        }
 
                        //Add form to context


@@ -399,18 +386,25 @@ class LocationController extends DefaultController {
         *
         * @param Request $request The request instance
         * @param int $id The location id
         *
         * @param Request $request The request instance
         * @param int $id The location id

+        * @param ?string $location The location slug

         *
         * @return Response The rendered view
         */
         *
         * @return Response The rendered view
         */

-       public function view(Request $request, int $id): Response {
+       public function view(Request $request, int $id, ?string $location): Response {

                //Without location
                if (empty($this->context['location'] = $this->doctrine->getRepository(Location::class)->findOneByIdAsArray($id, $this->locale))) {
                        //Throw 404
                        throw $this->createNotFoundException($this->translator->trans('Unable to find location: %id%', ['%id%' => $id]));
                }
 
                //Without location
                if (empty($this->context['location'] = $this->doctrine->getRepository(Location::class)->findOneByIdAsArray($id, $this->locale))) {
                        //Throw 404
                        throw $this->createNotFoundException($this->translator->trans('Unable to find location: %id%', ['%id%' => $id]));
                }
 

+               //With invalid slug
+               if ($location !== $this->context['location']['slug']) {
+                       //Redirect on correctly spelled location
+                       return $this->redirectToRoute('rapsysair_location_view', ['id' => $this->context['location']['id'], 'location' => $this->context['location']['slug']], Response::HTTP_MOVED_PERMANENTLY);
+               }
+

                //Fetch calendar
                //Fetch calendar

-               $this->context['calendar'] = $this->doctrine->getRepository(Session::class)->findAllByPeriodAsArray($this->period, $this->locale, !$this->isGranted('IS_AUTHENTICATED_REMEMBERED'), $this->context['location']['latitude'], $this->context['location']['longitude']);
+               $this->context['calendar'] = $this->doctrine->getRepository(Session::class)->findAllByPeriodAsCalendarArray($this->period, !$this->checker->isGranted('IS_AUTHENTICATED_REMEMBERED'), $this->context['location']['latitude'], $this->context['location']['longitude']);

 
                //Set dances
                $this->context['dances'] = [];
 
                //Set dances
                $this->context['dances'] = [];


@@ -432,13 +426,13 @@ class LocationController extends DefaultController {
 
                //Set modified
                //XXX: dance modified is already computed inside calendar modified
 
                //Set modified
                //XXX: dance modified is already computed inside calendar modified

-               $this->modified = max(array_merge([$this->context['location']['updated']], array_map(function ($v) { return $v['modified']; }, array_merge($this->context['calendar'], $this->context['locations']))));
+               $this->modified = max(array_merge([$this->context['location']['modified']], array_map(function ($v) { return $v['modified']; }, array_merge($this->context['calendar'], $this->context['locations']))));

 
                //Create response
                $response = new Response();
 
                //With logged user
 
                //Create response
                $response = new Response();
 
                //With logged user

-               if ($this->isGranted('IS_AUTHENTICATED_REMEMBERED')) {
+               if ($this->checker->isGranted('IS_AUTHENTICATED_REMEMBERED')) {

                        //Set last modified
                        $response->setLastModified(new \DateTime('-1 year'));
 
                        //Set last modified
                        $response->setLastModified(new \DateTime('-1 year'));
 


@@ -464,12 +458,12 @@ class LocationController extends DefaultController {
                }
 
                //Add multi map
                }
 
                //Add multi map

-               $this->context['multimap'] = $this->map->getMultiMap($this->context['location']['multimap'], $this->modified->getTimestamp(), $this->context['location']['latitude'], $this->context['location']['longitude'], $this->context['locations'], $this->map->getMultiZoom($this->context['location']['latitude'], $this->context['location']['longitude'], $this->context['locations']));
+               $this->context['multimap'] = $this->map->getMultiMap($this->context['location']['multimap'], $this->modified->getTimestamp(), $this->context['locations']);

 
                //Set keywords
                $this->context['keywords'] = [
                        $this->context['location']['title'],
 
                //Set keywords
                $this->context['keywords'] = [
                        $this->context['location']['title'],

-                       $this->context['location']['city'],
+                       $this->context['location']['city']['title'],

                        $this->translator->trans($this->context['location']['indoor']?'Indoor':'Outdoor'),
                        $this->translator->trans('Calendar'),
                        $this->translator->trans('Libre Air')
                        $this->translator->trans($this->context['location']['indoor']?'Indoor':'Outdoor'),
                        $this->translator->trans('Calendar'),
                        $this->translator->trans('Libre Air')


@@ -487,21 +481,27 @@ class LocationController extends DefaultController {
                        $dances = implode($this->translator->trans(' and '), array_filter(array_merge([implode(', ', array_slice($dances, 0, -1))], array_slice($dances, -1)), 'strlen'));
 
                        //Set title
                        $dances = implode($this->translator->trans(' and '), array_filter(array_merge([implode(', ', array_slice($dances, 0, -1))], array_slice($dances, -1)), 'strlen'));
 
                        //Set title

-                       $this->context['title'] = $this->translator->trans('%dances% %location%', ['%dances%' => $dances, '%location%' => $this->context['location']['atin']]);
+                       $this->context['title']['page'] = $this->translator->trans('%dances% %location%', ['%dances%' => $dances, '%location%' => $this->context['location']['atin']]);

 
                        //Set description
                        $this->context['description'] = $this->translator->trans('%dances% indoor and outdoor calendar %location%', ['%dances%' => $dances, '%location%' => $this->context['location']['at']]);
                //Without dances
                } else {
                        //Set title
 
                        //Set description
                        $this->context['description'] = $this->translator->trans('%dances% indoor and outdoor calendar %location%', ['%dances%' => $dances, '%location%' => $this->context['location']['at']]);
                //Without dances
                } else {
                        //Set title

-                       $this->context['title'] = $this->translator->trans('Dance %location%', ['%location%' => $this->context['location']['atin']]);
+                       $this->context['title']['page'] = $this->translator->trans('Dance %location%', ['%location%' => $this->context['location']['atin']]);

 
                        //Set description
 
                        //Set description

-                       $this->context['description'] = $this->translator->trans('Indoor and outdoor dance calendar %location%', [ '%location%' => $this->context['location']['at'] ]);
+                       $this->context['description'] = $this->translator->trans('Indoor and outdoor dance calendar %location%', ['%location%' => $this->context['location']['at']]);

                }
 
                //Set locations description
                }
 
                //Set locations description

-               $this->context['locations_description'] = $this->translator->trans('Libre Air location list %location%', ['%location%' => $this->context['location']['atin']]);
+               $this->context['locations_description'] = $this->translator->trans('Libre Air location list %location% %city%', ['%location%' => $this->context['location']['around'], '%city%' => $this->context['location']['city']['in']]);
+
+               //Set locations link
+               $this->context['locations_link'] = $this->context['location']['city']['link'];
+
+               //Set locations title
+               $this->context['locations_title'] = $this->context['location']['city']['title'].' ('.$this->context['location']['city']['id'].')';

 
                //Set alternates
                $this->context['alternates'] += $this->context['location']['alternates'];
 
                //Set alternates
                $this->context['alternates'] += $this->context['location']['alternates'];