tykayn/osm-commerces
1
0
Fork 0
mirror of https://forge.chapril.org/tykayn/osm-commerces synced 2025-10-09 17:02:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

up recherche home

Browse source
This commit is contained in:
Tykayn 2025-07-18 17:08:13 +02:00 • committed by tykayn
parent c89751b45c
commit 7887356dd9
3 changed files with 281 additions and 251 deletions
Download patch file Download diff file Expand all files Collapse all files

59
src/Controller/PublicController.php
View file

@ -2,23 +2,22 @@
namespace App\Controller; namespace App\Controller;
use App\Entity\Stats;
use App\Entity\Place;
use App\Entity\CityFollowUp; use App\Entity\CityFollowUp;
use App\Entity\Demande; use App\Entity\Demande;
use App\Service\Motocultrice; use App\Entity\Place;
use App\Service\FollowUpService; use App\Entity\Stats;
use Doctrine\ORM\EntityManagerInterface;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\Routing\Annotation\Route;
use GuzzleHttp\Client;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Mime\Email;
use Symfony\Component\Mailer\MailerInterface;
use App\Service\ActionLogger; use App\Service\ActionLogger;
use Symfony\Component\HttpFoundation\ResponseHeaderBag; use App\Service\FollowUpService;
use App\Service\Motocultrice;
use Doctrine\ORM\EntityManagerInterface;
use GuzzleHttp\Client;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Mailer\MailerInterface;
use Symfony\Component\Mime\Email;
use Symfony\Component\Routing\Annotation\Route;
class PublicController extends AbstractController class PublicController extends AbstractController
{ {
@ -31,7 +30,9 @@ class PublicController extends AbstractController
private MailerInterface $mailer, private MailerInterface $mailer,
private ActionLogger $actionLogger, private ActionLogger $actionLogger,
private FollowUpService $followUpService private FollowUpService $followUpService
) {} )
{
}
#[Route('/propose-email/{email}/{type}/{id}', name: 'app_public_propose_email')] #[Route('/propose-email/{email}/{type}/{id}', name: 'app_public_propose_email')]
public function proposeEmail(string $email, string $type, int $id): Response public function proposeEmail(string $email, string $type, int $id): Response
@ -60,11 +61,11 @@ class PublicController extends AbstractController
$debug = ''; $debug = '';
if ($this->getParameter('kernel.environment') !== 'prod') { if ($this->getParameter('kernel.environment') !== 'prod') {
$debug = 'Bonjour, nous sommes des bénévoles d\'OpenStreetMap France et nous vous proposons de modifier les informations de votre commerce. Voici votre lien unique de modification: ' . $this->generateUrl('app_public_edit', [ $debug = 'Voici votre lien unique de modification: <a href="' . $this->generateUrl('app_public_edit', [
'zipcode' => $zipCode, 'zipcode' => $zipCode,
'name' => $place_name, 'name' => $place_name,
'uuid' => $existingPlace->getUuidForUrl() 'uuid' => $existingPlace->getUuidForUrl()
], true); ], true) . '">cliquez ici pour accéder au formulaire de modification</a>"';
} }
$this->addFlash('success', 'L\'email a été mis à jour. Un email vous sera envoyé avec le lien de modification. ' . $debug); $this->addFlash('success', 'L\'email a été mis à jour. Un email vous sera envoyé avec le lien de modification. ' . $debug);
@ -195,16 +196,26 @@ class PublicController extends AbstractController
$stats = $stats_exist; $stats = $stats_exist;
} else { } else {
$stats = new Stats(); $stats = new Stats();
$stats->setZone((string)$demande->getInsee()); $zipcode = (string)$demande->getInsee();
$stats->setZone($zipcode);
$place->setZipCode($zipcode);
$this->entityManager->persist($stats); $this->entityManager->persist($stats);
} }
$stats->addPlace($place); $stats->addPlace($place);
$place->setStats($stats); $place->setStats($stats);
} }
} }
} }
if (!$place->getUuidForUrl()) {
$place->setUuidForUrl(uniqid());
}
if (!$place->getZipCode()) {
$place->setZipCode("00000");
}
$this->entityManager->persist($demande); $this->entityManager->persist($demande);
$this->entityManager->flush(); $this->entityManager->flush();
@ -260,8 +271,8 @@ class PublicController extends AbstractController
'name' => $cityName, 'name' => $cityName,
'zone' => $stat->getZone(), 'zone' => $stat->getZone(),
'coordinates' => [ 'coordinates' => [
'lat' => (float) $stat->getLat(), 'lat' => (float)$stat->getLat(),
'lon' => (float) $stat->getLon() 'lon' => (float)$stat->getLon()
], ],
'placesCount' => $stat->getPlacesCount(), 'placesCount' => $stat->getPlacesCount(),
'completionPercent' => $stat->getCompletionPercent(), 'completionPercent' => $stat->getCompletionPercent(),
@ -317,8 +328,8 @@ class PublicController extends AbstractController
if (!empty($data) && isset($data[0]['lat']) && isset($data[0]['lon'])) { if (!empty($data) && isset($data[0]['lat']) && isset($data[0]['lon'])) {
error_log("DEBUG: Coordonnées trouvées pour $cityName ($inseeCode): " . $data[0]['lat'] . ", " . $data[0]['lon']); error_log("DEBUG: Coordonnées trouvées pour $cityName ($inseeCode): " . $data[0]['lat'] . ", " . $data[0]['lon']);
return [ return [
'lat' => (float) $data[0]['lat'], 'lat' => (float)$data[0]['lat'],
'lon' => (float) $data[0]['lon'] 'lon' => (float)$data[0]['lon']
]; ];
} else { } else {
error_log("DEBUG: Aucune coordonnée trouvée pour $cityName ($inseeCode)"); error_log("DEBUG: Aucune coordonnée trouvée pour $cityName ($inseeCode)");
@ -901,7 +912,7 @@ class PublicController extends AbstractController
if ($place) { if ($place) {
return $this->redirectToRoute('app_public_edit', [ return $this->redirectToRoute('app_public_edit', [
'zipcode' => $place->getZipCode(), 'zipcode' => $place->getZipCode(),
'name' => $place->getName() !== '' ? $place->getName() : '?', 'name' => $place->getName() ? $place->getName() : '?',
'uuid' => $place->getUuidForUrl() 'uuid' => $place->getUuidForUrl()
]); ]);
} else { } else {
@ -1115,7 +1126,7 @@ class PublicController extends AbstractController
// Trier les changements par date pour chaque thème // Trier les changements par date pour chaque thème
foreach ($themeChanges as &$changes) { foreach ($themeChanges as &$changes) {
usort($changes, function($a, $b) { usort($changes, function ($a, $b) {
return $b->getDate() <=> $a->getDate(); return $b->getDate() <=> $a->getDate();
}); });
} }

32
src/Entity/Place.php
View file

@ -7,6 +7,7 @@ use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\Collection;
use Doctrine\DBAL\Types\Types; use Doctrine\DBAL\Types\Types;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
// use App\Service\Motocultrice; // use App\Service\Motocultrice;
#[ORM\Entity(repositoryClass: PlaceRepository::class)] #[ORM\Entity(repositoryClass: PlaceRepository::class)]
class Place class Place
@ -95,11 +96,11 @@ class Place
private ?string $street = null; private ?string $street = null;
#[ORM\Column(length: 255, nullable: true, options: ['charset' #[ORM\Column(length: 255, nullable: true, options: ['charset'
=> 'utf8mb4'])] => 'utf8mb4'])]
private ?string $housenumber = null; private ?string $housenumber = null;
#[ORM\Column(length: 255, nullable: true, options: ['charset' #[ORM\Column(length: 255, nullable: true, options: ['charset'
=> 'utf8mb4'])] => 'utf8mb4'])]
private ?string $siret = null; private ?string $siret = null;
#[ORM\Column(nullable: true)] #[ORM\Column(nullable: true)]
@ -195,29 +196,32 @@ class Place
return round($filled_fields / $total_fields * 100); return round($filled_fields / $total_fields * 100);
} }
public function guess_main_tag(array $tags_converted) { public function guess_main_tag(array $tags_converted)
{
$main_tag = null; $main_tag = null;
if (isset($tags_converted['amenity']) && $tags_converted['amenity'] != '') { if (isset($tags_converted['amenity']) && $tags_converted['amenity'] != '') {
$main_tag = 'amenity='.$tags_converted['amenity']; $main_tag = 'amenity=' . $tags_converted['amenity'];
} }
if (isset($tags_converted['shop']) && $tags_converted['shop'] != '') { if (isset($tags_converted['shop']) && $tags_converted['shop'] != '') {
$main_tag = 'shop='.$tags_converted['shop']; $main_tag = 'shop=' . $tags_converted['shop'];
} }
if (isset($tags_converted['tourism']) && $tags_converted['tourism'] != '') { if (isset($tags_converted['tourism']) && $tags_converted['tourism'] != '') {
$main_tag = 'tourism='.$tags_converted['tourism']; $main_tag = 'tourism=' . $tags_converted['tourism'];
} }
if (isset($tags_converted['office']) && $tags_converted['office'] != '') { if (isset($tags_converted['office']) && $tags_converted['office'] != '') {
$main_tag = 'office='.$tags_converted['office']; $main_tag = 'office=' . $tags_converted['office'];
} }
if (isset($tags_converted['healthcare']) && $tags_converted['healthcare'] != '') { if (isset($tags_converted['healthcare']) && $tags_converted['healthcare'] != '') {
$main_tag = 'healthcare='.$tags_converted['healthcare']; $main_tag = 'healthcare=' . $tags_converted['healthcare'];
} }
return $main_tag; return $main_tag;
} }
/** /**
* mettre à jour le lieu selon les tags osm * mettre à jour le lieu selon les tags osm
*/ */
public function update_place_from_overpass_data(array $overpass_data) { public function update_place_from_overpass_data(array $overpass_data)
{
if (!isset($overpass_data['tags']) || $overpass_data['tags'] == null) { if (!isset($overpass_data['tags']) || $overpass_data['tags'] == null) {
return; return;
@ -228,8 +232,8 @@ class Place
// Setters for basic properties from top-level of overpass data // Setters for basic properties from top-level of overpass data
$this->setOsmId($overpass_data['id']) $this->setOsmId($overpass_data['id'])
->setOsmKind($overpass_data['type']) ->setOsmKind($overpass_data['type'])
->setLat((float) ($overpass_data['lat'] ?? 0)) ->setLat((float)($overpass_data['lat'] ?? 0))
->setLon((float) ($overpass_data['lon'] ?? 0)); ->setLon((float)($overpass_data['lon'] ?? 0));
// Setters for metadata // Setters for metadata
if (isset($overpass_data['timestamp'])) { if (isset($overpass_data['timestamp'])) {
@ -284,7 +288,7 @@ class Place
// has address logic // has address logic
$this->setHasAddress(!empty($this->getStreet()) && !empty($this->getHousenumber()) $this->setHasAddress(!empty($this->getStreet()) && !empty($this->getHousenumber())
| (isset($tags['addr:street']) && isset($tags['addr:housenumber'])) ); | (isset($tags['addr:street']) && isset($tags['addr:housenumber'])));
// has website logic (with multiple possible tags) // has website logic (with multiple possible tags)
$websiteTags = ['website', 'contact:website', 'url', 'contact:url']; $websiteTags = ['website', 'contact:website', 'url', 'contact:url'];
@ -319,6 +323,10 @@ class Place
public function __construct() public function __construct()
{ {
$this->setUuidForUrl(uniqid())
->setDead(false)
->setAskedHumainsSupport(false)
->setOptedOut(false);
$this->histories = new ArrayCollection(); $this->histories = new ArrayCollection();
} }

43
templates/public/edit.html.twig
View file

@ -21,7 +21,13 @@
{% if main_tag %} {% if main_tag %}
{{ tag_emoji(main_tag) }} {{ tag_emoji(main_tag) }}
{% endif %} {% endif %}
{{ commerce_overpass.tags_converted.name }} - {{ commerce.stats.name }} {% if commerce_overpass.tags_converted.name is defined %}
{{ commerce_overpass.tags_converted.name }}
{% endif %}
{% if commerce.stats.name is defined %}
- {{ commerce.stats.name }}
{% endif %}
</h1> </h1>
<div id="map" style="height: 400px; width: 100%;" class="rounded mb-4"></div> <div id="map" style="height: 400px; width: 100%;" class="rounded mb-4"></div>
@ -75,7 +81,9 @@
<div class="input-group"> <div class="input-group">
<input type="text" class="form-control" <input type="text" class="form-control"
data-important="true" data-important="true"
id="commerce_tag_value__contact:email" name="commerce_tag_value__contact:email" value="{{ commerce_overpass.tags_converted['contact:email'] ?? '' }}"> id="commerce_tag_value__contact:email"
name="commerce_tag_value__contact:email"
value="{{ commerce_overpass.tags_converted['contact:email'] ?? '' }}">
</div> </div>
</div> </div>
</div> </div>
@ -92,7 +100,9 @@
<div class="input-group"> <div class="input-group">
<input type="text" class="form-control" <input type="text" class="form-control"
data-important="true" data-important="true"
id="commerce_tag_value__contact:website" name="commerce_tag_value__contact:website" value="{{ commerce_overpass.tags_converted['contact:website'] ?? '' }}"> id="commerce_tag_value__contact:website"
name="commerce_tag_value__contact:website"
value="{{ commerce_overpass.tags_converted['contact:website'] ?? '' }}">
</div> </div>
</div> </div>
</div> </div>
@ -110,7 +120,8 @@
<div class="input-group"> <div class="input-group">
<input type="text" class="form-control" <input type="text" class="form-control"
data-important="true" data-important="true"
id="commerce_tag_value__contact:mastodon" name="commerce_tag_value__contact:mastodon" value=""> id="commerce_tag_value__contact:mastodon"
name="commerce_tag_value__contact:mastodon" value="">
</div> </div>
</div> </div>
</div> </div>
@ -185,16 +196,16 @@
{% include 'public/edit/tags.html.twig' %} {% include 'public/edit/tags.html.twig' %}
{# <div class="mb-4" id="previsualisation_tags">#} {# <div class="mb-4" id="previsualisation_tags"> #}
{# <h4>Prévisualisation des tags OSM (texte à copier-coller)</h4>#} {# <h4>Prévisualisation des tags OSM (texte à copier-coller)</h4> #}
{# {% set tags_for_textarea = {} %}#} {# {% set tags_for_textarea = {} %} #}
{# {% for k, v in commerce_overpass.tags_converted %}#} {# {% for k, v in commerce_overpass.tags_converted %} #}
{# {% if v is not empty %}#} {# {% if v is not empty %} #}
{# {% set tags_for_textarea = tags_for_textarea|merge({ (k): v }) %}#} {# {% set tags_for_textarea = tags_for_textarea|merge({ (k): v }) %} #}
{# {% endif %}#} {# {% endif %} #}
{# {% endfor %}#} {# {% endfor %} #}
{# {% include 'public/_tags_textarea.html.twig' with { 'tags': tags_for_textarea } %}#} {# {% include 'public/_tags_textarea.html.twig' with { 'tags': tags_for_textarea } %} #}
{# </div>#} {# </div> #}
<div id="validation_messages" class="alert alert-danger d-none"></div> <div id="validation_messages" class="alert alert-danger d-none"></div>
<div class="d-grid gap-2 d-md-flex justify-content-md-end mt-4"> <div class="d-grid gap-2 d-md-flex justify-content-md-end mt-4">
@ -462,7 +473,7 @@
const popoverTrigger = document.querySelector('.missing-fields-info'); const popoverTrigger = document.querySelector('.missing-fields-info');
if (popoverTrigger) { if (popoverTrigger) {
// Add click handler to focus on the first missing field // Add click handler to focus on the first missing field
popoverTrigger.addEventListener('click', function(e) { popoverTrigger.addEventListener('click', function (e) {
e.preventDefault(); // Prevent scrolling to top e.preventDefault(); // Prevent scrolling to top
// Find the first missing field from the list_inputs_good_to_fill // Find the first missing field from the list_inputs_good_to_fill
@ -479,7 +490,7 @@
// Focus on the first missing field // Focus on the first missing field
firstMissingField.focus(); firstMissingField.focus();
// Scroll to the field if needed // Scroll to the field if needed
firstMissingField.scrollIntoView({ behavior: 'smooth', block: 'center' }); firstMissingField.scrollIntoView({behavior: 'smooth', block: 'center'});
} }
}); });