Merge branch 'maptiler:master' into master

package.json

@@ -48,8 +48,8 @@
   "devDependencies": {
     "@commitlint/cli": "^18.4.3",
     "@commitlint/config-conventional": "^18.4.3",
-    "@typescript-eslint/eslint-plugin": "^6.12.0",
-    "@typescript-eslint/parser": "^6.12.0",
+    "@typescript-eslint/eslint-plugin": "^6.13.1",
+    "@typescript-eslint/parser": "^6.13.1",
     "chai": "4.3.10",
     "eslint": "^8.54.0",
     "eslint-config-prettier": "^9.0.0",

public/templates/index.tmpl

@@ -79,7 +79,7 @@
           <div class="details">
             <h3>{{tileJSON.name}}</h3>
             <div class="identifier">identifier: {{@key}}{{#if formatted_filesize}} | size: {{formatted_filesize}}{{/if}}</div>
-            <div class="identifier">type: {{#is_vector}}vector{{/is_vector}}{{^is_vector}}raster{{/is_vector}} data {{#if source_type}} | ext: {{source_type}}{{/if}}</div>
+            <div class="identifier">type: {{#is_vector}}vector{{/is_vector}}{{^is_vector}}raster{{/is_vector}} data {{#if sourceType}} | ext: {{sourceType}}{{/if}}</div>
             <p class="services">
               services: <a href="{{public_url}}data/{{@key}}.json{{&../key_query}}">TileJSON</a>
               {{#if xyz_link}}

src/main.js

@@ -9,7 +9,7 @@ import axios from 'axios';
 import { server } from './server.js';
 import MBTiles from '@mapbox/mbtiles';
 import { isValidHttpUrl } from './utils.js';
-import { PMtilesOpen, GetPMtilesInfo } from './pmtiles_adapter.js';
+import { openPMtiles, getPMtilesInfo } from './pmtiles_adapter.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -62,26 +62,26 @@ const opts = program.opts();
 
 console.log(`Starting ${packageJson.name} v${packageJson.version}`);
 
-const StartServer = (configPath, config) => {
+const startServer = (configPath, config) => {
   let publicUrl = opts.public_url;
   if (publicUrl && publicUrl.lastIndexOf('/') !== publicUrl.length - 1) {
     publicUrl += '/';
   }
   return server({
-    configPath: configPath,
-    config: config,
+    configPath,
+    config,
     bind: opts.bind,
     port: opts.port,
     cors: opts.cors,
     verbose: opts.verbose,
     silent: opts.silent,
     logFile: opts.log_file,
     logFormat: opts.log_format,
-    publicUrl: publicUrl,
+    publicUrl,
   });
 };
 
-const StartWithInputFile = async (inputFile) => {
+const startWithInputFile = async (inputFile) => {
   console.log(`[INFO] Automatically creating config file for ${inputFile}`);
   console.log(`[INFO] Only a basic preview style will be used.`);
   console.log(
@@ -123,8 +123,8 @@ const StartWithInputFile = async (inputFile) => {
 
   const extension = inputFile.split('.').pop().toLowerCase();
   if (extension === 'pmtiles') {
-    let FileOpenInfo = PMtilesOpen(inputFile);
-    const metadata = await GetPMtilesInfo(FileOpenInfo);
+    const fileOpenInfo = openPMtiles(inputFile);
+    const metadata = await getPMtilesInfo(fileOpenInfo);
 
     if (
       metadata.format === 'pbf' &&
@@ -174,7 +174,7 @@ const StartWithInputFile = async (inputFile) => {
       console.log('Run with --verbose to see the config file here.');
     }
 
-    return StartServer(null, config);
+    return startServer(null, config);
   } else {
     if (isValidHttpUrl(inputFile)) {
       console.log(
@@ -215,7 +215,7 @@ const StartWithInputFile = async (inputFile) => {
               config['styles'][styleName] = {
                 style: styleFileRel,
                 tilejson: {
-                  bounds: bounds,
+                  bounds,
                 },
               };
             }
@@ -235,13 +235,13 @@ const StartWithInputFile = async (inputFile) => {
           console.log('Run with --verbose to see the config file here.');
         }
 
-        return StartServer(null, config);
+        return startServer(null, config);
       });
     });
   }
 };
 
-fs.stat(path.resolve(opts.config), (err, stats) => {
+fs.stat(path.resolve(opts.config), async (err, stats) => {
   if (err || !stats.isFile() || stats.size === 0) {
     let inputFile;
     if (opts.file) {
@@ -251,7 +251,7 @@ fs.stat(path.resolve(opts.config), (err, stats) => {
     }
 
     if (inputFile) {
-      return StartWithInputFile(inputFile);
+      return startWithInputFile(inputFile);
     } else {
       // try to find in the cwd
       const files = fs.readdirSync(process.cwd());
@@ -266,33 +266,34 @@ fs.stat(path.resolve(opts.config), (err, stats) => {
       }
       if (inputFile) {
         console.log(`No input file specified, using ${inputFile}`);
-        return StartWithInputFile(inputFile);
+        return startWithInputFile(inputFile);
       } else {
         const url =
           'https://github.com/maptiler/tileserver-gl/releases/download/v1.3.0/zurich_switzerland.mbtiles';
         const filename = 'zurich_switzerland.mbtiles';
         const writer = fs.createWriteStream(filename);
         console.log(`No input file found`);
         console.log(`[DEMO] Downloading sample data (${filename}) from ${url}`);
-        axios({
-          url,
-          method: 'GET',
-          responseType: 'stream',
-        })
-          .then((response) => {
-            response.data.pipe(writer);
-            writer.on('finish', () => StartWithInputFile(filename));
-            writer.on('error', (err) =>
-              console.error(`Error writing file: ${err}`),
-            );
-          })
-          .catch((error) => {
-            console.error(`Error downloading file: ${error}`);
+
+        try {
+          const response = await axios({
+            url,
+            method: 'GET',
+            responseType: 'stream',
           });
+
+          response.data.pipe(writer);
+          writer.on('finish', () => startWithInputFile(filename));
+          writer.on('error', (err) =>
+            console.error(`Error writing file: ${err}`),
+          );
+        } catch (error) {
+          console.error(`Error downloading file: ${error}`);
+        }
       }
     }
   } else {
     console.log(`Using specified config file from ${opts.config}`);
-    return StartServer(opts.config, null);
+    return startServer(opts.config, null);
   }
 });