@tileflow/svelte 0.1.0-alpha.24 → 0.1.0-alpha.25

package/README.md

@@ -73,7 +73,7 @@ The worker and shared module must match the application's installed MapLibre ver
 </script>
 
 <TileflowMap
-  source={{kind: 'tileflow', map: 'madrid'}}
+  source={{map: 'madrid'}}
   theme="system"
   center={[-3.7038, 40.4168]}
   zoom={12}
@@ -81,18 +81,20 @@ The worker and shared module must match the application's installed MapLibre ver
 />
 ```
 
-Coordinates are `[longitude, latitude]`. `source.map` matches the config's portable ID, not a hosted
-`map_...` identifier. The default manifest URL is exactly `/tileflow/manifest.json`. Set
-`source.manifestUrl` for a subpath or external host; the browser does not infer bundler configuration.
+Coordinates are `[longitude, latitude]`. `source` is one object, `{map, manifestUrl?}`.
+`source.map` matches the config's portable ID, not a hosted `map_...` identifier. The default
+manifest URL is exactly `/tileflow/manifest.json`. Set `source.manifestUrl` for a subpath or external
+host; the browser does not infer bundler configuration.
 
 Omitting `theme` uses `defaultTheme`. `system` needs an explicit light/dark mapping, which Streets
 supplies. Theme changes keep the MapLibre instance, camera, and interactions, and roll back on
 failure. `onThemeChange` reports transitions.
 
 `mapOptions` accepts native MapLibre options except `container` and `style`. Direct props win over
-those options, then the manifest view, then shared defaults. An unmanaged source with
-`{kind: 'maplibre', style: styleUrl}` loads one style without Tileflow themes or manifest identity;
-do not pass a Tileflow theme with it.
+those options, then the manifest view, then shared defaults. `TileflowMap` always selects a Tileflow
+map through its manifest; it has no renderer discriminator or direct-style mode. The obsolete
+source fields `kind` and `style` are rejected. For a completely unmanaged map, use `maplibre-gl`
+directly rather than a Tileflow component.
 
 ## Add annotations and native popup UI
 
@@ -137,7 +139,7 @@ This Svelte 5 component uses the worker and CSS setup above:
 {/snippet}
 
 <TileflowMap
-  source={{kind: 'tileflow', map: 'madrid'}}
+  source={{map: 'madrid'}}
   {annotations}
   interactionState={state}
   onInteractionStateChange={(next) => (state = next)}
@@ -164,9 +166,10 @@ HTML. Keep tooltips non-interactive and put buttons, links, and forms in popups.
 
 ## Display an existing image
 
-`mode="image"` displays an explicit `imageUrl` or a published manifest image without loading
-MapLibre. A local style build does not generate that image. This mode does not submit or poll a
-Static Maps operation; use the server-side
+`mode="image"` displays an explicit `imageUrl` or derives an image URL from the selected manifest
+map's `mapId`, `apiUrl`, concrete theme and view, without loading MapLibre. It still requires a valid
+Tileflow source. A local style build does not generate that image. This mode does not submit or poll
+a Static Maps operation; use the server-side
 [Static Maps client](https://github.com/tileflow/tileflow-sdk/blob/main/packages/static/README.md)
 for new renders, keeping privileged credentials off the browser.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tileflow/svelte",
-  "version": "0.1.0-alpha.24",
+  "version": "0.1.0-alpha.25",
   "license": "Apache-2.0",
   "description": "Svelte component for rendering Tileflow maps with MapLibre.",
   "type": "module",
@@ -44,7 +44,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@tileflow/core": ">=0.1.0-alpha.25 <0.1.0-beta.0",
+    "@tileflow/core": ">=0.1.0-alpha.27 <0.1.0-beta.0",
     "@tileflow/interactions": ">=0.1.0-alpha.4 <0.1.0-beta.0"
   },
   "peerDependencies": {

package/src/TileflowMap.svelte

@@ -23,7 +23,6 @@
     resolveTileflowRuntimeTheme,
     resolveTileflowRuntimeView,
     resolveTileflowStaticImageUrl,
-    shouldLoadTileflowManifest,
     type TileflowRuntimeManifestMap,
   } from '@tileflow/core/runtime';
   import {
@@ -144,7 +143,7 @@
   let manifestMap: TileflowRuntimeManifestMap | null = null;
   let manifestLoadId = 0;
   let manifestResolutionKey = '';
-  let manifestResolutionState: 'error' | 'loading' | 'not-needed' | 'ready' = 'loading';
+  let manifestResolutionState: 'error' | 'loading' | 'ready' = 'loading';
   let mapLoadId = 0;
   let mounted = false;
   let refreshRunId = 0;
@@ -170,23 +169,11 @@
   $: assertTileflowMapStyleInputs({source, theme});
   $: resolvedCaptureId = normalizeTileflowCaptureId(captureId);
   $: isImageMode = resolvedMode === 'image';
-  $: mapName = source?.kind === 'tileflow' ? source.map : undefined;
-  $: manifestUrl =
-    source?.kind === 'tileflow'
-      ? (source.manifestUrl ?? defaultTileflowManifestUrl)
-      : defaultTileflowManifestUrl;
-  $: shouldLoadManifest = shouldLoadTileflowManifest({
-    source,
-  });
-  $: manifestRequestKey = shouldLoadManifest
-    ? JSON.stringify([manifestUrl, mapName])
-    : 'not-needed';
+  $: mapName = source.map;
+  $: manifestUrl = source.manifestUrl ?? defaultTileflowManifestUrl;
+  $: manifestRequestKey = JSON.stringify([manifestUrl, mapName]);
   $: currentManifestResolutionState =
-    manifestResolutionKey === manifestRequestKey
-      ? manifestResolutionState
-      : shouldLoadManifest
-        ? 'loading'
-        : 'not-needed';
+    manifestResolutionKey === manifestRequestKey ? manifestResolutionState : 'loading';
   $: manifestMap =
     manifestResolutionKey === manifestRequestKey && manifestResolutionState === 'ready'
       ? loadedManifestMap
@@ -194,7 +181,6 @@
   $: themeResolution = resolveThemeSelection({
     colorScheme: systemColorScheme,
     manifestMap,
-    source,
     theme,
   });
   $: resolvedThemeName = themeResolution.name;
@@ -237,7 +223,6 @@
     isImageMode,
     runtimeImageUrl,
     runtimeStyle,
-    shouldLoadManifest,
     themeResolutionError: themeResolution.error,
   });
   $: currentMapCaptureState =
@@ -384,17 +369,7 @@
   }
 
   async function refreshManifest() {
-    const shouldLoad = shouldLoadManifest;
     const requestKey = manifestRequestKey;
-
-    if (!shouldLoad) {
-      manifestLoadId += 1;
-      loadedManifestMap = null;
-      manifestResolutionKey = requestKey;
-      manifestResolutionState = 'not-needed';
-      return;
-    }
-
     const loadId = ++manifestLoadId;
     loadedManifestMap = null;
     manifestResolutionKey = requestKey;
@@ -1228,16 +1203,12 @@
   function resolveThemeSelection(input: {
     colorScheme: 'dark' | 'light';
     manifestMap: TileflowRuntimeManifestMap | null;
-    source: TileflowMapProps['source'];
     theme: TileflowMapProps['theme'];
   }): Readonly<{error: boolean; name: string | undefined}> {
-    if (!input.manifestMap || input.source.kind !== 'tileflow') {
+    if (!input.manifestMap) {
       return {
         error: false,
-        name:
-          input.source.kind === 'tileflow' && input.theme && input.theme !== 'system'
-            ? input.theme
-            : undefined,
+        name: input.theme && input.theme !== 'system' ? input.theme : undefined,
       };
     }
 
@@ -1252,16 +1223,15 @@
   }
 
   function resolveRuntimeResolutionState(input: {
-    currentManifestResolutionState: 'error' | 'loading' | 'not-needed' | 'ready';
+    currentManifestResolutionState: 'error' | 'loading' | 'ready';
     imageSize: {height: number; width: number} | null;
     imageUrl: string | undefined;
     isImageMode: boolean;
     runtimeImageUrl: string | undefined;
     runtimeStyle: ReturnType<typeof resolveTileflowRuntimeStyle>;
-    shouldLoadManifest: boolean;
     themeResolutionError: boolean;
   }): 'error' | 'idle' | 'loading' {
-    if (input.shouldLoadManifest && input.currentManifestResolutionState !== 'ready') {
+    if (input.currentManifestResolutionState !== 'ready') {
       return input.currentManifestResolutionState === 'error' ? 'error' : 'loading';
     }
     if (input.themeResolutionError) return 'error';

package/src/style-source.js

@@ -16,12 +16,6 @@ export function validateTileflowMapStyleInputs(input) {
   if (input.theme !== undefined && !validateTileflowThemeSelection(input.theme)) {
     return {error: 'theme must be a concrete portable theme name or "system"', ok: false};
   }
-  if (
-    input.theme !== undefined &&
-    /** @type {{kind?: unknown}} */ (input.source).kind !== 'tileflow'
-  ) {
-    return {error: 'theme is only valid with a tileflow source', ok: false};
-  }
   return {ok: true};
 }