1.13.3

Reviewed-on: #26

app/components/icon.gjs

@@ -6,10 +6,13 @@ 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';
@@ -31,10 +34,13 @@ const ICONS = {
   bookmark,
   clock,
   edit,
+  facebook,
   globe,
   home,
+  instagram,
   'log-in': logIn,
   'log-out': logOut,
+  mail,
   map,
   'map-pin': mapPin,
   menu,

app/components/map.gjs

@@ -441,6 +441,7 @@ 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;
 
@@ -471,7 +472,12 @@ export default class MapComponent extends Component {
         }
       }
 
-      if (selected.bbox) {
+      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) {
         this.zoomToBbox(selected.bbox);
       } else {
         this.handlePinVisibility(coords);
@@ -524,17 +530,28 @@ export default class MapComponent extends Component {
       padding[1] = visibleWidth * 0.15;
     }
 
+    const currentZoom = view.getZoom();
+
     view.fit(extent, {
       padding: padding,
       duration: 1000,
       easing: (t) => t * (2 - t),
-      maxZoom: 19,
+      maxZoom: Math.max(currentZoom, 18),
     });
   }
 
   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();
 
@@ -553,12 +570,17 @@ export default class MapComponent extends Component {
     }
   }
 
-  animateToSmartCenter(coords) {
+  animateToSmartCenter(coords, zoom = null) {
     if (!this.mapInstance) return;
 
     const size = this.mapInstance.getSize();
     const view = this.mapInstance.getView();
-    const resolution = view.getResolution();
+    let resolution = view.getResolution();
+
+    if (zoom !== null) {
+      resolution = view.getResolutionForZoom(zoom);
+    }
+
     let targetCenter = coords;
 
     // Check if mobile (width <= 768px matches CSS)
@@ -580,11 +602,17 @@ export default class MapComponent extends Component {
       targetCenter = [coords[0], coords[1] - offsetMapUnits];
     }
 
-    view.animate({
+    const animationOptions = {
       center: targetCenter,
       duration: 1000,
       easing: (t) => t * (2 - t), // Ease-out
-    });
+    };
+
+    if (zoom !== null) {
+      animationOptions.zoom = zoom;
+    }
+
+    view.animate(animationOptions);
   }
 
   panIfObscured(coords) {
@@ -848,6 +876,7 @@ export default class MapComponent extends Component {
           'Clicked bookmark while sidebar open (switching):',
           clickedBookmark
         );
+        this.mapUi.preventNextZoom = true;
         this.router.transitionTo('place', clickedBookmark);
         return;
       }
@@ -862,6 +891,7 @@ 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;
     }

app/components/place-details.gjs

@@ -4,6 +4,7 @@ import { on } from '@ember/modifier';
 import { htmlSafe } from '@ember/template';
 import { humanizeOsmTag } from '../utils/format-text';
 import { getLocalizedName, getPlaceType } from '../utils/osm';
+import { getSocialInfo } from '../utils/social-links';
 import Icon from '../components/icon';
 import PlaceEditForm from './place-edit-form';
 
@@ -110,6 +111,12 @@ export default class PlaceDetails extends Component {
       );
     }
 
