Remove log statements

plotly · camdecoster · Mar 20, 2025 · Mar 20, 2025 · Mar 20, 2025 · Mar 20, 2025
commit e74c65c8246f88eb062d0700cdfd7542085209e4
diff --git a/tasks/topojson/get_geodata.mjs b/tasks/topojson/get_geodata.mjs
@@ -9,32 +9,26 @@ const { resolutions, unDownloadUrl, unFilename, vectors } = config;
 const tasksPath = './tasks/topojson';
 const outputPath = './build/geodata';

-// Download Natural Earth vectors
+// Download Natural Earth vector maps
 for (const vector of Object.values(vectors)) {
    for (const resolution of resolutions) {
        const url = getNEDownloadUrl({ resolution, vector });
        const filename = getNEFilename({ resolution, source: vector.source });
        const archivePath = `${outputPath}/${filename}.zip`;

-        if (fs.existsSync(archivePath)) {
-            console.log(`File ${archivePath} already exists. Skipping download.`);
-        } else {
+        if (!fs.existsSync(archivePath)) {
            try {
-                console.log(`Downloading data from ${url}`);
-
                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(archivePath);
                await pipeline(Readable.fromWeb(response.body), file);

-                console.log('Decompressing NE shapefile');
                // Use the shell to handle decompressing
                if (!fs.existsSync(outputPath)) fs.mkdirSync(outputPath, { recursive: true });
                exec(`unzip -o ${archivePath} -d ${outputPath}`);

-                console.log(`NE Shapefile decompressed to ${outputPath}`);
            } catch (error) {
                console.error(`Error when downloading file '${archivePath}': ${error}`);
                continue;
@@ -50,26 +44,18 @@ const geojsonPath = `${outputPath}`;
 const geojsonFilePath = `${geojsonPath}/${unFilename}.geojson`;

 if (fs.existsSync(archivePath)) {
-    console.log(`File ${archivePath} already exists. Skipping download.`);
-    if (fs.existsSync(geojsonFilePath)) console.log(`File ${geojsonFilePath} already exists. Skipping decompression.`);
-    else exec(`unzip -o ${archivePath} -d ${geojsonPath}`);
+    if (!fs.existsSync(geojsonFilePath)) exec(`unzip -o ${archivePath} -d ${geojsonPath}`);
 } else {
    try {
-        console.log(`Downloading data from ${url}`);
-
        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(geojsonFilePath);
        await pipeline(Readable.fromWeb(response.body), file);
-        console.log(`UN GeoJSON file saved to ${geojsonFilePath}`);

-        console.log('Compressing UN GeoJSON for future use');
        // Use the shell to handle compression
        exec(`zip -j ${archivePath} ${geojsonFilePath}`);

-        console.log(`UN GeoJSON archive saved to ${archivePath}`);
    } catch (error) {
        console.error(`Error when downloading file '${geojsonFilePath}': ${error}`);
    }

diff --git a/tasks/topojson/process_geodata.mjs b/tasks/topojson/process_geodata.mjs
@@ -18,8 +18,6 @@ async function convertShpToGeo(filename) {
    const outputFilePath = `${outputDirGeojson}/${filename}.geojson`;
    const commands = [inputFilePath, `-proj wgs84`, `-o format=geojson ${outputFilePath}`].join(' ');
    await mapshaper.runCommands(commands);
-
-    console.log(`GeoJSON saved to ${outputFilePath}`);
 }

 function getJsonFile(filename) {
@@ -32,7 +30,6 @@ function getJsonFile(filename) {
 }

 async function createCountriesLayer({ bounds, filter, name, resolution, source }) {
-    console.log(`Building ${resolution}m countries layer for '${name}'`);
    const inputFilePath = `${outputDirGeojson}/${unFilename}_${resolution}m/${source}.geojson`;
    const outputFilePath = `${outputDirGeojson}/${name}_${resolution}m/countries.geojson`;
    const commands = [
@@ -43,7 +40,6 @@ async function createCountriesLayer({ bounds, filter, name, resolution, source }
    ].join(' ');
    await mapshaper.runCommands(commands);
    addCentroidsToGeojson(outputFilePath);
-    // TODO: Add simplification command if on 110m resolution? Or take care of somewhere else?
 }

 function addCentroidsToGeojson(geojsonPath) {
@@ -62,7 +58,6 @@ function addCentroidsToGeojson(geojsonPath) {

 async function createLandLayer({ bounds, name, resolution, source }) {
    // TODO: Figure out way to only include North and Central America via filter, dissolve
-    console.log(`Building ${resolution}m land layer for '${name}'`);
    const inputFilePath = `${outputDirGeojson}/${unFilename}_${resolution}m/${source}.geojson`;
    const outputFilePath = `${outputDirGeojson}/${name}_${resolution}m/land.geojson`;
    const commands = [
@@ -75,7 +70,6 @@ async function createLandLayer({ bounds, name, resolution, source }) {
 }

 async function createCoastlinesLayer({ bounds, name, resolution, source }) {
-    console.log(`Building ${resolution}m coastlines layer for '${name}'`);
    // TODO: Update source to be a path?
    const inputFilePath = `${outputDirGeojson}/${unFilename}_${resolution}m/${source}.geojson`;
    const outputFilePath = `${outputDirGeojson}/${name}_${resolution}m/coastlines.geojson`;
@@ -90,7 +84,6 @@ async function createCoastlinesLayer({ bounds, name, resolution, source }) {
 }

 async function createOceanLayer({ bounds, name, resolution, source }) {
-    console.log(`Building ${resolution}m ocean layer for '${name}'`);
    const inputFilePath = `./tasks/topojson/world_rectangle.geojson`;
    const outputFilePath = `${outputDirGeojson}/${name}_${resolution}m/ocean.geojson`;
    const eraseFilePath = `${outputDirGeojson}/${unFilename}_${resolution}m/${source}.geojson`;
@@ -104,7 +97,6 @@ async function createOceanLayer({ bounds, name, resolution, source }) {
 }

 async function createRiversLayer({ name, resolution, source }) {
-    console.log(`Building ${resolution}m rivers layer for '${name}'`);
    const inputFilePath = `${outputDirGeojson}/${getNEFilename({ resolution, source })}.geojson`;
    const outputFilePath = `${outputDirGeojson}/${name}_${resolution}m/rivers.geojson`;
    const commands = [
@@ -116,7 +108,6 @@ async function createRiversLayer({ name, resolution, source }) {
 }

 async function createLakesLayer({ name, resolution, source }) {
-    console.log(`Building ${resolution}m lakes layer for '${name}'`);
    const inputFilePath = `${outputDirGeojson}/${getNEFilename({ resolution, source })}.geojson`;
    const outputFilePath = `${outputDirGeojson}/${name}_${resolution}m/lakes.geojson`;
    const commands = [
@@ -128,7 +119,6 @@ async function createLakesLayer({ name, resolution, source }) {
 }

 async function createSubunitsLayer({ name, resolution, source }) {
-    console.log(`Building ${resolution}m subunits layer for '${name}'`);
    const filter = ['AUS', 'BRA', 'CAN', 'USA'].map((id) => `adm0_a3 === "${id}"`).join(' || ');
    const inputFilePath = `${outputDirGeojson}/${getNEFilename({ resolution, source })}.geojson`;
    const outputFilePath = `${outputDirGeojson}/${name}_${resolution}m/subunits.geojson`;
@@ -211,10 +201,7 @@ function getCentroid(feature) {

 async function convertLayersToTopojson({ name, resolution }) {
    const regionDir = path.join(outputDirGeojson, `${name}_${resolution}m`);
-    if (!fs.existsSync(regionDir)) {
-        console.log(`Couldn't find ${regionDir}`);
-        return;
-    }
+    if (!fs.existsSync(regionDir)) return;

    const outputFile = `${outputDirTopojson}/${name}_${resolution}m.json`;
    // Layer names default to file names
@@ -225,8 +212,6 @@ async function convertLayersToTopojson({ name, resolution }) {
    const topojson = getJsonFile(outputFile);
    const prunedTopojson = pruneProperties(topojson);
    fs.writeFileSync(outputFile, JSON.stringify(prunedTopojson));
-
-    console.log(`Topojson saved to: ${outputFile}`);
 }

 // Get polygon features from UN GeoJSON