better config

Author: Zulko

src/config.js

@@ -1,9 +1,11 @@
 <script>
   import { onMount, onDestroy } from "svelte";
-  import L, { marker } from "leaflet";
+  import L from "leaflet";
   import "leaflet/dist/leaflet.css";
   import { createEventDispatcher } from "svelte";
-  import { rootUrl } from "../config";
+
+  const basePath = import.meta.env.BASE_URL;
+  console.log("basePath", basePath);
 
   // Props
   export let markers = [];
@@ -65,7 +67,7 @@
     return `
     <div class="map-marker marker-display-${marker.displayClass}" >
         <div class="marker-icon-circle">
-          <img src="${rootUrl}/icons/${icon}.svg">
+          <img src="${basePath}icons/${icon}.svg">
         </div>
         <div class="marker-text-container">
           <div class="marker-text marker-text-outline">${label}</div>

src/lib/Map.svelte

@@ -1,5 +1,4 @@
 <script>
-  import { fade } from "svelte/transition";
   import SlidingPaneHeader from "./SlidingPaneHeader.svelte";
 
   // Props

src/lib/SlidingPane.svelte

@@ -1,5 +1,5 @@
 <script>
-  import { rootUrl } from "../config";
+  const basePath = import.meta.env.BASE_URL;
   // Props
   export let title = "";
   export let expanded = false;
@@ -31,8 +31,8 @@
     >
       <img
         src={expanded
-          ? `${rootUrl}/icons/shrink.svg`
-          : `${rootUrl}/icons/expand.svg`}
+          ? `${basePath}icons/shrink.svg`
+          : `${basePath}icons/expand.svg`}
         alt={expanded ? "Shrink pane" : "Expand pane"}
         class="icon"
       />
@@ -47,8 +47,8 @@
     >
       <img
         src={expanded
-          ? `${rootUrl}/icons/shrink.svg`
-          : `${rootUrl}/icons/expand-vertical.svg`}
+          ? `${basePath}icons/shrink.svg`
+          : `${basePath}icons/expand-vertical.svg`}
         alt={expanded ? "Shrink pane" : "Expand pane"}
         class="icon"
       />

src/lib/SlidingPaneHeader.svelte

@@ -1,7 +1,6 @@
 import Loki from 'lokijs';
 import ngeohash from 'ngeohash'; // Import ngeohash for better performance
-import { rootUrl } from '../config'; // Import rootUrl from config file
-
+const basePath = import.meta.env.BASE_URL;
 // Initialize a LokiJS database
 
 const ingestedFiles = [];
@@ -160,7 +159,7 @@ export async function getGeoEntriesInBounds({minLat, maxLat, minLon, maxLon}) {
   if (geohashes_1.length > 3) {
     if (!ingestedFiles.includes("geodata/geo3_unique.csv.gz")) {
       // Use consistent path format
-      const fileUrl = rootUrl + "/geodata/geo3_unique.csv.gz";
+      const fileUrl = `${basePath}geodata/geo3_unique.csv.gz`;
       try {
         const rows = await loadCsvGzFile(fileUrl);
         addLatLonToRows(rows);
@@ -191,7 +190,7 @@ export async function getGeoEntriesInBounds({minLat, maxLat, minLon, maxLon}) {
 
       // Load all files in parallel but collect results before inserting
       const loadResults = await Promise.all(needDownload.map(async (g) => {
-        const url = rootUrl + `/geodata/${g}.csv.gz`;
+        const url = `${basePath}geodata/${g}.csv.gz`;
         try {
           const rows = await loadCsvGzFile(url);
           ingestedFiles.push(url);