map-gl-offline 0.8.7 → 0.8.9

package/dist/index.js

@@ -183,6 +183,28 @@ const MAPBOX_API = {
     MODELS_PATH: '/models/v1',
     PROTOCOL: 'mapbox://',
 };
+/**
+ * Mapbox Standard sub-tilesets that are sparse-by-design across the planet.
+ * These only have tiles where the underlying feature (indoor venues, landmark
+ * POIs, 3D procedural buildings) actually exists, and return 404 for nearly
+ * every other coordinate. The tile downloader pre-skips any source whose tile
+ * URL templates reference one of these tileset IDs, so we never issue probe
+ * or download requests for them — eliminating the 404 noise in devtools.
+ *
+ * Matching is done against the tileset segment of the tile URL template
+ * (e.g. `https://api.mapbox.com/v4/mapbox.indoor-v3/{z}/{x}/{y}.vector.pbf`
+ * or `mapbox://mapbox.indoor-v3`).
+ *
+ * The ids below are the ones the live Mapbox Standard style declares — note
+ * that the landmark-POI tileset is `mapbox.mapbox-landmark-pois-v1` (doubled
+ * `mapbox` segment), unlike the other two. The matcher is delimiter-anchored,
+ * so an approximate id silently never matches.
+ */
+const MAPBOX_STANDARD_SPARSE_TILESETS = [
+    'mapbox.indoor-v3',
+    'mapbox.mapbox-landmark-pois-v1',
+    'mapbox.procedural-buildings-v1',
+];
 // Map Providers
 const MAP_PROVIDERS = {
     AUTO: 'auto',
@@ -3285,15 +3307,42 @@ function configureSqlJs(config) {
     sqlJsPromise = null;
 }
 /**
- * Lazily initialise `sql.js`. The underlying module is loaded via dynamic
- * `import()` so it only ships with bundles that actually call MBTiles code.
+ * Resolve the `initSqlJs` factory.
+ *
+ * Bundler builds resolve the npm package via dynamic `import()`, so `sql.js`
+ * only ships with bundles that actually call MBTiles code. The UMD/CDN build
+ * has no module resolver, so the import throws there — fall back to the
+ * `initSqlJs` global that sql.js's own `<script>` build defines.
+ */
+async function resolveInitSqlJs() {
+    let importError;
+    try {
+        const mod = (await import('sql.js'));
+        if (typeof mod?.default === 'function')
+            return mod.default;
+    }
+    catch (error) {
+        // Bare specifier not resolvable (UMD/CDN), or the module threw while
+        // initialising. Either way, try the global before giving up.
+        importError = error;
+    }
+    const globalInit = globalThis.initSqlJs;
+    if (typeof globalInit === 'function')
+        return globalInit;
+    // Preserve the original failure — a module that resolved but threw is a
+    // very different problem from one that couldn't be resolved at all.
+    throw new Error('sql.js could not be loaded. Install `sql.js` when bundling, or load ' +
+        'https://cdn.jsdelivr.net/npm/sql.js/dist/sql-wasm.js before map-gl-offline ' +
+        'when using the UMD build.', importError !== undefined ? { cause: importError } : undefined);
+}
+/**
+ * Lazily initialise `sql.js`.
  */
 async function getSqlJs() {
     if (sqlJsPromise)
         return sqlJsPromise;
     sqlJsPromise = (async () => {
-        const mod = (await import('sql.js'));
-        const initSqlJs = mod.default;
+        const initSqlJs = await resolveInitSqlJs();
         const options = {};
         if (currentConfig.wasmBinary) {
             options.wasmBinary = currentConfig.wasmBinary;
@@ -6147,6 +6196,26 @@ const getExpiredResourceCount = () => cleanupService.getExpiredResourceCount();
 const cleanupExpiredTiles = (styleId) => cleanupService.cleanupExpiredTiles(styleId);
 
 const tileLogger = logger.scope('TileService');
+/**
+ * Match a tile-URL template against the known-sparse Mapbox Standard
+ * sub-tilesets. Catches:
+ *   - `mapbox://<tileset>` — original style source URL.
+ *   - `.../v4/<tileset>.json...` — resolved TileJSON URL produced when the
+ *     library resolves a `mapbox://` source URL into an HTTPS one.
+ *   - `.../v4/<tileset>/{z}/{x}/{y}...` — resolved tile-template URL.
+ */
+function urlReferencesKnownSparseTileset(template) {
+    return MAPBOX_STANDARD_SPARSE_TILESETS.some(tileset => {
+        if (template.includes(`mapbox://${tileset}`))
+            return true;
+        // `/v4/<tileset>` followed by `/` (tile template) or `.` (e.g. `.json`)
+        const idx = template.indexOf(`/${tileset}`);
+        if (idx === -1)
+            return false;
+        const next = template[idx + tileset.length + 1];
+        return next === '/' || next === '.';
+    });
+}
 /**
  * Service for managing offline map tiles
  * Handles downloading, storing, and retrieving map tiles from IndexedDB
@@ -6164,7 +6233,7 @@ class TileService {
      */
     async downloadTiles(region, style, styleId, options = {}) {
         const db = await this.db;
-        const { onProgress, batchSize = 10, maxRetries = 3, skipExisting = true, timeout = 10000, retryDelay = 1000, priorityZoomLevels = [], storageQuotaCheck = true, validateTiles = false, compressTiles = false, bandwidthLimit, probeSourcesBeforeDownload = true, } = options;
+        const { onProgress, batchSize = 10, maxRetries = 3, skipExisting = true, timeout = 10000, retryDelay = 1000, priorityZoomLevels = [], storageQuotaCheck = true, validateTiles = false, compressTiles = false, bandwidthLimit, probeSourcesBeforeDownload = true, skipKnownSparseSources = true, } = options;
         const startTime = Date.now();
         let totalSize = 0;
         let downloadedTiles = 0;
@@ -6268,6 +6337,16 @@ class TileService {
                 tileLogger.debug(`Skipping source ${sourceId}: no tiles array`);
                 continue;
             }
+            // Pre-skip Mapbox Standard sparse sub-tilesets (indoor-v3 etc.) before
+            // issuing any network request. They 404 for nearly every coord in a
+            // typical region; the downstream probe step would catch them, but the
+            // probe itself logs 404s in devtools. Matching here keeps the console
+            // clean.
+            if (skipKnownSparseSources &&
+                tiles.some(template => urlReferencesKnownSparseTileset(template))) {
+                tileLogger.info(`Skipping source "${sourceId}" — references a known sparse Mapbox Standard sub-tileset (no probe/download issued)`);
+                continue;
+            }
             const sourceMinZ = Math.ceil(sourceConfig.minzoom ?? region.minZoom);
             const sourceMaxZ = Math.floor(sourceConfig.maxzoom ?? region.maxZoom);
             let coordsForSource = tileCoords.filter(coord => coord.z >= sourceMinZ && coord.z <= sourceMaxZ);
@@ -7045,7 +7124,8 @@ var tileService$1 = /*#__PURE__*/Object.freeze({
     downloadTiles: downloadTiles,
     getTileAnalytics: getTileAnalytics,
     getTileStats: getTileStats,
-    tileService: tileService
+    tileService: tileService,
+    urlReferencesKnownSparseTileset: urlReferencesKnownSparseTileset
 });
 
 const glyphLogger = logger.scope('GlyphService');
@@ -14017,6 +14097,7 @@ exports.ImportExportService = ImportExportService;
 exports.MAPBOX_API = MAPBOX_API;
 exports.MAPBOX_CACHE_TTL = MAPBOX_CACHE_TTL;
 exports.MAPBOX_CLASSIC_STYLES = MAPBOX_CLASSIC_STYLES;
+exports.MAPBOX_STANDARD_SPARSE_TILESETS = MAPBOX_STANDARD_SPARSE_TILESETS;
 exports.MAP_PROVIDERS = MAP_PROVIDERS;
 exports.MAX_GLYPH_CODEPOINT = MAX_GLYPH_CODEPOINT;
 exports.MaintenanceService = MaintenanceService;
@@ -14137,6 +14218,7 @@ exports.stopAutoCleanup = stopAutoCleanup;
 exports.t = t;
 exports.tileService = tileService;
 exports.unregisterOfflineServiceWorker = unregisterOfflineServiceWorker;
+exports.urlReferencesKnownSparseTileset = urlReferencesKnownSparseTileset;
 exports.validateBounds = validateBounds;
 exports.validateRegionOptions = validateRegionOptions;
 exports.validateResource = validateResource;