Merge pull request #5515 from 3liz/backport-5384-to-release_3_9

[Backport release_3_9] Google maptile add Terrain layer

Author: Gustry

assets/src/modules/config/BaseLayer.js

@@ -803,6 +803,13 @@ const QMSExternalLayer = {
         "title": "Google Satellite",
         "mapType": "satellite",
         "key":""
+    },
+    "google-terrain": {
+        "type" :"google",
+        "title": "Google Terrain",
+        "mapType": "terrain",
+        "key":""
+
     }
 }
 
@@ -903,9 +910,13 @@ export class BaseLayersConfig {
                                     // roads
                                     extendedCfg[layerTreeItem.name] = structuredClone(QMSExternalLayer["google-streets"])
                                 } else if (externalUrl.includes('lyrs=s')){
-                                    // fallback on satellite map
+                                    // satellite map
                                     extendedCfg[layerTreeItem.name] = structuredClone(QMSExternalLayer["google-satellite"])
+                                } else if (externalUrl.includes('lyrs=p') || externalUrl.includes('lyrs=t')){
+                                    // terrain
+                                    extendedCfg[layerTreeItem.name] = structuredClone(QMSExternalLayer["google-terrain"])
                                 } else {
+                                    // Fallback to google-streets
                                     extendedCfg[layerTreeItem.name] = structuredClone(QMSExternalLayer["google-streets"])
                                 }
                                 // add the apikey to the configuration

tests/end2end/playwright/google-basemap.spec.js

@@ -25,15 +25,16 @@ test.describe('Google Maps Baselayers', () => {
         await gotoMap(url, page);
 
         // there are three Google base layers in the project, so the expected number of failing requests is three
-        expect(initGoogleRequestsCount).toBe(3);
+        expect(initGoogleRequestsCount).toBe(4);
         // baselayers group should be visible...
         await expect(page.locator('#switcher-baselayer')).toBeVisible();
 
         //.. and should contain the three Google base layers (not loaded)
         let options = page.locator('#switcher-baselayer').getByRole('combobox').locator('option');
-        await expect(options).toHaveCount(3);
+        await expect(options).toHaveCount(4);
         expect(await options.nth(0).getAttribute('value')).toBe('Google Streets');
         expect(await options.nth(1).getAttribute('value')).toBe('Google Satellite');
         expect(await options.nth(2).getAttribute('value')).toBe('Google Hybrid');
+        expect(await options.nth(3).getAttribute('value')).toBe('Google Terrain');
     });
 });