Add support for dotted gps coordinates

Add rapsys_pack_captcha route
Add rapsys_pack_thumb route

diff --git a/Resources/config/routes/rapsys_pack.yaml b/Resources/config/routes/rapsys_pack.yaml
index 77f8030b1e47b5f281e74c5674c63de5d51b0586..38c9620b57cfbf5412b955ee9aa2e50835046cbb 100644 (file)
--- a/Resources/config/routes/rapsys_pack.yaml
+++ b/Resources/config/routes/rapsys_pack.yaml
@@ -1,10 +1,20 @@
 #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}'
+    controller: Rapsys\PackBundle\Controller\ImageController::captcha
+    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}'
+    controller: Rapsys\PackBundle\Controller\ImageController::thumb
+    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