feat: Lidar processing and SVG viewing

.github/workflows/build.yml

@@ -4,7 +4,7 @@ on:
   push:
     tags:
       - 'v[0-9]+.[0-9]+.[0-9]+'
-    # branches: ["main"]
+    branches: ["feat/allinone"]
 
 jobs:
 

.gitignore

@@ -1,5 +1,9 @@
 electron-log-preload.js
 
+tools
+
+python
+temp
 # Logs
 logs
 *.log

README.md

@@ -42,4 +42,30 @@ npm version major
 git push origin main
 # then push and the version tag
 git push origin vx.x.x
-```
+```
+
+
+To install/unpack python tools:
+```bash
+mkdir myenv
+tar -xf example.tar.gz -C myenv
+cd myenv
+./bin/conda-unpack 
+```
+
+
+## Scripts
+
+### Trees
+
+We recommend creating trees with LODs and billboards in SpeedTree, exporting as OBJ, and then using the below script to convert to a single GLB that can be used with Meshery tree planting.
+
+```
+Usage:
+
+npm run generate-tree -- \
+/path/to/tree/Oak_LOD1.obj \
+/path/to/tree/Oak_LOD2.obj \
+/path/to/tree/Oak_LOD3.obj \
+/path/to/tree/OakTree.glb
+ ```

extra-resources/wms/arcgis.xml

@@ -0,0 +1,7 @@
+<GDAL_WMS>
+  <Service name="AGS">
+    <ServerUrl>https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer</ServerUrl>
+    <BBoxOrder>xyXY</BBoxOrder>
+    <SRS>3857</SRS>
+  </Service>
+</GDAL_WMS>

extra-resources/wms/bing.xml

@@ -0,0 +1,10 @@
+<GDAL_WMS>
+  <Service name="VirtualEarth">
+    <!-- <ServerUrl>http://a${server_num}.ortho.tiles.virtualearth.net/tiles/a${quadkey}.jpeg?g=90</ServerUrl> -->
+    <ServerUrl>https://ecn.t3.tiles.virtualearth.net/tiles/a${quadkey}.jpeg?g=1</ServerUrl>
+  </Service>
+  <MaxConnections>3</MaxConnections>
+  <Cache/>
+  <!-- Prevents failing on network errors, but will produce incomplete sat overlays -->
+  <!-- <ZeroBlockOnServerException>true</ZeroBlockOnServerException> -->
+</GDAL_WMS>

extra-resources/wms/google.xml

@@ -0,0 +1,29 @@
+<GDAL_WMS>
+
+<!-- Data is subject to term of use detailed at http://code.google.com/intl/nl/apis/maps/terms.html and
+     http://www.google.com/intl/en_ALL/help/terms_maps.html -->
+
+    <Service name="TMS">
+        <ServerUrl>http://mt.google.com/vt/lyrs=s&amp;x=${x}&amp;y=${y}&amp;z=${z}</ServerUrl> <!-- Satellite -->
+        <!-- <ServerUrl>http://mt.google.com/vt/lyrs=m&amp;x=${x}&amp;y=${y}&amp;z=${z}</ServerUrl> --> <!-- Map -->
+        <!-- <ServerUrl>http://mt.google.com/vt/lyrs=y&amp;x=${x}&amp;y=${y}&amp;z=${z}</ServerUrl> --> <!-- Hybrid -->
+        <!-- <ServerUrl>http://mt.google.com/vt/lyrs=t&amp;x=${x}&amp;y=${y}&amp;z=${z}</ServerUrl> --> <!-- Terrain -->
+        <!-- <ServerUrl>http://mt.google.com/vt/lyrs=p&amp;x=${x}&amp;y=${y}&amp;z=${z}</ServerUrl> --> <!-- Terrain, Streets and Water  -->
+    </Service>
+    <DataWindow>
+        <UpperLeftX>-20037508.34</UpperLeftX>
+        <UpperLeftY>20037508.34</UpperLeftY>
+        <LowerRightX>20037508.34</LowerRightX>
+        <LowerRightY>-20037508.34</LowerRightY>
+        <TileLevel>20</TileLevel>
+        <TileCountX>1</TileCountX>
+        <TileCountY>1</TileCountY>
+        <YOrigin>top</YOrigin>
+    </DataWindow>
+    <Projection>EPSG:3857</Projection>
+    <BlockSizeX>256</BlockSizeX>
+    <BlockSizeY>256</BlockSizeY>
+    <BandsCount>3</BandsCount>
+    <MaxConnections>5</MaxConnections>
+    <Cache />
+</GDAL_WMS>

forge.config.js

@@ -6,12 +6,15 @@ module.exports = {
     name: 'Meshery',
     authors: 'OpenGolfSim',
     description: 'OpenGolfSim Meshery is a tool for converting and building you course meshes',
-    asar: true,
+    // asar: true,
     icon: 'images/Meshery',
     appCategoryType: 'public.app-category.developer-tools',
     extraResource: [
       './extra-resources'
     ],
+    asar: {
+      unpack: '**/.webpack/main/*.worker.js',
+    },
     ...process.env.OSX_SIGN && {
       osxSign: {
         identity: process.env.APPLE_SIGNING_IDENTITY,
@@ -52,6 +55,7 @@ module.exports = {
     {
       name: '@electron-forge/plugin-webpack',
       config: {
+        port: 3102,
         mainConfig: './webpack.main.config.js',
         renderer: {
           config: './webpack.renderer.config.js',
@@ -64,8 +68,26 @@ module.exports = {
                 js: './src/preload.js',
               },
             },
+            {
+              html: './src/trees/tree.html',
+              js: './src/trees/tree_renderer.js',
+              name: 'tree_window',
+              preload: {
+                js: './src/trees/preload.js',
+              },
+            },
           ],
         },
+        devContentSecurityPolicy: [
+          "default-src 'self' blob: data: gap:",
+          "style-src 'self' 'unsafe-inline' blob: data: gap:",
+          "script-src 'self' 'unsafe-eval' 'unsafe-inline' blob: data: gap:",
+          "object-src 'self' blob: data: gap:",
+          "img-src 'self' blob: data: gap: *.openstreetmap.org *.arcgisonline.com mt.google.com *.virtualearth.net",
+          "connect-src 'self' https://*.mapbox.com blob: data: gap: project: laz:",
+          "frame-src 'self' blob: data: gap:",
+          "worker-src 'self' blob: data: gap:"
+        ].join('; ')
       },
     },
     // Fuses are used to enable/disable various Electron functionality