Merge branch 'master' into ci/add-e2e-tests

Author: sanak

.gitignore

@@ -80,9 +80,6 @@ typings/
 .cache
 .DS_Store
 
-# Automatically generated version.ts
-/src/version.ts
-
 # Playwright
 /test-results/
 /playwright-report/

e2e/basic.spec.ts

@@ -53,5 +53,28 @@ test.describe('1. 基本的な地図表示', () => {
     await waitForMapLoad(page);
     expect(consoleErrors).toHaveLength(0);
   });
+
+  test('1.4 アトリビューションが表示されていること', async ({ page }) => {
+    await page.goto(`${TEST_URL}/basic.html`);
+    await waitForMapLoad(page);
+
+    // CustomAttributionControl は Shadow DOM 内にアトリビューションを描画する
+    const attributionText = await page.evaluate(() => {
+      const containers = document.querySelectorAll('.geolonia .maplibregl-control-container .maplibregl-ctrl-bottom-right > div');
+      for (const container of containers) {
+        const shadow = container.shadowRoot;
+        if (shadow) {
+          const inner = shadow.querySelector('.maplibregl-ctrl-attrib-inner');
+          if (inner) {
+            return inner.innerHTML;
+          }
+        }
+      }
+      return null;
+    });
+
+    expect(attributionText).not.toBeNull();
+    expect(attributionText).not.toBe('');
+  });
 });
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@geolonia/embed",
-  "version": "5.2.1",
+  "version": "5.2.2",
   "description": "Geolonia embed JS API",
   "main": "dist/embed.js",
   "types": "dist/src/embed.d.ts",
@@ -15,8 +15,6 @@
     }
   },
   "scripts": {
-    "prestart": "npm run build:version",
-    "prelint": "npm run build:version",
     "start": "MAP_PLATFORM_STAGE=v1 webpack serve --config ./docs/webpack.config.js",
     "build": "npm run build:version && npm run build:embed",
     "build:version": "node ./scripts/build-version.mjs",

package.json

@@ -311,11 +311,11 @@ class CustomAttributionControl implements IControl {
       this.styleId = stylesheet.id;
     }
 
-    const sourceCaches = this._map.style.sourceCaches;
-    for (const id in sourceCaches) {
-      const sourceCache = sourceCaches[id];
-      if (sourceCache.used || sourceCache.usedForTerrain) {
-        const source = sourceCache.getSource();
+    const tileManagers = this._map.style.tileManagers;
+    for (const id in tileManagers) {
+      const tileManager = tileManagers[id];
+      if (tileManager.used || tileManager.usedForTerrain) {
+        const source = tileManager.getSource();
         if (
           source.attribution &&
           attributions.indexOf(source.attribution) < 0

src/lib/CustomAttributionControl.ts

@@ -0,0 +1 @@
+export const VERSION = '5.2.1';