1.11.4

Improve code based on linting
Merge pull request 'Prefer place name in UA/browser language' (#19 ) from feature/16-place_names into master
2026-02-10 19:21:34 +04:00 · 2026-02-10 19:20:38 +04:00 · 2026-02-10 15:20:23 +00:00 · 2026-02-10 19:19:36 +04:00 · 2026-02-10 18:53:21 +04:00 · 2026-02-10 14:52:22 +00:00
12 changed files with 48 additions and 15 deletions
--- a/app/components/place-details.gjs
+++ b/app/components/place-details.gjs
@ -2,6 +2,7 @@ import Component from '@glimmer/component';
 import { fn } from '@ember/helper';
 import { on } from '@ember/modifier';
 import { humanizeOsmTag } from '../utils/format-text';
+import { getLocalizedName } from '../utils/osm';
 import Icon from '../components/icon';
 import PlaceEditForm from './place-edit-form';

@ -22,8 +23,7 @@ export default class PlaceDetails extends Component {
  get name() {
    return (
      this.place.title ||
-      this.tags.name ||
-      this.tags['name:en'] ||
+      getLocalizedName(this.tags) ||
      'Unnamed Place'
    );
  }
--- a/app/components/places-sidebar.gjs
+++ b/app/components/places-sidebar.gjs
@ -7,6 +7,7 @@ import or from 'ember-truth-helpers/helpers/or';
 import PlaceDetails from './place-details';
 import Icon from './icon';
 import humanizeOsmTag from '../helpers/humanize-osm-tag';
+import { getLocalizedName } from '../utils/osm';

 export default class PlacesSidebar extends Component {
  @service storage;
@ -85,8 +86,7 @@ export default class PlacesSidebar extends Component {
    } else {
      // It's a fresh POI -> Save it
      const placeData = {
-        title:
-          place.osmTags.name || place.osmTags['name:en'] || 'Untitled Place',
+        title: getLocalizedName(place.osmTags, 'Untitled Place'),
        lat: place.lat,
        lon: place.lon,
        tags: [],
--- a/app/components/settings-pane.gjs
+++ b/app/components/settings-pane.gjs
@ -46,7 +46,7 @@ export default class SettingsPane extends Component {
              </option>
              <option
                value="false"
-                selected={{if (not this.settings.mapKinetic) "selected"}}
+                selected={{unless this.settings.mapKinetic "selected"}}
              >
                Off
              </option>
--- a/app/services/osm.js
+++ b/app/services/osm.js
@ -1,4 +1,5 @@
 import Service, { service } from '@ember/service';
+import { getLocalizedName } from '../utils/osm';

 export default class OsmService extends Service {
  @service settings;
@ -61,7 +62,7 @@ out center;

  normalizePoi(poi) {
    return {
-      title: poi.tags?.name || poi.tags?.['name:en'] || 'Untitled Place',
+      title: getLocalizedName(poi.tags),
      lat: poi.lat || poi.center?.lat,
      lon: poi.lon || poi.center?.lon,
      url: poi.tags?.website,
--- a/app/utils/osm.js
+++ b/app/utils/osm.js
@ -0,0 +1,32 @@
+export function getLocalizedName(tags, defaultName = 'Untitled Place') {
+  if (!tags) return defaultName;
+
+  // 1. Get user's preferred languages
+  const languages = navigator.languages || [navigator.language || 'en'];
+
+  // 2. Try to find a match for each preferred language
+  for (const lang of languages) {
+    if (!lang) continue;
+
+    // Handle "en-US", "de-DE", etc. -> look for "name:en", "name:de"
+    const shortLang = lang.split('-')[0];
+    const tagKey = `name:${shortLang}`;
+
+    if (tags[tagKey]) {
+      return tags[tagKey];
+    }
+  }
+
+  // 3. Fallback to standard "name"
+  if (tags.name) {
+    return tags.name;
+  }
+
+  // 4. Fallback to "name:en" (common in international places without local name)
+  if (tags['name:en']) {
+    return tags['name:en'];
+  }
+
+  // 5. Final fallback
+  return defaultName;
+}
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "marco",
-  "version": "1.11.2",
+  "version": "1.11.4",
  "private": true,
  "description": "Unhosted maps app",
  "repository": {
--- a/release/assets/main-D53xPL_H.css
+++ b/release/assets/main-D53xPL_H.css
--- a/release/assets/main-G8wPYi_P.css
+++ b/release/assets/main-G8wPYi_P.css
--- a/release/assets/main-ji2SNMnp.js
+++ b/release/assets/main-ji2SNMnp.js
--- a/release/assets/modules-4-12-BU9FhOG9.js
+++ b/release/assets/modules-4-12-BU9FhOG9.js
--- a/release/index.html
+++ b/release/index.html
@ -26,8 +26,8 @@
    <meta name="msapplication-TileColor" content="#F6E9A6">
    <meta name="msapplication-TileImage" content="/icons/icon-144.png">

-  <script type="module" crossorigin src="/assets/main-CYFdUlXN.js"></script>
-  <link rel="stylesheet" crossorigin href="/assets/main-D53xPL_H.css">
+  <script type="module" crossorigin src="/assets/main-ji2SNMnp.js"></script>
+  <link rel="stylesheet" crossorigin href="/assets/main-G8wPYi_P.css">
 </head>
  <body>
 </body>
--- a/tests/acceptance/navigation-test.js
+++ b/tests/acceptance/navigation-test.js
@ -82,7 +82,7 @@ module('Acceptance | navigation', function (hooks) {

    // 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');
@ -95,7 +95,7 @@ module('Acceptance | navigation', function (hooks) {
      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');
Author	SHA1	Message	Date
Râu Cao	20f63065ad	1.11.4	2026-02-10 19:21:34 +04:00
Râu Cao	39a7ec3595	Improve code based on linting	2026-02-10 19:20:38 +04:00
Râu Cao	32dfa3a30f	Merge pull request 'Prefer place name in UA/browser language' (#19 ) from feature/16-place_names into master Reviewed-on: #19	2026-02-10 15:20:23 +00:00
Râu Cao	64ccc694d3	Prefer place name in UA/browser language closes #16	2026-02-10 19:19:36 +04:00
Râu Cao	87e2380ef6	1.11.3	2026-02-10 18:53:21 +04:00
Râu Cao	66c31b19f1	Merge pull request 'UI improvements' (#18 ) from feature/location_improvements into master Reviewed-on: #18	2026-02-10 14:52:22 +00:00