From 7ee6a52dbf74dd76cb549e7afd02d8d11ec7a589 Mon Sep 17 00:00:00 2001 From: Albin Date: Wed, 3 Apr 2024 09:31:47 +0200 Subject: [PATCH 1/4] Move and rename map gl geo data This is primarily done in order to satisfy the F-Droid build system. --- .../geo/land_contour_indices.gl | Bin .../geo/land_positions.gl | Bin .../geo/land_triangle_indices.gl | Bin .../geo/ocean_indices.gl | Bin .../geo/ocean_positions.gl | Bin 5 files changed, 0 insertions(+), 0 deletions(-) rename gui/assets/geo/land_contour_indices.bin => dist-assets/geo/land_contour_indices.gl (100%) rename gui/assets/geo/land_positions.bin => dist-assets/geo/land_positions.gl (100%) rename gui/assets/geo/land_triangle_indices.bin => dist-assets/geo/land_triangle_indices.gl (100%) rename gui/assets/geo/ocean_indices.bin => dist-assets/geo/ocean_indices.gl (100%) rename gui/assets/geo/ocean_positions.bin => dist-assets/geo/ocean_positions.gl (100%) diff --git a/gui/assets/geo/land_contour_indices.bin b/dist-assets/geo/land_contour_indices.gl similarity index 100% rename from gui/assets/geo/land_contour_indices.bin rename to dist-assets/geo/land_contour_indices.gl diff --git a/gui/assets/geo/land_positions.bin b/dist-assets/geo/land_positions.gl similarity index 100% rename from gui/assets/geo/land_positions.bin rename to dist-assets/geo/land_positions.gl diff --git a/gui/assets/geo/land_triangle_indices.bin b/dist-assets/geo/land_triangle_indices.gl similarity index 100% rename from gui/assets/geo/land_triangle_indices.bin rename to dist-assets/geo/land_triangle_indices.gl diff --git a/gui/assets/geo/ocean_indices.bin b/dist-assets/geo/ocean_indices.gl similarity index 100% rename from gui/assets/geo/ocean_indices.bin rename to dist-assets/geo/ocean_indices.gl diff --git a/gui/assets/geo/ocean_positions.bin b/dist-assets/geo/ocean_positions.gl similarity index 100% rename from gui/assets/geo/ocean_positions.bin rename to dist-assets/geo/ocean_positions.gl From 8245f66ebd3ecea27624984e2cf2cbc321c2e31a Mon Sep 17 00:00:00 2001 From: Albin Date: Wed, 3 Apr 2024 09:55:50 +0200 Subject: [PATCH 2/4] Change android map path --- android/lib/map/src/main/res/raw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/lib/map/src/main/res/raw b/android/lib/map/src/main/res/raw index 9f90f80c9342..617a9d19ac7f 120000 --- a/android/lib/map/src/main/res/raw +++ b/android/lib/map/src/main/res/raw @@ -1 +1 @@ -../../../../../../gui/assets/geo \ No newline at end of file +../../../../../../dist-assets/geo \ No newline at end of file From 361a48e552331383ec15d8ba965f4f5a76cc481a Mon Sep 17 00:00:00 2001 From: Albin Date: Wed, 3 Apr 2024 10:47:22 +0200 Subject: [PATCH 3/4] Adjust map file extension used in desktop apps --- gui/src/main/index.ts | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts index a84465538883..4cdb9f5727fa 100644 --- a/gui/src/main/index.ts +++ b/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); From b000c35f46254517c967fe4f89d41cc6d6a4b4d5 Mon Sep 17 00:00:00 2001 From: Oskar Nyberg Date: Fri, 5 Apr 2024 08:08:42 +0200 Subject: [PATCH 4/4] Copy geo data to assets/geo during desktop build --- gui/tasks/assets.js | 8 +++++++- gui/tasks/watch.js | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gui/tasks/assets.js b/gui/tasks/assets.js index ee53363a6a30..56b0c7a8ad56 100644 --- a/gui/tasks/assets.js +++ b/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; diff --git a/gui/tasks/watch.js b/gui/tasks/watch.js index 7badef949e7a..c64c4d48d31e 100644 --- a/gui/tasks/watch.js +++ b/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';