Revert "fix: add Stadia tile proxy with caching and theme attribution fixes (#88)"

This reverts commit 5ccca6f.

Author: fityannugroho

.env.example

@@ -12,16 +12,3 @@ NEXT_PUBLIC_DATA_SOURCE_PAGINATION_MAX_PAGE_SIZE=100
 
 # Default page size for pagination
 NEXT_PUBLIC_DATA_SOURCE_PAGINATION_DEFAULT_PAGE_SIZE=10
-
-# Enable Stadia tile proxy (recommended for local development to avoid strict rate limits)
-# 1 = enable
-NEXT_PUBLIC_STADIA_TILE_PROXY=0
-
-# Stadia Maps API key (only used by the proxy route)
-STADIA_API_KEY=
-
-# Tile proxy cache max-age in seconds (0 = disable cache)
-TILE_CACHE_MAX_AGE=86400
-
-# Tile proxy stale-while-revalidate in seconds
-TILE_CACHE_STALE_WHILE_REVALIDATE=604800

app/api/stadia-tiles/[...path]/route.ts

@@ -27,7 +27,6 @@ export const metadata: Metadata = {
     default: config.appName,
   },
   description,
-  referrer: 'strict-origin-when-cross-origin',
   robots: {
     index: true,
     follow: true,

app/layout.tsx

@@ -4,117 +4,31 @@ import { useTheme } from 'next-themes'
 import { useEffect, useRef } from 'react'
 import { useMap } from 'react-leaflet'
 
-function getAttributions(style: unknown) {
-  if (!style || typeof style !== 'object') return []
-
-  const sources = (style as { sources?: Record<string, unknown> }).sources
-  if (!sources || typeof sources !== 'object') return []
-
-  const attributions = new Set<string>()
-  for (const source of Object.values(sources)) {
-    if (!source || typeof source !== 'object') continue
-    const attribution = (source as { attribution?: unknown }).attribution
-    if (typeof attribution === 'string' && attribution.trim()) {
-      attributions.add(attribution)
-    }
-  }
-
-  return Array.from(attributions)
-}
-
-function getMapStyle(style: unknown) {
-  if (process.env.NEXT_PUBLIC_STADIA_TILE_PROXY !== '1') return style
-  if (!style || typeof style !== 'object') return style
-
-  const sources = (style as { sources?: Record<string, unknown> }).sources
-  if (!sources || typeof sources !== 'object') return style
-
-  for (const source of Object.values(sources)) {
-    if (!source || typeof source !== 'object') continue
-
-    const tiles = (source as { tiles?: unknown }).tiles
-    if (!Array.isArray(tiles)) continue
-
-    ;(source as { tiles: string[] }).tiles = tiles.map((tile) =>
-      typeof tile === 'string' &&
-      tile.startsWith('https://tiles.stadiamaps.com/tiles/')
-        ? tile.replace(
-            'https://tiles.stadiamaps.com/tiles/',
-            '/api/stadia-tiles/',
-          )
-        : (tile as string),
-    )
-  }
-
-  return style
-}
-
-async function waitForMaplibreMap(layer: L.MaplibreGL, signal: AbortSignal) {
-  for (let attempt = 0; attempt < 20; attempt++) {
-    if (signal.aborted) return null
-    const maplibreMap = layer.getMaplibreMap()
-    if (maplibreMap) return maplibreMap
-    await new Promise((resolve) => setTimeout(resolve, 50))
-  }
-  return null
-}
-
 export default function TileLayer() {
   const map = useMap()
   const { resolvedTheme } = useTheme()
-  const glRef = useRef<L.MaplibreGL | null>(null)
-  const attributionRef = useRef<string[]>([])
+  const glRef = useRef<L.MaplibreGL>(
+    L.maplibreGL({
+      style: `/map-styles/${resolvedTheme}.json`,
+    }),
+  )
 
   useEffect(() => {
-    map.attributionControl.setPrefix(
-      '<a href="https://leafletjs.com">Leaflet</a>',
-    )
-  }, [map])
+    const maplibreMap = glRef.current.getMaplibreMap()
 
-  useEffect(() => {
-    if (!resolvedTheme) return
+    if (!maplibreMap) {
+      glRef.current.addTo(map)
 
-    const controller = new AbortController()
-    const styleUrl = `/map-styles/${resolvedTheme}.json`
+      map.attributionControl.setPrefix(
+        '<a href="https://leafletjs.com">Leaflet</a>',
+      )
 
-    const applyStyle = async () => {
-      try {
-        const response = await fetch(styleUrl, { signal: controller.signal })
-        if (!response.ok) return
-
-        const style = getMapStyle(await response.json())
-        if (controller.signal.aborted) return
-
-        if (glRef.current) {
-          glRef.current.removeFrom(map)
-          glRef.current = null
-        }
-        if (map.attributionControl) {
-          for (const attribution of attributionRef.current) {
-            map.attributionControl.removeAttribution(attribution)
-          }
-        }
-        attributionRef.current = getAttributions(style)
-
-        glRef.current = L.maplibreGL({
-          style: style as never,
-        })
-        glRef.current.addTo(map)
-
-        await waitForMaplibreMap(
-          glRef.current as L.MaplibreGL,
-          controller.signal,
-        )
-      } catch (error) {
-        if ((error as Error).name === 'AbortError') return
-        throw error
-      }
+      return
     }
 
-    applyStyle()
-
-    return () => controller.abort()
-  }, [resolvedTheme, map])
+    // Update the style when the theme changes
+    maplibreMap.setStyle(`/map-styles/${resolvedTheme}.json`)
+  }, [map, resolvedTheme])
 
   return null
 }

components/TileLayer.tsx

@@ -1,18 +1,4 @@
 /** @type {import('next').NextConfig} */
-const nextConfig = {
-  async headers() {
-    return [
-      {
-        source: '/:path*',
-        headers: [
-          {
-            key: 'Referrer-Policy',
-            value: 'strict-origin-when-cross-origin',
-          },
-        ],
-      },
-    ]
-  },
-}
+const nextConfig = {}
 
 module.exports = nextConfig