fix: simplify source to data mapping

Signed-off-by: Andrew Calcutt <acalcutt@techidiots.net>

src/serve_data.js

@@ -204,7 +204,7 @@ export const serve_data = {
       inputType = 'mbtiles';
       if (isValidHttpUrl(params.pmtiles)) {
         throw Error(
-          `ERROR: MBTiles does not support web based files: ${inputFile}`,
+          `ERROR: MBTiles does not support web based files: "${inputFile}"`,
         );
       } else {
         inputFile = path.resolve(options.paths.mbtiles, params.mbtiles);
@@ -218,7 +218,7 @@ export const serve_data = {
     if (!isValidHttpUrl(inputFile)) {
       const inputFileStats = fs.statSync(inputFile);
       if (!inputFileStats.isFile() || inputFileStats.size === 0) {
-        throw Error(`Not valid input file: ${inputFile}`);
+        throw Error(`Not valid input file: "${inputFile}"`);
       }
     }
 

src/serve_rendered.js

@@ -1469,27 +1469,22 @@ export const serve_rendered = {
       let source = styleJSON.sources[name];
       const url = source.url;
 
-      if (
+      if (url && (url.startsWith('pmtiles:') || url.startsWith('mbtiles:'))) {
-        url &&
+        // found pmtiles or mbtiles source, replace with info from local file
-        (url.lastIndexOf('pmtiles:', 0) === 0 ||
-          url.lastIndexOf('mbtiles:', 0) === 0)
-      ) {
-        // found mbtiles source, replace with info from local file
         delete source.url;
 
-        let inputFile = url.replace('pmtiles://', '').replace('mbtiles://', '');
+        let inputFile;
-        const fromData =
+        let dataId = url.replace('pmtiles://', '').replace('mbtiles://', '');
-          inputFile[0] === '{' && inputFile[inputFile.length - 1] === '}';
+        const fromData = dataId.startsWith('{') && dataId.endsWith('}');
 
         if (fromData) {
-          inputFile = inputFile.substr(1, inputFile.length - 2);
+          dataId = dataId.slice(1, -1);
-          const mapsTo = (params.mapping || {})[inputFile];
+          const mapsTo = (params.mapping || {})[dataId];
           if (mapsTo) {
-            inputFile = mapsTo;
+            dataId = mapsTo;
           }
 
-          let protocol = url.split(':')[0];
+          const DataInfo = dataResolver(dataId);
-          const DataInfo = dataResolver(inputFile, protocol);
           if (DataInfo.inputfile) {
             inputFile = DataInfo.inputfile;
             source_type = DataInfo.filetype;
@@ -1502,7 +1497,7 @@ export const serve_rendered = {
         if (!isValidHttpUrl(inputFile)) {
           const inputFileStats = fs.statSync(inputFile);
           if (!inputFileStats.isFile() || inputFileStats.size === 0) {
-            throw Error(`Not valid PMTiles file: ${inputFile}`);
+            throw Error(`Not valid PMTiles file: "${inputFile}"`);
           }
         }
 
@@ -1547,7 +1542,7 @@ export const serve_rendered = {
               inputFile = path.resolve(options.paths.mbtiles, inputFile);
               const inputFileStats = fs.statSync(inputFile);
               if (!inputFileStats.isFile() || inputFileStats.size === 0) {
-                throw Error(`Not valid MBTiles file: ${inputFile}`);
+                throw Error(`Not valid MBTiles file: "${inputFile}"`);
               }
               map.sources[name] = new MBTiles(inputFile + '?mode=ro', (err) => {
                 map.sources[name].getInfo((err, info) => {

src/serve_style.js

@@ -111,26 +111,21 @@ export const serve_style = {
     for (const name of Object.keys(styleJSON.sources)) {
       const source = styleJSON.sources[name];
       const url = source.url;
-      if (
+      const protocol = url.split(':')[0];
-        url &&
-        (url.lastIndexOf('pmtiles:', 0) === 0 ||
-          url.lastIndexOf('mbtiles:', 0) === 0)
-      ) {
-        let inputSource = url
-          .replace('pmtiles://', '')
-          .replace('mbtiles://', '');
 
-        const fromData =
+      if (url && (url.startsWith('pmtiles:') || url.startsWith('mbtiles:'))) {
-          inputSource[0] === '{' && inputSource[inputSource.length - 1] === '}';
+        let dataId = url.replace('pmtiles://', '').replace('mbtiles://', '');
 
+        const fromData = dataId.startsWith('{') && dataId.endsWith('}');
         if (fromData) {
-          inputSource = inputSource.substr(1, inputSource.length - 2);
+          dataId = dataId.slice(1, -1);
-          const mapsTo = (params.mapping || {})[inputSource];
+          const mapsTo = (params.mapping || {})[dataId];
           if (mapsTo) {
-            inputSource = mapsTo;
+            dataId = mapsTo;
           }
         }
-        const identifier = reportTiles(inputSource, fromData);
+
+        const identifier = reportTiles(dataId, fromData, protocol);
         if (!identifier) {
           return false;
         }

src/server.js

@@ -183,42 +183,32 @@ function start(opts) {
         item,
         id,
         opts.publicUrl,
-        (fileid, fromData) => {
+        (dataId, fromData, protocol) => {
           let dataItemId;
           for (const id of Object.keys(data)) {
             if (fromData) {
-              if (id === fileid) {
+              if (id === dataId) {
                 dataItemId = id;
               }
             } else {
-              if (
+              const fileType = Object.keys(data[id])[0];
-                data[id].mbtiles !== undefined &&
+              if (data[id][fileType] === dataId) {
-                data[id].mbtiles === fileid
-              ) {
-                dataItemId = id;
-              } else if (
-                data[id].pmtiles !== undefined &&
-                data[id].pmtiles === fileid
-              ) {
                 dataItemId = id;
               }
             }
           }
           if (dataItemId) {
-            // mbtiles exist in the data config
+            // input files exists in the data config
             return dataItemId;
           } else {
             if (fromData || !allowMoreData) {
               console.log(
-                `ERROR: style "${item.style}" using unknown file "${fileid}"! Skipping...`,
+                `ERROR: style "${item.style}" using unknown file "${dataId}"! Skipping...`,
               );
               return undefined;
             } else {
-              let id = fileid.substr(0, fileid.lastIndexOf('.')) || fileid;
+              let id = dataId.substr(0, dataId.lastIndexOf('.')) || dataId;
-              while (data[id]) id += '_';
+              data[id][protocol] = dataId;
-              data[id] = {
-                filename: fileid,
-              };
               return id;
             }
           }
@@ -239,35 +229,20 @@ function start(opts) {
             item,
             id,
             opts.publicUrl,
-            (fileid, protocol) => {
+            (dataId) => {
-              //console.log(protocol);
-              let inputFile;
               let fileType;
+              let inputFile;
               for (const id of Object.keys(data)) {
-                if (id === fileid) {
+                fileType = Object.keys(data[id])[0];
-                  if (data[id].pmtiles !== undefined) {
+                if (id === dataId) {
-                    if (isValidHttpUrl(data[id].pmtiles)) {
+                  if (isValidHttpUrl(inputFile)) {
-                      inputFile = data[id].pmtiles;
+                    inputFile = data[id][fileType];
                   } else {
                     inputFile = path.resolve(
-                        options.paths.pmtiles,
+                      options.paths[fileType],
-                        data[id].pmtiles,
+                      data[id][fileType],
                     );
                   }
-                    fileType = 'pmtiles';
-                  } else if (data[id].mbtiles !== undefined) {
-                    inputFile = path.resolve(
-                      options.paths.mbtiles,
-                      data[id].mbtiles,
-                    );
-                    fileType = 'mbtiles';
-                  } else if (data[id].filename !== undefined) {
-                    inputFile = path.resolve(
-                      options.paths[protocol],
-                      data[id].filename,
-                    );
-                    fileType = protocol;
-                  }
                 }
               }
               return { inputfile: inputFile, filetype: fileType };