diff --git a/php.ini b/php.ini index e7b8ad0..e9fa75b 100644 --- a/php.ini +++ b/php.ini @@ -1,4 +1,4 @@ upload_max_filesize = 40M post_max_size = 40M -memory_limit = 256M +memory_limit = 512M diff --git a/src/Controller/MapController.php b/src/Controller/MapController.php index ef3db85..e0fa418 100644 --- a/src/Controller/MapController.php +++ b/src/Controller/MapController.php @@ -14,7 +14,7 @@ class MapController extends AbstractController #[Route('/popup', name: 'app_map_popup')] public function popup(Request $request): Response { - // Grosso modo, on récuère les données de la feature correspondante + // Grosso modo, on récupère les données de la feature correspondante // Cf `assets/controllers/map_controller.js` $element = json_decode($request->query->get('element'), true); diff --git a/src/Controller/TaskController.php b/src/Controller/TaskController.php index ea0db01..9165e06 100644 --- a/src/Controller/TaskController.php +++ b/src/Controller/TaskController.php @@ -110,7 +110,7 @@ class TaskController extends AbstractController $josmCommands = [ // Charge l’imagerie (fond OSM par défaut) 'imagery' => [ - 'id' => $project->hasImagery() ? $project->getImagery() : 'osmfr', + (($project->hasImagery() and substr($project->getImagery(), 0, 4) === 'http') ? 'url' : 'id') => ($project->hasImagery() ? $project->getImagery() : 'osmfr'), ], ]; diff --git a/src/Form/CsvType.php b/src/Form/CsvType.php index 3701a11..de25cf5 100644 --- a/src/Form/CsvType.php +++ b/src/Form/CsvType.php @@ -17,7 +17,7 @@ class CsvType extends AbstractType 'label' => 'Fichier CSV', 'constraints' => [ new File([ - 'maxSize' => '10M', + 'maxSize' => '40M', 'mimeTypes' => [ 'text/csv', 'text/plain', diff --git a/src/Form/TaskType.php b/src/Form/TaskType.php index d45ff58..4153dda 100644 --- a/src/Form/TaskType.php +++ b/src/Form/TaskType.php @@ -30,6 +30,7 @@ class TaskType extends AbstractType 'required' => false, 'help_html' => true, 'help' => 'XML décrivant ce qu’il faut charger dans la feuille de données de JOSM (cf FR:OSM XML - OpenStreetMap Wiki)', + 'empty_data' => '', ]) ->add('status', TaskLifecycleType::class, [ 'label' => 'État', diff --git a/src/Service/OverpassClient.php b/src/Service/OverpassClient.php index 61d7fef..823a2a5 100644 --- a/src/Service/OverpassClient.php +++ b/src/Service/OverpassClient.php @@ -12,7 +12,7 @@ class OverpassClient ) { } - public function query($query, $prefix = '[out:json][timeout:25];', $suffix = 'out geom;') + public function query($query, $prefix = '[out:json][timeout:60];', $suffix = 'out geom;') { $response = $this->client->request('GET', 'https://overpass-api.de/api/interpreter', [ 'query' => [