Fix attribution control bug (#85)

maptiler · Apr 25, 2024 · d3aed49 · d3aed49
1 parent e565ccb
commit d3aed49
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@
 ### Bug Fixes
 ### Others
 
+## 2.0.3
+### Bug Fixes
+- Fixed issue in attribution control
+
 ## 2.0.2
 ### Bug Fixes
 - Fix for the client-side caching breaking GeoJSON sources [#82](https://github.com/maptiler/maptiler-sdk-js/pull/82)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@maptiler/sdk",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "The Javascript & TypeScript map SDK tailored for MapTiler Cloud",
   "module": "dist/maptiler-sdk.mjs",
   "types": "dist/maptiler-sdk.d.ts",

diff --git a/src/Map.ts b/src/Map.ts
@@ -18,6 +18,7 @@ import type {
   StyleSetterOptions,
   ExpressionSpecification,
   SymbolLayerSpecification,
+  AttributionControlOptions,
 } from "maplibre-gl";
 import { ReferenceMapStyle, MapStyleVariant } from "@maptiler/client";
 import { config, MAPTILER_SESSION_ID, SdkConfig } from "./config";
@@ -35,7 +36,6 @@ import { MaptilerTerrainControl } from "./MaptilerTerrainControl";
 import { MaptilerNavigationControl } from "./MaptilerNavigationControl";
 import { geolocation } from "@maptiler/client";
 import { MaptilerGeolocateControl } from "./MaptilerGeolocateControl";
-import { AttributionControl } from "./MLAdapters/AttributionControl";
 import { ScaleControl } from "./MLAdapters/ScaleControl";
 import { FullscreenControl } from "./MLAdapters/FullscreenControl";
 
@@ -205,13 +205,32 @@ export class Map extends maplibregl.Map {
       );
     }
 
+    // default attribution control options
+    let attributionControlOptions = {
+      compact: false,
+    } as AttributionControlOptions;
+    if (options.customAttribution) {
+      attributionControlOptions.customAttribution = options.customAttribution;
+    } else if (
+      options.attributionControl &&
+      typeof options.attributionControl === "object"
+    ) {
+      attributionControlOptions = {
+        ...attributionControlOptions,
+        ...options.attributionControl,
+      };
+    }
+
     // calling the map constructor with full length style
     super({
       ...options,
       style,
       maplibreLogo: false,
       transformRequest: combineTransformRequest(options.transformRequest),
-      ...(options.attributionControl ?? { attributionControl: false }),
+      attributionControl:
+        options.forceNoAttributionControl === true
+          ? false
+          : attributionControlOptions,
     });
 
     if (config.caching) {
@@ -377,15 +396,6 @@ export class Map extends maplibregl.Map {
             new MaptilerLogoControl({ logoURL }),
             options.logoPosition,
           );
-
-          // if attribution in option is `false` or not provided, but the the logo shows up in the tileJson, then the attribution must show anyways
-          if (!options.attributionControl) {
-            this.addControl(
-              new AttributionControl({
-                customAttribution: options.customAttribution,
-              }),
-            );
-          }
         } else if (options.maptilerLogo) {
           this.addControl(new MaptilerLogoControl(), options.logoPosition);
         }