+    if (type === 'email') {
+      return htmlSafe(
+        parts.map((p) => `<a href="mailto:${p}">${p}</a>`).join('<br>')
+      );
+    }
+
     if (type === 'url') {
       return htmlSafe(
         parts
@@ -131,6 +138,11 @@ export default class PlaceDetails extends Component {
     return this.formatMultiLine(val, 'phone');
   }
 
+  get email() {
+    const val = this.tags.email || this.tags['contact:email'];
+    return this.formatMultiLine(val, 'email');
+  }
+
   get website() {
     const val =
       this.place.url || this.tags.website || this.tags['contact:website'];
@@ -159,6 +171,14 @@ export default class PlaceDetails extends Component {
       .join(', ');
   }
 
+  get facebook() {
+    return getSocialInfo(this.tags, 'facebook');
+  }
+
+  get instagram() {
+    return getSocialInfo(this.tags, 'instagram');
+  }
+
   get wikipedia() {
     const val = this.tags.wikipedia;
     if (!val) return null;
@@ -292,6 +312,45 @@ export default class PlaceDetails extends Component {
           </p>
         {{/if}}
 
+        {{#if this.email}}
+          <p class="content-with-icon">
+            <Icon @name="mail" @title="Email" />
+            <span>
+              {{this.email}}
+            </span>
+          </p>
+        {{/if}}
+
+        {{#if this.facebook}}
+          <p class="content-with-icon">
+            <Icon @name="facebook" @title="Facebook" />
+            <span>
+              <a
+                href={{this.facebook.url}}
+                target="_blank"
+                rel="noopener noreferrer"
+              >
+                {{this.facebook.username}}
+              </a>
+            </span>
+          </p>
+        {{/if}}
+
+        {{#if this.instagram}}
+          <p class="content-with-icon">
+            <Icon @name="instagram" @title="Instagram" />
+            <span>
+              <a
+                href={{this.instagram.url}}
+                target="_blank"
+                rel="noopener noreferrer"
+              >
+                {{this.instagram.username}}
+              </a>
+            </span>
+          </p>
+        {{/if}}
+
         {{#if this.wikipedia}}
           <p class="content-with-icon">
             <Icon @name="wikipedia" @title="Wikipedia" @filled={{true}} />

app/routes/place.js

@@ -72,7 +72,9 @@ export default class PlaceRoute extends Route {
 
     // Notify the Map UI to show the pin
     if (model) {
-      this.mapUi.selectPlace(model);
+      const options = { preventZoom: this.mapUi.preventNextZoom };
+      this.mapUi.selectPlace(model, options);
+      this.mapUi.preventNextZoom = false;
     }
     // Stop the pulse animation if it was running (e.g. redirected from search)
     this.mapUi.stopSearch();

app/services/map-ui.js

@@ -9,18 +9,24 @@ export default class MapUiService extends Service {
   @tracked returnToSearch = false;
   @tracked currentCenter = null;
   @tracked searchBoxHasFocus = false;
+  @tracked selectionOptions = {};
+  @tracked preventNextZoom = false;
 
-  selectPlace(place) {
+  selectPlace(place, options = {}) {
     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() {

app/services/osm.js

@@ -35,7 +35,6 @@ export default class OsmService extends Service {
       'building',
       'landuse',
       'public_transport',
-      'highway',
       'aeroway',
     ];
     const typeKeysQuery = [`~"^(${typeKeys.join('|')})$"~".*"`];

app/styles/app.css

@@ -203,6 +203,7 @@ 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 {
@@ -239,7 +240,11 @@ body {
 .sidebar-content {
   padding: 1rem;
   overflow-y: auto;
-  flex: 1; /* Take up remaining vertical space */
+  -webkit-overflow-scrolling: touch;
+  flex: 1;
+  min-height: 0;
+  touch-action: pan-y;
+  overscroll-behavior: contain;
 }
 
 .edit-form {
@@ -427,6 +432,10 @@ body {
   justify-content: center;
 }
 
+.place-details {
+  padding-bottom: 2rem;
+}
+
 .place-details h3 {
   font-size: 1.2rem;
   margin-top: 0;
@@ -768,7 +777,6 @@ 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);

app/utils/social-links.js

@@ -0,0 +1,52 @@
+// Helper to get value from multiple keys
+const get = (tags, ...keys) => {
+  for (const k of keys) {
+    if (tags[k]) return tags[k];
+  }
+  return null;
+};
+
+export function getSocialInfo(tags, platform) {
+  if (!tags) return null;
+
+  const key = platform;
+  const domain = `${platform}.com`;
+  const val = get(tags, `contact:${key}`, key);
+
+  if (!val) return null;
+
+  // Check if it's a full URL
+  if (val.startsWith('http')) {
+    try {
+      const url = new URL(val);
+
+      // Handle Facebook profile.php?id=...
+      if (
+        platform === 'facebook' &&
+        url.pathname === '/profile.php' &&
+        url.searchParams.has('id')
+      ) {
+        return {
+          url: val,
+          username: url.searchParams.get('id'),
+        };
+      }
+
+      // Clean up pathname to get username
+      let username = url.pathname.replace(/^\/|\/$/g, '');
+      return {
+        url: val,
+        username: username || val, // Fallback to full URL if path is empty
+      };
+    } catch {
+      return { url: val, username: val };
+    }
+  }
+
+  // Assume it's a username
+  const username = val.replace(/^@/, ''); // Remove leading @
+  return {
+    url: `https://${domain}/${username}`,
+    username: username,
+  };
+}

package.json

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

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-C68xq8aX.js"></script>
+  <script type="module" crossorigin src="/assets/main-gjk9d6Ld.js"></script>
-  <link rel="stylesheet" crossorigin href="/assets/main-DoLYcE7E.css">
+  <link rel="stylesheet" crossorigin href="/assets/main-DAo4Q0R2.css">
 </head>
   <body>
  </body>

tests/unit/utils/social-links-test.js

@@ -0,0 +1,66 @@
+import { getSocialInfo } from 'marco/utils/social-links';
+import { module, test } from 'qunit';
+
+module('Unit | Utility | social-links', function () {
+  test('it returns null if tags are missing', function (assert) {
+    let result = getSocialInfo({}, 'facebook');
+    assert.strictEqual(result, null);
+  });
+
+  test('it returns null if specific platform tags are missing', function (assert) {
+    let result = getSocialInfo({ twitter: 'foo' }, 'facebook');
+    assert.strictEqual(result, null);
+  });
+
+  test('it handles simple usernames', function (assert) {
+    let result = getSocialInfo({ facebook: 'foo' }, 'facebook');
+    assert.deepEqual(result, {
+      url: 'https://facebook.com/foo',
+      username: 'foo',
+    });
+
+    result = getSocialInfo({ 'contact:instagram': '@bar' }, 'instagram');
+    assert.deepEqual(result, {
+      url: 'https://instagram.com/bar',
+      username: 'bar',
+    });
+  });
+
+  test('it handles full URLs', function (assert) {
+    let result = getSocialInfo(
+      { facebook: 'https://www.facebook.com/foo' },
+      'facebook'
+    );
+    assert.deepEqual(result, {
+      url: 'https://www.facebook.com/foo',
+      username: 'foo',
+    });
+  });
+
+  test('it handles Facebook profile.php URLs', function (assert) {
+    let result = getSocialInfo(
+      { facebook: 'https://www.facebook.com/profile.php?id=12345' },
+      'facebook'
+    );
+    assert.deepEqual(result, {
+      url: 'https://www.facebook.com/profile.php?id=12345',
+      username: '12345',
+    });
+  });
+
+  test('it falls back gracefully for malformed URLs', function (assert) {
+    let result = getSocialInfo({ facebook: 'http://' }, 'facebook');
+    assert.deepEqual(result, {
+      url: 'http://',
+      username: 'http://',
+    });
+  });
+
+  test('it prioritizes contact:tag over tag', function (assert) {
+    let result = getSocialInfo(
+      { 'contact:facebook': 'priority', facebook: 'fallback' },
+      'facebook'
+    );
+    assert.strictEqual(result.username, 'priority');
+  });
+});

vite.config.mjs

@@ -3,9 +3,9 @@ import { extensions, ember } from '@embroider/vite';
 import { babel } from '@rollup/plugin-babel';
 
 export default defineConfig({
-  // server: {
+  server: {
-  //   host: '0.0.0.0'
+    host: '0.0.0.0'
-  // },
+  },
   plugins: [
     ember(),
     // extra plugins here