Virtual-branch-1935744840

.eslintrc.json

@@ -1,6 +1,6 @@
 {
   "root": true,
-  "ignorePatterns": ["**/*", "**/.vite/", "**/.cache/", "**/node_modules/", "**/apps/airspaces/src/assets/airspaces/"],
+  "ignorePatterns": ["**/*", "**/.vite/", "**/.cache/", "**/node_modules/", "**/apps/fxc-tiles/src/assets/airspaces/"],
   "plugins": ["@nx", "require-node-import-prefix", "simple-import-sort", "import"],
   "overrides": [
     {

.gitignore

@@ -44,4 +44,5 @@ Thumbs.db
 .nx/cache
 .nx/workspace-data
 apps/run/benchmarks
-apps/fxc-front/dev-dist/registerSW.js
+apps/fxc-front/dev-dist/registerSW.js
+**/vite.config.{js,ts,mjs,mts,cjs,cts}.timestamp*

apps/fetcher/project.json

@@ -70,6 +70,7 @@
       "executor": "@nx-tools/nx-container:build",
       "dependsOn": ["build"],
       "options": {
+        "file": "apps/fetcher/Dockerfile",
         "platforms": ["linux/amd64", "linux/arm64"],
         "engine": "docker",
         "push": true,

apps/fxc-front/vite.config.mts

@@ -98,7 +98,7 @@ export default defineConfig(
 
 // Get the airspace update date from the commit.
 function getAirspaceDate() {
-  const tileInfo = join(__dirname, '/..', '/airspaces/src/assets/airspaces/tiles-info.json');
+  const tileInfo = join(__dirname, '/..', '/fxc-tiles/src/assets/tiles/tiles-info.json');
 
   if (existsSync(tileInfo)) {
     try {

apps/fxc-tiles/Dockerfile

@@ -5,7 +5,7 @@ ENV NODE_ENV=production
 WORKDIR /usr/src/app
 RUN npm install -g npm@latest
 
-COPY dist/apps/airspaces/package*.json ./
+COPY dist/apps/fxc-tiles/package*.json ./
 RUN npm ci --no-audit
 
-COPY dist/apps/airspaces/unzip.js ./
+COPY dist/apps/fxc-tiles/unzip.js ./

apps/fxc-tiles/README.md

@@ -6,7 +6,7 @@ Install [tippecanoe](https://github.com/felt/tippecanoe) - note that the the map
 
 - nx build fxc-tiles
 - cd dist/apps/fxc-tiles
-- npm run download
+- `npm run download-airspaces`
 - Display stats with `node dist/apps/fxc-tiles/airspaces/stats.js` (quick check of the airspaces)
 - Create the geojson with `node dist/apps/fxc-tiles/airspaces/create-geojson.js`
 - Create the vector tiles with `node dist/apps/fxc-tiles/airspaces/create-tiles.js`
@@ -22,7 +22,7 @@ Install [tippecanoe](https://github.com/felt/tippecanoe) - note that the the map
 
 - Execute `zip -r tiles.zip tiles` to create the zip file,
 - GCE (See Below) or execute `node unzip.js -d tiles-info-diff.json` to apply the diffs,
-- Copy and commit `tiles-info.json` in `apps/airspaces/src/assets/`.
+- Copy and commit `tiles-info.json` in `apps/fxc-tiles/src/assets/`.
 
 ### Using the unzip script on a Compute VM
 

apps/fxc-tiles/jest.config.ts

@@ -13,5 +13,5 @@ export default {
     ],
   },
   moduleFileExtensions: ['ts', 'js', 'html'],
-  coverageDirectory: '../../coverage/apps/airspaces',
+  coverageDirectory: '../../coverage/apps/fxc-tiles',
 };

apps/fxc-tiles/project.json

@@ -76,7 +76,7 @@
       }
     },
     "test": {
-      "outputs": ["{workspaceRoot}/coverage/{projectRoot}", "{workspaceRoot}/coverage/apps/airspaces"],
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}", "{workspaceRoot}/coverage/apps/fxc-tiles"],
       "dependsOn": [
         {
           "projects": ["secrets"],

apps/fxc-tiles/src/assets/airspaces/download.sh

@@ -1,10 +1,10 @@
 #! /usr/bin/env sh
 
-DIST_FOLDER=`realpath $(dirname "$0")`
-DST_FOLDER=`realpath $DIST_FOLDER/../../../apps/fxc-tiles/src/assets/airspaces`
+DIST_ASP_FOLDER=`realpath $(dirname "$0")`
+DST_FOLDER=`realpath $DIST_ASP_FOLDER/../../../../apps/fxc-tiles/src/assets/airspaces`
 
 echo "# Download openaip airspaces"
-node $DIST_FOLDER/download-openaip.js -o $DST_FOLDER
+node $DIST_ASP_FOLDER/download-openaip.js -o $DST_FOLDER
 
 echo "# Download Ukraine airspaces"
 mkdir -p /tmp/asp/

apps/proxy/project.json

@@ -64,6 +64,7 @@
       "executor": "@nx-tools/nx-container:build",
       "dependsOn": ["build"],
       "options": {
+        "file": "apps/proxy/Dockerfile",
         "platforms": ["linux/amd64", "linux/arm64"],
         "engine": "docker",
         "push": true,

apps/run/project.json

@@ -81,6 +81,7 @@
       "executor": "@nx-tools/nx-container:build",
       "dependsOn": ["build"],
       "options": {
+        "file": "apps/run/Dockerfile",
         "platforms": ["linux/amd64", "linux/arm64"],
         "engine": "docker",
         "push": true,

nx.json

@@ -98,7 +98,5 @@
       },
       "include": ["apps/run/**/*"]
     }
-  ],
-  "nxCloudId": "670fcac1c44cc6732ed40361",
-  "useLegacyCache": true
+  ]
 }