From: Raphaël Gertz <git@rapsys.eu>
Date: Fri, 13 Jan 2023 02:14:26 +0000 (+0100)
Subject: Force jpeg format route parameter
X-Git-Tag: 0.2.3
X-Git-Url: https://git.rapsys.eu/packbundle/commitdiff_plain/13cd82c5bac6da8f00d01709d5f1d6925aa8a887

Force jpeg format route parameter
---

diff --git a/Resources/config/routes/rapsys_pack.yaml b/Resources/config/routes/rapsys_pack.yaml
index c9ad80a..72d3a27 100644
--- a/Resources/config/routes/rapsys_pack.yaml
+++ b/Resources/config/routes/rapsys_pack.yaml
@@ -1,24 +1,26 @@
 #Routes configuration
 rapsys_pack_captcha:
-    path: '/captcha/{hash<[a-zA-Z0-9=_-]+>}/{updated<\d+>}/{equation<[a-zA-Z0-9=_-]+>}/{width<\d+>?120}/{height<\d+>?36}.{_format?jpeg}'
+    path: '/captcha/{hash<[a-zA-Z0-9=_-]+>}/{updated<\d+>}/{equation<[a-zA-Z0-9=_-]+>}/{width<\d+>?120}/{height<\d+>?36}.{!_format?jpeg}'
     controller: Rapsys\PackBundle\Controller\ImageController::captcha
     methods: GET
 
+#TODO: replace this url with a redirection route ???
+#XXX: we don't need the mtime, maybe we can drop it in this redirect instead of apache ?
 rapsys_pack_facebook:
     path: '/bundles/rapsyspack/facebook/{mtime<\d+>}{path</.*>}.{!_format?jpeg}'
     methods: GET
 
 rapsys_pack_map:
-    path: '/map/{hash<[a-zA-Z0-9=_-]+>}/{updated<\d+>}/{latitude<\d+(\.?\d+)?>}/{longitude<\d+(\.?\d+)?>}/{zoom<\d+>?17}/{width<\d+>?640}/{height<\d+>?640}.{_format?jpeg}'
+    path: '/map/{hash<[a-zA-Z0-9=_-]+>}/{updated<\d+>}/{latitude<\d+(\.?\d+)?>}/{longitude<\d+(\.?\d+)?>}/{zoom<\d+>?17}/{width<\d+>?640}/{height<\d+>?640}.{!_format?jpeg}'
     controller: Rapsys\PackBundle\Controller\MapController::map
     methods: GET
 
 rapsys_pack_multimap:
-    path: '/multimap/{hash<[a-zA-Z0-9=_-]+>}/{updated<\d+>}/{latitude<\d+(\.?\d+)?>}/{longitude<\d+(\.?\d+)?>}/{coordinates<\d+(\.\d+)?,\d+(\.\d+)?(-\d+(\.\d+)?,\d+(\.\d+)?)*>}/{zoom<\d+>?15}/{width<\d+>?640}/{height<\d+>?640}.{_format?jpeg}'
+    path: '/multimap/{hash<[a-zA-Z0-9=_-]+>}/{updated<\d+>}/{latitude<\d+(\.?\d+)?>}/{longitude<\d+(\.?\d+)?>}/{coordinates<(?:\d+(\.\d+)?,\d+(\.\d+)?(-\d+(\.\d+)?,\d+(\.\d+)?)*)?>}/{zoom<\d+>?15}/{width<\d+>?640}/{height<\d+>?640}.{!_format?jpeg}'
     controller: Rapsys\PackBundle\Controller\MapController::multimap
     methods: GET
 
 rapsys_pack_thumb:
-    path: '/thumb/{hash<[a-zA-Z0-9=_-]+>}/{updated<\d+>}/{path<[a-zA-Z0-9=_-]+>}/{width<\d+>?640}/{height<\d+>?640}.{_format?jpeg}'
+    path: '/thumb/{hash<[a-zA-Z0-9=_-]+>}/{updated<\d+>}/{path<[a-zA-Z0-9=_-]+>}/{width<\d+>?640}/{height<\d+>?640}.{!_format?jpeg}'
     controller: Rapsys\PackBundle\Controller\ImageController::thumb
     methods: GET