Merge pull request #50 from UW-Macrostrat/fixes

Fix API

Author: davidsklar99

.env.example

@@ -1,8 +1,9 @@
 # Required variables
 VITE_MAPBOX_API_TOKEN='<your-api-key>'
 VITE_MACROSTRAT_TILESERVER_DOMAIN='https://tileserver.staging.svc.macrostrat.org'
+VITE_MACROSTRAT_INSTANCE='Development'
 VITE_MACROSTRAT_API_DOMAIN='https://macrostrat.org'
-ROCKD_API_URL = 'https://dev.rockd.org/api/v2/'
+VITE_ROCKD_API_URL='https://dev.rockd.org/api/v2/'
 
 # Needed for map ingestion system
 # VITE_MACROSTRAT_INGEST_API=https://dev.macrostrat.org/api/ingest
@@ -12,9 +13,6 @@ ROCKD_API_URL = 'https://dev.rockd.org/api/v2/'
 # VITE_MACROSTRAT_TILESERVER_V2='https://dev.macrostrat.org/tiles'
 # VITE_MACROSTRAT_TILESERVER_V1='https://tiles.macrostrat.org'
 
-# Needed for paleogeography
-# VITE_CORELLE_API_DOMAIN='https://rotate.macrostrat.org'
-
 # Needed for non-root installations (deprecated)
 # PUBLIC_URL='/'
 

packages/settings/index.ts

@@ -1,10 +1,13 @@
 /* Client-side code to access configuration variables */
 import { getRuntimeConfig } from "./utils";
 
+export const rockdApiURL = getRuntimeConfig("ROCKD_API_URL");
+export const rockdApiOldURL = "https://rockd.org/api/v2/";
+
 export const darkMapURL =
   "mapbox://styles/jczaplewski/cl5uoqzzq003614o6url9ou9z?optimize=true";
-export const baseMapURL =
-  "mapbox://styles/jczaplewski/clatdbkw4002q14lov8zx0bm0?optimize=true";
+export const whiteMapURL =
+  "mapbox://styles/jczaplewski/cje04mr9l3mo82spihpralr4i?optimize=true";
 export const satelliteMapURL =
   "mapbox://styles/jczaplewski/cl51esfdm000e14mq51erype3?optimize=true";
 
@@ -14,49 +17,22 @@ export const burwellTileDomain = getRuntimeConfig(
 export const apiDomain = getRuntimeConfig("MACROSTRAT_API_DOMAIN");
 export const tileserverDomain = burwellTileDomain;
 
-export const gddDomain = "https://xdd.wisc.edu";
-export const pbdbDomain = "https://paleobiodb.org";
-
 export const mapboxAccessToken = getRuntimeConfig("MAPBOX_API_TOKEN");
 
 export const baseURL = getRuntimeConfig("BASE_URL", "/");
 
-export const apiV2Prefix = getRuntimeConfig(
-  "MACROSTRAT_API_V2",
-  apiDomain + "/api/v2"
-);
-
 export const ingestPrefix = getRuntimeConfig(
   "MACROSTRAT_INGEST_API",
   apiDomain + "/api/ingest"
 );
 
-export const cdrPrefix = getRuntimeConfig("CDR_API");
-
-export const mapPagePrefix = "/map";
-export const routerBasename = "/map";
-
-export const postgrestPrefix = getRuntimeConfig(
-  "MACROSTRAT_POSTGREST_PREFIX",
-  apiDomain + "/api/pg"
-);
-
-export const macrostratInstance = getRuntimeConfig("MACROSTRAT_INSTANCE");
-
-export const elevationLayerURL = getRuntimeConfig("ELEVATION_LAYER_URL");
-
 /** Legacy settings object */
 export const SETTINGS = {
-  cdrPrefix,
+  rockdApiURL,
   darkMapURL,
-  baseMapURL,
+  whiteMapURL,
   satelliteMapURL,
   burwellTileDomain,
-  apiDomain,
-  gddDomain,
-  pbdbDomain,
   mapboxAccessToken,
-  apiV2Prefix,
-  mapPagePrefix,
-  routerBasename,
+  rockdApiOldURL
 };

pages/checkin/index.ts

@@ -6,7 +6,6 @@ import { BlankImage, imageExists, Footer, getProfilePicUrl, useRockdAPI, getImag
 import { Icon } from "@blueprintjs/core";
 import styles from "../main.module.sass";
 import { SETTINGS } from "@macrostrat-web/settings";
-import { DarkModeButton } from "@macrostrat/ui-components";
 import "./main.sass";
 import "@macrostrat/style-system";
 import { MapAreaContainer, MapView, MapMarker } from "@macrostrat/map-interface";
@@ -18,10 +17,8 @@ import { LithologyList } from "@macrostrat/data-components";
 const h = hyper.styled(styles);
 
 export function Checkins({checkinID}) {
-    const checkinData = useRockdAPI("protected/checkins?checkin_id=" + checkinID);
+    const checkinData = useRockdAPI("/protected/checkins?checkin_id=" + checkinID);
     const [overlayOpen, setOverlayOpen] = useState(false);
-    const [overlayImage, setOverlayImage] = useState(null);
-    const [overlayBody, setOverlayBody] = useState(null);
     const [showMap, setShowMap] = useState(false);
 
     if (!checkinData) {
@@ -108,10 +105,6 @@ export function Checkins({checkinID}) {
                 }
             }),
         ]),
