Merge branch 'main' of https://github.com/UW-Macrostrat/web

* 'main' of https://github.com/UW-Macrostrat/web:
  Improve raster tiling examples

Author: davenquinn

pages/dev/map/layers/@layer/+data.ts

@@ -5,6 +5,7 @@ import {
   MacrostratVectorTileset,
 } from "~/_utils/map-layers";
 import { render } from "vike/abort";
+import { tileserverDomain } from "@macrostrat-web/settings";
 
 export async function data(pageContext: PageContextServer) {
   const config = useConfig();
@@ -66,10 +67,16 @@ const layerIndex: LayerInfo[] = [
   },
   {
     slug: "carto-raster",
-    tileset: MacrostratRasterTileset.Carto,
+    tileset: tileserverDomain + "/legacy/carto/{z}/{x}/{y}.png", //?cache=bypass",
     type: "raster",
     title: "Carto (raster)",
   },
+  {
+    slug: "carto-raster-v1",
+    tileset: "https://tiles.macrostrat.org/carto/{z}/{x}/{y}.png",
+    type: "raster",
+    title: "Carto (raster, v1)",
+  },
   {
     slug: "emphasized",
     tileset: MacrostratRasterTileset.Emphasized,

pages/dev/map/layers/index/+Page.ts

@@ -12,6 +12,7 @@ export function Page() {
       h(LinkItem, { to: "carto-v1" }, "Carto (v1)"),
       h(LinkItem, { to: "carto-slim-v1" }, "Carto (slim, v1)"),
       h(LinkItem, { to: "carto-raster" }, "Carto (image)"),
+      h(LinkItem, { to: "carto-raster-v1" }, "Carto (image, v1)"),
       h(LinkItem, { to: "emphasized" }, "Carto (image, emphasized)"),
       h(LinkItem, { to: "all-maps" }, "All maps"),
     ]),

src/_utils/map-layers.client.ts

@@ -78,11 +78,12 @@ export function LineSymbolManager({ showLineSymbols }) {
   return null;
 }
 
-export function buildRasterStyle(layer: MacrostratRasterTileset) {
-  const tileDomain = "https://tiles.macrostrat.org";
-
-  let tileURL = tileDomain + `/${layer}/{z}/{x}/{y}.png`;
-
+export function buildRasterStyle(layer: MacrostratRasterTileset | string) {
+  let tileURL = layer;
+  if (!tileURL.startsWith("http")) {
+    const tileDomain = "https://tiles.macrostrat.org";
+    tileURL = tileDomain + `/${layer}/{z}/{x}/{y}.png`;
+  }
   // if (layer == MacrostratRasterTileset.Emphasized) {
   //   tileURL = `https://next.macrostrat.org/tiles/tiles/carto/{z}/{x}/{y}.png`;
   // }

vite.config.ts

@@ -113,6 +113,9 @@ export default defineConfig({
     CESIUM_BASE_URL: JSON.stringify("/cesium"),
     // If not building for server context
   },
+  server: {
+    allowedHosts: ["localhost", "dev.macrostrat.local"],
+  },
   ssr: {
     noExternal: [
       /** All dependencies that cannot be bundled on the server (e.g., due to CSS imports)