From d092630e94af1e5c38c8cb22335b939f6759ab7d Mon Sep 17 00:00:00 2001 From: marc tobias Date: Tue, 29 Aug 2023 22:48:52 +0200 Subject: [PATCH 1/1] adjust details test cases to what newest Nominatim returns --- src/pages/DetailsPage.svelte | 8 +++++--- test/details.js | 40 +++++++++++++++++++++++++----------- 2 files changed, 33 insertions(+), 15 deletions(-) diff --git a/src/pages/DetailsPage.svelte b/src/pages/DetailsPage.svelte index 2b8f4cc..225d1a0 100644 --- a/src/pages/DetailsPage.svelte +++ b/src/pages/DetailsPage.svelte @@ -56,6 +56,7 @@ function place_has_keywords(aThisPlace) { // Return false if Nominatim API sends 'keywords: { name: [], address: [] }' + // Like no longer needed after Nominatim version 4.3 return ( aThisPlace.keywords && aThisPlace.keywords.name && aThisPlace.keywords.address && (aThisPlace.keywords.name.length > 0 || aThisPlace.keywords.address.length > 0) @@ -94,10 +95,11 @@ - {#if (Array.isArray(aPlace.names)) } - No Name - {:else} + {#if aPlace.names && typeof (aPlace.names) === 'object' + && Object.keys(aPlace.names).length} + {:else} + No Name {/if} {aPlace.category}:{aPlace.type} diff --git a/test/details.js b/test/details.js index 513dcba..df667b6 100644 --- a/test/details.js +++ b/test/details.js @@ -87,7 +87,33 @@ describe('Details Page', function () { }); } + + it('should support case-insenstive search, can navigate to new page', async function () { + let input_field = await page.$('input[type=edit]'); + await input_field.click({ clickCount: 3 }); + await input_field.type('w375257537'); + await page.click('button[type=submit]'); + + await page.waitForSelector('a[href="https://www.openstreetmap.org/way/375257537"]'); + assert.ok((await page.$eval('.container h1', el => el.textContent)).includes('Taj Mahal')); + }); + }); + + describe('With street search - a place that is parent of buildings', function () { + before(async function () { + page = await browser.newPage(); + await page.goto('http://localhost:9999/details.html?osmtype=W&osmid=32703083'); + await page.waitForSelector('.container .row'); + }); + + after(async function () { + await page.close(); + }); + it('should change page url on clicking display child places', async function () { + let page_content = await page.$eval('body', el => el.textContent); + assert.ok(page_content.includes('Gafleistrasse')); + let current_url; let [child_places_btn] = await page.$x("//a[contains(text(), 'display child places')]"); @@ -98,18 +124,8 @@ describe('Details Page', function () { current_url = new URL(await page.url()); assert.strictEqual(current_url.searchParams.get('hierarchy'), '1'); - let page_content = await page.$eval('body', el => el.textContent); - assert.ok(page_content.includes('Alte Landstrasse')); // one of the streets - }); - - it('should support case-insenstive search, can navigate to new page', async function () { - let input_field = await page.$('input[type=edit]'); - await input_field.click({ clickCount: 3 }); - await input_field.type('w375257537'); - await page.click('button[type=submit]'); - - await page.waitForSelector('a[href="https://www.openstreetmap.org/way/375257537"]'); - assert.ok((await page.$eval('.container h1', el => el.textContent)).includes('Taj Mahal')); + page_content = await page.$eval('body', el => el.textContent); + assert.ok(page_content.includes('bus_stop')); // parent of several bus stops }); }); -- 2.39.5