Merge branch 'main' into lex-updates

Author: davidsklar99

content/.obsidian/core-plugins.json

@@ -1,20 +1,31 @@
-[
-  "file-explorer",
-  "global-search",
-  "switcher",
-  "graph",
-  "backlink",
-  "canvas",
-  "outgoing-link",
-  "tag-pane",
-  "page-preview",
-  "daily-notes",
-  "templates",
-  "note-composer",
-  "command-palette",
-  "editor-status",
-  "bookmarks",
-  "outline",
-  "word-count",
-  "file-recovery"
-]
+{
+  "file-explorer": true,
+  "global-search": true,
+  "switcher": true,
+  "graph": true,
+  "backlink": true,
+  "canvas": true,
+  "outgoing-link": true,
+  "tag-pane": true,
+  "properties": false,
+  "page-preview": true,
+  "daily-notes": true,
+  "templates": true,
+  "note-composer": true,
+  "command-palette": true,
+  "slash-command": false,
+  "editor-status": true,
+  "bookmarks": true,
+  "markdown-importer": false,
+  "zk-prefixer": false,
+  "random-note": false,
+  "outline": true,
+  "word-count": true,
+  "slides": false,
+  "audio-recorder": false,
+  "workspaces": false,
+  "file-recovery": true,
+  "publish": false,
+  "sync": false,
+  "webviewer": false
+}

content/Architecture.md

@@ -1,7 +1,7 @@
 - Macrostrat is centered around a [[PostgreSQL]] database
-		- A "database-centric" application
+    - A "database-centric" application
 
 ## Architectural models
 
 - Supabase
-- [[PostgREST]]
+- [PostgREST](https://postgrest.org/)

content/Community.md

@@ -2,7 +2,9 @@ Macrostrat is part of a broad geoinformatics ecosystem.
 
 ## Geological systems
 
-- The [EarthByte](https://www.earthbyte.org) group is engaged in many complementary activities towards building a digital crust
+- Paleobiology database (PBDB): [https://paleobiodb.org](https://paleobiodb.org)
+- The [EarthByte](https://www.earthbyte.org) group is engaged in many complementary activities towards building a
+  digital crust
 
 ## Cool Earth observing websites
 

content/Components/Macrostrat data services.md

@@ -3,12 +3,16 @@ geologic column data.
 
 There are two main reasons for this:
 
-1. Macrostrat currently contains voluminous geologic map and column data that cannot be accessed in aggregate anywhere else.
-	- Over 300 different geologic maps, containing more than 2.5 million rock unit polygons covering the world, have been integrated into a single, unified, queryable environment in Macrostrat.
-	- Additionally, more than 35,000 rock units from over 1,500 regional columns covering all of North America and limited other regions are publicly available.
-2. Macrostrat has a public "REST" application programming interface (API) that makes the full complement of data available in Findable, Accessible, Interoperable, and Reusable (FAIR) fashion with a CC-BY license.
+1. Macrostrat currently contains voluminous geologic map and column data that cannot be accessed in aggregate anywhere
+   else.
+    - Over 300 different geologic maps, containing more than 2.5 million rock unit polygons covering the world, have
+      been integrated into a single, unified, queryable environment in Macrostrat.
+    - Additionally, more than 35,000 rock units from over 1,500 regional columns covering all of North America and
+      limited other regions are publicly available.
+2. Macrostrat has a public "REST" application programming interface (API) that makes the full complement of data
+   available in Findable, Accessible, Interoperable, and Reusable (FAIR) fashion with a CC-BY license.
 
-Many third-party applications and users take advantage of Macrostrat FAIR data services:
+Many third-party applications and users take advantage of Macrostrat data services:
 
 - Mancos
 - StraboSpot
@@ -21,6 +25,7 @@ Many third-party applications and users take advantage of Macrostrat FAIR data s
 ## Usage
 
 Macrostrat’s data services have become impactful community resources for geologic information:
+
 - Our geologic map server has served more than 2 billion tile requests since logging began in 2018 (~10 per second)
 - Over the last 28 days, our other data APIs have served 3.8 million requests (~2 per second).
-- Conservatively, these amount to 100,000 requests for information each day.
+- Conservatively, these amount to 100,000 requests for information each day.

content/Macrostrat.md

@@ -1,10 +1,11 @@
 ---
 permalink: index
+title: Documentation
 ---
 
 Macrostrat is a geological model of the Earth's crust and its stratigraphic
-framework. It is a community-driven project that is centered at the University
-of Wisconsin–Madison.
+framework. It is currently developed at the eponymous lab at University of Wisconsin–Madison, by a team of geologists
+and software engineers.
 
 The Macrostrat data platform underlies [Rockd](https://rockd.org/), a mobile
 application that allows users to explore the geology of the world around them.
@@ -18,3 +19,9 @@ more fully to contributors in [[Version 2]].
 
 The documentation is open-source, and we encourage contributions. Please
 contribute on [GitHub](https://github.com/UW-Macrostrat/docs).
+
+## Sections
+
+- [Legacy documentation](/docs/legacy)
+- [Web components](/docs/web-components)
+- [Python](/docs/python-libraries)

content/Version 2.md

@@ -1,6 +1,5 @@
 - A vision to create a new version of Macrostrat with a community-contribution model.
 - Macrostrat v1 effectively harnessed geologic data, but Macrostrat v2 seeks to harness the community
 - Vision first described in a GSA talk in 2021
-- Elaborated in this paper
 
-The first round of funding to support initial development along these lines was secured in summer 2022 by [[Daven Quinn]]
+The first round of funding to support initial development along these lines was secured in summer 2023 by [[Daven Quinn]]

pages/+config.ts

@@ -26,6 +26,7 @@ export default {
   ],
   clientRouting: true,
   supportsDarkMode: true,
+  trailingSlash: false,
   meta: {
     supportsDarkMode: {
       env: {

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"),
     ]),

pages/dev/test-site/+config.ts

@@ -0,0 +1,7 @@
+export default {
+  // Disable client-side navigation.
+  // This allows the sub-site to use global styles without
+  // affecting the rest of the app.
+  // Ideally, we will clean up styles in the future.
+  clientRouting: false,
+};