fix: bug fixes and start custom data

Author: dudewheresmycode

README.md

@@ -68,4 +68,11 @@ npm run generate-tree -- \
 /path/to/tree/Oak_LOD2.obj \
 /path/to/tree/Oak_LOD3.obj \
 /path/to/tree/OakTree.glb
+ ```
+
+
+ ## Debug Logs
+
+ ```powershell
+ Get-Content "$env:USERPROFILE\AppData\Roaming\ogs-meshery\logs\main.log" -Wait -Tail 30
  ```

src/contexts/Project.jsx

@@ -11,6 +11,7 @@ const ProjectContext = createContext({
   // setProject: () => {},
   generateHillShade: () => {},
   generateSatellite: () => {},
+  generateTerrainData: () => {},
   setProjectSettings: () => {},
   updateSceneSettings: () => {},
   addHole: () => {},
@@ -219,6 +220,12 @@ export const ProjectProvider = ({ children }) => {
       setProject((old) => ({ ...old, stats: res.stats, raw: res.raw }))
     }
   }
+  const generateTerrainData = async (terrainType) => {
+    const res = await window.meshery.terrain.generate(terrainType);
+    if (res) {
+      setProject((old) => ({ ...old, stats: res.stats, raw: res.raw }))
+    }
+  }
 
   const updateLayerById = (layerId, update) => {
     return window.meshery.project.updateLayerById(layerId, update);
@@ -300,6 +307,7 @@ export const ProjectProvider = ({ children }) => {
       handleDownloadCourse,
       generateHillShade,
       generateSatellite,
+      generateTerrainData,
       palette,
       updateLayerById,
       generateMeshes,

src/dialogs/EditTerrainDialog.jsx

@@ -720,9 +720,9 @@ export default function EditTerrainDialog(props) {
                     }}
                   >
                     <MenuItem value={''}>None</MenuItem>
-                    {project._svgBuffer ? (
+                    {/* {project._svgBuffer ? (
                       <MenuItem value='svg'>Course SVG</MenuItem>
-                    ) : null}
+                    ) : null} */}
                     {Object.values(project.satellite).map(sat => {
                       return (<MenuItem key={sat.uri} value={sat.uri}>Satellite ({sat.source})</MenuItem>);
                     })}

src/dialogs/GenerateSVGDialog.jsx

@@ -56,12 +56,20 @@ export default function SearchShapesDialog(props) {
 
   const handleSave = useCallback(async () => {
     console.log('save it', results);
-    const file = await window.meshery.project.saveSVG({ paths: results.paths, included });
+    const file = await window.meshery.project.saveSVG({ paths: results?.paths, included });
     if (props.onSave) {
       props.onSave();
     }
   }, [results, included]);
 
+  useEffect(() => {
+    setIncluded(old => ({
+      ...old,
+      hillShade: !!project?.hillShade,
+      satellite: hasSatellite
+    }));
+  }, [hasSatellite, project?.hillShade])
+
   useEffect(() => {
     if (!props.open || !project.settings.centerPoint || !project.settings.distance) {
       return;

src/dialogs/GenerateTerrainDialog.jsx

@@ -1,18 +1,22 @@
-import React from 'react';
+import React, { useCallback, useState } from 'react';
 import { Dialog, DialogTitle, DialogContent, Typography, DialogActions, Button, Alert, Stack, Box, TextField, MenuItem } from '@mui/material';
 import MenuBookIcon from '@mui/icons-material/MenuBook';
 import ClearIcon from '@mui/icons-material/Clear';
+import { useProject } from '../contexts/Project';
 
 export default function GenerateTerrainDialog(props) {
   const { onClose, open } = props;
+  const { generateTerrainData } = useProject();
+  const [terrainType, setTerrainType] = useState('flat');
 
   const handleClose = () => {
     onClose();
   };
-  const handleGenerate = async () => {
-    await window.meshery.terrain.generate('flat');
+  const handleGenerate = useCallback(async () => {
+    // await window.meshery.terrain.generate(terrainType);
+    await generateTerrainData(terrainType);
     onClose();
-  };
+  }, [terrainType]);
 
   return (
     <Dialog
@@ -29,8 +33,9 @@ export default function GenerateTerrainDialog(props) {
           <TextField
             label="Generate"
             select={true}
+            onChange={(event) => setTerrainType(event.target.value)}
             fullWidth={true}
-            defaultValue={'flat'}
+            value={terrainType}
           >
             <MenuItem value="flat">Flat</MenuItem>
             <MenuItem value="random">Random</MenuItem>

src/fuse/CourseScene.jsx

@@ -305,7 +305,7 @@ export default function CourseScene({
     const meshes = surfacesRef.current.map(s => s.mesh);
     const hits = raycasterRef.current.intersectObjects(meshes, false);
     if (hits.length > 0) {
-      const layer = project._meshes.find(l => l.id === hits[0].object.name);
+      const layer = project._meshes?.find(l => l.id === hits[0].object.name);
       if (onSelect) onSelect(layer);
 
       const bbox = new THREE.Box3().setFromObject(hits[0].object);

src/hooks/useCompositeTexture.js

@@ -15,26 +15,36 @@ export default function useCompositeTexture(baseUrl, overlayUrl, overlayOpacity
   const [texture, setTexture] = useState(null);
 
   useEffect(() => {
-    if (!baseUrl) {
-      setTexture(null);
-      return;
-    }
+    // if (!baseUrl) {
+    //   setTexture(null);
+    //   return;
+    // }
 
     let cancelled = false;
 
     async function composite() {
-      let resolvedBase = baseUrl;
-      if (resolvedBase.includes('hillshade')) {
-        resolvedBase = resolvedBase.replace('.tif', '.jpg');
-      }
-
-      const baseImg = await loadImage(resolvedBase);
+      let baseImg;
       const canvas = document.createElement('canvas');
-      canvas.width = baseImg.naturalWidth;
-      canvas.height = baseImg.naturalHeight;
+      if (baseUrl) {
+        let resolvedBase = baseUrl;
+        if (resolvedBase.includes('hillshade')) {
+          resolvedBase = resolvedBase.replace('.tif', '.jpg');
+        }
+        baseImg = await loadImage(resolvedBase);
+        canvas.width = baseImg.naturalWidth;
+        canvas.height = baseImg.naturalHeight;
+      } else {
+        canvas.width = 4096;
+        canvas.height = 4096;
+      }
       const ctx = canvas.getContext('2d');
 
-      ctx.drawImage(baseImg, 0, 0, canvas.width, canvas.height);
+      if (baseImg) {
+        ctx.drawImage(baseImg, 0, 0, canvas.width, canvas.height);
+      } else {
+        ctx.fillStyle = '#aaa';
+        ctx.fillRect(0, 0, canvas.width, canvas.height);
+      }
 
       if (overlayUrl) {
         try {

src/lib/app.js

@@ -8,12 +8,12 @@ const APP_NAME = 'ogs-meshery';
 const getDefaultInstallPath = () => {
   switch (process.platform) {
     case 'win32':
-      return path.join(app.getPath('home'), `.${APP_NAME}`, 'tools');
+      return path.join(app.getPath('home'), `.${APP_NAME}-tools`);
     case 'darwin':
-      return path.join(app.getPath('home'), APP_NAME, 'tools');
+      return path.join(app.getPath('home'), `${APP_NAME}-tools`);
     case 'linux':
       const dataHome = process.env.XDG_DATA_HOME || path.join(os.homedir(), '.local', 'share');
-      return path.join(dataHome, APP_NAME, 'tools');
+      return path.join(dataHome, `${APP_NAME}-tools`);
     default:
       throw new Error('Unsupported platform');
   }

src/lib/imagery.js

@@ -83,6 +83,32 @@ async function getElevationRange(tifPath) {
   };
 }
 
+export async function getGeoTIFFSummary(tifPath) {
+  const output = await runGDALCommand('gdalinfo', ['-json', tifPath]);
+
+  const info = JSON.parse(output.stdout);
+
+  const wkt = info.coordinateSystem?.wkt || '';
+  if (!wkt.trim()) {
+    throw new Error(`No CRS found in ${tifPath} — cannot build GeoJSON bbox`);
+  }
+
+  if (!info.wgs84Extent) {
+    throw new Error(`GDAL could not compute WGS84 extent for ${tifPath}`);
+  }
+
+  const bboxGeoJSON = {
+    type: 'Feature',
+    properties: {},
+    geometry: info.wgs84Extent
+  };
+
+  return {
+    ...info,
+    bboxGeoJSON
+  };
+}
+
 /**
  * Convert lat/lon to tile coordinates at a given zoom level
  */

src/lib/ipc.js

@@ -7,7 +7,7 @@ import * as tools from './tools';
 import * as colors from './colors';
 import * as plants from './cache/plants';
 import { exportMeshes } from './export';
-import { generateTerrain } from './terrain';
+import { generateTerrain, importTerrainData } from './terrain';
 import { changeToolsPath, getRecentProjects, getToolsPath } from './app';
 
 
@@ -82,6 +82,7 @@ ipcMain.handle('terrain.smoothRivers', (_event, data) => project.smoothRivers(da
 ipcMain.handle('terrain.smoothLakes', (_event, data) => project.smoothLakes(data));
 ipcMain.handle('terrain.saveHeightMap', (_event, data, heightScale) => project.saveHeightMap(data, heightScale));
 ipcMain.handle('terrain.generate', (_event, type) => generateTerrain(type));
+ipcMain.handle('terrain.importTerrainData', (_event) => importTerrainData());
 
 ipcMain.handle('mesh.getCourseMesh', (_event) => project.getCourseMesh());
 ipcMain.handle('imagery.downloadDEM', (_event, courseBounds) => imagery.downloadCourseDEM(courseBounds));