1.20.4

A bit too small otherwise

app/components/app-menu/settings/nostr.gjs

@@ -12,6 +12,7 @@ const stripProtocol = (url) => (url ? url.replace(/^wss?:\/\//, '') : '');
 export default class AppMenuSettingsNostr extends Component {
   @service settings;
   @service nostrData;
+  @service toast;
 
   @tracked newReadRelay = '';
   @tracked newWriteRelay = '';
@@ -90,6 +91,16 @@ export default class AppMenuSettingsNostr extends Component {
     this.settings.update('nostrWriteRelays', null);
   }
 
+  @action
+  async clearCache() {
+    try {
+      await this.nostrData.clearCache();
+      this.toast.show('Nostr cache cleared');
+    } catch (e) {
+      this.toast.show(`Failed to clear Nostr cache: ${e.message}`);
+    }
+  }
+
   <template>
     {{! template-lint-disable no-nested-interactive }}
     <details>
@@ -213,6 +224,18 @@ export default class AppMenuSettingsNostr extends Component {
             </button>
           {{/if}}
         </div>
+
+        <div class="form-group">
+          <label>Cached data</label>
+          <button
+            type="button"
+            class="btn btn-outline btn-full"
+            {{on "click" this.clearCache}}
+          >
+            <Icon @name="database" @size={{18}} @color="var(--danger-color)" />
+            Clear profiles, photos, and reviews
+          </button>
+        </div>
       </div>
     </details>
   </template>

app/components/blurhash.gjs

@@ -23,7 +23,7 @@ export default class Blurhash extends Component {
       imageData.data.set(pixels);
       ctx.putImageData(imageData, 0, 0);
     } catch (e) {
-      console.warn('Failed to decode blurhash:', e);
+      console.warn('Failed to decode blurhash:', e.message || e);
     }
   });
 

app/components/map.gjs

@@ -1034,7 +1034,7 @@ export default class MapComponent extends Component {
   }
 
   handleMapMove = async () => {
-    if (!this.mapInstance) return;
+    if (!this.mapInstance || this.isDestroying || this.isDestroyed) return;
 
     const view = this.mapInstance.getView();
     const center = toLonLat(view.getCenter());

app/components/modal.gjs

@@ -11,6 +11,7 @@ export default class Modal extends Component {
 
   @action
   close() {
+    if (this.args.disableClose) return;
     if (this.args.onClose) {
       this.args.onClose();
     }
@@ -31,10 +32,11 @@ export default class Modal extends Component {
       >
         <button
           type="button"
-          class="close-modal-btn btn-text"
+          class="close-modal-btn btn-text {{if @disableClose 'disabled'}}"
+          disabled={{@disableClose}}
           {{on "click" this.close}}
         >
-          <Icon @name="x" @size={{24}} />
+          <Icon @name="x" @size={{24}} @color="currentColor" />
         </button>
         {{yield}}
       </div>

app/components/place-details.gjs

@@ -26,6 +26,13 @@ export default class PlaceDetails extends Component {
   @tracked showLists = false;
   @tracked isPhotoUploadModalOpen = false;
   @tracked isNostrConnectModalOpen = false;
+  @tracked newlyUploadedPhotoId = null;
+  @tracked isPhotoUploadActive = false;
+
+  @action
+  handleUploadStateChange(isActive) {
+    this.isPhotoUploadActive = isActive;
+  }
 
   @action
   openPhotoUploadModal(e) {
@@ -40,8 +47,20 @@ export default class PlaceDetails extends Component {
   }
 
   @action
-  closePhotoUploadModal() {
+  closePhotoUploadModal(eventId) {
+    if (this.isPhotoUploadActive) return;
     this.isPhotoUploadModalOpen = false;
+    if (typeof eventId === 'string') {
+      this.newlyUploadedPhotoId = eventId;
+
+      // Allow DOM to update first, then scroll to the top to show the new photo in the carousel
+      setTimeout(() => {
+        const sidebar = document.querySelector('.sidebar-content');
+        if (sidebar) {
+          sidebar.scrollTop = 0;
+        }
+      }, 50);
+    }
   }
 
   @action
@@ -352,7 +371,12 @@ export default class PlaceDetails extends Component {
           @onCancel={{this.cancelEditing}}
         />
       {{else}}
-        <PlacePhotosCarousel @photos={{this.photos}} @name={{this.name}} />
+        <PlacePhotosCarousel
+          @photos={{this.photos}}
+          @name={{this.name}}
+          @resetKey={{this.place.osmId}}
+          @scrollToEventId={{this.newlyUploadedPhotoId}}
+        />
         <h3>{{this.name}}</h3>
         <p class="place-type">
           {{this.type}}
@@ -552,11 +576,15 @@ export default class PlaceDetails extends Component {
       {{#if this.osmUrl}}
         <div class="meta-info">
           <p class="content-with-icon">
-            <Icon @name="camera" />
+            <Icon @name="feather-camera" />
             <span>
-              <a href="#" {{on "click" this.openPhotoUploadModal}}>
+              <button
+                type="button"
+                class="btn-link"
+                {{on "click" this.openPhotoUploadModal}}
+              >
                 Add a photo
-              </a>
+              </button>
             </span>
           </p>
         </div>
@@ -564,10 +592,14 @@ export default class PlaceDetails extends Component {
     </div>
 
     {{#if this.isPhotoUploadModalOpen}}
-      <Modal @onClose={{this.closePhotoUploadModal}}>
+      <Modal
+        @onClose={{this.closePhotoUploadModal}}
+        @disableClose={{this.isPhotoUploadActive}}
+      >
         <PlacePhotoUpload
           @place={{this.saveablePlace}}
           @onClose={{this.closePhotoUploadModal}}
+          @onUploadStateChange={{this.handleUploadStateChange}}
         />
       </Modal>
     {{/if}}

app/components/place-photo-upload-item.gjs

@@ -7,9 +7,10 @@ import Icon from '#components/icon';
 import { on } from '@ember/modifier';
 import { fn } from '@ember/helper';
 import { isMobile } from '../utils/device';
+import Blurhash from './blurhash';
 
 const MAX_IMAGE_DIMENSION = 1920;
-const IMAGE_QUALITY = 0.94;
+const IMAGE_QUALITY = 0.9;
 const MAX_THUMBNAIL_DIMENSION = 350;
 const THUMBNAIL_QUALITY = 0.9;
 
@@ -19,7 +20,9 @@ export default class PlacePhotoUploadItem extends Component {
   @service toast;
 
   @tracked thumbnailUrl = '';
+  @tracked blurhash = '';
   @tracked error = '';
+  @tracked statusText = '';
 
   constructor() {
     super(...arguments);
@@ -45,6 +48,7 @@ export default class PlacePhotoUploadItem extends Component {
 
   uploadTask = task(async (file) => {
     this.error = '';
+    this.statusText = 'Processing';
     try {
       // 1. Process main image and generate blurhash in worker
       const mainData = await this.imageProcessor.process(
@@ -54,6 +58,8 @@ export default class PlacePhotoUploadItem extends Component {
         true // computeBlurhash
       );
 
+      this.blurhash = mainData.blurhash;
+
       // 2. Process thumbnail (no blurhash needed)
       const thumbData = await this.imageProcessor.process(
         file,
@@ -67,18 +73,34 @@ export default class PlacePhotoUploadItem extends Component {
       let mainResult, thumbResult;
       const isMobileDevice = isMobile();
 
+      const mainProgress = (status) => {
+        if (status === 'signing') this.statusText = 'Signing photo upload';
+        if (status === 'uploading') this.statusText = 'Uploading photo';
+      };
+
+      const thumbProgress = (status) => {
+        if (status === 'signing') this.statusText = 'Signing thumbnail upload';
+        if (status === 'uploading') this.statusText = 'Uploading thumbnail';
+      };
+
       if (isMobileDevice) {
         // Mobile: sequential uploads to preserve bandwidth and memory
         mainResult = await this.blossom.upload(mainData.blob, {
           sequential: true,
+          onProgress: mainProgress,
         });
         thumbResult = await this.blossom.upload(thumbData.blob, {
           sequential: true,
+          onProgress: thumbProgress,
         });
       } else {
         // Desktop: concurrent uploads
-        const mainUploadPromise = this.blossom.upload(mainData.blob);
-        const thumbUploadPromise = this.blossom.upload(thumbData.blob);
+        const mainUploadPromise = this.blossom.upload(mainData.blob, {
+          onProgress: mainProgress,
+        });
+        const thumbUploadPromise = this.blossom.upload(thumbData.blob, {
+          onProgress: thumbProgress,
+        });
 
         [mainResult, thumbResult] = await Promise.all([
           mainUploadPromise,
@@ -110,6 +132,9 @@ export default class PlacePhotoUploadItem extends Component {
         {{if this.uploadTask.isRunning 'is-uploading'}}
         {{if this.error 'has-error'}}"
     >
+      {{#if this.blurhash}}
+        <Blurhash @hash={{this.blurhash}} class="place-header-photo-blur" />
+      {{/if}}
       <img src={{this.thumbnailUrl}} alt="thumbnail" />
 
       {{#if this.uploadTask.isRunning}}
@@ -120,6 +145,9 @@ export default class PlacePhotoUploadItem extends Component {
             @color="white"
             class="spin-animation"
           />
+          {{#if this.statusText}}
+            <span class="upload-status-text">{{this.statusText}}</span>
+          {{/if}}
         </div>
       {{/if}}
 

app/components/place-photo-upload.gjs

@@ -17,9 +17,8 @@ export default class PlacePhotoUpload extends Component {
   @service blossom;
   @service toast;
 
-  @tracked files = [];
-  @tracked uploadedPhotos = [];
-  @tracked status = '';
+  @tracked file = null;
+  @tracked uploadedPhoto = null;
   @tracked error = '';
   @tracked isPublishing = false;
   @tracked isDragging = false;
@@ -34,17 +33,13 @@ export default class PlacePhotoUpload extends Component {
 
   get allUploaded() {
     return (
-      this.files.length > 0 && this.files.length === this.uploadedPhotos.length
+      this.file && this.uploadedPhoto && this.file === this.uploadedPhoto.file
     );
   }
 
-  get photoWord() {
-    return this.files.length === 1 ? 'Photo' : 'Photos';
-  }
-
   @action
   handleFileSelect(event) {
-    this.addFiles(event.target.files);
+    this.addFile(event.target.files[0]);
     event.target.value = ''; // Reset input
   }
 
@@ -64,32 +59,42 @@ export default class PlacePhotoUpload extends Component {
   handleDrop(event) {
     event.preventDefault();
     this.isDragging = false;
-    this.addFiles(event.dataTransfer.files);
+    if (event.dataTransfer.files.length > 0) {
+      this.addFile(event.dataTransfer.files[0]);
+    }
   }
 
-  addFiles(fileList) {
-    if (!fileList) return;
-    const newFiles = Array.from(fileList).filter((f) =>
-      f.type.startsWith('image/')
-    );
-    this.files = [...this.files, ...newFiles];
+  addFile(file) {
+    if (!file || !file.type.startsWith('image/')) {
+      this.error = 'Please select a valid image file.';
+      return;
+    }
+    this.error = '';
+    // If a photo was already uploaded but not published, delete it from the server
+    if (this.uploadedPhoto) {
+      this.deletePhotoTask.perform(this.uploadedPhoto);
+    }
+    this.file = file;
+    this.uploadedPhoto = null;
+    if (this.args.onUploadStateChange) {
+      this.args.onUploadStateChange(true);
+    }
   }
 
   @action
   handleUploadSuccess(photoData) {
-    this.uploadedPhotos = [...this.uploadedPhotos, photoData];
+    this.uploadedPhoto = photoData;
   }
 
   @action
-  removeFile(fileToRemove) {
-    const photoData = this.uploadedPhotos.find((p) => p.file === fileToRemove);
-    this.files = this.files.filter((f) => f !== fileToRemove);
-    this.uploadedPhotos = this.uploadedPhotos.filter(
-      (p) => p.file !== fileToRemove
-    );
-
-    if (photoData && photoData.hash && photoData.url) {
-      this.deletePhotoTask.perform(photoData);
+  removeFile() {
+    if (this.uploadedPhoto) {
+      this.deletePhotoTask.perform(this.uploadedPhoto);
+    }
+    this.file = null;
+    this.uploadedPhoto = null;
+    if (this.args.onUploadStateChange) {
+      this.args.onUploadStateChange(false);
     }
   }
 
@@ -126,7 +131,6 @@ export default class PlacePhotoUpload extends Component {
       return;
     }
 
-    this.status = 'Publishing event...';
     this.error = '';
     this.isPublishing = true;
 
@@ -142,34 +146,33 @@ export default class PlacePhotoUpload extends Component {
         tags.push(['g', Geohash.encode(lat, lon, 9)]);
       }
 
-      for (const photo of this.uploadedPhotos) {
-        const imeta = ['imeta', `url ${photo.url}`];
+      const photo = this.uploadedPhoto;
+      const imeta = ['imeta', `url ${photo.url}`];
 
-        imeta.push(`m ${photo.type}`);
+      imeta.push(`m ${photo.type}`);
 
-        if (photo.dim) {
-          imeta.push(`dim ${photo.dim}`);
-        }
-
-        imeta.push('alt A photo of a place');
-
-        if (photo.fallbackUrls && photo.fallbackUrls.length > 0) {
-          for (const fallbackUrl of photo.fallbackUrls) {
-            imeta.push(`fallback ${fallbackUrl}`);
-          }
-        }
-
-        if (photo.thumbUrl) {
-          imeta.push(`thumb ${photo.thumbUrl}`);
-        }
-
-        if (photo.blurhash) {
-          imeta.push(`blurhash ${photo.blurhash}`);
-        }
-
-        tags.push(imeta);
+      if (photo.dim) {
+        imeta.push(`dim ${photo.dim}`);
       }
 
+      imeta.push('alt A photo of a place');
+
+      if (photo.fallbackUrls && photo.fallbackUrls.length > 0) {
+        for (const fallbackUrl of photo.fallbackUrls) {
+          imeta.push(`fallback ${fallbackUrl}`);
+        }
+      }
+
+      if (photo.thumbUrl) {
+        imeta.push(`thumb ${photo.thumbUrl}`);
+      }
+
+      if (photo.blurhash) {
+        imeta.push(`blurhash ${photo.blurhash}`);
+      }
+
+      tags.push(imeta);
+
       // NIP-XX draft Place Photo event
       const template = {
         kind: 360,
@@ -185,19 +188,21 @@ export default class PlacePhotoUpload extends Component {
       await this.nostrRelay.publish(this.nostrData.activeWriteRelays, event);
       this.nostrData.store.add(event);
 
-      this.toast.show('Photos published successfully');
-      this.status = '';
+      this.toast.show('Photo published successfully');
 
-      // Clear out the files so user can upload more or be done
-      this.files = [];
-      this.uploadedPhotos = [];
+      // Clear out the file so user can upload more or be done
+      this.file = null;
+      this.uploadedPhoto = null;
+
+      if (this.args.onUploadStateChange) {
+        this.args.onUploadStateChange(false);
+      }
 
       if (this.args.onClose) {
-        this.args.onClose();
+        this.args.onClose(event.id);
       }
     } catch (e) {
       this.error = 'Failed to publish: ' + e.message;
-      this.status = '';
     } finally {
       this.isPublishing = false;
     }
@@ -205,7 +210,7 @@ export default class PlacePhotoUpload extends Component {
 
   <template>
     <div class="place-photo-upload">
-      <h2>Add Photos for {{this.title}}</h2>
+      <h2>Add Photo for {{this.title}}</h2>
 
       {{#if this.error}}
         <div class="alert alert-error">
@@ -213,42 +218,13 @@ export default class PlacePhotoUpload extends Component {
         </div>
       {{/if}}
 
-      {{#if this.status}}
-        <div class="alert alert-info">
-          {{this.status}}
-        </div>
-      {{/if}}
-
-      <div
-        class="dropzone {{if this.isDragging 'is-dragging'}}"
-        {{on "dragover" this.handleDragOver}}
-        {{on "dragleave" this.handleDragLeave}}
-        {{on "drop" this.handleDrop}}
-      >
-        <label for="photo-upload-input" class="dropzone-label">
-          <Icon @name="upload-cloud" @size={{48}} @color="#ccc" />
-          <p>Drag and drop photos here, or click to browse</p>
-        </label>
-        <input
-          id="photo-upload-input"
-          type="file"
-          accept="image/*"
-          multiple
-          class="file-input-hidden"
-          disabled={{this.isPublishing}}
-          {{on "change" this.handleFileSelect}}
-        />
-      </div>
-
-      {{#if this.files.length}}
+      {{#if this.file}}
         <div class="photo-grid">
-          {{#each this.files as |file|}}
-            <PlacePhotoUploadItem
-              @file={{file}}
-              @onSuccess={{this.handleUploadSuccess}}
-              @onRemove={{this.removeFile}}
-            />
-          {{/each}}
+          <PlacePhotoUploadItem
+            @file={{this.file}}
+            @onSuccess={{this.handleUploadSuccess}}
+            @onRemove={{this.removeFile}}
+          />
         </div>
 
         <button
@@ -260,11 +236,29 @@ export default class PlacePhotoUpload extends Component {
           {{#if this.isPublishing}}
             Publishing...
           {{else}}
-            Publish
-            {{this.files.length}}
-            {{this.photoWord}}
+            Publish Photo
           {{/if}}
         </button>
+      {{else}}
+        <div
+          class="dropzone {{if this.isDragging 'is-dragging'}}"
+          {{on "dragover" this.handleDragOver}}
+          {{on "dragleave" this.handleDragLeave}}
+          {{on "drop" this.handleDrop}}
+        >
+          <label for="photo-upload-input" class="dropzone-label">
+            <Icon @name="upload-cloud" @size={{48}} @color="#ccc" />
+            <p>Drag and drop a photo here, or click to browse</p>
+          </label>
+          <input
+            id="photo-upload-input"
+            type="file"
+            accept="image/*"
+            class="file-input-hidden"
+            disabled={{this.isPublishing}}
+            {{on "change" this.handleFileSelect}}
+          />
+        </div>
       {{/if}}
     </div>
   </template>

app/components/place-photos-carousel.gjs

@@ -29,6 +29,31 @@ export default class PlacePhotosCarousel extends Component {
     return !this.canScrollRight;
   }
 
+  lastResetKey = null;
+
+  resetScrollPosition = modifier((element, [resetKey]) => {
+    if (resetKey !== undefined && resetKey !== this.lastResetKey) {
+      this.lastResetKey = resetKey;
+      element.scrollLeft = 0;
+      setTimeout(() => this.updateScrollState(), 50);
+    }
+  });
+
+  scrollToNewPhoto = modifier((element, [eventId]) => {
+    if (eventId && eventId !== this.lastEventId) {
+      this.lastEventId = eventId;
+      // Allow DOM to update first since the photo was *just* added to the store
+      setTimeout(() => {
+        const targetSlide = element.querySelector(
+          `[data-event-id="${eventId}"]`
+        );
+        if (targetSlide) {
+          element.scrollLeft = targetSlide.offsetLeft;
+        }
+      }, 100);
+    }
+  });
+
   setupCarousel = modifier((element) => {
     this.carouselElement = element;
 
@@ -84,11 +109,18 @@ export default class PlacePhotosCarousel extends Component {
         <div
           class="place-photos-carousel-track"
           {{this.setupCarousel}}
+          {{this.resetScrollPosition @resetKey}}
+          {{this.scrollToNewPhoto @scrollToEventId}}
           {{on "scroll" this.updateScrollState}}
         >
           {{#each this.photos as |photo|}}
             {{! template-lint-disable no-inline-styles }}
-            <div class="carousel-slide" style={{photo.style}}>
+            <div
+              class="carousel-slide
+                {{if photo.isLandscape 'landscape' 'portrait'}}"
+              style={{photo.style}}
+              data-event-id={{photo.eventId}}
+            >
               {{#if photo.blurhash}}
                 <Blurhash
                   @hash={{photo.blurhash}}
@@ -103,11 +135,11 @@ export default class PlacePhotosCarousel extends Component {
                   {{#if photo.thumbUrl}}
                     <source
                       media="(max-width: 768px)"
-                      srcset={{photo.thumbUrl}}
+                      data-srcset={{photo.thumbUrl}}
                     />
                   {{/if}}
                   <img
-                    src={{photo.url}}
+                    data-src={{photo.url}}
                     class="place-header-photo landscape"
                     alt={{@name}}
                     {{fadeInImage photo.url}}
@@ -116,7 +148,7 @@ export default class PlacePhotosCarousel extends Component {
               {{else}}
                 {{! Portrait uses thumb everywhere if available }}
                 <img
-                  src={{if photo.thumbUrl photo.thumbUrl photo.url}}
+                  data-src={{if photo.thumbUrl photo.thumbUrl photo.url}}
                   class="place-header-photo portrait"
                   alt={{@name}}
                   {{fadeInImage (if photo.thumbUrl photo.thumbUrl photo.url)}}
@@ -124,6 +156,8 @@ export default class PlacePhotosCarousel extends Component {
               {{/if}}
             </div>
           {{/each}}
+
+          <div class="carousel-placeholder"></div>
         </div>
 
         {{#if this.showChevrons}}
@@ -135,7 +169,7 @@ export default class PlacePhotosCarousel extends Component {
             disabled={{this.cannotScrollLeft}}
             aria-label="Previous photo"
           >
-            <Icon @name="chevron-left" />
+            <Icon @name="chevron-left" @color="currentColor" />
           </button>
 
           <button
@@ -146,7 +180,7 @@ export default class PlacePhotosCarousel extends Component {
             disabled={{this.cannotScrollRight}}
             aria-label="Next photo"
           >
-            <Icon @name="chevron-right" />
+            <Icon @name="chevron-right" @color="currentColor" />
           </button>
         {{/if}}
       </div>

app/modifiers/fade-in-image.js

@@ -7,24 +7,69 @@ export default modifier((element, [url]) => {
   element.classList.remove('loaded');
   element.classList.remove('loaded-instant');
 
-  // Create an off-DOM image to reliably check cache status
-  // without waiting for the actual DOM element to load it
-  const img = new Image();
-  img.src = url;
-
-  if (img.complete) {
-    // Already in browser cache, skip the animation
-    element.classList.add('loaded-instant');
-    return;
-  }
+  let observer;
 
   const handleLoad = () => {
-    element.classList.add('loaded');
+    // Only apply the fade-in animation if it wasn't already loaded instantly
+    if (!element.classList.contains('loaded-instant')) {
+      element.classList.add('loaded');
+    }
   };
 
   element.addEventListener('load', handleLoad);
 
+  const loadWhenVisible = (entries, obs) => {
+    entries.forEach((entry) => {
+      if (entry.isIntersecting) {
+        // Stop observing once we start loading
+        obs.unobserve(element);
+
+        // Check if the image is already in the browser cache
+        // Create an off-DOM image to reliably check cache status
+        // without waiting for the actual DOM element to load it
+        const img = new Image();
+        img.src = url;
+
+        if (img.complete) {
+          // Already in browser cache, skip the animation
+          element.classList.add('loaded-instant');
+        }
+
+        // If this image is inside a <picture> tag, we also need to swap <source> tags
+        const parent = element.parentElement;
+        if (parent && parent.tagName === 'PICTURE') {
+          const sources = parent.querySelectorAll('source');
+          sources.forEach((source) => {
+            if (source.dataset.srcset) {
+              source.srcset = source.dataset.srcset;
+            }
+          });
+        }
+
+        // Swap data-src to src to trigger the actual network fetch (or render from cache)
+        if (element.dataset.src) {
+          element.src = element.dataset.src;
+        } else {
+          // Fallback if data-src wasn't used but the modifier was called
+          element.src = url;
+        }
+      }
+    });
+  };
+
+  // Setup Intersection Observer to only load when the image enters the viewport
+  observer = new IntersectionObserver(loadWhenVisible, {
+    root: null, // Use the viewport as the root
+    rootMargin: '100px 100%', // Load one full viewport width ahead/behind
+    threshold: 0, // Trigger immediately when any part enters the expanded margin
+  });
+
+  observer.observe(element);
+
   return () => {
     element.removeEventListener('load', handleLoad);
+    if (observer) {
+      observer.disconnect();
+    }
   };
 });

app/routes/place.js

@@ -9,25 +9,47 @@ export default class PlaceRoute extends Route {
   async model(params) {
     const id = params.place_id;
 
+    let type, osmId;
+    let isExplicitOsm = false;
+
     if (
       id.startsWith('osm:node:') ||
       id.startsWith('osm:way:') ||
       id.startsWith('osm:relation:')
     ) {
-      const [, type, osmId] = id.split(':');
+      isExplicitOsm = true;
+      [, type, osmId] = id.split(':');
       console.debug(`Fetching explicit OSM ${type}:`, osmId);
-      return this.loadOsmPlace(osmId, type);
+    }
+
+    let backgroundFetchPromise = null;
+    if (isExplicitOsm) {
+      backgroundFetchPromise = this.loadOsmPlace(osmId, type);
     }
 
     await this.waitForSync();
 
-    let bookmark = this.storage.findPlaceById(id);
+    let lookupId = isExplicitOsm ? osmId : id;
+    let bookmark = this.storage.findPlaceById(lookupId);
+
+    // Ensure type matches if we are looking up by osmId
+    if (bookmark && isExplicitOsm && bookmark.osmType !== type) {
+      bookmark = null; // Type mismatch, not the same OSM object
+    }
 
     if (bookmark) {
       console.debug('Found in bookmarks:', bookmark.title);
       return bookmark;
     }
 
+    if (isExplicitOsm) {
+      console.debug(
+        `Not in bookmarks, using explicitly fetched OSM ${type}:`,
+        osmId
+      );
+      return await backgroundFetchPromise;
+    }
+
     console.warn('Not in bookmarks:', id);
     return null;
   }
@@ -119,14 +141,14 @@ export default class PlaceRoute extends Route {
   }
 
   serialize(model) {
-    // If the model is a saved bookmark, use its ID
-    if (model.id) {
-      return { place_id: model.id };
-    }
-    // If it's an OSM POI, use the explicit format
+    // If it's an OSM POI, use the explicit format first
     if (model.osmId && model.osmType) {
       return { place_id: `osm:${model.osmType}:${model.osmId}` };
     }
+    // If the model is a saved bookmark (and not OSM, e.g. custom place), use its ID
+    if (model.id) {
+      return { place_id: model.id };
+    }
     // Fallback
     return { place_id: model.osmId };
   }

app/services/blossom.js

@@ -60,10 +60,13 @@ export default class BlossomService extends Service {
     return `Nostr ${base64url}`;
   }
 
-  async _uploadToServer(file, hash, serverUrl) {
+  async _uploadToServer(file, hash, serverUrl, onProgress) {
     const uploadUrl = getBlossomUrl(serverUrl, 'upload');
+
+    if (onProgress) onProgress('signing');
     const authHeader = await this._getAuthHeader('upload', hash, serverUrl);
 
+    if (onProgress) onProgress('uploading');
     // eslint-disable-next-line warp-drive/no-external-request-patterns
     const response = await fetch(uploadUrl, {
       method: 'PUT',
@@ -109,14 +112,20 @@ export default class BlossomService extends Service {
 
     if (options.sequential) {
       // Sequential upload logic
-      mainResult = await this._uploadToServer(file, payloadHash, mainServer);
+      mainResult = await this._uploadToServer(
+        file,
+        payloadHash,
+        mainServer,
+        options.onProgress
+      );
 
       for (const serverUrl of fallbackServers) {
         try {
           const result = await this._uploadToServer(
             file,
             payloadHash,
-            serverUrl
+            serverUrl,
+            options.onProgress
           );
           fallbackUrls.push(result.url);
         } catch (error) {
@@ -125,9 +134,14 @@ export default class BlossomService extends Service {
       }
     } else {
       // Concurrent upload logic
-      const mainPromise = this._uploadToServer(file, payloadHash, mainServer);
+      const mainPromise = this._uploadToServer(
+        file,
+        payloadHash,
+        mainServer,
+        options.onProgress
+      );
       const fallbackPromises = fallbackServers.map((serverUrl) =>
-        this._uploadToServer(file, payloadHash, serverUrl)
+        this._uploadToServer(file, payloadHash, serverUrl, options.onProgress)
       );
 
       // Main server MUST succeed

app/services/nostr-data.js

@@ -356,6 +356,13 @@ export default class NostrDataService extends Service {
     return 'Not connected';
   }
 
+  async clearCache() {
+    await this._cachePromise;
+    if (this.cache) {
+      await this.cache.deleteAllEvents();
+    }
+  }
+
   _cleanupSubscriptions() {
     if (this._requestSub) {
       this._requestSub.unsubscribe();

app/services/osm.js

@@ -8,6 +8,7 @@ export default class OsmService extends Service {
   controller = null;
   cachedResults = null;
   lastQueryKey = null;
+  cachedPlaces = new Map();
 
   cancelAll() {
     if (this.controller) {
@@ -232,6 +233,13 @@ out center;
   async fetchOsmObject(osmId, osmType) {
     if (!osmId || !osmType) return null;
 
+    const cacheKey = `${osmType}:${osmId}`;
+    const cached = this.cachedPlaces.get(cacheKey);
+    if (cached && Date.now() - cached.timestamp < 10000) {
+      console.debug(`Using in-memory cached OSM object for ${cacheKey}`);
+      return cached.data;
+    }
+
     let url;
     if (osmType === 'node') {
       url = `https://www.openstreetmap.org/api/0.6/node/${osmId}.json`;
@@ -253,8 +261,25 @@ out center;
         }
         throw new Error(`OSM API request failed: ${res.status}`);
       }
+
       const data = await res.json();
-      return this.normalizeOsmApiData(data.elements, osmId, osmType);
+      const normalizedData = this.normalizeOsmApiData(
+        data.elements,
+        osmId,
+        osmType
+      );
+
+      this.cachedPlaces.set(cacheKey, {
+        data: normalizedData,
+        timestamp: Date.now(),
+      });
+
+      // Cleanup cache entry automatically after 10 seconds
+      setTimeout(() => {
+        this.cachedPlaces.delete(cacheKey);
+      }, 10000);
+
+      return normalizedData;
     } catch (e) {
       console.error('Failed to fetch OSM object:', e);
       return null;

app/styles/app.css

@@ -215,12 +215,12 @@ body {
 .dropzone {
   border: 2px dashed #ccc;
   border-radius: 8px;
-  padding: 2rem 1.5rem;
   text-align: center;
   transition: all 0.2s ease;
   margin: 1.5rem 0 1rem;
   background-color: rgb(255 255 255 / 2%);
   cursor: pointer;
+  aspect-ratio: 4 / 3;
 }
 
 .dropzone.is-dragging {
@@ -232,9 +232,12 @@ body {
   display: flex;
   flex-direction: column;
   align-items: center;
+  justify-content: center;
   gap: 1rem;
   cursor: pointer;
   color: #898989;
+  width: 100%;
+  height: 100%;
 }
 
 .dropzone-label p {
@@ -246,25 +249,35 @@ body {
 }
 
 .photo-grid {
-  display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(100px, 1fr));
+  display: flex;
+  flex-direction: column;
   gap: 12px;
   margin-bottom: 20px;
 }
 
 .photo-upload-item {
   position: relative;
-  aspect-ratio: 1 / 1;
+  aspect-ratio: 4 / 3;
   border-radius: 6px;
   overflow: hidden;
   background: #1e262e;
+  width: 100%;
 }
 
 .photo-upload-item img {
+  position: absolute;
+  top: 0;
+  left: 0;
   width: 100%;
   height: 100%;
-  object-fit: cover;
+  object-fit: contain;
   display: block;
+  z-index: 1;
+}
+
+.photo-upload-item .overlay,
+.photo-upload-item .btn-remove-photo {
+  z-index: 2;
 }
 
 .photo-upload-item .overlay {
@@ -272,10 +285,20 @@ body {
   inset: 0;
   background: rgb(0 0 0 / 60%);
   display: flex;
+  flex-direction: column;
   align-items: center;
   justify-content: center;
 }
 
+.upload-status-text {
+  color: white;
+  margin-top: 1rem;
+  font-size: 0.9rem;
+  text-shadow: 0 1px 3px rgb(0 0 0 / 80%);
+  text-align: center;
+  padding: 0 1rem;
+}
+
 .photo-upload-item .error-overlay {
   background: rgb(224 108 117 / 80%);
   cursor: pointer;
@@ -761,12 +784,19 @@ select.form-control {
   border-top: 1px solid #eee;
 }
 
-.meta-info a {
+.meta-info a,
+.meta-info .btn-link {
   color: var(--link-color);
   text-decoration: none;
+  background: none;
+  border: none;
+  padding: 0;
+  font: inherit;
+  cursor: pointer;
 }
 
-.meta-info a:hover {
+.meta-info a:hover,
+.meta-info .btn-link:hover {
   text-decoration: underline;
 }
 
@@ -889,6 +919,10 @@ abbr[title] {
   overflow: hidden;
 }
 
+.carousel-placeholder {
+  display: none;
+}
+
 .place-header-photo-blur {
   position: absolute;
   top: 0;
@@ -950,11 +984,11 @@ abbr[title] {
   padding: 0;
 }
 
-.place-photos-carousel-wrapper:hover .carousel-nav-btn {
+.place-photos-carousel-wrapper:hover .carousel-nav-btn:not(.disabled) {
   opacity: 1;
 }
 
-.carousel-nav-btn:hover {
+.carousel-nav-btn:not(.disabled):hover {
   background: rgb(0 0 0 / 80%);
 }
 
@@ -973,22 +1007,35 @@ abbr[title] {
 
 @media (width <= 768px) {
   .place-photos-carousel-track {
-    scroll-snap-type: none; /* No snapping on mobile */
-    gap: 0.25rem;
-    padding-bottom: 0.5rem; /* Space for the scrollbar if visible, but we hid it */
+    scroll-snap-type: none;
+    gap: 2px;
+    background-color: #fff;
   }
 
   .carousel-slide {
     flex: 0 0 auto;
     height: 100px;
-    width: calc(100px * var(--slide-ratio, 1.7778));
-    aspect-ratio: auto;
+    width: auto;
     scroll-snap-align: none;
   }
 
+  .carousel-slide.landscape {
+    aspect-ratio: var(--slide-ratio, 16 / 9);
+  }
+
+  .carousel-slide.portrait {
+    aspect-ratio: 1 / 1;
+  }
+
+  .carousel-placeholder {
+    display: block;
+    background-color: var(--hover-bg);
+    flex: 1 1 0%;
+    min-width: 0;
+  }
+
   .place-header-photo.landscape,
   .place-header-photo.portrait {
-    /* On mobile, all images use cover inside their precise ratio container */
     object-fit: cover;
   }
 
@@ -1768,6 +1815,12 @@ button.create-place {
   top: 1rem;
   right: 1rem;
   cursor: pointer;
+  color: #898989;
+}
+
+.close-modal-btn.disabled {
+  color: #ccc;
+  cursor: not-allowed;
 }
 
 .place-photo-upload h2 {
@@ -1786,11 +1839,6 @@ button.create-place {
   color: #c00;
 }
 
-.alert-info {
-  background: #eef;
-  color: #00c;
-}
-
 .preview-group {
   margin-bottom: 1rem;
 }

app/utils/icons.js

@@ -2,11 +2,12 @@
 import activity from 'feather-icons/dist/icons/activity.svg?raw';
 import arrowLeft from 'feather-icons/dist/icons/arrow-left.svg?raw';
 import bookmark from 'feather-icons/dist/icons/bookmark.svg?raw';
-import camera from 'feather-icons/dist/icons/camera.svg?raw';
+import featherCamera from 'feather-icons/dist/icons/camera.svg?raw';
 import checkSquare from 'feather-icons/dist/icons/check-square.svg?raw';
 import chevronLeft from 'feather-icons/dist/icons/chevron-left.svg?raw';
 import chevronRight from 'feather-icons/dist/icons/chevron-right.svg?raw';
 import clock from 'feather-icons/dist/icons/clock.svg?raw';
+import database from 'feather-icons/dist/icons/database.svg?raw';
 import edit from 'feather-icons/dist/icons/edit.svg?raw';
 import facebook from 'feather-icons/dist/icons/facebook.svg?raw';
 import gift from 'feather-icons/dist/icons/gift.svg?raw';
@@ -44,7 +45,9 @@ import badgeShieldWithFire from '@waysidemapping/pinhead/dist/icons/badge_shield
 import beachUmbrellaInGround from '@waysidemapping/pinhead/dist/icons/beach_umbrella_in_ground.svg?raw';
 import beerMugWithFoam from '@waysidemapping/pinhead/dist/icons/beer_mug_with_foam.svg?raw';
 import burgerAndDrinkCupWithStraw from '@waysidemapping/pinhead/dist/icons/burger_and_drink_cup_with_straw.svg?raw';
+import bridge from '@waysidemapping/pinhead/dist/icons/bridge.svg?raw';
 import bus from '@waysidemapping/pinhead/dist/icons/bus.svg?raw';
+import camera from '@waysidemapping/pinhead/dist/icons/camera.svg?raw';
 import boxingGloveUp from '@waysidemapping/pinhead/dist/icons/boxing_glove_up.svg?raw';
 import car from '@waysidemapping/pinhead/dist/icons/car.svg?raw';
 import cigaretteWithSmokeCurl from '@waysidemapping/pinhead/dist/icons/cigarette_with_smoke_curl.svg?raw';
@@ -75,6 +78,7 @@ import gravestone from '@waysidemapping/pinhead/dist/icons/gravestone.svg?raw';
 import grecianVase from '@waysidemapping/pinhead/dist/icons/grecian_vase.svg?raw';
 import greekCross from '@waysidemapping/pinhead/dist/icons/greek_cross.svg?raw';
 import iceCreamOnCone from '@waysidemapping/pinhead/dist/icons/ice_cream_on_cone.svg?raw';
+import industrialBuilding from '@waysidemapping/pinhead/dist/icons/industrial_building.svg?raw';
 import jewel from '@waysidemapping/pinhead/dist/icons/jewel.svg?raw';
 import lowriseBuilding from '@waysidemapping/pinhead/dist/icons/lowrise_building.svg?raw';
 import marketStall from '@waysidemapping/pinhead/dist/icons/market_stall.svg?raw';
@@ -102,6 +106,7 @@ import roundStructureWithFlag from '@waysidemapping/pinhead/dist/icons/round_str
 import sailingShipInWater from '@waysidemapping/pinhead/dist/icons/sailing_ship_in_water.svg?raw';
 import scissorsOpen from '@waysidemapping/pinhead/dist/icons/scissors_open.svg?raw';
 import shipwreckInWater from '@waysidemapping/pinhead/dist/icons/shipwreck_in_water.svg?raw';
+import steamTrainOnRailwayTrack from '@waysidemapping/pinhead/dist/icons/steam_train_on_railway_track.svg?raw';
 import shoppingBag from '@waysidemapping/pinhead/dist/icons/shopping_bag.svg?raw';
 import shoppingBasket from '@waysidemapping/pinhead/dist/icons/shopping_basket.svg?raw';
 import shoppingCart from '@waysidemapping/pinhead/dist/icons/shopping_cart.svg?raw';
@@ -131,8 +136,10 @@ const ICONS = {
   bookmark,
   'boxing-glove-up': boxingGloveUp,
   'burger-and-drink-cup-with-straw': burgerAndDrinkCupWithStraw,
+  bridge,
   bus,
   camera,
+  'feather-camera': featherCamera,
   'check-square': checkSquare,
   'chevron-left': chevronLeft,
   'chevron-right': chevronRight,
@@ -153,6 +160,7 @@ const ICONS = {
   'comedy-mask-and-tragedy-mask': comedyMaskAndTragedyMask,
   croissant,
   'cup-and-saucer': cupAndSaucer,
+  database,
   donut,
   edit,
   eyeglasses,
@@ -174,6 +182,7 @@ const ICONS = {
   heart,
   home,
   'ice-cream-on-cone': iceCreamOnCone,
+  'industrial-building': industrialBuilding,
   info,
   instagram,
   jewel,
@@ -214,6 +223,7 @@ const ICONS = {
   'sailing-ship-in-water': sailingShipInWater,
   'scissors-open': scissorsOpen,
   'shipwreck-in-water': shipwreckInWater,
+  'steam-train-on-railway-track': steamTrainOnRailwayTrack,
   'shopping-bag': shoppingBag,
   search,
   server,

app/utils/osm-icons.js

@@ -109,6 +109,7 @@ export const POI_ICON_RULES = [
   { tags: { amenity: 'arts_center' }, icon: 'comedy-mask-and-tragedy-mask' },
 
   // Historic
+  { tags: { historic: 'bridge' }, icon: 'bridge' },
   { tags: { historic: 'fort' }, icon: 'fort' },
   { tags: { historic: 'castle' }, icon: 'palace' },
   { tags: { historic: 'building' }, icon: 'classical-building-with-flag' },
@@ -119,6 +120,12 @@ export const POI_ICON_RULES = [
     tags: { historic: 'monument' },
     icon: 'classical-building-with-dome-and-flag',
   },
+  { tags: { historic: 'folly' }, icon: 'classical-building' },
+  { tags: { historic: 'industrial' }, icon: 'industrial-building' },
+  {
+    tags: { historic: 'railway_station' },
+    icon: 'steam-train-on-railway-track',
+  },
   { tags: { historic: 'ship' }, icon: 'sailing-ship-in-water' },
   { tags: { historic: 'wreck' }, icon: 'shipwreck-in-water' },
   { tags: { historic: 'ruins' }, icon: 'camera' },

app/utils/poi-categories.js

@@ -41,7 +41,7 @@ export const POI_CATEGORIES = [
   {
     id: 'things-to-do',
     label: 'Things to do',
-    icon: 'camera',
+    icon: 'feather-camera',
     filter: [
       '["tourism"~"^(museum|gallery|attraction|viewpoint|zoo|theme_park|aquarium|artwork)$"]',
       '["amenity"~"^(cinema|theatre|arts_centre|planetarium)$"]',

doc/nostr/nip-place-photos.md

@@ -14,7 +14,7 @@ While NIP-68 (Picture-first feeds) caters to general visual feeds, this NIP spec
 
 ## Content
 
-The `.content` of the event SHOULD generally be empty. If a user wishes to provide a detailed description, summary, or caption for a place, clients SHOULD encourage them to create a Place Review event (`kind: 30360`) instead.
+The `.content` of the event SHOULD generally be empty. If a user wishes to provide a detailed description for a place, clients SHOULD encourage them to create a Place Review event (`kind: 30360`) instead.
 
 ## Tags
 
@@ -45,17 +45,19 @@ Used for spatial indexing and discovery. Events MUST include at least one high-p
 
 #### 3. `imeta` — Inline Media Metadata
 
-Media files MUST be attached using the `imeta` tag as defined in NIP-92. Each `imeta` tag represents one media item. The primary `url` SHOULD also be appended to the event's `.content` for backwards compatibility with clients that do not parse `imeta` tags.
+An event MUST contain exactly one `imeta` tag representing a single media item. The primary `url` MAY also be appended to the event's `.content` for backwards compatibility with clients that do not parse `imeta` tags.
 
-Clients SHOULD include `alt` (accessibility descriptions), `dim` (dimensions), `m` (MIME type), and `blurhash` where possible.
+Clients SHOULD include `alt` (accessibility descriptions), `dim` (dimensions), `m` (MIME type), `thumb` (URL to a smaller thumbnail image), and `blurhash` where possible. Clients MAY also include `fallback` URLs if the media is hosted on multiple servers.
 
 ```json
 [
   "imeta",
-  "url https://example.com/photo.jpg",
+  "url https://blossom.example.com/8e2e28a503fa37482de5b0959ee38b2bb4de4e0a752db24c568981c2ab410260.jpg",
   "m image/jpeg",
-  "dim 3024x4032",
+  "dim 1440x1920",
   "alt A steaming bowl of ramen on a wooden table at the restaurant.",
+  "fallback https://mirror.example.com/8e2e28a503fa37482de5b0959ee38b2bb4de4e0a752db24c568981c2ab410260.jpg",
+  "thumb https://example.com/7a1f592f6ea8e932b1de9568285b01851e4cf708466b0a03010b91e92c6c8135.jpg",
   "blurhash eVF$^OI:${M{o#*0-nNFxakD-?xVM}WEWB%iNKxvR-oetmo#R-aen$"
 ]
 ```
@@ -83,10 +85,12 @@ Clients SHOULD include `alt` (accessibility descriptions), `dim` (dimensions), `
 
     [
       "imeta",
-      "url https://example.com/ramen.jpg",
+      "url https://blossom.example.com/a9c84e183789a74288b8e05d04cc61230e74f386925a953e6b29f957e8cc3a61.jpg",
       "m image/jpeg",
-      "dim 1080x1080",
+      "dim 1920x1920",
       "alt A close-up of spicy miso ramen with chashu pork, soft boiled egg, and scallions.",
+      "fallback https://mirror.example.com/a9c84e183789a74288b8e05d04cc61230e74f386925a953e6b29f957e8cc3a61.jpg",
+      "thumb https://example.com/c5a528e20235e16cc1c18090b8f04179de76288ea4e410b0fcb8d1487e416a2d.jpg",
       "blurhash UHI=0o~q4T-o~q%MozM{x]t7RjRPt7oKkCWB"
     ],
 
@@ -98,6 +102,10 @@ Clients SHOULD include `alt` (accessibility descriptions), `dim` (dimensions), `
 
 ## Rationale
 
+### Kind 360
+
+Easy to remember as a 360-degree view of places.
+
 ### Why not use NIP-68 (Picture-first feeds)?
 
 NIP-68 is designed for general-purpose social feeds (like Instagram). Place photos require strict guarantees about what entity is being depicted to be useful for map clients, directories, and review aggregators. By mandating the `i` tag for POI linking and the `g` tag for spatial querying, this kind ensures interoperability for geo-spatial applications without cluttering general picture feeds with mundane POI images (like photos of storefronts or menus).
@@ -105,3 +113,7 @@ NIP-68 is designed for general-purpose social feeds (like Instagram). Place phot
 ### Separation from Place Reviews
 
 Reviews (kind 30360) and media have different lifecycles and data models. A user might upload 10 photos of a park without writing a review, or write a detailed review without attaching photos. Keeping them as separate events allows clients to query `imeta` attachments for a specific `i` tag to quickly build a photo gallery for a place, regardless of whether a review was attached.
+
+### Single Photo per Event
+
+Restricting events to a single `imeta` attachment (one photo per event) is an intentional design choice. Batching photos into a single event forces all engagement (likes, zaps) to apply to the entire batch, rendering granular tagging and sorting impossible. Single-photo events enable per-photo engagement, fine-grained categorization (e.g., tagging one photo as "food" and another as "menu"), and richer sorting algorithms based on individual photo popularity.

doc/nostr/nip-place-reviews.md

@@ -276,6 +276,10 @@ Content payloads SHOULD NOT include place identifiers.
 
 ## Rationale
 
+### Kind 30360
+
+Pairs with kind 360 (Place Photos). Easy to remember as a 360-degree review of all aspects of a place.
+
 ### No Place Field in Content
 
 Avoids duplication and inconsistency with tags.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "marco",
-  "version": "1.19.1",
+  "version": "1.20.4",
   "private": true,
   "description": "Unhosted maps app",
   "repository": {

release/assets/image-processor-Dj3-kZwI.js

@@ -0,0 +1 @@
+!function(){"use strict";var t=["0","1","2","3","4","5","6","7","8","9","A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z","a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z","#","$","%","*","+",",","-",".",":",";","=","?","@","[","]","^","_","{","|","}","~"],e=(e,a)=>{var o="";for(let r=1;r<=a;r++){let h=Math.floor(e)/Math.pow(83,a-r)%83;o+=t[Math.floor(h)]}return o},a=t=>{let e=t/255;return e<=.04045?e/12.92:Math.pow((e+.055)/1.055,2.4)},o=t=>{let e=Math.max(0,Math.min(1,t));return e<=.0031308?Math.trunc(12.92*e*255+.5):Math.trunc(255*(1.055*Math.pow(e,.4166666666666667)-.055)+.5)},r=(t,e)=>(t=>t<0?-1:1)(t)*Math.pow(Math.abs(t),e),h=class extends Error{constructor(t){super(t),this.name="ValidationError",this.message=t}},i=(t,e,o,r)=>{let h=0,i=0,n=0,s=4*e;for(let g=0;g<e;g++){let e=4*g;for(let l=0;l<o;l++){let o=e+l*s,c=r(g,l);h+=c*a(t[o]),i+=c*a(t[o+1]),n+=c*a(t[o+2])}}let l=1/(e*o);return[h*l,i*l,n*l]};self.onmessage=async t=>{if("PROCESS_IMAGE"!==t.data?.type)return;const{id:a,file:n,targetWidth:s,targetHeight:l,quality:g,computeBlurhash:c}=t.data;try{let t,M;try{const e=await createImageBitmap(n,{resizeWidth:s,resizeHeight:l,resizeQuality:"high"});if(t=new OffscreenCanvas(s,l),M=t.getContext("2d"),!M)throw new Error("Failed to get 2d context from OffscreenCanvas");M.drawImage(e,0,0,s,l),e.close()}catch(f){console.warn("Hardware resize failed, falling back to stepped software scaling:",f);const e=await n.arrayBuffer(),a=new Blob([e],{type:n.type}),o=await createImageBitmap(a);let r=o.width,h=o.height,i=new OffscreenCanvas(r,h),g=i.getContext("2d");for(g.imageSmoothingEnabled=!0,g.imageSmoothingQuality="high",g.drawImage(o,0,0);.5*i.width>s&&.5*i.height>l;){const t=new OffscreenCanvas(Math.floor(.5*i.width),Math.floor(.5*i.height)),e=t.getContext("2d");e.imageSmoothingEnabled=!0,e.imageSmoothingQuality="high",e.drawImage(i,0,0,t.width,t.height),i=t}t=new OffscreenCanvas(s,l),M=t.getContext("2d"),M.imageSmoothingEnabled=!0,M.imageSmoothingQuality="high",M.drawImage(i,0,0,s,l),o.close()}let d=null;if(c)try{d=((t,a,n)=>{if(a*n*4!==t.length)throw new h("Width and height must match the pixels array");let s=[];for(let e=0;e<3;e++)for(let o=0;o<4;o++){let r=0==o&&0==e?1:2,h=i(t,a,n,(t,h)=>r*Math.cos(Math.PI*o*t/a)*Math.cos(Math.PI*e*h/n));s.push(h)}let l,g=s[0],c=s.slice(1),f="";if(f+=e(21,1),c.length>0){let t=Math.max(...c.map(t=>Math.max(...t))),a=Math.floor(Math.max(0,Math.min(82,Math.floor(166*t-.5))));l=(a+1)/166,f+=e(a,1)}else l=1,f+=e(0,1);return f+=e((t=>(o(t[0])<<16)+(o(t[1])<<8)+o(t[2]))(g),4),c.forEach(t=>{f+=e(((t,e)=>19*Math.floor(Math.max(0,Math.min(18,Math.floor(9*r(t[0]/e,.5)+9.5))))*19+19*Math.floor(Math.max(0,Math.min(18,Math.floor(9*r(t[1]/e,.5)+9.5))))+Math.floor(Math.max(0,Math.min(18,Math.floor(9*r(t[2]/e,.5)+9.5)))))(t,l),2)}),f})(M.getImageData(0,0,s,l).data,s,l)}catch(m){console.warn("Could not generate blurhash (possible canvas fingerprinting protection):",m)}const u=await t.convertToBlob({type:"image/jpeg",quality:g}),w=`${s}x${l}`;self.postMessage({id:a,success:!0,blob:u,dim:w,blurhash:d})}catch(M){self.postMessage({id:a,success:!1,error:M.message})}}}();

release/index.html

@@ -39,8 +39,8 @@
     <meta name="msapplication-TileColor" content="#F6E9A6">
     <meta name="msapplication-TileImage" content="/icons/icon-144.png">
 
-  <script type="module" crossorigin src="/assets/main-BVEi_-zb.js"></script>
-  <link rel="stylesheet" crossorigin href="/assets/main-BF2Ls-fG.css">
+  <script type="module" crossorigin src="/assets/main-CIpd5fcK.js"></script>
+  <link rel="stylesheet" crossorigin href="/assets/main-CHuW_yI-.css">
 </head>
   <body>
  </body>

tests/helpers/index.js

@@ -3,6 +3,7 @@ import {
   setupRenderingTest as upstreamSetupRenderingTest,
   setupTest as upstreamSetupTest,
 } from 'ember-qunit';
+import { setupNostrMocks } from './mock-nostr';
 
 // This file exists to provide wrappers around ember-qunit's
 // test setup functions. This way, you can easily extend the setup that is
@@ -10,6 +11,7 @@ import {
 
 function setupApplicationTest(hooks, options) {
   upstreamSetupApplicationTest(hooks, options);
+  setupNostrMocks(hooks);
 
   // Additional setup for application tests can be done here.
   //
@@ -29,12 +31,14 @@ function setupApplicationTest(hooks, options) {
 
 function setupRenderingTest(hooks, options) {
   upstreamSetupRenderingTest(hooks, options);
+  setupNostrMocks(hooks);
 
   // Additional setup for rendering tests can be done here.
 }
 
 function setupTest(hooks, options) {
   upstreamSetupTest(hooks, options);
+  setupNostrMocks(hooks);
 
   // Additional setup for unit tests can be done here.
 }

tests/helpers/mock-nostr.js

@@ -0,0 +1,96 @@
+import Service from '@ember/service';
+import { tracked } from '@glimmer/tracking';
+import { Promise } from 'rsvp';
+
+export class MockNostrAuthService extends Service {
+  @tracked pubkey = null;
+  @tracked signerType = null;
+  @tracked connectStatus = null;
+  @tracked connectUri = null;
+
+  get isConnected() {
+    return false;
+  }
+
+  get isMobile() {
+    return false;
+  }
+
+  get signer() {
+    return null;
+  }
+
+  async connectWithExtension() {
+    return Promise.resolve();
+  }
+
+  async connectWithApp() {
+    return Promise.resolve();
+  }
+
+  disconnect() {}
+}
+
+export class MockNostrDataService extends Service {
+  @tracked profile = null;
+  @tracked mailboxes = null;
+  @tracked blossomServers = [];
+  @tracked placePhotos = [];
+
+  store = {
+    add: () => {},
+  };
+
+  get activeReadRelays() {
+    return [];
+  }
+
+  get activeWriteRelays() {
+    return [];
+  }
+
+  get defaultReadRelays() {
+    return [];
+  }
+
+  get defaultWriteRelays() {
+    return [];
+  }
+
+  get userDisplayName() {
+    return 'Mock User';
+  }
+
+  loadPlacesInBounds() {
+    return Promise.resolve();
+  }
+
+  loadPhotosForPlace() {
+    return Promise.resolve();
+  }
+
+  loadPlacePhotos() {
+    return Promise.resolve();
+  }
+}
+
+export class MockNostrRelayService extends Service {
+  pool = {
+    publish: () => Promise.resolve([{ ok: true }]),
+    subscribe: () => {},
+    unsubscribe: () => {},
+    close: () => {},
+  };
+
+  async publish() {
+    return [{ ok: true }];
+  }
+}
+
+export function setupNostrMocks(hooks) {
+  hooks.beforeEach(function () {
+    this.owner.register('service:nostrAuth', MockNostrAuthService);
+    this.owner.register('service:nostrData', MockNostrDataService);
+    this.owner.register('service:nostrRelay', MockNostrRelayService);
+  });
+}

tests/integration/components/place-photos-carousel-test.gjs

@@ -0,0 +1,114 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'marco/tests/helpers';
+import { render, click } from '@ember/test-helpers';
+import PlacePhotosCarousel from 'marco/components/place-photos-carousel';
+
+module('Integration | Component | place-photos-carousel', function (hooks) {
+  setupRenderingTest(hooks);
+
+  test('it renders gracefully with no photos', async function (assert) {
+    this.photos = [];
+
+    await render(
+      <template><PlacePhotosCarousel @photos={{this.photos}} /></template>
+    );
+
+    assert
+      .dom('.place-photos-carousel-wrapper')
+      .doesNotExist('it does not render the wrapper when there are no photos');
+  });
+
+  test('it renders a single photo without navigation chevrons', async function (assert) {
+    this.photos = [
+      {
+        url: 'photo1.jpg',
+        thumbUrl: 'thumb1.jpg',
+        blurhash: 'LKO2?U%2Tw=w]~RBVZRi};RPxuwH',
+        ratio: 1.5,
+        isLandscape: true,
+      },
+    ];
+
+    await render(
+      <template>
+        <div class="test-container">
+          <PlacePhotosCarousel @photos={{this.photos}} />
+        </div>
+      </template>
+    );
+
+    assert
+      .dom('.place-photos-carousel-wrapper')
+      .exists('it renders the wrapper');
+    assert
+      .dom('.carousel-slide:not(.carousel-placeholder)')
+      .exists({ count: 1 }, 'it renders one real photo slide');
+    assert
+      .dom('.carousel-placeholder')
+      .exists({ count: 1 }, 'it renders one placeholder');
+    assert
+      .dom('img.place-header-photo')
+      .hasAttribute('data-src', 'photo1.jpg', 'it sets the data-src correctly');
+
+    // There should be no chevrons when there's only 1 photo
+    assert
+      .dom('.carousel-nav-btn')
+      .doesNotExist('it does not render chevrons for a single photo');
+  });
+
+  test('it renders multiple photos and shows chevrons', async function (assert) {
+    this.photos = [
+      {
+        url: 'photo1.jpg',
+        thumbUrl: 'thumb1.jpg',
+        blurhash: 'LKO2?U%2Tw=w]~RBVZRi};RPxuwH',
+        ratio: 1.5,
+        isLandscape: true,
+      },
+      {
+        url: 'photo2.jpg',
+        thumbUrl: 'thumb2.jpg',
+        blurhash: 'LKO2?U%2Tw=w]~RBVZRi};RPxuwH',
+        ratio: 1.0,
+        isLandscape: false,
+      },
+      {
+        url: 'photo3.jpg',
+        thumbUrl: 'thumb3.jpg',
+        blurhash: 'LKO2?U%2Tw=w]~RBVZRi};RPxuwH',
+        ratio: 0.8,
+        isLandscape: false,
+      },
+    ];
+
+    await render(
+      <template>
+        <div class="test-container">
+          <PlacePhotosCarousel @photos={{this.photos}} />
+        </div>
+      </template>
+    );
+
+    await new Promise((resolve) => setTimeout(resolve, 100));
+
+    assert.dom('.carousel-slide').exists({ count: 3 }, 'it renders all slides');
+    assert
+      .dom('.carousel-nav-btn')
+      .exists({ count: 2 }, 'it renders both chevrons');
+
+    // Initially, it shouldn't be able to scroll left
+    assert
+      .dom('.carousel-nav-btn.prev')
+      .hasClass('disabled', 'the prev button is disabled initially');
+    assert
+      .dom('.carousel-nav-btn.next')
+      .doesNotHaveClass('disabled', 'the next button is enabled initially');
+
+    // We can't perfectly test native scroll behavior easily in JSDOM/QUnit without mocking the DOM elements' scroll properties,
+    // but we can test that clicking the next button triggers the scrolling method.
+    // However, since we mock scrollLeft in the component logic implicitly via template action, let's at least ensure clicking doesn't throw.
+    await click('.carousel-nav-btn.next');
+
+    assert.ok(true, 'clicking next button does not throw');
+  });
+});