update to 5.7

.env

@@ -7,6 +7,6 @@ IMAGE_TAG=dev
 USER_ID=1000   # User ID used in the Docker containers
 GROUP_ID=1000  # Group ID used in the Docker containers
 
-NODE_TAG=10
+NODE_TAG=15
 COMPOSER_VERSION=2.6.5
 FPM_HOST="fpm:9000"
\ No newline at end of file

app/app/Http/Kernel.php

@@ -30,10 +30,10 @@ class Kernel extends HttpKernel
         'web' => [
             \App\Http\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
-            \Illuminate\Session\Middleware\StartSession::class,
+                // \Illuminate\Session\Middleware\StartSession::class,
                 // \Illuminate\Session\Middleware\AuthenticateSession::class,
-            \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-            \App\Http\Middleware\VerifyCsrfToken::class,
+                // \Illuminate\View\Middleware\ShareErrorsFromSession::class,
+                // \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
 

app/package.json

@@ -22,5 +22,8 @@
     "sass-loader": "^7.1.0",
     "vue": "^2.5.17",
     "vue-template-compiler": "^2.7.15"
+  },
+  "dependencies": {
+    "osrm-text-instructions": "^0.13.3"
   }
 }

app/public/mix-manifest.json

 {
-    "/js/modules.js": "/js/modules.js?id=c214da964ab4e8d87901",
-    "/../resources/assets/css/offline-module.css": "/../resources/assets/css/offline-module.css?id=b625751a39e93d3132b3",
-    "/js/lib.js": "/js/lib.js?id=68b329da9893e34099c7",
-    "/js/map-normal.js": "/js/map-normal.js?id=d41d8cd98f00b204e980",
-    "/js/map.js": "/js/map.js?id=68b329da9893e34099c7",
-    "/js/turf.min.js": "/js/turf.min.js?id=d41d8cd98f00b204e980",
-    "/css/staticPages.css": "/css/staticPages.css?id=d41d8cd98f00b204e980",
-    "/css/general.css": "/css/general.css?id=b625751a39e93d3132b3",
-    "/css/mapSearch.css": "/css/mapSearch.css?id=d41d8cd98f00b204e980",
-    "/css/iframeSearch.css": "/css/iframeSearch.css?id=d41d8cd98f00b204e980",
-    "/css/routing.css": "/css/routing.css?id=d41d8cd98f00b204e980"
+    "/js/modules.js": "/js/modules.js?id=d46f830c2a36b9d0ce70",
+    "/../resources/css/offline-module.css": "/../resources/css/offline-module.css?id=2e59f1c53d8b5bc08353",
+    "/js/lib.js": "/js/lib.js?id=5e13e04914a8734ddea7",
+    "/js/map-normal.js": "/js/map-normal.js?id=66c668920230437ad8cf",
+    "/js/map.js": "/js/map.js?id=43049f3d0d0441f15246",
+    "/js/turf.min.js": "/js/turf.min.js?id=859561c2951cc6bd635a",
+    "/css/staticPages.css": "/css/staticPages.css?id=74737c858d58797108ca",
+    "/css/general.css": "/css/general.css?id=787dbb34eea9bbfaa241",
+    "/css/mapSearch.css": "/css/mapSearch.css?id=ae0023b9d1214e22f2f2",
+    "/css/iframeSearch.css": "/css/iframeSearch.css?id=2ae301fe29e809c1cf6b",
+    "/css/routing.css": "/css/routing.css?id=014b091b4366ad8570c8"
 }

app/resources/js/app.js

