Merge branch 'move-and-rename-map-gl-data'

android/lib/map/src/main/res/raw

@@ -1 +1 @@
-../../../../../../gui/assets/geo
+../../../../../../dist-assets/geo

gui/src/main/index.ts

@@ -767,15 +767,13 @@ class ApplicationMain
     }));
 
     IpcMainEventChannel.map.handleGetData(async () => ({
-      landContourIndices: await fs.promises.readFile(
-        path.join(GEO_DIR, 'land_contour_indices.bin'),
-      ),
-      landPositions: await fs.promises.readFile(path.join(GEO_DIR, 'land_positions.bin')),
+      landContourIndices: await fs.promises.readFile(path.join(GEO_DIR, 'land_contour_indices.gl')),
+      landPositions: await fs.promises.readFile(path.join(GEO_DIR, 'land_positions.gl')),
       landTriangleIndices: await fs.promises.readFile(
-        path.join(GEO_DIR, 'land_triangle_indices.bin'),
+        path.join(GEO_DIR, 'land_triangle_indices.gl'),
       ),
-      oceanIndices: await fs.promises.readFile(path.join(GEO_DIR, 'ocean_indices.bin')),
-      oceanPositions: await fs.promises.readFile(path.join(GEO_DIR, 'ocean_positions.bin')),
+      oceanIndices: await fs.promises.readFile(path.join(GEO_DIR, 'ocean_indices.gl')),
+      oceanPositions: await fs.promises.readFile(path.join(GEO_DIR, 'ocean_positions.gl')),
     }));
 
     IpcMainEventChannel.tunnel.handleConnect(this.connectTunnel);

gui/tasks/assets.js

@@ -20,14 +20,20 @@ function copyLocales() {
   return src('locales/**/*.po').pipe(dest('build/locales'));
 }
 
+function copyGeoData() {
+  return src('../dist-assets/geo/*.gl').pipe(dest('build/assets/geo'));
+}
+
 copyStaticAssets.displayName = 'copy-static-assets';
 copyConfig.displayName = 'copy-config';
 copyCss.displayName = 'copy-css';
 copyHtml.displayName = 'copy-html';
 copyLocales.displayName = 'copy-locales';
+copyGeoData.displayName = 'copy-geo-data';
 
-exports.copyAll = parallel(copyStaticAssets, copyConfig, copyCss, copyHtml, copyLocales);
+exports.copyAll = parallel(copyStaticAssets, copyConfig, copyCss, copyHtml, copyLocales, copyGeoData);
 exports.copyStaticAssets = copyStaticAssets;
 exports.copyCss = copyCss;
 exports.copyHtml = copyHtml;
 exports.copyConfig = copyConfig;
+exports.copyGeoData = copyGeoData;

gui/tasks/watch.js

@@ -20,7 +20,10 @@ function watchHtml() {
 }
 
 function watchStaticAssets() {
-  return watch(['assets/**'], series(assets.copyStaticAssets, electron.reloadRenderer));
+  return watch(
+    ['assets/**', '../dist-assets/geo/*.gl'],
+    series(assets.copyStaticAssets, assets.copyGeoData, electron.reloadRenderer),
+  );
 }
 
 watchMainScripts.displayName = 'watch-main-scripts';