Add preload for initial fetch request

Author: rldhont

lizmap/modules/lizmap/lib/Project/Project.php

@@ -534,8 +534,27 @@ public function getWMSGetCapabilitiesUrl()
                 'repository' => $this->repository->getKey(),
                 'project' => $this->key,
                 'SERVICE' => 'WMS',
+                'REQUEST' => 'GetCapabilities',
                 'VERSION' => '1.3.0',
+            )
+        );
+    }
+
+    /**
+     * Get the WMS GetCapabilities Url.
+     *
+     * @return string
+     */
+    public function getWFSGetCapabilitiesUrl()
+    {
+        return $this->appContext->getFullUrl(
+            'lizmap~service:index',
+            array(
+                'repository' => $this->repository->getKey(),
+                'project' => $this->key,
+                'SERVICE' => 'WFS',
                 'REQUEST' => 'GetCapabilities',
+                'VERSION' => '1.0.0',
             )
         );
     }
@@ -553,8 +572,8 @@ public function getWMTSGetCapabilitiesUrl()
                 'repository' => $this->repository->getKey(),
                 'project' => $this->key,
                 'SERVICE' => 'WMTS',
-                'VERSION' => '1.0.0',
                 'REQUEST' => 'GetCapabilities',
+                'VERSION' => '1.0.0',
             )
         );
     }

lizmap/modules/view/controllers/lizMap.classic.php

@@ -213,6 +213,27 @@ public function index()
             'resourceUrlReplacement' => array(),
         );
 
+        // Add preload links
+        $rep->addPreloadLink(
+            jUrl::get(
+                'lizmap~service:getProjectConfig',
+                array('repository' => $repository, 'project' => $project),
+            ),
+            'fetch',
+            'application/json',
+        );
+        $rep->addPreloadLink(
+            jUrl::get(
+                'lizmap~service:getKeyValueConfig',
+                array('repository' => $repository, 'project' => $project),
+            ),
+            'fetch',
+            'application/json',
+        );
+        $rep->addPreloadLink($lproj->getWMSGetCapabilitiesUrl(), 'fetch', 'application/xml');
+        $rep->addPreloadLink($lproj->getWFSGetCapabilitiesUrl(), 'fetch', 'application/xml');
+        $rep->addPreloadLink($lproj->getWMTSGetCapabilitiesUrl(), 'fetch', 'application/xml');
+
         // Get optional WMS public url list
         $lser = lizmap::getServices();
         if ($lser->wmsPublicUrlList) {
@@ -316,6 +337,7 @@ function f($x)
             }
         }
 
+        // Add map theme
         $rep->addAssets('maptheme');
 
         // Add dockable css

tests/end2end/playwright/viewport.spec.js

@@ -27,10 +27,17 @@ test.describe('Viewport devicePixelRatio 1', () => {
 
         // Go to the map
         await gotoMap(url, page)
-        // Wait to let the config loaded
-        await page.waitForTimeout(1000);
         // Check that the get project config has been catched
-        expect(requests).toHaveLength(1);
+        // Preload and fetch
+        let timeCount = 0;
+        while (requests.length < 2) {
+            timeCount += 100;
+            if (timeCount > 1000) {
+                throw new Error('Timeout');
+            }
+            await page.waitForTimeout(100);
+        }
+        await expect(requests).toHaveLength(2);
 
         // Wait to let the JS build classes
         await page.waitForTimeout(1000);
@@ -97,10 +104,17 @@ test.describe('Viewport devicePixelRatio 2', () => {
 
         // Go to the map
         await gotoMap(url, page)
-        // Wait to let the config loaded
-        await page.waitForTimeout(1000);
         // Check that the get project config has been catched
-        expect(requests).toHaveLength(1);
+        // Preload and fetch
+        let timeCount = 0;
+        while (requests.length < 2) {
+            timeCount += 100;
+            if (timeCount > 1000) {
+                throw new Error('Timeout');
+            }
+            await page.waitForTimeout(100);
+        }
+        expect(requests).toHaveLength(2);
 
         // Wait to let the JS build classes
         await page.waitForTimeout(1000);