-/**
- * First we will load all of this project's JavaScript dependencies which
- * includes Vue and other libraries. It is a great starting point when
- * building robust, powerful web applications using Vue and Laravel.
- */
-
-require("./bootstrap");
-
-window.Vue = require("vue");
-
-/**
- * The following block of code may be used to automatically register your
- * Vue components. It will recursively scan this directory for the Vue
- * components and automatically register them with their "basename".
- *
- * Eg. ./components/ExampleComponent.vue -> <example-component></example-component>
- */
-
-// const files = require.context('./', true, /\.vue$/i)
-// files.keys().map(key => Vue.component(key.split('/').pop().split('.')[0], files(key).default))
-
-Vue.component(
-  "example-component",
-  require("./components/ExampleComponent.vue").default
-);
-
-/**
- * Next, we will create a fresh Vue application instance and attach it to
- * the page. Then, you may begin adding components to this application
- * or customize the JavaScript scaffolding to fit your unique needs.
- */
-
-const app = new Vue({
-  el: "#app",
+var map = null;
+var mapTmp = null;
+$(document).ready(function () {
+  $(".inactive").hide();
+
+  // Check if the user called a URL with a location specified
+  var regexp = /\/map\/([^\/]+\/){0,1}([-|\d|\.|e]+),([-|\d|\.|e]+),([-|\d|\.|e]+)$/;
+  var url = document.location.href;
+  var result = url.match(regexp);
+  var query = undefined;
+  var waypoints = undefined;
+  var vehicle = undefined;
+  if (result != null) {
+    // Check if the current url points to a search, or a position to show on the map
+    query = result[1];
+    if (typeof query != "undefined" && query.length > 0) {
+      query = decodeURIComponent(query.replace(/\+/g, ' '));
+    }
+
+    var initPos = [parseFloat(result[2]), parseFloat(result[3])];
+    var initZoom = parseFloat(result[4]);
+
+    map = new InteractiveMap(initPos[0], initPos[1], initZoom, false);
+  } else {
+    // Check if the current url points to a route calculation
+    regexp = /\/route\/start\/(car|bicycle|foot)\/([^\/]+)$/;
+    result = url.match(regexp);
+    if (result != null) {
+      vehicle = result[1];
+      waypoints = [];
+      var points = result[2];
+      // Validate the Waypoints
+      regexp = /(gps|[-]{0,1}\d+\.\d+,[-]{0,1}\d+\.\d+)/gi;
+      result = points.match(regexp);
+      if (result) {
+        result.forEach(value => {
+          var waypoint;
+          if (value == "gps") {
+            waypoints.push(["gps"]);
+          } else {
+            var newWaypoint = value.split(",");
+            newWaypoint = [
+              parseFloat(newWaypoint[0]),
+              parseFloat(newWaypoint[1])
+            ];
+            // Check if the new Waypoint is within valid bounds
+            waypoints.push(newWaypoint);
+          }
+        });
+        if (waypoints.length == 0) {
+          // Fallback if no valid waypoints given
+          vehicle = undefined;
+          waypoints = undefined;
+          map = new InteractiveMap();
+        } else {
+          // Valid Route given as argument
+          var minPoint = undefined;
+          var maxPoint = undefined;
+
+          $.each(waypoints, (index, value) => {
+            if (value[0] != "gps") {
+              if (minPoint == undefined) {
+                minPoint = [value[0], value[1]];
+              }
+              if (maxPoint == undefined) {
+                maxPoint = [value[0], value[1]];
+              }
+              minPoint[0] = minPoint[0] > value[0] ? value[0] : minPoint[0];
+              minPoint[1] = minPoint[1] > value[1] ? value[1] : minPoint[1];
+              maxPoint[0] = maxPoint[0] < value[0] ? value[0] : maxPoint[0];
+              maxPoint[1] = maxPoint[1] < value[1] ? value[1] : maxPoint[1];
+            }
+          });
+          if (minPoint == undefined || maxPoint == undefined) {
+            map = new InteractiveMap(undefined, undefined, 6, true);
+          } else {
+            var medianPoint = [
+              minPoint[0] + (maxPoint[0] - minPoint[0]) / 2.0,
+              minPoint[1] + (maxPoint[1] - minPoint[1]) / 2.0
+            ];
+            map = new InteractiveMap(medianPoint[0], medianPoint[1], 6, false);
+          }
+        }
+      }
+    } else {
+      map = new InteractiveMap();
+    }
+  }
+
+  var height =
+    typeof window.outerHeight != "undefined"
+      ? Math.max(window.outerHeight, $(window).height())
+      : $(window).height();
+
+  $("div.map").css("max-height", height);
+  $("body").css("max-height", height);
+  $("body").css("overflow", "hidden");
+
+  // Start the correct module now:
+  if (query != undefined) {
+    query = query.replace(/\/+$/, "");
+    map.switchModule("search", query);
+    query = undefined;
+  } else if (waypoints != undefined && vehicle != undefined) {
+    map.switchModule("route-finding", {
+      waypoints: waypoints,
+      vehicle: vehicle
+    });
+  } else map.switchModule("search");
+
+  if (
+    typeof android != "undefined" &&
+    typeof android.pageFinished == "function"
+  )
+    android.pageFinished();
 });

build/node/Dockerfile

-ARG NODE_TAG=10
+ARG NODE_TAG
 FROM node:${NODE_TAG}
 
 ARG USER_ID=1000

docker-compose.yml

@@ -40,6 +40,7 @@ services:
       args:
         USER: ${USER_ID}
         GROUP: ${GROUP_ID}
+        NODE_TAG: ${NODE_TAG}
     volumes:
       - ./app:/app
       - npm-cache:/home/mgmaps/.npm