Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 raucao
|
ac089286bd
|
No files matched your search
+57
-2
@@ -1,10 +1,65 @@
|
||||
import Component from '@glimmer/component';
|
||||
import { htmlSafe } from '@ember/template';
|
||||
import { getIcon } from '../utils/icons';
|
||||
|
||||
import arrowLeft from 'feather-icons/dist/icons/arrow-left.svg?raw';
|
||||
import activity from 'feather-icons/dist/icons/activity.svg?raw';
|
||||
import bookmark from 'feather-icons/dist/icons/bookmark.svg?raw';
|
||||
import clock from 'feather-icons/dist/icons/clock.svg?raw';
|
||||
import edit from 'feather-icons/dist/icons/edit.svg?raw';
|
||||
import facebook from 'feather-icons/dist/icons/facebook.svg?raw';
|
||||
import globe from 'feather-icons/dist/icons/globe.svg?raw';
|
||||
import home from 'feather-icons/dist/icons/home.svg?raw';
|
||||
import instagram from 'feather-icons/dist/icons/instagram.svg?raw';
|
||||
import logIn from 'feather-icons/dist/icons/log-in.svg?raw';
|
||||
import logOut from 'feather-icons/dist/icons/log-out.svg?raw';
|
||||
import mail from 'feather-icons/dist/icons/mail.svg?raw';
|
||||
import map from 'feather-icons/dist/icons/map.svg?raw';
|
||||
import mapPin from 'feather-icons/dist/icons/map-pin.svg?raw';
|
||||
import menu from 'feather-icons/dist/icons/menu.svg?raw';
|
||||
import navigation from 'feather-icons/dist/icons/navigation.svg?raw';
|
||||
import phone from 'feather-icons/dist/icons/phone.svg?raw';
|
||||
import plus from 'feather-icons/dist/icons/plus.svg?raw';
|
||||
import server from 'feather-icons/dist/icons/server.svg?raw';
|
||||
import search from 'feather-icons/dist/icons/search.svg?raw';
|
||||
import settings from 'feather-icons/dist/icons/settings.svg?raw';
|
||||
import target from 'feather-icons/dist/icons/target.svg?raw';
|
||||
import user from 'feather-icons/dist/icons/user.svg?raw';
|
||||
import x from 'feather-icons/dist/icons/x.svg?raw';
|
||||
import zap from 'feather-icons/dist/icons/zap.svg?raw';
|
||||
import wikipedia from '../icons/wikipedia.svg?raw';
|
||||
|
||||
const ICONS = {
|
||||
'arrow-left': arrowLeft,
|
||||
activity,
|
||||
bookmark,
|
||||
clock,
|
||||
edit,
|
||||
facebook,
|
||||
globe,
|
||||
home,
|
||||
instagram,
|
||||
'log-in': logIn,
|
||||
'log-out': logOut,
|
||||
mail,
|
||||
map,
|
||||
'map-pin': mapPin,
|
||||
menu,
|
||||
navigation,
|
||||
phone,
|
||||
plus,
|
||||
server,
|
||||
search,
|
||||
settings,
|
||||
target,
|
||||
user,
|
||||
wikipedia,
|
||||
x,
|
||||
zap,
|
||||
};
|
||||
|
||||
export default class IconComponent extends Component {
|
||||
get svg() {
|
||||
return getIcon(this.args.name);
|
||||
return ICONS[this.args.name];
|
||||
}
|
||||
|
||||
get size() {
|
||||
|
||||
+11
-65
@@ -60,30 +60,9 @@ export default class MapComponent extends Component {
|
||||
|
||||
// Create a vector source and layer for bookmarks
|
||||
this.bookmarkSource = new VectorSource();
|
||||
|
||||
const bookmarkStyleFunction = (feature) => {
|
||||
const originalPlace = feature.get('originalPlace');
|
||||
let color =
|
||||
getComputedStyle(document.documentElement)
|
||||
.getPropertyValue('--default-list-color')
|
||||
.trim() || '#000000'; // Fallback to black if variable is missing to make error obvious
|
||||
|
||||
if (
|
||||
originalPlace &&
|
||||
originalPlace._listIds &&
|
||||
originalPlace._listIds.length > 0
|
||||
) {
|
||||
// Find the first list color
|
||||
// We need access to storage.lists.
|
||||
// Since this is inside setupMap, 'this' refers to the component instance.
|
||||
const firstListId = originalPlace._listIds[0];
|
||||
const list = this.storage.lists.find((l) => l.id === firstListId);
|
||||
if (list && list.color) {
|
||||
color = list.color;
|
||||
}
|
||||
}
|
||||
|
||||
return [
|
||||
const bookmarkLayer = new VectorLayer({
|
||||
source: this.bookmarkSource,
|
||||
style: [
|
||||
new Style({
|
||||
image: new Circle({
|
||||
radius: 10,
|
||||
@@ -94,19 +73,14 @@ export default class MapComponent extends Component {
|
||||
new Style({
|
||||
image: new Circle({
|
||||
radius: 9,
|
||||
fill: new Fill({ color: color }),
|
||||
fill: new Fill({ color: '#ffcc33' }), // Gold/Yellow
|
||||
stroke: new Stroke({
|
||||
color: '#fff',
|
||||
width: 2,
|
||||
}),
|
||||
}),
|
||||
}),
|
||||
];
|
||||
};
|
||||
|
||||
const bookmarkLayer = new VectorLayer({
|
||||
source: this.bookmarkSource,
|
||||
style: bookmarkStyleFunction,
|
||||
],
|
||||
zIndex: 10, // Ensure it sits above the map tiles
|
||||
});
|
||||
|
||||
@@ -467,7 +441,6 @@ export default class MapComponent extends Component {
|
||||
// Track the selected place from the UI Service (Router -> Map)
|
||||
updateSelectedPin = modifier(() => {
|
||||
const selected = this.mapUi.selectedPlace;
|
||||
const options = this.mapUi.selectionOptions || {};
|
||||
|
||||
if (!this.selectedPinOverlay || !this.selectedPinElement) return;
|
||||
|
||||
@@ -498,12 +471,7 @@ export default class MapComponent extends Component {
|
||||
}
|
||||
}
|
||||
|
||||
if (options.preventZoom) {
|
||||
// If we are preventing zoom (e.g. user clicked a bookmark), we still need to center
|
||||
// but without changing the zoom level.
|
||||
// We use animateToSmartCenter without a second argument (zoom=null).
|
||||
this.animateToSmartCenter(coords);
|
||||
} else if (selected.bbox) {
|
||||
if (selected.bbox) {
|
||||
this.zoomToBbox(selected.bbox);
|
||||
} else {
|
||||
this.handlePinVisibility(coords);
|
||||
@@ -562,22 +530,13 @@ export default class MapComponent extends Component {
|
||||
padding: padding,
|
||||
duration: 1000,
|
||||
easing: (t) => t * (2 - t),
|
||||
maxZoom: Math.max(currentZoom, 18),
|
||||
maxZoom: currentZoom,
|
||||
});
|
||||
}
|
||||
|
||||
handlePinVisibility(coords) {
|
||||
if (!this.mapInstance) return;
|
||||
|
||||
const view = this.mapInstance.getView();
|
||||
const currentZoom = view.getZoom();
|
||||
|
||||
// If too far out (e.g. world view), zoom in to neighborhood level (16)
|
||||
if (currentZoom < 16) {
|
||||
this.animateToSmartCenter(coords, 16);
|
||||
return;
|
||||
}
|
||||
|
||||
const pixel = this.mapInstance.getPixelFromCoordinate(coords);
|
||||
const size = this.mapInstance.getSize();
|
||||
|
||||
@@ -596,17 +555,12 @@ export default class MapComponent extends Component {
|
||||
}
|
||||
}
|
||||
|
||||
animateToSmartCenter(coords, zoom = null) {
|
||||
animateToSmartCenter(coords) {
|
||||
if (!this.mapInstance) return;
|
||||
|
||||
const size = this.mapInstance.getSize();
|
||||
const view = this.mapInstance.getView();
|
||||
let resolution = view.getResolution();
|
||||
|
||||
if (zoom !== null) {
|
||||
resolution = view.getResolutionForZoom(zoom);
|
||||
}
|
||||
|
||||
const resolution = view.getResolution();
|
||||
let targetCenter = coords;
|
||||
|
||||
// Check if mobile (width <= 768px matches CSS)
|
||||
@@ -628,17 +582,11 @@ export default class MapComponent extends Component {
|
||||
targetCenter = [coords[0], coords[1] - offsetMapUnits];
|
||||
}
|
||||
|
||||
const animationOptions = {
|
||||
view.animate({
|
||||
center: targetCenter,
|
||||
duration: 1000,
|
||||
easing: (t) => t * (2 - t), // Ease-out
|
||||
};
|
||||
|
||||
if (zoom !== null) {
|
||||
animationOptions.zoom = zoom;
|
||||
}
|
||||
|
||||
view.animate(animationOptions);
|
||||
});
|
||||
}
|
||||
|
||||
panIfObscured(coords) {
|
||||
@@ -902,7 +850,6 @@ export default class MapComponent extends Component {
|
||||
'Clicked bookmark while sidebar open (switching):',
|
||||
clickedBookmark
|
||||
);
|
||||
this.mapUi.preventNextZoom = true;
|
||||
this.router.transitionTo('place', clickedBookmark);
|
||||
return;
|
||||
}
|
||||
@@ -917,7 +864,6 @@ export default class MapComponent extends Component {
|
||||
// Normal behavior (sidebar is closed)
|
||||
if (clickedBookmark) {
|
||||
console.debug('Clicked bookmark:', clickedBookmark);
|
||||
this.mapUi.preventNextZoom = true;
|
||||
this.router.transitionTo('place', clickedBookmark);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1,39 +1,23 @@
|
||||
import Component from '@glimmer/component';
|
||||
import { service } from '@ember/service';
|
||||
import { fn } from '@ember/helper';
|
||||
import { on } from '@ember/modifier';
|
||||
import { htmlSafe } from '@ember/template';
|
||||
import { humanizeOsmTag } from '../utils/format-text';
|
||||
import { getLocalizedName, getPlaceType } from '../utils/osm';
|
||||
import { mapToStorageSchema } from '../utils/place-mapping';
|
||||
import { getSocialInfo } from '../utils/social-links';
|
||||
import Icon from '../components/icon';
|
||||
import PlaceEditForm from './place-edit-form';
|
||||
import PlaceListsManager from './place-lists-manager';
|
||||
|
||||
import { tracked } from '@glimmer/tracking';
|
||||
import { action } from '@ember/object';
|
||||
|
||||
export default class PlaceDetails extends Component {
|
||||
@service storage;
|
||||
@tracked isEditing = false;
|
||||
@tracked showLists = false;
|
||||
|
||||
get isSaved() {
|
||||
return this.storage.isPlaceSaved(this.place.id || this.place.osmId);
|
||||
}
|
||||
|
||||
get place() {
|
||||
return this.args.place || {};
|
||||
}
|
||||
|
||||
get saveablePlace() {
|
||||
if (this.place.createdAt) {
|
||||
return this.place;
|
||||
}
|
||||
|
||||
return mapToStorageSchema(this.place);
|
||||
}
|
||||
|
||||
get tags() {
|
||||
return this.place.osmTags || {};
|
||||
}
|
||||
@@ -44,7 +28,7 @@ export default class PlaceDetails extends Component {
|
||||
|
||||
@action
|
||||
startEditing() {
|
||||
if (!this.isSaved) return; // Only allow editing saved places
|
||||
if (!this.place.createdAt) return; // Only allow editing saved places
|
||||
this.isEditing = true;
|
||||
}
|
||||
|
||||
@@ -53,21 +37,6 @@ export default class PlaceDetails extends Component {
|
||||
this.isEditing = false;
|
||||
}
|
||||
|
||||
@action
|
||||
toggleLists(event) {
|
||||
// Prevent this click from propagating to the document listener
|
||||
// which handles the "click outside" logic.
|
||||
if (event) {
|
||||
event.stopPropagation();
|
||||
}
|
||||
this.showLists = !this.showLists;
|
||||
}
|
||||
|
||||
@action
|
||||
closeLists() {
|
||||
this.showLists = false;
|
||||
}
|
||||
|
||||
@action
|
||||
async saveChanges(changes) {
|
||||
if (this.args.onSave) {
|
||||
@@ -278,29 +247,23 @@ export default class PlaceDetails extends Component {
|
||||
{{/if}}
|
||||
|
||||
<div class="actions">
|
||||
<div class="save-button-wrapper">
|
||||
<button
|
||||
type="button"
|
||||
class={{if this.isSaved "btn btn-secondary" "btn btn-outline"}}
|
||||
{{on "click" this.toggleLists}}
|
||||
>
|
||||
<Icon
|
||||
@name="bookmark"
|
||||
@color={{if this.isSaved "currentColor" "#007bff"}}
|
||||
/>
|
||||
{{if this.isSaved "Saved" "Save"}}
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
class={{if
|
||||
this.place.createdAt
|
||||
"btn btn-secondary"
|
||||
"btn btn-outline"
|
||||
}}
|
||||
{{on "click" (fn @onToggleSave this.place)}}
|
||||
>
|
||||
<Icon
|
||||
@name="bookmark"
|
||||
@color={{if this.place.createdAt "currentColor" "#007bff"}}
|
||||
/>
|
||||
{{if this.place.createdAt "Saved" "Save"}}
|
||||
</button>
|
||||
|
||||
{{#if this.showLists}}
|
||||
<PlaceListsManager
|
||||
@place={{this.saveablePlace}}
|
||||
@onClose={{this.closeLists}}
|
||||
@isSaved={{this.isSaved}}
|
||||
/>
|
||||
{{/if}}
|
||||
</div>
|
||||
|
||||
{{#if this.isSaved}}
|
||||
{{#if this.place.createdAt}}
|
||||
<button
|
||||
type="button"
|
||||
class="btn btn-outline"
|
||||
|
||||
@@ -1,135 +0,0 @@
|
||||
import Component from '@glimmer/component';
|
||||
import { service } from '@ember/service';
|
||||
import { action } from '@ember/object';
|
||||
import { tracked } from '@glimmer/tracking';
|
||||
import { on } from '@ember/modifier';
|
||||
import { fn } from '@ember/helper';
|
||||
import { htmlSafe } from '@ember/template';
|
||||
import onClickOutside from '../modifiers/on-click-outside';
|
||||
|
||||
export default class PlaceListsManager extends Component {
|
||||
@service storage;
|
||||
@service router;
|
||||
@tracked _forceClear = false;
|
||||
|
||||
get isSaved() {
|
||||
return this.args.isSaved;
|
||||
}
|
||||
|
||||
get placeListIds() {
|
||||
if (this._forceClear) return [];
|
||||
return this.args.place._listIds || [];
|
||||
}
|
||||
|
||||
styleFor(color) {
|
||||
return htmlSafe(`background-color: ${color}`);
|
||||
}
|
||||
|
||||
@action
|
||||
isInList(list) {
|
||||
if (!this.placeListIds) return false;
|
||||
return this.placeListIds.includes(list.id);
|
||||
}
|
||||
|
||||
@action
|
||||
async toggleSaved() {
|
||||
if (this.isSaved) {
|
||||
const { osmId, osmType } = this.args.place;
|
||||
|
||||
await this.storage.removePlace(this.args.place);
|
||||
|
||||
// Clean up the local object reference immediately to prevent UI flicker
|
||||
// or stale state if the transition is delayed/cancelled.
|
||||
if (this.args.place) {
|
||||
this.args.place.id = null;
|
||||
this.args.place.createdAt = null;
|
||||
this.args.place._listIds = [];
|
||||
this._forceClear = true;
|
||||
}
|
||||
|
||||
// Transition immediately to the canonical state
|
||||
if (osmId && osmType) {
|
||||
// Create a transient copy that looks like a fresh OSM result
|
||||
const rawPlace = { ...this.args.place };
|
||||
delete rawPlace.id;
|
||||
delete rawPlace.createdAt;
|
||||
delete rawPlace._listIds;
|
||||
|
||||
// Transition to the place route using the raw object
|
||||
// This updates the URL to 'osm:...' and renders immediately
|
||||
this.router.transitionTo('place', rawPlace);
|
||||
} else {
|
||||
// Custom place deleted -> go home
|
||||
this.router.transitionTo('index');
|
||||
}
|
||||
|
||||
if (this.args.onClose) this.args.onClose();
|
||||
} else {
|
||||
await this.storage.storePlace(this.args.place);
|
||||
}
|
||||
}
|
||||
|
||||
@action
|
||||
async toggleList(list) {
|
||||
const isMember = this.placeListIds.includes(list.id);
|
||||
const shouldAdd = !isMember;
|
||||
|
||||
if (shouldAdd && !this.isSaved) {
|
||||
// Auto-save if adding to list
|
||||
await this.storage.storePlace(this.args.place);
|
||||
}
|
||||
|
||||
try {
|
||||
// Toggle membership
|
||||
// We must pass the SAVED place (with ID) to the toggle function
|
||||
// If we just saved it above, the args.place might still be the old object reference unless storage updates it in-place?
|
||||
// StorageService.storePlace returns the new object.
|
||||
// But togglePlaceList handles saving internally if ID is missing.
|
||||
|
||||
// Let's rely on storage.togglePlaceList to handle the "save if needed" part.
|
||||
await this.storage.togglePlaceList(this.args.place, list.id, shouldAdd);
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
alert('Failed to update list: ' + e.message);
|
||||
}
|
||||
}
|
||||
|
||||
<template>
|
||||
<div class="place-lists-manager" {{onClickOutside @onClose}}>
|
||||
<div class="list-item master-toggle">
|
||||
<label>
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={{this.isSaved}}
|
||||
{{on "change" this.toggleSaved}}
|
||||
/>
|
||||
<span class="list-color"></span>
|
||||
<span class="list-name">Saved places</span>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div class="divider"></div>
|
||||
|
||||
<div class="lists-container">
|
||||
{{#each this.storage.lists as |list|}}
|
||||
<div class="list-item">
|
||||
<label>
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={{this.isInList list}}
|
||||
{{on "change" (fn this.toggleList list)}}
|
||||
disabled={{unless this.isSaved true}}
|
||||
/>
|
||||
{{! template-lint-disable no-inline-styles }}
|
||||
<span
|
||||
class="list-color"
|
||||
style={{this.styleFor list.color}}
|
||||
></span>
|
||||
<span class="list-name">{{list.title}}</span>
|
||||
</label>
|
||||
</div>
|
||||
{{/each}}
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
}
|
||||
@@ -51,39 +51,40 @@ export default class PlacesSidebar extends Component {
|
||||
if (!place) return;
|
||||
|
||||
if (place.createdAt) {
|
||||
// Direct delete without confirmation
|
||||
try {
|
||||
await this.storage.removePlace(place);
|
||||
console.debug('Place deleted:', place.title);
|
||||
if (confirm(`Delete "${place.title}"?`)) {
|
||||
try {
|
||||
await this.storage.removePlace(place);
|
||||
console.debug('Place deleted:', place.title);
|
||||
|
||||
// Notify parent to refresh map bookmarks
|
||||
if (this.args.onBookmarkChange) {
|
||||
this.args.onBookmarkChange();
|
||||
}
|
||||
// Notify parent to refresh map bookmarks
|
||||
if (this.args.onBookmarkChange) {
|
||||
this.args.onBookmarkChange();
|
||||
}
|
||||
|
||||
if (this.args.onUpdate) {
|
||||
// Reconstruct the "original" place without ID/Geohash/CreatedAt
|
||||
const freshPlace = {
|
||||
...place,
|
||||
id: undefined,
|
||||
geohash: undefined,
|
||||
createdAt: undefined,
|
||||
};
|
||||
this.args.onUpdate(freshPlace);
|
||||
}
|
||||
if (this.args.onUpdate) {
|
||||
// Reconstruct the "original" place without ID/Geohash/CreatedAt
|
||||
const freshPlace = {
|
||||
...place,
|
||||
id: undefined,
|
||||
geohash: undefined,
|
||||
createdAt: undefined,
|
||||
};
|
||||
this.args.onUpdate(freshPlace);
|
||||
}
|
||||
|
||||
// Also fire onSelect if it exists (for list view)
|
||||
if (this.args.onSelect) {
|
||||
this.args.onSelect(null);
|
||||
}
|
||||
// Also fire onSelect if it exists (for list view)
|
||||
if (this.args.onSelect) {
|
||||
this.args.onSelect(null);
|
||||
}
|
||||
|
||||
// Close sidebar after delete
|
||||
if (this.args.onClose) {
|
||||
this.args.onClose();
|
||||
// Close sidebar after delete
|
||||
if (this.args.onClose) {
|
||||
this.args.onClose();
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('Failed to delete:', e);
|
||||
alert('Failed to delete: ' + e.message);
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('Failed to delete:', e);
|
||||
alert('Failed to delete: ' + e.message);
|
||||
}
|
||||
} else {
|
||||
// It's a fresh POI -> Save it
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
import { modifier } from 'ember-modifier';
|
||||
|
||||
export default modifier((element, [callback]) => {
|
||||
const handler = (event) => {
|
||||
// Check if the click target is contained within the element
|
||||
if (element && !element.contains(event.target)) {
|
||||
callback(event);
|
||||
}
|
||||
};
|
||||
|
||||
// Delay attaching the listener to avoid catching the opening click
|
||||
// (using a microtask or setTimeout 0)
|
||||
const timer = setTimeout(() => {
|
||||
document.addEventListener('click', handler);
|
||||
}, 0);
|
||||
|
||||
return () => {
|
||||
clearTimeout(timer);
|
||||
document.removeEventListener('click', handler);
|
||||
};
|
||||
});
|
||||
+1
-3
@@ -72,9 +72,7 @@ export default class PlaceRoute extends Route {
|
||||
|
||||
// Notify the Map UI to show the pin
|
||||
if (model) {
|
||||
const options = { preventZoom: this.mapUi.preventNextZoom };
|
||||
this.mapUi.selectPlace(model, options);
|
||||
this.mapUi.preventNextZoom = false;
|
||||
this.mapUi.selectPlace(model);
|
||||
}
|
||||
// Stop the pulse animation if it was running (e.g. redirected from search)
|
||||
this.mapUi.stopSearch();
|
||||
|
||||
@@ -9,24 +9,18 @@ export default class MapUiService extends Service {
|
||||
@tracked returnToSearch = false;
|
||||
@tracked currentCenter = null;
|
||||
@tracked searchBoxHasFocus = false;
|
||||
@tracked selectionOptions = {};
|
||||
@tracked preventNextZoom = false;
|
||||
|
||||
selectPlace(place, options = {}) {
|
||||
selectPlace(place) {
|
||||
this.selectedPlace = place;
|
||||
this.selectionOptions = options;
|
||||
}
|
||||
|
||||
clearSelection() {
|
||||
this.selectedPlace = null;
|
||||
this.selectionOptions = {};
|
||||
this.preventNextZoom = false;
|
||||
}
|
||||
|
||||
startSearch() {
|
||||
this.isSearching = true;
|
||||
this.isCreating = false;
|
||||
this.preventNextZoom = false;
|
||||
}
|
||||
|
||||
stopSearch() {
|
||||
|
||||
+2
-119
@@ -15,7 +15,6 @@ export default class StorageService extends Service {
|
||||
@tracked savedPlaces = [];
|
||||
@tracked loadedPrefixes = [];
|
||||
@tracked currentBbox = null;
|
||||
@tracked lists = [];
|
||||
@tracked version = 0; // Shared version tracker for bookmarks
|
||||
@tracked initialSyncDone = false;
|
||||
@tracked connected = false;
|
||||
@@ -47,11 +46,6 @@ export default class StorageService extends Service {
|
||||
this.rs.on('connected', () => {
|
||||
this.connected = true;
|
||||
this.userAddress = this.rs.remote.userAddress;
|
||||
this.loadLists();
|
||||
});
|
||||
|
||||
this.rs.on('not-connected', () => {
|
||||
this.loadLists();
|
||||
});
|
||||
|
||||
this.rs.on('disconnected', () => {
|
||||
@@ -60,7 +54,6 @@ export default class StorageService extends Service {
|
||||
this.placesInView = [];
|
||||
this.savedPlaces = [];
|
||||
this.loadedPrefixes = [];
|
||||
this.lists = [];
|
||||
this.initialSyncDone = false;
|
||||
});
|
||||
|
||||
@@ -68,18 +61,13 @@ export default class StorageService extends Service {
|
||||
// console.debug('[rs] sync done:', result);
|
||||
if (!this.initialSyncDone) {
|
||||
this.initialSyncDone = true;
|
||||
this.loadLists();
|
||||
}
|
||||
});
|
||||
|
||||
this.rs.scope('/places/').on('change', (event) => {
|
||||
// console.debug(event);
|
||||
if (event.relativePath.startsWith('_lists/')) {
|
||||
this.loadLists();
|
||||
} else {
|
||||
this.handlePlaceChange(event);
|
||||
debounceTask(this, 'reloadCurrentView', 200);
|
||||
}
|
||||
this.handlePlaceChange(event);
|
||||
debounceTask(this, 'reloadCurrentView', 200);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -132,98 +120,6 @@ export default class StorageService extends Service {
|
||||
this.loadAllPlaces(required);
|
||||
}
|
||||
|
||||
async loadLists() {
|
||||
try {
|
||||
if (!this.places.lists) return; // Wait for module init
|
||||
|
||||
// Ensure defaults exist first
|
||||
await this.places.lists.initDefaults();
|
||||
|
||||
const lists = await this.places.lists.getAll();
|
||||
this.lists = lists || [];
|
||||
|
||||
// Decorate with hardcoded icons for default lists (in-memory only)
|
||||
this.lists.forEach((list) => {
|
||||
if (list.id === 'to-go') {
|
||||
list.icon = 'bookmark';
|
||||
} else if (list.id === 'to-do') {
|
||||
list.icon = 'check-square';
|
||||
}
|
||||
});
|
||||
|
||||
this.refreshPlaceListAssociations();
|
||||
} catch (e) {
|
||||
console.error('Failed to load lists:', e);
|
||||
}
|
||||
}
|
||||
|
||||
refreshPlaceListAssociations() {
|
||||
// 1. Build an index of PlaceID -> ListID[]
|
||||
const placeToListMap = new Map();
|
||||
|
||||
this.lists.forEach((list) => {
|
||||
if (list.placeRefs && Array.isArray(list.placeRefs)) {
|
||||
list.placeRefs.forEach((ref) => {
|
||||
if (!ref.id) return;
|
||||
if (!placeToListMap.has(ref.id)) {
|
||||
placeToListMap.set(ref.id, []);
|
||||
}
|
||||
placeToListMap.get(ref.id).push(list.id);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
// 2. Helper to attach lists to a place object
|
||||
const attachLists = (place) => {
|
||||
const listIds = placeToListMap.get(place.id) || [];
|
||||
// Assign directly to object property (non-tracked mutation is fine as we trigger updates below)
|
||||
place._listIds = listIds;
|
||||
return place;
|
||||
};
|
||||
|
||||
// 3. Update savedPlaces
|
||||
this.savedPlaces = this.savedPlaces.map((p) => attachLists({ ...p }));
|
||||
|
||||
// 4. Update placesInView
|
||||
this.placesInView = this.placesInView.map((p) => attachLists({ ...p }));
|
||||
}
|
||||
|
||||
async togglePlaceList(place, listId, shouldBeInList) {
|
||||
if (!place) return;
|
||||
|
||||
// Ensure place is saved first if it's new
|
||||
let savedPlace = place;
|
||||
if (!place.id || !place.geohash) {
|
||||
if (shouldBeInList) {
|
||||
// If adding to a list, we must save the place first
|
||||
savedPlace = await this.storePlace(place);
|
||||
} else {
|
||||
return; // Can't remove an unsaved place from a list
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
if (shouldBeInList) {
|
||||
await this.places.lists.addPlace(
|
||||
listId,
|
||||
savedPlace.id,
|
||||
savedPlace.geohash
|
||||
);
|
||||
} else {
|
||||
await this.places.lists.removePlace(listId, savedPlace.id);
|
||||
}
|
||||
|
||||
// Reload lists to reflect changes
|
||||
await this.loadLists();
|
||||
|
||||
// Return the updated place
|
||||
return this.findPlaceById(savedPlace.id);
|
||||
} catch (e) {
|
||||
console.error('Failed to toggle place in list:', e);
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
|
||||
async loadPlacesInBounds(bbox) {
|
||||
// 1. Calculate required prefixes
|
||||
const requiredPrefixes = getGeohashPrefixesInBbox(bbox);
|
||||
@@ -277,8 +173,6 @@ export default class StorageService extends Service {
|
||||
// Full reload
|
||||
this.placesInView = places;
|
||||
}
|
||||
// Refresh list associations
|
||||
this.refreshPlaceListAssociations();
|
||||
} else {
|
||||
if (!prefixes) this.placesInView = [];
|
||||
}
|
||||
@@ -296,22 +190,11 @@ export default class StorageService extends Service {
|
||||
let place = this.savedPlaces.find((p) => p.id && String(p.id) === strId);
|
||||
if (place) return place;
|
||||
|
||||
// Check placesInView as fallback
|
||||
place = this.placesInView.find((p) => p.id && String(p.id) === strId);
|
||||
if (place) return place;
|
||||
|
||||
// Then search by OSM ID
|
||||
place = this.savedPlaces.find((p) => p.osmId && String(p.osmId) === strId);
|
||||
if (place) return place;
|
||||
|
||||
place = this.placesInView.find((p) => p.osmId && String(p.osmId) === strId);
|
||||
return place;
|
||||
}
|
||||
|
||||
isPlaceSaved(id) {
|
||||
return !!this.findPlaceById(id);
|
||||
}
|
||||
|
||||
async storePlace(placeData) {
|
||||
const savedPlace = await this.places.store(placeData);
|
||||
|
||||
|
||||
+2
-71
@@ -1,9 +1,5 @@
|
||||
/* Ember supports plain CSS out of the box. More info: https://cli.emberjs.com/release/advanced-use/stylesheets/ */
|
||||
|
||||
:root {
|
||||
--default-list-color: #fc3;
|
||||
}
|
||||
|
||||
html,
|
||||
body {
|
||||
height: 100%;
|
||||
@@ -207,7 +203,6 @@ body {
|
||||
box-shadow: 2px 0 5px rgb(0 0 0 / 10%);
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
overflow: hidden; /* Ensure flex children are contained */
|
||||
}
|
||||
|
||||
.settings-pane.sidebar {
|
||||
@@ -244,11 +239,7 @@ body {
|
||||
.sidebar-content {
|
||||
padding: 1rem;
|
||||
overflow-y: auto;
|
||||
-webkit-overflow-scrolling: touch;
|
||||
flex: 1;
|
||||
min-height: 0;
|
||||
touch-action: pan-y;
|
||||
overscroll-behavior: contain;
|
||||
flex: 1; /* Take up remaining vertical space */
|
||||
}
|
||||
|
||||
.edit-form {
|
||||
@@ -781,6 +772,7 @@ button.create-place {
|
||||
|
||||
.sidebar-content {
|
||||
overflow-y: auto;
|
||||
overscroll-behavior: contain; /* Prevent scroll chaining */
|
||||
|
||||
/* Ensure content doesn't get hidden behind bottom safe areas on mobile */
|
||||
padding-bottom: env(safe-area-inset-bottom, 20px);
|
||||
@@ -985,64 +977,3 @@ button.create-place {
|
||||
text-overflow: ellipsis;
|
||||
margin-top: 2px;
|
||||
}
|
||||
|
||||
/* Place Lists Manager */
|
||||
.save-button-wrapper {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.place-lists-manager {
|
||||
position: absolute;
|
||||
top: 100%;
|
||||
left: 0;
|
||||
margin-top: 0.5rem;
|
||||
background: white;
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 4px 12px rgb(0 0 0 / 15%);
|
||||
width: 220px;
|
||||
z-index: 10;
|
||||
padding: 0.5rem 0;
|
||||
}
|
||||
|
||||
.place-lists-manager .list-item {
|
||||
padding: 0.5rem 1rem;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.place-lists-manager .list-item:hover {
|
||||
background: #f8f9fa;
|
||||
}
|
||||
|
||||
.place-lists-manager label {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.75rem;
|
||||
width: 100%;
|
||||
cursor: pointer;
|
||||
margin: 0;
|
||||
font-size: 0.95rem;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.place-lists-manager input[type='checkbox'] {
|
||||
accent-color: #007bff;
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.place-lists-manager .list-color {
|
||||
width: 12px;
|
||||
height: 12px;
|
||||
background-color: var(--default-list-color);
|
||||
border-radius: 50%;
|
||||
flex-shrink: 0;
|
||||
border: 1px solid rgb(0 0 0 / 10%);
|
||||
}
|
||||
|
||||
.place-lists-manager .divider {
|
||||
height: 1px;
|
||||
background: #eee;
|
||||
margin: 0.5rem 0;
|
||||
}
|
||||
@@ -1,61 +0,0 @@
|
||||
import arrowLeft from 'feather-icons/dist/icons/arrow-left.svg?raw';
|
||||
import activity from 'feather-icons/dist/icons/activity.svg?raw';
|
||||
import bookmark from 'feather-icons/dist/icons/bookmark.svg?raw';
|
||||
import checkSquare from 'feather-icons/dist/icons/check-square.svg?raw';
|
||||
import clock from 'feather-icons/dist/icons/clock.svg?raw';
|
||||
import edit from 'feather-icons/dist/icons/edit.svg?raw';
|
||||
import facebook from 'feather-icons/dist/icons/facebook.svg?raw';
|
||||
import globe from 'feather-icons/dist/icons/globe.svg?raw';
|
||||
import home from 'feather-icons/dist/icons/home.svg?raw';
|
||||
import instagram from 'feather-icons/dist/icons/instagram.svg?raw';
|
||||
import logIn from 'feather-icons/dist/icons/log-in.svg?raw';
|
||||
import logOut from 'feather-icons/dist/icons/log-out.svg?raw';
|
||||
import mail from 'feather-icons/dist/icons/mail.svg?raw';
|
||||
import map from 'feather-icons/dist/icons/map.svg?raw';
|
||||
import mapPin from 'feather-icons/dist/icons/map-pin.svg?raw';
|
||||
import menu from 'feather-icons/dist/icons/menu.svg?raw';
|
||||
import navigation from 'feather-icons/dist/icons/navigation.svg?raw';
|
||||
import phone from 'feather-icons/dist/icons/phone.svg?raw';
|
||||
import plus from 'feather-icons/dist/icons/plus.svg?raw';
|
||||
import server from 'feather-icons/dist/icons/server.svg?raw';
|
||||
import search from 'feather-icons/dist/icons/search.svg?raw';
|
||||
import settings from 'feather-icons/dist/icons/settings.svg?raw';
|
||||
import target from 'feather-icons/dist/icons/target.svg?raw';
|
||||
import user from 'feather-icons/dist/icons/user.svg?raw';
|
||||
import x from 'feather-icons/dist/icons/x.svg?raw';
|
||||
import zap from 'feather-icons/dist/icons/zap.svg?raw';
|
||||
import wikipedia from '../icons/wikipedia.svg?raw';
|
||||
|
||||
const ICONS = {
|
||||
'arrow-left': arrowLeft,
|
||||
activity,
|
||||
bookmark,
|
||||
'check-square': checkSquare,
|
||||
clock,
|
||||
edit,
|
||||
facebook,
|
||||
globe,
|
||||
home,
|
||||
instagram,
|
||||
'log-in': logIn,
|
||||
'log-out': logOut,
|
||||
mail,
|
||||
map,
|
||||
'map-pin': mapPin,
|
||||
menu,
|
||||
navigation,
|
||||
phone,
|
||||
plus,
|
||||
server,
|
||||
search,
|
||||
settings,
|
||||
target,
|
||||
user,
|
||||
wikipedia,
|
||||
x,
|
||||
zap,
|
||||
};
|
||||
|
||||
export function getIcon(name) {
|
||||
return ICONS[name];
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
import { getLocalizedName } from './osm';
|
||||
|
||||
export function mapToStorageSchema(place) {
|
||||
return {
|
||||
title: place.title || getLocalizedName(place.osmTags, 'Untitled Place'),
|
||||
lat: place.lat,
|
||||
lon: place.lon,
|
||||
tags: [],
|
||||
url: place.osmTags?.website,
|
||||
osmId: String(place.osmId || place.id),
|
||||
osmType: place.osmType,
|
||||
osmTags: place.osmTags || {},
|
||||
description: place.description,
|
||||
};
|
||||
}
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "marco",
|
||||
"version": "1.14.0",
|
||||
"version": "1.13.0",
|
||||
"private": true,
|
||||
"description": "Unhosted maps app",
|
||||
"repository": {
|
||||
@@ -52,7 +52,7 @@
|
||||
"@embroider/vite": "^1.5.0",
|
||||
"@eslint/js": "^9.39.2",
|
||||
"@glimmer/component": "^2.0.0",
|
||||
"@remotestorage/module-places": "~1.2.1",
|
||||
"@remotestorage/module-places": "1.x",
|
||||
"@rollup/plugin-babel": "^6.1.0",
|
||||
"@warp-drive/core": "~5.8.0",
|
||||
"@warp-drive/ember": "~5.8.0",
|
||||
|
||||
Generated
+5
-5
@@ -55,8 +55,8 @@ importers:
|
||||
specifier: ^2.0.0
|
||||
version: 2.0.0
|
||||
'@remotestorage/module-places':
|
||||
specifier: ~1.2.1
|
||||
version: 1.2.1
|
||||
specifier: 1.x
|
||||
version: 1.0.0
|
||||
'@rollup/plugin-babel':
|
||||
specifier: ^6.1.0
|
||||
version: 6.1.0(@babel/core@7.28.6)(rollup@4.55.1)
|
||||
@@ -1380,8 +1380,8 @@ packages:
|
||||
resolution: {integrity: sha512-4rdu8GPY9TeQwsYp5D2My74dC3dSVS3tghAvisG80ybK4lqa0gvlrglaSTBxogJbxqHRw/NjI/liEtb3+SD+Bw==}
|
||||
engines: {node: '>=18.12'}
|
||||
|
||||
'@remotestorage/module-places@1.2.1':
|
||||
resolution: {integrity: sha512-hNRuhGoG8RS+cieVvDVzXWBEuNPfyeFirhgNH3z1WoKw9ngHdPY6V0sT0vKbsxB8xaODReZfo2ZKHLTmdFunlw==}
|
||||
'@remotestorage/module-places@1.0.0':
|
||||
resolution: {integrity: sha512-vaqJeTw658gjPyLz70Mq2AbGfDZ66O2mpDFME+gtaGFYl2+UvrvRLCrXWHYuyTE21f3TJdegeXM6C5nZMxLv9A==}
|
||||
|
||||
'@rollup/plugin-babel@6.1.0':
|
||||
resolution: {integrity: sha512-dFZNuFD2YRcoomP4oYf+DvQNSUA9ih+A3vUqopQx5EdtPGo3WBnQcI/S8pwpz91UsGfL0HsMSOlaMld8HrbubA==}
|
||||
@@ -7002,7 +7002,7 @@ snapshots:
|
||||
'@pnpm/error': 1000.0.5
|
||||
find-up: 5.0.0
|
||||
|
||||
'@remotestorage/module-places@1.2.1':
|
||||
'@remotestorage/module-places@1.0.0':
|
||||
dependencies:
|
||||
latlon-geohash: 2.0.0
|
||||
ulid: 3.0.2
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
const t=Object.freeze(Object.defineProperty({__proto__:null,get default(){return MV}},Symbol.toStringTag,{value:"Module"}));!function(){const t=document.createElement("link").relList;if(!(t&&t.supports&&t.supports("modulepreload"))){for(const t of document.querySelectorAll('link[rel="modulepreload"]'))e(t);new MutationObserver(t=>{for(const n of t)if("childList"===n.type)for(const t of n.addedNodes)"LINK"===t.tagName&&"modulepreload"===t.rel&&e(t)}).observe(document,{childList:!0,subtree:!0})}function e(t){if(t.ep)return;t.ep=!0;const e=function(t){const e={};return t.integrity&&(e.integrity=t.integrity),t.referrerPolicy&&(e.referrerPolicy=t.referrerPolicy),"use-credentials"===t.crossOrigin?e.credentials="include":"anonymous"===t.crossOrigin?e.credentials="omit":e.credentials="same-origin",e}(t);fetch(t.href,e)}}();const e="object"==typeof self&&null!==self&&self.Object===Object&&"undefined"!=typeof Window&&self.constructor===Window&&"object"==typeof document&&null!==document&&self.document===document&&"object"==typeof location&&null!==location&&self.location===location&&"object"==typeof history&&null!==history&&self.history===history&&"object"==typeof navigator&&null!==navigator&&self.navigator===navigator&&"string"==typeof navigator.userAgent,n=e?self:null,i=e?self.location:null,r=e?self.history:null,s=e?self.navigator.userAgent:"Lynx (textmode)",o=!(!e||"object"!=typeof chrome||"object"==typeof opera),a=!!e&&/Firefox|FxiOS/.test(s),l=Object.freeze(Object.defineProperty({__proto__:null,hasDOM:e,history:r,isChrome:o,isFirefox:a,location:i,userAgent:s,window:n},Symbol.toStringTag,{value:"Module"}));function c(t){return t&&t.Object===Object?t:void 0}const h=c((u="object"==typeof global&&global)&&void 0===u.nodeType?u:void 0)||c("object"==typeof self&&self)||c("object"==typeof window&&window)||"undefined"!=typeof mainContext&&mainContext||new Function("return this")();var u;const d=function(t,e){return void 0===e?{imports:t,exports:t,lookup:t}:{imports:e.imports||t,exports:e.exports||t,lookup:e.lookup||t}}(h,h.Ember);function p(){return d.lookup}function f(t){d.lookup=t}const g={ENABLE_OPTIONAL_FEATURES:!1,EXTEND_PROTOTYPES:{Array:!1},LOG_STACKTRACE_ON_DEPRECATION:!0,LOG_VERSION:!0,RAISE_ON_DEPRECATION:!1,STRUCTURED_PROFILE:!1,_DEBUG_RENDER_TREE:!1,_ALL_DEPRECATIONS_ENABLED:!1,_OVERRIDE_DEPRECATION_VERSION:null,_DEFAULT_ASYNC_OBSERVERS:!1,_RERENDER_LOOP_LIMIT:1e3,EMBER_LOAD_HOOKS:{},FEATURES:{}};function m(){return g}(t=>{if("object"!=typeof t||null===t)return;for(let i in t){if(!Object.prototype.hasOwnProperty.call(t,i)||"EXTEND_PROTOTYPES"===i||"EMBER_LOAD_HOOKS"===i)continue;let e=g[i];g[i]=!0===e?!1!==t[i]:!1===e?!0===t[i]:t[i]}let{EMBER_LOAD_HOOKS:e}=t;if("object"==typeof e&&null!==e)for(let i in e){if(!Object.prototype.hasOwnProperty.call(e,i))continue;let t=e[i];Array.isArray(t)&&(g.EMBER_LOAD_HOOKS[i]=t.filter(t=>"function"==typeof t))}let{FEATURES:n}=t;if("object"==typeof n&&null!==n)for(let i in n)Object.prototype.hasOwnProperty.call(n,i)&&(g.FEATURES[i]=!0===n[i])})(h.EmberENV);let y=()=>{},_=()=>{},v=!1;function b(){return v}function w(t){v=Boolean(t)}let x=()=>{};const{toString:S}=Object.prototype,{toString:C}=Function.prototype,{isArray:k}=Array,{keys:E}=Object,{stringify:T}=JSON,R=100,P=/^[\w$]+$/;function I(t){return"number"==typeof t&&2===arguments.length?this:M(t,0)}function M(t,e,n){let i=!1;switch(typeof t){case"undefined":return"undefined";case"object":if(null===t)return"null";if(k(t)){i=!0;break}if(t.toString===S||void 0===t.toString)break;return t.toString();case"function":return t.toString===C?t.name?`[Function:${t.name}]`:"[Function]":t.toString();case"string":return T(t);default:return t.toString()}if(void 0===n)n=new WeakSet;else if(n.has(t))return"[Circular]";return n.add(t),i?function(t,e,n){if(e>4)return"[Array]";let i="[";for(let r=0;r<t.length;r++){if(i+=0===r?" ":", ",r>=R){i+=`... ${t.length-R} more items`;break}i+=M(t[r],e,n)}return i+=" ]",i}(t,e+1,n):function(t,e,n){if(e>4)return"[Object]";let i="{",r=E(t);for(let s=0;s<r.length;s++){if(i+=0===s?" ":", ",s>=R){i+=`... ${r.length-R} more keys`;break}let o=r[s];i+=`${O(String(o))}: ${M(t[o],e,n)}`}return i+=" }",i}(t,e+1,n)}function O(t){return P.test(t)?t:T(t)}function A(t){let e=t.lookup("renderer:-dom");if(!e)throw new Error("BUG: owner is missing renderer");return e.debugRenderTree.capture()}const F=()=>{};let L=F,z=F,D=F,j=F,N=F,U=F,B=F,q=F,$=function(){return arguments[arguments.length-1]};function V(){}const G=Object.freeze(Object.defineProperty({__proto__:null,_warnIfUsingStrippedFeatureFlags:void 0,assert:y,captureRenderTree:A,debug:D,debugFreeze:N,debugSeal:j,deprecate:V,deprecateFunc:$,getDebugFunction:q,info:L,inspect:I,isTesting:b,registerDeprecationHandler:_,registerWarnHandler:x,runInDebug:U,setDebugFunction:B,setTesting:w,warn:z},Symbol.toStringTag,{value:"Module"}));function W(t){let e=Object.create(null);e[t]=1;for(let n in e)if(n===t)return n;return t}function H(t){return null!==t&&("object"==typeof t||"fLine truncated
|
||||
/*! For license information please see remotestorage.js.LICENSE.txt */const Yx=Gx(Kx),Xx="0123456789bcdefghjkmnpqrstuvwxyz";class Zx{static encode(t,e,n){if(void 0===n){for(let n=1;n<=12;n++){const i=Zx.encode(t,e,n),r=Zx.decode(i);if(r.lat==t&&r.lon==e)return i}n=12}if(t=Number(t),e=Number(e),n=Number(n),isNaN(t)||isNaN(e)||isNaN(n))throw new Error("Invalid geohash");let i=0,r=0,s=!0,o="",a=-90,l=90,c=-180,h=180;for(;o.length<n;){if(s){const t=(c+h)/2;e>=t?(i=2*i+1,c=t):(i*=2,h=t)}else{const e=(a+l)/2;t>=e?(i=2*i+1,a=e):(i*=2,l=e)}s=!s,5==++r&&(o+=Xx.charAt(i),r=0,i=0)}return o}static decode(t){const e=Zx.bounds(t),n=e.sw.lat,i=e.sw.lon,r=e.ne.lat,s=e.ne.lon;let o=(n+r)/2,a=(i+s)/2;return o=o.toFixed(Math.floor(2-Math.log(r-n)/Math.LN10)),a=a.toFixed(Math.floor(2-Math.log(s-i)/Math.LN10)),{lat:Number(o),lon:Number(a)}}static bounds(t){if(0==t.length)throw new Error("Invalid geohash");t=t.toLowerCase();let e=!0,n=-90,i=90,r=-180,s=180;for(let o=0;o<t.length;o++){const a=t.charAt(o),l=Xx.indexOf(a);if(-1==l)throw new Error("Invalid geohash");for(let t=4;t>=0;t--){const o=l>>t&1;if(e){const t=(r+s)/2;1==o?r=t:s=t}else{const t=(n+i)/2;1==o?n=t:i=t}e=!e}}return{sw:{lat:n,lon:r},ne:{lat:i,lon:s}}}static adjacent(t,e){if(t=t.toLowerCase(),e=e.toLowerCase(),0==t.length)throw new Error("Invalid geohash");if(-1=="nsew".indexOf(e))throw new Error("Invalid direction");const n=t.slice(-1);let i=t.slice(0,-1);const r=t.length%2;return-1!={n:["prxz","bcfguvyz"],s:["028b","0145hjnp"],e:["bcfguvyz","prxz"],w:["0145hjnp","028b"]}[e][r].indexOf(n)&&""!=i&&(i=Zx.adjacent(i,e)),i+Xx.charAt({n:["p0r21436x8zb9dcf5h7kjnmqesgutwvy","bc01fg45238967deuvhjyznpkmstqrwx"],s:["14365h7k9dcfesgujnmqp0r2twvyx8zb","238967debc01fg45kmstqrwxuvhjyznp"],e:["bc01fg45238967deuvhjyznpkmstqrwx","p0r21436x8zb9dcf5h7kjnmqesgutwvy"],w:["238967debc01fg45kmstqrwxuvhjyznp","14365h7k9dcfesgujnmqp0r2twvyx8zb"]}[e][r].indexOf(n))}static neighbours(t){return{n:Zx.adjacent(t,"n"),ne:Zx.adjacent(Zx.adjacent(t,"n"),"e"),e:Zx.adjacent(t,"e"),se:Zx.adjacent(Zx.adjacent(t,"s"),"e"),s:Zx.adjacent(t,"s"),sw:Zx.adjacent(Zx.adjacent(t,"s"),"w"),w:Zx.adjacent(t,"w"),nw:Zx.adjacent(Zx.adjacent(t,"n"),"w")}}}const Jx="0123456789ABCDEFGHJKMNPQRSTVWXYZ",Qx=0xffffffffffff;var tS;!function(t){t.Base32IncorrectEncoding="B32_ENC_INVALID",t.DecodeTimeInvalidCharacter="DEC_TIME_CHAR",t.DecodeTimeValueMalformed="DEC_TIME_MALFORMED",t.EncodeTimeNegative="ENC_TIME_NEG",t.EncodeTimeSizeExceeded="ENC_TIME_SIZE_EXCEED",t.EncodeTimeValueMalformed="ENC_TIME_MALFORMED",t.PRNGDetectFailure="PRNG_DETECT",t.ULIDInvalid="ULID_INVALID",t.Unexpected="UNEXPECTED",t.UUIDInvalid="UUID_INVALID"}(tS||(tS={}));class eS extends Error{constructor(t,e){super(`${e} (${t})`),this.name="ULIDError",this.code=t}}function nS(t){const e=Math.floor(32*t())%32;return Jx.charAt(e)}const iS={type:"object",properties:{id:{type:"string"},title:{type:"string"},lat:{type:"number"},lon:{type:"number"},geohash:{type:"string"},zoom:{type:"number"},url:{type:"string"},osmId:{type:"string"},osmType:{type:"string"},osmTags:{type:"object",additionalProperties:{type:"string"}},description:{type:"string"},tags:{type:"array",items:{type:"string"},default:[]},createdAt:{type:"string",format:"date-time"},updatedAt:{type:"string",format:"date-time"}},required:["id","title","lat","lon","geohash","createdAt"]},rS={name:"places",builder:function(t){function e(t,e){return`${t.substring(0,2)}/${t.substring(2,4)}/${e}`}t.declareType("place",iS);const n={store:async function(n){const i=function(t){const e=(new Date).toISOString(),n=t.id||function(){const t=function(){const t="undefined"!=typeof WorkerGlobalScope&&self instanceof WorkerGlobalScope?self:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:null,e=t&&(t.crypto||t.msCrypto)||null;if("function"==typeof e?.getRandomValues)return()=>{const t=new Uint8Array(1);return e.getRandomValues(t),t[0]/256};if("function"==typeof e?.randomBytes)return()=>e.randomBytes(1).readUInt8()/256;throw new eS(tS.PRNGDetectFailure,"Failed to find a reliable PRNG")}();return function(t,e=10){if(isNaN(t))throw new eS(tS.EncodeTimeValueMalformed,`Time must be a number: ${t}`);if(t>Qx)throw new eS(tS.EncodeTimeSizeExceeded,`Cannot encode a time larger than ${Qx}: ${t}`);if(t<0)throw new eS(tS.EncodeTimeNegative,`Time must be positive: ${t}`);if(!1===Number.isInteger(t))throw new eS(tS.EncodeTimeValueMalformed,`Time must be an integer: ${t}`);let n,i="";for(let r=e;r>0;r--)n=t%32,i=Jx.charAt(n)+i,t=(t-n)/32;return i}(Date.now(),10)+function(t,e){let n="";for(;t>0;t--)n=nS(e)+n;return n}(16,t)}(),i="number"==typeof t.lat?t.lat:0,r="number"==typeof t.lon?t.lon:0,s=t.title||"Untitled Place",o=t.geohash||Zx.encode(i,r,10),a={...t,id:n,lat:i,lon:r,geohash:o,title:s,tags:t.tags||[],createdAt:t.createdAt||e,updatedAt:t.id?e:void 0};return Object.keys(a).forEach(t=>{void 0===a[t]&&delete a[t]}),a}(n),r=e(i.geohash,i.id);return await t.storeObject("place",rLine truncated
|
||||
@@ -1 +0,0 @@
|
||||
:root{--default-list-color: #fc3}html,body{height:100%;overscroll-behavior:none;-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:transparent}button{-webkit-tap-highlight-color:transparent}body{margin:0;font-family:Noto Sans,sans-serif;font-size:16px;color:#333}#root,#ember-testing{height:100%}.map-container{background:#f8f9fa;-webkit-tap-highlight-color:transparent;outline:none;position:absolute;inset:0}#rs-widget-container{position:absolute;top:60px;right:10px;z-index:4000;display:none}#rs-widget-container.visible{display:block}.rs-backdrop{position:fixed;inset:0;z-index:3999}.app-header{position:absolute;top:0;left:0;right:0;height:60px;padding:.5rem 1rem;display:flex;justify-content:space-between;align-items:center;z-index:3000;pointer-events:none}@media(max-width:768px){.app-header{padding:0 .5rem}}.header-left,.header-right{pointer-events:auto}.header-left{display:flex;align-items:center}.btn-press{transition:transform .1s}.btn-press:active{transform:scale(.95)}.user-btn{background:none;border:none;cursor:pointer;padding:0}.user-avatar-placeholder{width:40px;height:40px;background:#2a3743;border-radius:50%;display:flex;align-items:center;justify-content:center;box-shadow:0 2px 5px #0003}.user-menu-container{position:relative}.user-menu-popover{position:absolute;top:100%;right:0;margin-top:10px;width:280px;background:#fff;border-radius:8px;box-shadow:0 4px 12px #00000026;padding:1rem;z-index:3001}.menu-backdrop{position:fixed;inset:0;z-index:3000}.user-status{padding-bottom:1rem;margin-bottom:1rem;border-bottom:1px solid #eee;color:#666;font-size:.9rem}.account-list{list-style:none;padding:0;margin:0}.account-item{display:flex;justify-content:space-between;align-items:center;padding:.75rem 0}.account-item.disabled{opacity:.5;pointer-events:none}.account-info{display:flex;align-items:center;gap:.75rem;font-weight:500}.btn-text{background:none;border:none;padding:0;font-weight:600;cursor:pointer;font-size:.9rem}.text-primary{color:#007bff}.text-danger{color:#dc3545}.btn-text:hover{text-decoration:underline}.sidebar{position:absolute;top:0;left:0;bottom:0;width:300px;background:#fff;z-index:3100;box-shadow:2px 0 5px #0000001a;display:flex;flex-direction:column;overflow:hidden}.settings-pane.sidebar{z-index:3200}@media(max-width:768px){.settings-pane.sidebar{width:100%;right:0;border-radius:16px 16px 0 0;height:66vh;top:auto;bottom:0}}.sidebar-header{padding:1rem;border-bottom:1px solid #eee;display:flex;justify-content:space-between;align-items:center}.sidebar-header h2{margin:0;font-size:1.2rem;display:flex;align-items:center;gap:.5rem}.sidebar-content{padding:1rem;overflow-y:auto;-webkit-overflow-scrolling:touch;flex:1;min-height:0;touch-action:pan-y;overscroll-behavior:contain}.edit-form{margin:-1rem -1rem 1rem;background:#f8f9fa;padding:1rem;border-bottom:1px solid #eee}.form-group{margin-bottom:.75rem}.form-group label{display:block;font-size:.85rem;color:#666;margin-bottom:.25rem}.form-control{width:100%;padding:.5rem;border:1px solid #ddd;border-radius:4px;font-family:inherit;font-size:1rem;box-sizing:border-box}.form-control:focus{outline:none;border-color:#007bff;box-shadow:0 0 0 2px #007bff1a}.edit-actions{display:flex;gap:.5rem;justify-content:flex-end}.settings-section{margin-bottom:2rem}.settings-section h3{font-size:1rem;font-weight:700;color:#666;margin:0 0 .5rem;text-transform:uppercase;letter-spacing:.5px}.settings-section .form-group{margin-top:1rem}.settings-section p a{color:#007bff;text-decoration:none}.settings-section p a:hover{text-decoration:underline}.btn-full{width:100%}.btn-primary{background:#007bff;color:#fff;border:none;padding:.75rem;border-radius:4px;font-weight:500;cursor:pointer}.btn-primary:hover{background:#0069d9}.meta-info{font-size:.9rem}.meta-info p{margin-top:1rem;margin-bottom:1rem}.meta-info p:first-child{margin-top:1.2rem;padding-top:1.2rem;border-top:1px solid #eee}.meta-info a{color:#007bff;text-decoration:none}.meta-info a:hover{text-decoration:underline}.link-list{list-style:none;padding:0;margin:0}.link-list li{margin-bottom:.5rem}.link-list a{color:#007bff;text-decoration:none;font-size:.95rem}.link-list a:hover{text-decoration:underline}.places-list{list-style:none;padding:0;margin:-1rem -1rem 0}.place-item{width:100%;text-align:left;border:none;border-bottom:1px solid #eee;background:#fff;color:#333;padding:1rem;cursor:pointer;transition:background .2s;font-family:inherit}.place-item:hover{background:#eee}.place-name{font-size:1rem;font-weight:700;margin-bottom:.25rem}.place-type{color:#666;font-size:.85rem}.back-btn{background:none;border:none;cursor:pointer;padding:0 .5rem;margin-left:-.5rem;display:flex;align-items:center;justify-content:center}.close-btn{background:none;border:none;cursor:pointer;padding:0 .5rem;margin-right:-.5rem;display:flex;align-items:center;justify-content:center}.place-details{padding-bottom:2rem}.place-details h3{font-size:1.2rem;margin-top:0;margin-bottom:.5rem}.place-details .place-type{color:#666;font-size:.9rem;Line truncated
|
||||
@@ -0,0 +1 @@
|
||||
html,body{height:100%;overscroll-behavior:none;-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:transparent}button{-webkit-tap-highlight-color:transparent}body{margin:0;font-family:Noto Sans,sans-serif;font-size:16px;color:#333}#root,#ember-testing{height:100%}.map-container{background:#f8f9fa;-webkit-tap-highlight-color:transparent;outline:none;position:absolute;inset:0}#rs-widget-container{position:absolute;top:60px;right:10px;z-index:4000;display:none}#rs-widget-container.visible{display:block}.rs-backdrop{position:fixed;inset:0;z-index:3999}.app-header{position:absolute;top:0;left:0;right:0;height:60px;padding:.5rem 1rem;display:flex;justify-content:space-between;align-items:center;z-index:3000;pointer-events:none}@media(max-width:768px){.app-header{padding:0 .5rem}}.header-left,.header-right{pointer-events:auto}.header-left{display:flex;align-items:center}.btn-press{transition:transform .1s}.btn-press:active{transform:scale(.95)}.user-btn{background:none;border:none;cursor:pointer;padding:0}.user-avatar-placeholder{width:40px;height:40px;background:#2a3743;border-radius:50%;display:flex;align-items:center;justify-content:center;box-shadow:0 2px 5px #0003}.user-menu-container{position:relative}.user-menu-popover{position:absolute;top:100%;right:0;margin-top:10px;width:280px;background:#fff;border-radius:8px;box-shadow:0 4px 12px #00000026;padding:1rem;z-index:3001}.menu-backdrop{position:fixed;inset:0;z-index:3000}.user-status{padding-bottom:1rem;margin-bottom:1rem;border-bottom:1px solid #eee;color:#666;font-size:.9rem}.account-list{list-style:none;padding:0;margin:0}.account-item{display:flex;justify-content:space-between;align-items:center;padding:.75rem 0}.account-item.disabled{opacity:.5;pointer-events:none}.account-info{display:flex;align-items:center;gap:.75rem;font-weight:500}.btn-text{background:none;border:none;padding:0;font-weight:600;cursor:pointer;font-size:.9rem}.text-primary{color:#007bff}.text-danger{color:#dc3545}.btn-text:hover{text-decoration:underline}.sidebar{position:absolute;top:0;left:0;bottom:0;width:300px;background:#fff;z-index:3100;box-shadow:2px 0 5px #0000001a;display:flex;flex-direction:column}.settings-pane.sidebar{z-index:3200}@media(max-width:768px){.settings-pane.sidebar{width:100%;right:0;border-radius:16px 16px 0 0;height:66vh;top:auto;bottom:0}}.sidebar-header{padding:1rem;border-bottom:1px solid #eee;display:flex;justify-content:space-between;align-items:center}.sidebar-header h2{margin:0;font-size:1.2rem;display:flex;align-items:center;gap:.5rem}.sidebar-content{padding:1rem;overflow-y:auto;flex:1}.edit-form{margin:-1rem -1rem 1rem;background:#f8f9fa;padding:1rem;border-bottom:1px solid #eee}.form-group{margin-bottom:.75rem}.form-group label{display:block;font-size:.85rem;color:#666;margin-bottom:.25rem}.form-control{width:100%;padding:.5rem;border:1px solid #ddd;border-radius:4px;font-family:inherit;font-size:1rem;box-sizing:border-box}.form-control:focus{outline:none;border-color:#007bff;box-shadow:0 0 0 2px #007bff1a}.edit-actions{display:flex;gap:.5rem;justify-content:flex-end}.settings-section{margin-bottom:2rem}.settings-section h3{font-size:1rem;font-weight:700;color:#666;margin:0 0 .5rem;text-transform:uppercase;letter-spacing:.5px}.settings-section .form-group{margin-top:1rem}.settings-section p a{color:#007bff;text-decoration:none}.settings-section p a:hover{text-decoration:underline}.btn-full{width:100%}.btn-primary{background:#007bff;color:#fff;border:none;padding:.75rem;border-radius:4px;font-weight:500;cursor:pointer}.btn-primary:hover{background:#0069d9}.meta-info{font-size:.9rem}.meta-info p{margin-top:1rem;margin-bottom:1rem}.meta-info p:first-child{margin-top:1.2rem;padding-top:1.2rem;border-top:1px solid #eee}.meta-info a{color:#007bff;text-decoration:none}.meta-info a:hover{text-decoration:underline}.link-list{list-style:none;padding:0;margin:0}.link-list li{margin-bottom:.5rem}.link-list a{color:#007bff;text-decoration:none;font-size:.95rem}.link-list a:hover{text-decoration:underline}.places-list{list-style:none;padding:0;margin:-1rem -1rem 0}.place-item{width:100%;text-align:left;border:none;border-bottom:1px solid #eee;background:#fff;color:#333;padding:1rem;cursor:pointer;transition:background .2s;font-family:inherit}.place-item:hover{background:#eee}.place-name{font-size:1rem;font-weight:700;margin-bottom:.25rem}.place-type{color:#666;font-size:.85rem}.back-btn{background:none;border:none;cursor:pointer;padding:0 .5rem;margin-left:-.5rem;display:flex;align-items:center;justify-content:center}.close-btn{background:none;border:none;cursor:pointer;padding:0 .5rem;margin-right:-.5rem;display:flex;align-items:center;justify-content:center}.place-details{padding-bottom:2rem}.place-details h3{font-size:1.2rem;margin-top:0;margin-bottom:.5rem}.place-details .place-type{color:#666;font-size:.9rem;margin:0 0 1rem}.place-details p.place-description{line-height:1.4}.place-details .actions{padding-bottom:.3rem;display:flex;flex-direction:roLine truncated
|
||||
@@ -1,2 +0,0 @@
|
||||
const t=Object.freeze(Object.defineProperty({__proto__:null,get default(){return DV}},Symbol.toStringTag,{value:"Module"}));!function(){const t=document.createElement("link").relList;if(!(t&&t.supports&&t.supports("modulepreload"))){for(const t of document.querySelectorAll('link[rel="modulepreload"]'))e(t);new MutationObserver(t=>{for(const n of t)if("childList"===n.type)for(const t of n.addedNodes)"LINK"===t.tagName&&"modulepreload"===t.rel&&e(t)}).observe(document,{childList:!0,subtree:!0})}function e(t){if(t.ep)return;t.ep=!0;const e=function(t){const e={};return t.integrity&&(e.integrity=t.integrity),t.referrerPolicy&&(e.referrerPolicy=t.referrerPolicy),"use-credentials"===t.crossOrigin?e.credentials="include":"anonymous"===t.crossOrigin?e.credentials="omit":e.credentials="same-origin",e}(t);fetch(t.href,e)}}();const e="object"==typeof self&&null!==self&&self.Object===Object&&"undefined"!=typeof Window&&self.constructor===Window&&"object"==typeof document&&null!==document&&self.document===document&&"object"==typeof location&&null!==location&&self.location===location&&"object"==typeof history&&null!==history&&self.history===history&&"object"==typeof navigator&&null!==navigator&&self.navigator===navigator&&"string"==typeof navigator.userAgent,n=e?self:null,i=e?self.location:null,r=e?self.history:null,s=e?self.navigator.userAgent:"Lynx (textmode)",o=!(!e||"object"!=typeof chrome||"object"==typeof opera),a=!!e&&/Firefox|FxiOS/.test(s),l=Object.freeze(Object.defineProperty({__proto__:null,hasDOM:e,history:r,isChrome:o,isFirefox:a,location:i,userAgent:s,window:n},Symbol.toStringTag,{value:"Module"}));function c(t){return t&&t.Object===Object?t:void 0}const h=c((u="object"==typeof global&&global)&&void 0===u.nodeType?u:void 0)||c("object"==typeof self&&self)||c("object"==typeof window&&window)||"undefined"!=typeof mainContext&&mainContext||new Function("return this")();var u;const d=function(t,e){return void 0===e?{imports:t,exports:t,lookup:t}:{imports:e.imports||t,exports:e.exports||t,lookup:e.lookup||t}}(h,h.Ember);function p(){return d.lookup}function f(t){d.lookup=t}const g={ENABLE_OPTIONAL_FEATURES:!1,EXTEND_PROTOTYPES:{Array:!1},LOG_STACKTRACE_ON_DEPRECATION:!0,LOG_VERSION:!0,RAISE_ON_DEPRECATION:!1,STRUCTURED_PROFILE:!1,_DEBUG_RENDER_TREE:!1,_ALL_DEPRECATIONS_ENABLED:!1,_OVERRIDE_DEPRECATION_VERSION:null,_DEFAULT_ASYNC_OBSERVERS:!1,_RERENDER_LOOP_LIMIT:1e3,EMBER_LOAD_HOOKS:{},FEATURES:{}};function m(){return g}(t=>{if("object"!=typeof t||null===t)return;for(let i in t){if(!Object.prototype.hasOwnProperty.call(t,i)||"EXTEND_PROTOTYPES"===i||"EMBER_LOAD_HOOKS"===i)continue;let e=g[i];g[i]=!0===e?!1!==t[i]:!1===e?!0===t[i]:t[i]}let{EMBER_LOAD_HOOKS:e}=t;if("object"==typeof e&&null!==e)for(let i in e){if(!Object.prototype.hasOwnProperty.call(e,i))continue;let t=e[i];Array.isArray(t)&&(g.EMBER_LOAD_HOOKS[i]=t.filter(t=>"function"==typeof t))}let{FEATURES:n}=t;if("object"==typeof n&&null!==n)for(let i in n)Object.prototype.hasOwnProperty.call(n,i)&&(g.FEATURES[i]=!0===n[i])})(h.EmberENV);let y=()=>{},_=()=>{},v=!1;function b(){return v}function w(t){v=Boolean(t)}let x=()=>{};const{toString:S}=Object.prototype,{toString:C}=Function.prototype,{isArray:k}=Array,{keys:E}=Object,{stringify:T}=JSON,R=100,P=/^[\w$]+$/;function I(t){return"number"==typeof t&&2===arguments.length?this:M(t,0)}function M(t,e,n){let i=!1;switch(typeof t){case"undefined":return"undefined";case"object":if(null===t)return"null";if(k(t)){i=!0;break}if(t.toString===S||void 0===t.toString)break;return t.toString();case"function":return t.toString===C?t.name?`[Function:${t.name}]`:"[Function]":t.toString();case"string":return T(t);default:return t.toString()}if(void 0===n)n=new WeakSet;else if(n.has(t))return"[Circular]";return n.add(t),i?function(t,e,n){if(e>4)return"[Array]";let i="[";for(let r=0;r<t.length;r++){if(i+=0===r?" ":", ",r>=R){i+=`... ${t.length-R} more items`;break}i+=M(t[r],e,n)}return i+=" ]",i}(t,e+1,n):function(t,e,n){if(e>4)return"[Object]";let i="{",r=E(t);for(let s=0;s<r.length;s++){if(i+=0===s?" ":", ",s>=R){i+=`... ${r.length-R} more keys`;break}let o=r[s];i+=`${O(String(o))}: ${M(t[o],e,n)}`}return i+=" }",i}(t,e+1,n)}function O(t){return P.test(t)?t:T(t)}function A(t){let e=t.lookup("renderer:-dom");if(!e)throw new Error("BUG: owner is missing renderer");return e.debugRenderTree.capture()}const F=()=>{};let L=F,z=F,j=F,D=F,N=F,U=F,B=F,q=F,$=function(){return arguments[arguments.length-1]};function V(){}const G=Object.freeze(Object.defineProperty({__proto__:null,_warnIfUsingStrippedFeatureFlags:void 0,assert:y,captureRenderTree:A,debug:j,debugFreeze:N,debugSeal:D,deprecate:V,deprecateFunc:$,getDebugFunction:q,info:L,inspect:I,isTesting:b,registerDeprecationHandler:_,registerWarnHandler:x,runInDebug:U,setDebugFunction:B,setTesting:w,warn:z},Symbol.toStringTag,{value:"Module"}));function W(t){let e=Object.create(null);e[t]=1;for(let n in e)if(n===t)return n;return t}function H(t){return null!==t&&("object"==typeof t||"fLine truncated
|
||||
/*! For license information please see remotestorage.js.LICENSE.txt */const Yx=Gx(Kx),Xx="0123456789bcdefghjkmnpqrstuvwxyz";class Zx{static encode(t,e,n){if(void 0===n){for(let n=1;n<=12;n++){const i=Zx.encode(t,e,n),r=Zx.decode(i);if(r.lat==t&&r.lon==e)return i}n=12}if(t=Number(t),e=Number(e),n=Number(n),isNaN(t)||isNaN(e)||isNaN(n))throw new Error("Invalid geohash");let i=0,r=0,s=!0,o="",a=-90,l=90,c=-180,h=180;for(;o.length<n;){if(s){const t=(c+h)/2;e>=t?(i=2*i+1,c=t):(i*=2,h=t)}else{const e=(a+l)/2;t>=e?(i=2*i+1,a=e):(i*=2,l=e)}s=!s,5==++r&&(o+=Xx.charAt(i),r=0,i=0)}return o}static decode(t){const e=Zx.bounds(t),n=e.sw.lat,i=e.sw.lon,r=e.ne.lat,s=e.ne.lon;let o=(n+r)/2,a=(i+s)/2;return o=o.toFixed(Math.floor(2-Math.log(r-n)/Math.LN10)),a=a.toFixed(Math.floor(2-Math.log(s-i)/Math.LN10)),{lat:Number(o),lon:Number(a)}}static bounds(t){if(0==t.length)throw new Error("Invalid geohash");t=t.toLowerCase();let e=!0,n=-90,i=90,r=-180,s=180;for(let o=0;o<t.length;o++){const a=t.charAt(o),l=Xx.indexOf(a);if(-1==l)throw new Error("Invalid geohash");for(let t=4;t>=0;t--){const o=l>>t&1;if(e){const t=(r+s)/2;1==o?r=t:s=t}else{const t=(n+i)/2;1==o?n=t:i=t}e=!e}}return{sw:{lat:n,lon:r},ne:{lat:i,lon:s}}}static adjacent(t,e){if(t=t.toLowerCase(),e=e.toLowerCase(),0==t.length)throw new Error("Invalid geohash");if(-1=="nsew".indexOf(e))throw new Error("Invalid direction");const n=t.slice(-1);let i=t.slice(0,-1);const r=t.length%2;return-1!={n:["prxz","bcfguvyz"],s:["028b","0145hjnp"],e:["bcfguvyz","prxz"],w:["0145hjnp","028b"]}[e][r].indexOf(n)&&""!=i&&(i=Zx.adjacent(i,e)),i+Xx.charAt({n:["p0r21436x8zb9dcf5h7kjnmqesgutwvy","bc01fg45238967deuvhjyznpkmstqrwx"],s:["14365h7k9dcfesgujnmqp0r2twvyx8zb","238967debc01fg45kmstqrwxuvhjyznp"],e:["bc01fg45238967deuvhjyznpkmstqrwx","p0r21436x8zb9dcf5h7kjnmqesgutwvy"],w:["238967debc01fg45kmstqrwxuvhjyznp","14365h7k9dcfesgujnmqp0r2twvyx8zb"]}[e][r].indexOf(n))}static neighbours(t){return{n:Zx.adjacent(t,"n"),ne:Zx.adjacent(Zx.adjacent(t,"n"),"e"),e:Zx.adjacent(t,"e"),se:Zx.adjacent(Zx.adjacent(t,"s"),"e"),s:Zx.adjacent(t,"s"),sw:Zx.adjacent(Zx.adjacent(t,"s"),"w"),w:Zx.adjacent(t,"w"),nw:Zx.adjacent(Zx.adjacent(t,"n"),"w")}}}const Jx="0123456789ABCDEFGHJKMNPQRSTVWXYZ",Qx=0xffffffffffff;var tS;!function(t){t.Base32IncorrectEncoding="B32_ENC_INVALID",t.DecodeTimeInvalidCharacter="DEC_TIME_CHAR",t.DecodeTimeValueMalformed="DEC_TIME_MALFORMED",t.EncodeTimeNegative="ENC_TIME_NEG",t.EncodeTimeSizeExceeded="ENC_TIME_SIZE_EXCEED",t.EncodeTimeValueMalformed="ENC_TIME_MALFORMED",t.PRNGDetectFailure="PRNG_DETECT",t.ULIDInvalid="ULID_INVALID",t.Unexpected="UNEXPECTED",t.UUIDInvalid="UUID_INVALID"}(tS||(tS={}));class eS extends Error{constructor(t,e){super(`${e} (${t})`),this.name="ULIDError",this.code=t}}function nS(t){const e=Math.floor(32*t())%32;return Jx.charAt(e)}const iS={type:"object",properties:{id:{type:"string"},title:{type:"string"},lat:{type:"number"},lon:{type:"number"},geohash:{type:"string"},zoom:{type:"number"},url:{type:"string"},osmId:{type:"string"},osmType:{type:"string"},osmTags:{type:"object",additionalProperties:{type:"string"}},description:{type:"string"},tags:{type:"array",items:{type:"string"},default:[]},createdAt:{type:"string",format:"date-time"},updatedAt:{type:"string",format:"date-time"}},required:["id","title","lat","lon","geohash","createdAt"]},rS={type:"object",properties:{id:{type:"string"},title:{type:"string"},color:{type:"string"},placeRefs:{type:"array",items:{type:"object",properties:{id:{type:"string"},geohash:{type:"string"}},required:["id","geohash"]},default:[]},createdAt:{type:"string",format:"date-time"},updatedAt:{type:"string",format:"date-time"}},required:["id","title","placeRefs","createdAt"]},sS={name:"places",builder:function(t){function e(t,e){return`${t.substring(0,2)}/${t.substring(2,4)}/${e}`}t.declareType("place",iS),t.declareType("list",rS);const n={async getAll(){const e=await t.getAll("_lists/");return e?Object.values(e):[]},async get(e){const n=`_lists/${e}`;return t.getObject(n)},async create(e,n,i){const r=`_lists/${e}`;let s=await t.getObject(r);const o=(new Date).toISOString();return s?(s.title=n,i&&(s.color=i),s.updatedAt=o):s={id:e,title:n,color:i,placeRefs:[],createdAt:o,updatedAt:o},await t.storeObject("list",r,s),s},async delete(e){await t.remove(`_lists/${e}`)},async addPlace(e,n,i){const r=`_lists/${e}`,s=await t.getObject(r);if(!s)throw new Error(`List not found: ${e}`);return-1===s.placeRefs.findIndex(t=>t.id===n)&&(s.placeRefs.push({id:n,geohash:i}),s.updatedAt=(new Date).toISOString(),await t.storeObject("list",r,s)),s},async removePlace(e,n){const i=`_lists/${e}`,r=await t.getObject(i);if(!r)throw new Error(`List not found: ${e}`);const s=r.placeRefs.findIndex(t=>t.id===n);return-1!==s&&(r.placeRefs.splice(s,1),r.updatedAt=(new Date).toISOString(),await t.storeObject("list",i,r)),r},async initDefaults(){const t=[{id:"to-go",title:"Want to go",color:"#2e9e4f"},{id:"to-do",title:"To do",color:"#2a7fff"}];for(const e of t)awLine truncated
|
||||
@@ -1 +1 @@
|
||||
import{c as e,g as a,a as s,s as t,A as r,C as o,b as n,D as i,L as l,N as b,d as c,P as p,e as d,S as m,T as u,_ as g,f as y,h as _,i as O,j as S,k as f,l as C,m as P,n as h,o as v,p as j,q as E,r as M,t as D,u as N,v as V,w as A,x as w,y as T,z as I,B as x,E as R,F as k,G as F,H as L,I as z,J as G,K as U,M as B,O as W,Q as Y,R as H,U as J,V as K,W as X,X as q,Y as Q,Z,$,a0 as ee,a1 as ae,a2 as se,a3 as te,a4 as re,a5 as oe,a6 as ne,a7 as ie,a8 as le,a9 as be,aa as pe,ab as de,ac as me,ad as ue,ae as ge,af as ye,ag as _e,ah as Oe,ai as Se,aj as fe,ak as Ce,al as Pe,am as he,an as ve,ao as je,ap as Ee,aq as Me,ar as De,as as Ne,at as Ve,au as Ae,av as we,aw as Te,ax as Ie,ay as xe,az as Re,aA as ke,aB as Fe,aC as Le,aD as ze,aE as Ge,aF as Ue,aG as Be,aH as We,aI as Ye,aJ as He,aK as Je,aL as Ke,aM as Xe,aN as qe,aO as Qe,aP as Ze,aQ as $e,aR as ea,aS as aa,aT as sa,aU as ta,aV as ra,aW as oa,aX as na,aY as ia,aZ as la,a_ as ba,a$ as pa,b0 as da,b1 as ma,b2 as ua,b3 as ga,b4 as ya,b5 as _a,b6 as Oa,b7 as Sa,b8 as fa,b9 as Ca,ba as Pa,bb as ha,bc as va,bd as ja,be as Ea,bf as Ma,bg as Da,bh as Na,bi as Va,bj as Aa,bk as wa,bl as Ta,bm as Ia,bn as xa,bo as Ra,bp as ka,bq as Fa,br as La,bs as za,bt as Ga,bu as Ua,bv as Ba,bw as Wa,bx as Ya,by as Ha,bz as Ja,bA as Ka,bB as Xa,bC as qa,bD as Qa,bE as Za,bF as $a,bG as es,bH as as,bI as ss,bJ as ts,bK as rs,bL as os,bM as ns,bN as is,bO as ls,bP as bs,bQ as cs,bR as ps,bS as ds,bT as ms,bU as us}from"./main-GynTgP18.js";export{bV as Application,bW as ApplicationNamespace,bX as Array,bY as ArrayProxy,bZ as Controller,b_ as Debug,b$ as EmberDestroyable,c0 as EmberObject,c1 as EnumerableMutable,cc as GlimmerComponent,cd as GlimmerManager,ce as GlimmerReference,cf as GlimmerRuntime,cg as GlimmerUtil,ch as GlimmerValidator,c2 as Instrumentation,c0 as Object,c3 as ObjectCore,c4 as ObjectEvented,c5 as ObjectObservable,c6 as ObjectPromiseProxyMixin,c7 as ObjectProxy,ca as Owner,c8 as Runloop,c9 as Service,cb as VERSION}from"./main-GynTgP18.js";const gs=new WeakMap,ys=Object.freeze(Object.defineProperty({__proto__:null,ASYNC_OBSERVERS:r,ComputedDescriptor:o,ComputedProperty:n,DEBUG_INJECTION_FUNCTIONS:i,Libraries:l,NAMESPACES:b,NAMESPACES_BY_ID:c,PROPERTY_DID_CHANGE:p,PROXY_CONTENT:d,SYNC_OBSERVERS:m,TrackedDescriptor:u,_getPath:g,_getProp:y,_setProp:_,activateObserver:O,addArrayObserver:S,addListener:f,addNamespace:C,addObserver:P,alias:h,arrayContentDidChange:v,arrayContentWillChange:j,autoComputed:E,beginPropertyChanges:M,cached:(...s)=>{const[t,r,o]=s,n=new WeakMap,i=o.get;o.get=function(){return n.has(this)||n.set(this,e(i.bind(this))),a(n.get(this))}},changeProperties:D,computed:N,createCache:e,defineDecorator:V,defineProperty:A,defineValue:w,deprecateProperty:function(e,a,r){Object.defineProperty(e,a,{configurable:!0,enumerable:!1,set(e){t(this,r,e)},get(){return s(this,r)}})},descriptorForDecorator:T,descriptorForProperty:I,eachProxyArrayDidChange:function(e,a,s,t){let r=gs.get(e);void 0!==r&&r.arrayDidChange(e,a,s,t)},eachProxyArrayWillChange:function(e,a,s,t){let r=gs.get(e);void 0!==r&&r.arrayWillChange(e,a,s,t)},endPropertyChanges:x,expandProperties:R,findNamespace:k,findNamespaces:F,flushAsyncObservers:L,get:s,getCachedValueFor:z,getProperties:G,getValue:a,hasListeners:U,hasUnknownProperty:B,inject:W,isClassicDecorator:Y,isComputed:H,isConst:J,isElementDescriptor:K,isNamespaceSearchDisabled:X,libraries:q,makeComputedDecorator:Q,markObjectAsDirty:Z,nativeDescDecorator:$,notifyPropertyChange:ee,objectAt:ae,on:se,processAllNamespaces:te,processNamespace:re,removeArrayObserver:oe,removeListener:ne,removeNamespace:ie,removeObserver:le,replace:be,replaceInNativeArray:pe,revalidateObservers:de,sendEvent:me,set:t,setClassicDecorator:ue,setNamespaceSearchDisabled:ge,setProperties:ye,setUnprocessedMixins:_e,tagForObject:Oe,tagForProperty:Se,tracked:fe,trySet:Ce},Symbol.toStringTag,{value:"Module"})),_s=Object.freeze(Object.defineProperty({__proto__:null,Input:Pe,Textarea:he,capabilities:ve,default:je,getComponentTemplate:Ee,setComponentManager:Me,setComponentTemplate:De},Symbol.toStringTag,{value:"Module"})),Os=Object.freeze(Object.defineProperty({__proto__:null,cacheFor:z,guidFor:Ne},Symbol.toStringTag,{value:"Module"})),Ss=Object.freeze(Object.defineProperty({__proto__:null,EventTarget:Ve,Promise:Ae,all:we,allSettled:Te,asap:Ie,async:xe,cast:Re,configure:ke,default:Fe,defer:Le,denodeify:ze,filter:Ge,hash:Ue,hashSettled:Be,map:We,off:Ye,on:He,race:Je,reject:Ke,resolve:Xe,rethrow:qe},Symbol.toStringTag,{value:"Module"})),fs=Object.freeze(Object.defineProperty({__proto__:null,default:Qe},Symbol.toStringTag,{value:"Module"})),Cs=Object.freeze(Object.defineProperty({__proto__:null,ENV:Ze,context:$e,getENV:ea,getLookup:aa,global:sa,setLookup:ta},Symbol.toStringTag,{value:"Module"})),Ps=Object.freeze(Object.defineProperty({__proto__:null,Meta:ra,UNDEFINED:oa,counters:na,meta:ia,peekMeta:la,setMeta:ba},Symbol.toStringTag,{value:"Module"})),hs=Object.freeze(Object.definePropLine truncated
|
||||
import{c as e,g as a,a as s,s as t,A as r,C as o,b as n,D as i,L as l,N as b,d as c,P as p,e as d,S as m,T as u,_ as g,f as y,h as _,i as O,j as S,k as f,l as C,m as P,n as h,o as v,p as j,q as E,r as M,t as D,u as N,v as V,w as A,x as w,y as T,z as I,B as x,E as R,F as k,G as F,H as L,I as z,J as G,K as U,M as B,O as W,Q as Y,R as H,U as J,V as K,W as X,X as q,Y as Q,Z,$,a0 as ee,a1 as ae,a2 as se,a3 as te,a4 as re,a5 as oe,a6 as ne,a7 as ie,a8 as le,a9 as be,aa as pe,ab as de,ac as me,ad as ue,ae as ge,af as ye,ag as _e,ah as Oe,ai as Se,aj as fe,ak as Ce,al as Pe,am as he,an as ve,ao as je,ap as Ee,aq as Me,ar as De,as as Ne,at as Ve,au as Ae,av as we,aw as Te,ax as Ie,ay as xe,az as Re,aA as ke,aB as Fe,aC as Le,aD as ze,aE as Ge,aF as Ue,aG as Be,aH as We,aI as Ye,aJ as He,aK as Je,aL as Ke,aM as Xe,aN as qe,aO as Qe,aP as Ze,aQ as $e,aR as ea,aS as aa,aT as sa,aU as ta,aV as ra,aW as oa,aX as na,aY as ia,aZ as la,a_ as ba,a$ as pa,b0 as da,b1 as ma,b2 as ua,b3 as ga,b4 as ya,b5 as _a,b6 as Oa,b7 as Sa,b8 as fa,b9 as Ca,ba as Pa,bb as ha,bc as va,bd as ja,be as Ea,bf as Ma,bg as Da,bh as Na,bi as Va,bj as Aa,bk as wa,bl as Ta,bm as Ia,bn as xa,bo as Ra,bp as ka,bq as Fa,br as La,bs as za,bt as Ga,bu as Ua,bv as Ba,bw as Wa,bx as Ya,by as Ha,bz as Ja,bA as Ka,bB as Xa,bC as qa,bD as Qa,bE as Za,bF as $a,bG as es,bH as as,bI as ss,bJ as ts,bK as rs,bL as os,bM as ns,bN as is,bO as ls,bP as bs,bQ as cs,bR as ps,bS as ds,bT as ms,bU as us}from"./main-BKvJYcmy.js";export{bV as Application,bW as ApplicationNamespace,bX as Array,bY as ArrayProxy,bZ as Controller,b_ as Debug,b$ as EmberDestroyable,c0 as EmberObject,c1 as EnumerableMutable,cc as GlimmerComponent,cd as GlimmerManager,ce as GlimmerReference,cf as GlimmerRuntime,cg as GlimmerUtil,ch as GlimmerValidator,c2 as Instrumentation,c0 as Object,c3 as ObjectCore,c4 as ObjectEvented,c5 as ObjectObservable,c6 as ObjectPromiseProxyMixin,c7 as ObjectProxy,ca as Owner,c8 as Runloop,c9 as Service,cb as VERSION}from"./main-BKvJYcmy.js";const gs=new WeakMap,ys=Object.freeze(Object.defineProperty({__proto__:null,ASYNC_OBSERVERS:r,ComputedDescriptor:o,ComputedProperty:n,DEBUG_INJECTION_FUNCTIONS:i,Libraries:l,NAMESPACES:b,NAMESPACES_BY_ID:c,PROPERTY_DID_CHANGE:p,PROXY_CONTENT:d,SYNC_OBSERVERS:m,TrackedDescriptor:u,_getPath:g,_getProp:y,_setProp:_,activateObserver:O,addArrayObserver:S,addListener:f,addNamespace:C,addObserver:P,alias:h,arrayContentDidChange:v,arrayContentWillChange:j,autoComputed:E,beginPropertyChanges:M,cached:(...s)=>{const[t,r,o]=s,n=new WeakMap,i=o.get;o.get=function(){return n.has(this)||n.set(this,e(i.bind(this))),a(n.get(this))}},changeProperties:D,computed:N,createCache:e,defineDecorator:V,defineProperty:A,defineValue:w,deprecateProperty:function(e,a,r){Object.defineProperty(e,a,{configurable:!0,enumerable:!1,set(e){t(this,r,e)},get(){return s(this,r)}})},descriptorForDecorator:T,descriptorForProperty:I,eachProxyArrayDidChange:function(e,a,s,t){let r=gs.get(e);void 0!==r&&r.arrayDidChange(e,a,s,t)},eachProxyArrayWillChange:function(e,a,s,t){let r=gs.get(e);void 0!==r&&r.arrayWillChange(e,a,s,t)},endPropertyChanges:x,expandProperties:R,findNamespace:k,findNamespaces:F,flushAsyncObservers:L,get:s,getCachedValueFor:z,getProperties:G,getValue:a,hasListeners:U,hasUnknownProperty:B,inject:W,isClassicDecorator:Y,isComputed:H,isConst:J,isElementDescriptor:K,isNamespaceSearchDisabled:X,libraries:q,makeComputedDecorator:Q,markObjectAsDirty:Z,nativeDescDecorator:$,notifyPropertyChange:ee,objectAt:ae,on:se,processAllNamespaces:te,processNamespace:re,removeArrayObserver:oe,removeListener:ne,removeNamespace:ie,removeObserver:le,replace:be,replaceInNativeArray:pe,revalidateObservers:de,sendEvent:me,set:t,setClassicDecorator:ue,setNamespaceSearchDisabled:ge,setProperties:ye,setUnprocessedMixins:_e,tagForObject:Oe,tagForProperty:Se,tracked:fe,trySet:Ce},Symbol.toStringTag,{value:"Module"})),_s=Object.freeze(Object.defineProperty({__proto__:null,Input:Pe,Textarea:he,capabilities:ve,default:je,getComponentTemplate:Ee,setComponentManager:Me,setComponentTemplate:De},Symbol.toStringTag,{value:"Module"})),Os=Object.freeze(Object.defineProperty({__proto__:null,cacheFor:z,guidFor:Ne},Symbol.toStringTag,{value:"Module"})),Ss=Object.freeze(Object.defineProperty({__proto__:null,EventTarget:Ve,Promise:Ae,all:we,allSettled:Te,asap:Ie,async:xe,cast:Re,configure:ke,default:Fe,defer:Le,denodeify:ze,filter:Ge,hash:Ue,hashSettled:Be,map:We,off:Ye,on:He,race:Je,reject:Ke,resolve:Xe,rethrow:qe},Symbol.toStringTag,{value:"Module"})),fs=Object.freeze(Object.defineProperty({__proto__:null,default:Qe},Symbol.toStringTag,{value:"Module"})),Cs=Object.freeze(Object.defineProperty({__proto__:null,ENV:Ze,context:$e,getENV:ea,getLookup:aa,global:sa,setLookup:ta},Symbol.toStringTag,{value:"Module"})),Ps=Object.freeze(Object.defineProperty({__proto__:null,Meta:ra,UNDEFINED:oa,counters:na,meta:ia,peekMeta:la,setMeta:ba},Symbol.toStringTag,{value:"Module"})),hs=Object.freeze(Object.definePropLine truncated
|
||||
+2
-2
@@ -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-GynTgP18.js"></script>
|
||||
<link rel="stylesheet" crossorigin href="/assets/main-BT0n1kYB.css">
|
||||
<script type="module" crossorigin src="/assets/main-BKvJYcmy.js"></script>
|
||||
<link rel="stylesheet" crossorigin href="/assets/main-BeloONRF.css">
|
||||
</head>
|
||||
<body>
|
||||
</body>
|
||||
|
||||
@@ -42,9 +42,6 @@ class MockStorageService extends Service {
|
||||
findPlaceById() {
|
||||
return null;
|
||||
}
|
||||
isPlaceSaved() {
|
||||
return false;
|
||||
}
|
||||
loadPlacesInBounds() {
|
||||
return [];
|
||||
}
|
||||
|
||||
@@ -41,9 +41,6 @@ module('Acceptance | search', function (hooks) {
|
||||
findPlaceById() {
|
||||
return null;
|
||||
}
|
||||
isPlaceSaved() {
|
||||
return false;
|
||||
}
|
||||
rs = {
|
||||
on: () => {},
|
||||
};
|
||||
@@ -88,9 +85,6 @@ module('Acceptance | search', function (hooks) {
|
||||
findPlaceById() {
|
||||
return null;
|
||||
}
|
||||
isPlaceSaved() {
|
||||
return false;
|
||||
}
|
||||
rs = {
|
||||
on: () => {},
|
||||
};
|
||||
@@ -136,9 +130,6 @@ module('Acceptance | search', function (hooks) {
|
||||
if (id === '999') return this.savedPlaces[0];
|
||||
return null;
|
||||
}
|
||||
isPlaceSaved(id) {
|
||||
return !!this.findPlaceById(id);
|
||||
}
|
||||
rs = {
|
||||
on: () => {},
|
||||
};
|
||||
|
||||
@@ -1,49 +1,11 @@
|
||||
import { module, test } from 'qunit';
|
||||
import { setupRenderingTest } from 'marco/tests/helpers';
|
||||
import { render, click } from '@ember/test-helpers';
|
||||
import Service from '@ember/service';
|
||||
import { render } from '@ember/test-helpers';
|
||||
import PlaceDetails from 'marco/components/place-details';
|
||||
|
||||
module('Integration | Component | place-details', function (hooks) {
|
||||
setupRenderingTest(hooks);
|
||||
|
||||
class StorageService extends Service {
|
||||
lists = [
|
||||
{ id: 'to-go', title: 'Want to go', color: '#2e9e4f' },
|
||||
{ id: 'to-do', title: 'To do', color: '#2a7fff' },
|
||||
];
|
||||
|
||||
isPlaceSaved() {
|
||||
return false;
|
||||
}
|
||||
|
||||
findPlaceById() {
|
||||
return null;
|
||||
}
|
||||
|
||||
async storePlace(place) {
|
||||
return { ...place, id: '123', createdAt: new Date().toISOString() };
|
||||
}
|
||||
|
||||
async removePlace() {
|
||||
return true;
|
||||
}
|
||||
|
||||
async togglePlaceList() {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
hooks.beforeEach(function () {
|
||||
this.owner.register('service:storage', StorageService);
|
||||
|
||||
// Mock Router for all tests
|
||||
class MockRouter extends Service {
|
||||
transitionTo() {}
|
||||
}
|
||||
this.owner.register('service:router', MockRouter);
|
||||
});
|
||||
|
||||
test('it formats coordinates correctly', async function (assert) {
|
||||
const place = {
|
||||
title: 'Test Place',
|
||||
@@ -72,187 +34,4 @@ module('Integration | Component | place-details', function (hooks) {
|
||||
assert.dom('.place-details h3').hasText('Place without Coords');
|
||||
assert.dom('.meta-info a[href*="geo:"]').doesNotExist();
|
||||
});
|
||||
|
||||
test('it reveals the list manager when save is clicked', async function (assert) {
|
||||
const place = {
|
||||
title: 'Cool Cafe',
|
||||
lat: 10,
|
||||
lon: 10,
|
||||
};
|
||||
|
||||
await render(<template><PlaceDetails @place={{place}} /></template>);
|
||||
|
||||
// Manager is initially hidden
|
||||
assert.dom('.place-lists-manager').doesNotExist();
|
||||
|
||||
// Find the Save button
|
||||
// It's the first button in .actions
|
||||
const saveBtn = this.element.querySelector('.actions button');
|
||||
await click(saveBtn);
|
||||
|
||||
// Manager should be visible now
|
||||
assert.dom('.place-lists-manager').exists();
|
||||
|
||||
// Check for default lists from mock service
|
||||
assert.dom('.place-lists-manager').includesText('Want to go');
|
||||
assert.dom('.place-lists-manager').includesText('To do');
|
||||
assert.dom('.place-lists-manager').includesText('Saved');
|
||||
});
|
||||
|
||||
test('it handles saving a new place via master toggle', async function (assert) {
|
||||
let storedPlace = null;
|
||||
|
||||
// Override mock service specifically for this test to spy on storePlace
|
||||
class MockStorage extends Service {
|
||||
lists = [];
|
||||
async storePlace(place) {
|
||||
storedPlace = place;
|
||||
return { ...place, id: 'new-id', createdAt: new Date().toISOString() };
|
||||
}
|
||||
isPlaceSaved() {
|
||||
return false;
|
||||
}
|
||||
findPlaceById() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
this.owner.register('service:storage', MockStorage);
|
||||
|
||||
const place = {
|
||||
title: 'New Spot',
|
||||
lat: 20,
|
||||
lon: 20,
|
||||
};
|
||||
|
||||
await render(<template><PlaceDetails @place={{place}} /></template>);
|
||||
|
||||
// Open manager
|
||||
await click('.actions button');
|
||||
|
||||
// Find master "Saved" toggle
|
||||
const masterToggle = this.element.querySelector(
|
||||
'.place-lists-manager .master-toggle input'
|
||||
);
|
||||
|
||||
// It should be unchecked initially for a new place
|
||||
assert.dom(masterToggle).isNotChecked();
|
||||
|
||||
// Click it to save
|
||||
await click(masterToggle);
|
||||
|
||||
// Verify storePlace was called
|
||||
assert.ok(storedPlace, 'storePlace was called');
|
||||
assert.strictEqual(storedPlace.title, 'New Spot');
|
||||
});
|
||||
|
||||
test('it handles removing a saved place via master toggle', async function (assert) {
|
||||
let removedPlaceId = null;
|
||||
|
||||
class MockStorage extends Service {
|
||||
lists = [];
|
||||
async removePlace(place) {
|
||||
removedPlaceId = place.id;
|
||||
}
|
||||
isPlaceSaved() {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
this.owner.register('service:storage', MockStorage);
|
||||
|
||||
const place = {
|
||||
id: 'saved-id',
|
||||
title: 'Saved Spot',
|
||||
lat: 30,
|
||||
lon: 30,
|
||||
createdAt: '2023-01-01', // Marks it as saved
|
||||
};
|
||||
|
||||
await render(<template><PlaceDetails @place={{place}} /></template>);
|
||||
|
||||
// Open manager
|
||||
await click('.actions button');
|
||||
|
||||
// Find master "Saved" toggle
|
||||
const masterToggle = this.element.querySelector(
|
||||
'.place-lists-manager .master-toggle input'
|
||||
);
|
||||
|
||||
// It should be checked initially for a saved place
|
||||
assert.dom(masterToggle).isChecked();
|
||||
|
||||
// Click it to remove
|
||||
await click(masterToggle);
|
||||
|
||||
assert.strictEqual(removedPlaceId, 'saved-id', 'removePlace was called');
|
||||
|
||||
assert.deepEqual(place._listIds, [], '_listIds was cleared on the object');
|
||||
});
|
||||
|
||||
test('it adds place to a list', async function (assert) {
|
||||
let listId = null;
|
||||
let placeArg = null;
|
||||
let shouldAdd = null;
|
||||
|
||||
class MockStorage extends Service {
|
||||
lists = [{ id: 'favs', title: 'Favorites', color: 'red' }];
|
||||
async togglePlaceList(place, id, add) {
|
||||
placeArg = place;
|
||||
listId = id;
|
||||
shouldAdd = add;
|
||||
}
|
||||
isPlaceSaved() {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
this.owner.register('service:storage', MockStorage);
|
||||
|
||||
// Provide a place that is already saved
|
||||
const place = {
|
||||
id: 'p1',
|
||||
title: 'My Spot',
|
||||
createdAt: '2023-01-01',
|
||||
_listIds: [], // Not in any list yet
|
||||
};
|
||||
|
||||
await render(<template><PlaceDetails @place={{place}} /></template>);
|
||||
|
||||
// Open manager
|
||||
await click('.actions button');
|
||||
|
||||
// Find the checkbox for "Favorites"
|
||||
const checkbox = this.element.querySelectorAll(
|
||||
'.place-lists-manager input[type="checkbox"]'
|
||||
)[1]; // Index 1 because 0 is master toggle
|
||||
|
||||
await click(checkbox);
|
||||
|
||||
assert.strictEqual(listId, 'favs');
|
||||
assert.strictEqual(placeArg.id, 'p1');
|
||||
assert.true(shouldAdd);
|
||||
});
|
||||
|
||||
test('it respects storage service state over stale place object', async function (assert) {
|
||||
class MockStorage extends Service {
|
||||
lists = [];
|
||||
isPlaceSaved() {
|
||||
return false;
|
||||
}
|
||||
findPlaceById() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
this.owner.register('service:storage', MockStorage);
|
||||
|
||||
const place = {
|
||||
id: 'stale-id',
|
||||
title: 'Stale Place',
|
||||
createdAt: '2023-01-01', // Looks saved
|
||||
};
|
||||
|
||||
await render(<template><PlaceDetails @place={{place}} /></template>);
|
||||
|
||||
// Button should say "Save", not "Saved" because isPlaceSaved returns false
|
||||
assert.dom('.actions button').hasText('Save');
|
||||
assert.dom('.actions button').doesNotHaveClass('btn-secondary');
|
||||
});
|
||||
});
|
||||
@@ -1,58 +0,0 @@
|
||||
import { mapToStorageSchema } from 'marco/utils/place-mapping';
|
||||
import { module, test } from 'qunit';
|
||||
|
||||
module('Unit | Utility | place-mapping', function () {
|
||||
test('it maps a raw place object to the storage schema', function (assert) {
|
||||
const rawPlace = {
|
||||
osmId: 12345,
|
||||
osmType: 'node',
|
||||
lat: 52.52,
|
||||
lon: 13.405,
|
||||
osmTags: {
|
||||
name: 'Test Place',
|
||||
website: 'https://example.com',
|
||||
},
|
||||
description: 'A test description',
|
||||
};
|
||||
|
||||
const result = mapToStorageSchema(rawPlace);
|
||||
|
||||
assert.strictEqual(result.title, 'Test Place');
|
||||
assert.strictEqual(result.lat, 52.52);
|
||||
assert.strictEqual(result.lon, 13.405);
|
||||
assert.strictEqual(result.osmId, '12345');
|
||||
assert.strictEqual(result.osmType, 'node');
|
||||
assert.strictEqual(result.url, 'https://example.com');
|
||||
assert.strictEqual(result.description, 'A test description');
|
||||
assert.deepEqual(result.osmTags, rawPlace.osmTags);
|
||||
assert.deepEqual(result.tags, []);
|
||||
});
|
||||
|
||||
test('it prioritizes place.title over osmTags.name', function (assert) {
|
||||
const rawPlace = {
|
||||
osmId: 123,
|
||||
lat: 0,
|
||||
lon: 0,
|
||||
title: 'Custom Title',
|
||||
osmTags: {
|
||||
name: 'OSM Name',
|
||||
},
|
||||
};
|
||||
|
||||
const result = mapToStorageSchema(rawPlace);
|
||||
assert.strictEqual(result.title, 'Custom Title');
|
||||
});
|
||||
|
||||
test('it handles fallback title correctly when no name is present', function (assert) {
|
||||
const rawPlace = {
|
||||
id: 987,
|
||||
lat: 10,
|
||||
lon: 20,
|
||||
osmTags: {},
|
||||
};
|
||||
|
||||
const result = mapToStorageSchema(rawPlace);
|
||||
assert.strictEqual(result.title, 'Untitled Place');
|
||||
assert.strictEqual(result.osmId, '987');
|
||||
});
|
||||
});
|
||||
+1
-1
@@ -4,7 +4,7 @@ import { babel } from '@rollup/plugin-babel';
|
||||
|
||||
export default defineConfig({
|
||||
// server: {
|
||||
// host: '0.0.0.0',
|
||||
// host: '0.0.0.0'
|
||||
// },
|
||||
plugins: [
|
||||
ember(),
|
||||
|
||||
Reference in new issue
Block a user