From: Sarah Hoffmann Date: Tue, 27 Jun 2023 09:38:35 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: https://git.openstreetmap.org./nominatim-ui.git/commitdiff_plain/c296bef87014f72b3f8aae878b9a23f6c08780a7?hp=24da90317a8ef77e6eded05331c3a555da8ae199 Merge remote-tracking branch 'upstream/master' --- diff --git a/.eslintrc.json b/.eslintrc.json index 908eb4d..a05265d 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -2,7 +2,8 @@ { "extends": [ "airbnb-base/legacy", - "plugin:mocha/recommended" + "plugin:mocha/recommended", + "plugin:svelte/recommended" ], "parserOptions": { "ecmaVersion": 2019, @@ -12,7 +13,7 @@ "browser": true }, "plugins": [ - "svelte3", + "svelte", "mocha" ], "overrides": [ @@ -36,19 +37,11 @@ 100, 2, { - "ignoreUrls": true, - "ignoreComments": false + "ignoreUrls": true } ] } }, - { - "files": ["*.svelte"], - "processor": "svelte3/svelte3", - "rules": { - "no-label-var": "off" // eslint thinks $: (https://svelte.dev/tutorial/reactive-statements) are labels - } - }, { "files": ["test/**"], "globals": { diff --git a/CHANGES.md b/CHANGES.md index 194e97d..93c3f73 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,16 @@ # CHANGES +* version 3.3.0 - 2023-06-26 + * Reverse map: show search position (red circle) also when no search results + * test-suite: remove httpbin HTTP calls, server is unreliable + * test-suite: replace eslint-plugin-svelte3 with eslint-plugin-svelte plus lint fixes + * NPM package updates (Bootstrap 5.3, Leaflet 1.9.4) + * NPM package updates (Svelte 3.x => 4.0) + +* version 3.2.12 - 2023-04-04 + * Reverse page: remove uncommon zoom labels, align with Nominatim 4.x + * NPM package updates + * version 3.2.11 - 2023-03-08 * Configuration: You can now set Map_Default_Bounds als alternative to lat,lon, zoom. Thanks Piskvor * NPM package updates diff --git a/package.json b/package.json index ee2f272..28e36d5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "nominatim-ui", "description": "Debug web interface for Nominatim geocoder", - "version": "3.2.11", + "version": "3.3.0", "license": "GPL-2.0", "scripts": { "build": "rollup -c", @@ -12,21 +12,21 @@ "start": "static-server dist" }, "devDependencies": { - "@rollup/plugin-commonjs": "^24.0", + "@rollup/plugin-commonjs": "^25.0", "@rollup/plugin-node-resolve": "^15.0", "eslint-plugin-mocha": "^10.0", "fs-extra": "^11.0.0", "http": "^0.0.1-security", "http-proxy": "^1.18.1", "mocha": "^10.0", - "puppeteer": "^19.0", + "puppeteer": "^20.0", "rollup": "^3.3.0", "rollup-plugin-css-only": "^4.3.0", "rollup-plugin-livereload": "^2.0.0", "rollup-plugin-svelte": "^7.0.0", "rollup-plugin-terser": "^7.0.0", "static-server": "^2.2.1", - "svelte": "^3.49.0" + "svelte": "^4.0" }, "dependencies": { "bootstrap": "^5.0.0", @@ -34,8 +34,8 @@ "eslint": "^8.0", "eslint-config-airbnb-base": "^15.0", "eslint-plugin-import": "^2.22.1", - "eslint-plugin-svelte3": "^4.0", - "leaflet": "1.9.3", + "eslint-plugin-svelte": "^2.13", + "leaflet": "1.9.4", "leaflet-minimap": "^3.6.1", "timeago.js": "^4.0.2" }, diff --git a/src/components/DetailsLink.svelte b/src/components/DetailsLink.svelte index d914079..1785179 100644 --- a/src/components/DetailsLink.svelte +++ b/src/components/DetailsLink.svelte @@ -49,4 +49,6 @@ } - + + + diff --git a/src/components/DetailsOneRow.svelte b/src/components/DetailsOneRow.svelte index 67c5152..8b77df2 100644 --- a/src/components/DetailsOneRow.svelte +++ b/src/components/DetailsOneRow.svelte @@ -22,17 +22,25 @@ {/if} {formatPlaceType(addressLine)} + {@html osmLink(addressLine)} {addressLine.rank_address} {formatAdminLevel(addressLine.admin_level)} + {@html formatDistance(addressLine.distance, bDistanceInMeters)} {#if addressLine.osm_id} - details + + details + {:else if !reverse_only && addressLine.type.match(/^country/)} - search by name + + search by name + {:else if !reverse_only && addressLine.type === 'postcode'} - search by name + + search by name + {/if} diff --git a/src/components/DetailsPostcodeHint.svelte b/src/components/DetailsPostcodeHint.svelte index 5946d2a..13ac99b 100644 --- a/src/components/DetailsPostcodeHint.svelte +++ b/src/components/DetailsPostcodeHint.svelte @@ -47,17 +47,25 @@ (how?)
-
\ No newline at end of file + diff --git a/src/components/Error.svelte b/src/components/Error.svelte index e8702b9..fad20eb 100644 --- a/src/components/Error.svelte +++ b/src/components/Error.svelte @@ -14,6 +14,9 @@
{error_message} - +
{/if} diff --git a/src/components/Footer.svelte b/src/components/Footer.svelte index 6e5547a..e80d5c3 100644 --- a/src/components/Footer.svelte +++ b/src/components/Footer.svelte @@ -11,7 +11,9 @@