Fix attribution and maplibre css

Author: jboolean

frontend/src/screens/App/screens/MapPane/components/MainMap/MapLibreMap.tsx

@@ -43,11 +43,12 @@ class MapLibreMap
         [-73.70027209999999, 40.9175771], // NE
       ],
       hash: true,
+      attributionControl: {
+        compact: false,
+      },
     });
     this.map = map;
 
-    map.addControl(new maplibregl.AttributionControl());
-
     map.on('click', PHOTO_LAYER, (e) => {
       const { panOnClick } = this.props;
       if (panOnClick) map.panTo(e.lngLat);

frontend/src/screens/App/screens/ToteBag/components/Back.tsx

@@ -13,14 +13,16 @@ export default function ToteBag(): JSX.Element {
     if (!container) return;
 
     const attributionEl = container.querySelector(
-      '.mapboxgl-ctrl-attrib-inner'
+      '.mapboxgl-ctrl-attrib-inner,.maplibregl-ctrl-attrib-inner'
     );
     if (!attributionEl) return;
 
     const observer = new MutationObserver(() => {
       const text = (attributionEl as HTMLElement).innerText;
       const improveText =
-        attributionEl.querySelector('.mapbox-improve-map')?.textContent || '';
+        attributionEl.querySelector(
+          '.mapbox-improve-map,.maplibregl-improve-map'
+        )?.textContent || '';
 
       if (text) {
         setAttributionText(text.replace(improveText, ''));

frontend/webpack.common.js

@@ -45,6 +45,7 @@ module.exports = {
       },
       {
         test: /\.(css|less)$/,
+        exclude: /node_modules/,
         use: [
           MiniCssExtractPlugin.loader,
           {
@@ -60,6 +61,21 @@ module.exports = {
           'less-loader',
         ],
       },
+      {
+        test: /\.css$/,
+        include: /node_modules/,
+        use: [
+          MiniCssExtractPlugin.loader,
+          {
+            loader: 'css-loader',
+            options: {
+              modules: false,
+              importLoaders: 1,
+            },
+          },
+          'postcss-loader',
+        ],
+      },
       {
         test: /\.(png|jpg|gif|svg|style\.json)$/,
         type: 'asset/resource',