1.11.2

Merge pull request 'Fix back button behavior' (#14 ) from bugfix/back_button into master
Reviewed-on: #14
2026-02-08 17:01:01 +04:00 · 2026-02-08 13:00:07 +00:00 · 2026-02-08 16:59:53 +04:00
9 changed files with 119 additions and 8 deletions
--- a/app/routes/place.js
+++ b/app/routes/place.js
@@ -56,6 +56,8 @@ export default class PlaceRoute extends Route {
  deactivate() {
    // Clear the pin when leaving the route
    this.mapUi.clearSelection();
    // Reset the "return to search" flag so it doesn't persist to subsequent navigations
    this.mapUi.returnToSearch = false;
  }
  async loadOsmPlace(id, type = null) {
--- a/app/services/map-ui.js
+++ b/app/services/map-ui.js
@@ -6,6 +6,7 @@ export default class MapUiService extends Service {
  @tracked isSearching = false;
  @tracked isCreating = false;
  @tracked creationCoordinates = null;
  @tracked returnToSearch = false;
  selectPlace(place) {
    this.selectedPlace = place;
--- a/app/templates/place.gjs
+++ b/app/templates/place.gjs
@@ -77,11 +77,11 @@ export default class PlaceTemplate extends Component {
  navigateBack(place) {
    // The sidebar calls this with null when "Back" is clicked.
    if (place === null) {
-      // If we have history, go back (preserves search state)
+      // If we came from search results, go back in history
-      if (window.history.length > 1) {
+      if (this.mapUi.returnToSearch) {
        window.history.back();
      } else {
-        // Fallback if opened directly
+        // Otherwise just close the sidebar (return to map index)
        this.router.transitionTo('index');
      }
    } else {
--- a/app/templates/search.gjs
+++ b/app/templates/search.gjs
@@ -5,10 +5,12 @@ import { action } from '@ember/object';
 export default class SearchTemplate extends Component {
  @service router;
  @service mapUi;
  @action
  selectPlace(place) {
    if (place) {
      this.mapUi.returnToSearch = true;
      this.router.transitionTo('place', place);
    }
  }
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "marco",
-  "version": "1.11.1",
+  "version": "1.11.2",
  "private": true,
  "description": "Unhosted maps app",
  "repository": {
--- a/release/assets/main-CYFdUlXN.js
+++ b/release/assets/main-CYFdUlXN.js
--- a/release/assets/modules-4-12-xpGE2dfv.js
+++ b/release/assets/modules-4-12-xpGE2dfv.js
--- a/release/index.html
+++ b/release/index.html
@@ -26,7 +26,7 @@
    <meta name="msapplication-TileColor" content="#F6E9A6">
    <meta name="msapplication-TileImage" content="/icons/icon-144.png">
-  <script type="module" crossorigin src="/assets/main-DlYgnqpR.js"></script>
+  <script type="module" crossorigin src="/assets/main-CYFdUlXN.js"></script>
  <link rel="stylesheet" crossorigin href="/assets/main-D53xPL_H.css">
 </head>
  <body>
--- a/tests/acceptance/navigation-test.js
+++ b/tests/acceptance/navigation-test.js
@@ -0,0 +1,106 @@
 import { module, test } from 'qunit';
 import { visit, currentURL, click, settled } from '@ember/test-helpers';
 import { setupApplicationTest } from 'marco/tests/helpers';
 import Service from '@ember/service';
 import sinon from 'sinon';
 class MockOsmService extends Service {
  async getNearbyPois() {
    return [
      {
        osmId: '123',
        lat: 1,
        lon: 1,
        osmTags: { name: 'Test Place', amenity: 'cafe' },
        osmType: 'node',
      },
    ];
  }
  async getPoiById() {
    return {
      osmId: '123',
      lat: 1,
      lon: 1,
      osmTags: { name: 'Test Place', amenity: 'cafe' },
      osmType: 'node',
    };
  }
 }
 class MockStorageService extends Service {
  savedPlaces = [];
  findPlaceById() {
    return null;
  }
  loadPlacesInBounds() {
    return [];
  }
  get placesInView() {
    return [];
  }
  rs = {
    on: () => {},
  };
 }
 module('Acceptance | navigation', function (hooks) {
  setupApplicationTest(hooks);
  hooks.beforeEach(function () {
    this.owner.register('service:osm', MockOsmService);
    this.owner.register('service:storage', MockStorageService);
  });
  test('navigating from search results to place and back uses history', async function (assert) {
    const mapUi = this.owner.lookup('service:map-ui');
    const backStub = sinon.stub(window.history, 'back');
    try {
      await visit('/search?lat=1&lon=1');
      assert.strictEqual(currentURL(), '/search?lat=1&lon=1');
      await click('.place-item');
      assert.ok(currentURL().includes('/place/'), 'Navigated to place');
      assert.true(mapUi.returnToSearch, 'Flag returnToSearch is set');
      // Click the back button in the sidebar
      await click('.back-btn');
      assert.true(backStub.calledOnce, 'window.history.back() was called');
    } finally {
      backStub.restore();
    }
  });
  test('closing the sidebar resets the returnToSearch flag', async function (assert) {
    const mapUi = this.owner.lookup('service:map-ui');
    await visit('/search?lat=1&lon=1');
    await click('.place-item'); // Sets returnToSearch = true
    assert.true(mapUi.returnToSearch, 'Flag is set upon entering place');
    // Click the Close (X) button
    await click('.close-btn');
    await settled();
    assert.strictEqual(currentURL(), '/', 'Returned to index');
    assert.false(mapUi.returnToSearch, 'Flag is reset after closing sidebar');
  });
  test('navigating directly to place and back closes sidebar', async function (assert) {
    const backStub = sinon.stub(window.history, 'back');
    try {
      await visit('/place/osm:node:123');
      assert.ok(currentURL().includes('/place/'), 'Visited place directly');
      await click('.back-btn');
      await settled();
      assert.strictEqual(currentURL(), '/', 'Returned to index/map');
      assert.true(backStub.notCalled, 'window.history.back() was NOT called');
    } finally {
      backStub.restore();
    }
  });
 });
Author	SHA1	Message	Date
Râu Cao	9f48d7b264	1.11.2	2026-02-08 17:01:01 +04:00
Râu Cao	bbd3bf47c6	Merge pull request 'Fix back button behavior' (#14 ) from bugfix/back_button into master Reviewed-on: #14	2026-02-08 13:00:07 +00:00
Râu Cao	59e3d91071	Fix back button behavior fixes #12	2026-02-08 16:59:53 +04:00