conflicts resolution

.github/workflows/deploy.yml

@@ -3,7 +3,7 @@ name: Deploy to Container
 on:
   push:
     branches:
-      - 17_schedule_and_swagger
+      - 24_correction_coord
       - main
       - dev
 
@@ -26,4 +26,4 @@ jobs:
         chmod 600 ~/.ssh/pkey
         eval "$(ssh-agent -s)"
         ssh-add ~/.ssh/pkey
-        ssh ${{ secrets.SECRET_USER }}@${{ secrets.SECRET_HOST }} -p ${{ secrets.SECRET_PORT }} "cd ./project/Swissdle && git pull origin main && cd backend-laravel && composer install && php artisan vendor:publish --provider "L5Swagger\L5SwaggerServiceProvider" && cd ../frontend-vue && npm install && npm run build && (crontab -l && crontab -r) || echo '* * * * * cd /home/laravel/project/Swissdle/backend-laravel && /usr/local/bin/php artisan schedule:run >> /home/laravel/project/Swissdle/cron.log' | crontab"
+        ssh ${{ secrets.SECRET_USER }}@${{ secrets.SECRET_HOST }} -p ${{ secrets.SECRET_PORT }} "cd ./project/Swissdle && git pull origin main && cd backend-laravel && php artisan db:wipe --force && php artisan migrate --force && php artisan db:seed --force && composer install && php artisan vendor:publish --provider "L5Swagger\L5SwaggerServiceProvider" && cd ../frontend-vue && npm install && npm run build && (crontab -l && crontab -r) || echo '* * * * * cd /home/laravel/project/Swissdle/backend-laravel && /usr/local/bin/php artisan schedule:run >> /home/laravel/project/Swissdle/cron.log' | crontab"

backend-laravel/database/data/transform_coordinates.py

@@ -0,0 +1,22 @@
+import json
+
+from pyproj import Proj, transform
+
+lv95 = Proj(init='epsg:2056')  # LV95
+wgs84 = Proj(init='epsg:4326')  # WGS84
+
+with open('wrong_coord_format_swissdle_data.json', 'r', encoding='utf-8') as file:
+    data = json.load(file)
+
+    for city in data:
+        e = city['E']
+        n = city['N']
+
+        lon, lat = transform(lv95, wgs84, e, n)
+
+        city['E'] = lon
+        city['N'] = lat
+
+    with open('swissdle_data.json', 'w', encoding='utf-8') as file:
+        json.dump(data, file, ensure_ascii=False, indent=4)
+