-        h('div.overlay-body', [
-            h(BlankImage, { className: 'observation-image', src: overlayImage }),
-            overlayBody,
-        ])
     ]);
 
     const map = h(Map, {center, showMap, setShowMap});

pages/explore/+Page.client.ts

@@ -20,8 +20,6 @@ import { createCheckins, useRockdAPI, Image } from "../index";
 import "./main.sass";
 import "@macrostrat/style-system";
 import { MapPosition } from "@macrostrat/mapbox-utils";
-import { configDefinitionsBuiltInGlobal } from "vike/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn";
-import { CONTEXTMENU_WARN_DECORATOR_NEEDS_REACT_ELEMENT } from "@blueprintjs/core/lib/esm/legacy/contextMenuTargetLegacy";
 
 const h = hyper.styled(styles);
 
@@ -59,7 +57,7 @@ function weaverStyle(type: object) {
     sources: {
       weaver: {
         type: "vector",
-        tiles: [ "https://dev.rockd.org/api/v2/checkin-tile/{z}/{x}/{y}?cluster=true"],
+        tiles: [ SETTINGS.rockdApiURL + "/checkin-tile/{z}/{x}/{y}?cluster=true"],
       }
     },
     layers: [
@@ -176,7 +174,7 @@ function WeaverMap({
 
   // handle selected checkins
   const checkinData = useRockdAPI(
-    selectedCheckin ? `protected/checkins?checkin_id=${selectedCheckin}` : null
+    selectedCheckin ? `/protected/checkins?checkin_id=${selectedCheckin}` : null
   );
 
   const toolbar = h(Toolbar, {showSettings, setSettings, showFilter, setFilter});
@@ -341,7 +339,7 @@ function getCheckins(lat1, lat2, lng1, lng2) {
   let maxLng = Math.floor(lng2 * 100) / 100;
 
   // change use map coords
-  return useRockdAPI("protected/checkins?minlat=" + minLat + 
+  return useRockdAPI("/protected/checkins?minlat=" + minLat + 
     "&maxlat=" + maxLat +
     "&minlng=" + minLng +
     "&maxlng=" + maxLng);
@@ -384,6 +382,12 @@ function FeatureDetails({setInspectPosition}) {
   if (result == null) return h(Spinner, { className: "loading-spinner" });
   result = result.success.data;  
 
+  result.sort((a, b) => {
+    if (a.photo === null && b.photo !== null) return 1;
+    if (a.photo !== null && b.photo === null) return -1;
+    return 0;
+  });
+
   checkins = createCheckins(result, mapRef, setInspectPosition);
 
   return h("div", {className: 'checkin-container'}, [
@@ -576,7 +580,7 @@ function AutoComplete({showFilter, setFilteredCheckins, setFilteredData, autocom
   let result = null;
 
   try {
-    result = useRockdAPI("autocomplete/" + input);
+    result = useRockdAPI("/autocomplete/" + input);
   } catch (e) {
     return null;
   }
@@ -674,5 +678,5 @@ function AutoComplete({showFilter, setFilteredCheckins, setFilteredData, autocom
 }
 
 function getPersonCheckins(personId) {
-  return useRockdAPI("protected/checkins?person_id=" + personId + "&all=100");
+  return useRockdAPI("/protected/checkins?person_id=" + personId + "&all=100");
 }