Fix zip/unzip of UN geojson

Author: camdecoster

tasks/topojson/config.mjs

@@ -70,10 +70,22 @@ const config = {
     inputDir: './build/geodata',
     vectors: {
         // 'coastlines', 'countries', and 'land' are derived from UN geodata
-        ocean: 'ocean',
-        lakes: 'lakes',
-        rivers: 'rivers_lake_centerlines',
-        subunits: 'admin_1_states_provinces_lakes'
+        ocean: {
+            source: 'ocean',
+            type: 'physical'
+        },
+        lakes: {
+            source: 'lakes',
+            type: 'physical'
+        },
+        rivers: {
+            source: 'rivers_lake_centerlines',
+            type: 'physical'
+        },
+        subunits: {
+            source: 'admin_1_states_provinces_lakes',
+            type: 'cultural'
+        }
     },
     layers: {
         coastlines: 'land',

tasks/topojson/get_geodata.mjs

@@ -10,10 +10,10 @@ const tasksPath = './tasks/topojson';
 const outputPath = './build/geodata';
 
 // Download Natural Earth vectors
-for (const [vector, source] of Object.entries(vectors)) {
+for (const vector of Object.values(vectors)) {
     for (const resolution of resolutions) {
         const url = getNEDownloadUrl({ resolution, vector });
-        const filename = getNEFilename({ resolution, source });
+        const filename = getNEFilename({ resolution, source: vector.source });
         const archivePath = `${outputPath}/${filename}.zip`;
 
         if (fs.existsSync(archivePath)) {
@@ -46,11 +46,12 @@ for (const [vector, source] of Object.entries(vectors)) {
 // Download UN GeoJSON file
 const url = unDownloadUrl;
 const archivePath = `${tasksPath}/${unFilename}.zip`;
-const geojsonPath = `${outputPath}/${unFilename}.geojson`;
+const geojsonPath = `${outputPath}`;
+const geojsonFilePath = `${geojsonPath}/${unFilename}.geojson`;
 
 if (fs.existsSync(archivePath)) {
     console.log(`File ${archivePath} already exists. Skipping download.`);
-    if (fs.existsSync(geojsonPath)) console.log(`File ${geojsonPath} already exists. Skipping decompression.`);
+    if (fs.existsSync(geojsonFilePath)) console.log(`File ${geojsonFilePath} already exists. Skipping decompression.`);
     else exec(`unzip -o ${archivePath} -d ${geojsonPath}`);
 } else {
     try {
@@ -59,17 +60,17 @@ if (fs.existsSync(archivePath)) {
         const response = await fetch(url);
         if (!response.ok || !response.body) throw new Error(`Bad response: ${response.status}`);
 
-        if (!fs.existsSync(outputPath)) fs.mkdirSync(outputPath, { recursive: true });
-        const file = fs.createWriteStream(geojsonPath);
+        // if (!fs.existsSync(outputPath)) fs.mkdirSync(outputPath, { recursive: true });
+        const file = fs.createWriteStream(geojsonFilePath);
         await pipeline(Readable.fromWeb(response.body), file);
-        console.log(`UN GeoJSON file saved to ${geojsonPath}`);
+        console.log(`UN GeoJSON file saved to ${geojsonFilePath}`);
 
         console.log('Compressing UN GeoJSON for future use');
         // Use the shell to handle compression
-        exec(`zip ${archivePath} ${geojsonPath}`);
+        exec(`zip -j ${archivePath} ${geojsonFilePath}`);
 
         console.log(`UN GeoJSON archive saved to ${archivePath}`);
     } catch (error) {
-        console.error(`Error when downloading file '${geojsonPath}': ${error}`);
+        console.error(`Error when downloading file '${geojsonFilePath}': ${error}`);
     }
 }

tasks/topojson/process_geodata.mjs

@@ -243,7 +243,7 @@ const simplifiedGeojson = {
 fs.writeFileSync(`${outputDirGeojson}/${unFilename}_110m/all_features.geojson`, JSON.stringify(simplifiedGeojson));
 
 for (const resolution of resolutions) {
-    for (const source of Object.values(vectors)) {
+    for (const { source } of Object.values(vectors)) {
         await convertShpToGeo(getNEFilename({ resolution, source }));
     }