X-Git-Url: https://git.openstreetmap.org./nominatim-ui.git/blobdiff_plain/0af7af382b5cf0cb446fa1c0084d38609c543daf..044b38e5fab5a1de96a648502de606559d49ae93:/src/pages/DetailsPage.svelte diff --git a/src/pages/DetailsPage.svelte b/src/pages/DetailsPage.svelte index b7c436d..aa3670f 100644 --- a/src/pages/DetailsPage.svelte +++ b/src/pages/DetailsPage.svelte @@ -4,17 +4,20 @@ import { osmLink, wikipediaLink, coverageType, isAdminBoundary, - formatAddressRank, formatKeywordToken + formatAddressRank, formatKeywordToken, formatOSMType } from '../lib/helpers.js'; import Header from '../components/Header.svelte'; import MapIcon from '../components/MapIcon.svelte'; import SearchSectionDetails from '../components/SearchSectionDetails.svelte'; import DetailsOneRow from '../components/DetailsOneRow.svelte'; import DetailsLink from '../components/DetailsLink.svelte'; + import DetailsPostcodeHint from '../components/DetailsPostcodeHint.svelte'; + import InfoRow from '../components/DetailsInfoRow.svelte'; + import InfoRowList from '../components/DetailsInfoRowList.svelte'; import Map from '../components/Map.svelte'; let aPlace; - let base_url = window.location.search; + let base_url; let api_request_params; let api_request_finished = false; @@ -51,12 +54,28 @@ } } + 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) + ); + } + + function country_code(aThisPlace) { + let aLine = aThisPlace.address.find((address_line) => address_line.type === 'country_code'); + return aLine ? aLine.localname : null; + } + $: { let pageinfo = $page; if (pageinfo.tab === 'details') { loaddata(pageinfo.params); + base_url = window.location.search; } } + $: reverse_only = Nominatim_Config.Reverse_Only;
@@ -68,110 +87,67 @@

- {aPlace.localname} + {aPlace.localname || `${formatOSMType(aPlace.osm_type)} ${aPlace.osm_id}` } link to this page

-
+
- +
- - - - - - - - - - - - + + {#if aPlace.names && typeof (aPlace.names) === 'object' + && Object.keys(aPlace.names).length} + + {:else} + No Name + {/if} + + {aPlace.category}:{aPlace.type} + {aPlace.indexed_date} {#if (isAdminBoundary(aPlace)) } - - - - + {aPlace.admin_level} {/if} - - - - - - - - + {aPlace.rank_search} + + {aPlace.rank_address} ({formatAddressRank(aPlace.rank_address)}) + {#if aPlace.calculated_importance} - - - - + {/if} - - - - - - - - - - - - - - - + + + {@html osmLink(aPlace)} + + {aPlace.place_id} + ( + on this server + ) + {#if aPlace.calculated_wikipedia} - - - - + + {@html wikipediaLink(aPlace)} {/if} - - - - - - - - - - - - + + {#if aPlace.calculated_postcode} + {aPlace.calculated_postcode} + + {/if} + + +
Name - {#each Object.keys(aPlace.names) as name} -
- {aPlace.names[name]} ({name}) -
- {/each} -
Type{aPlace.category}:{aPlace.type}
Last Updated{aPlace.indexed_date}
Admin Level{aPlace.admin_level}
Search Rank{aPlace.rank_search}
Address Rank{aPlace.rank_address} ({formatAddressRank(aPlace.rank_address)})
Importance + {aPlace.calculated_importance} {#if !aPlace.importance} (estimated){/if} -
Coverage{coverageType(aPlace)}
Centre Point (lat,lon) + {coverageType(aPlace)} + {aPlace.centroid.coordinates[1]},{aPlace.centroid.coordinates[0]} -
OSM{@html osmLink(aPlace)} -
- Place Id - (on this server) - {aPlace.place_id}
Wikipedia Calculated{@html wikipediaLink(aPlace)}
Computed Postcode{aPlace.calculated_postcode}
Address Tags - {#each Object.keys(aPlace.addresstags) as name} -
- {aPlace.addresstags[name]} ({name}) -
- {/each} -
Extra Tags - {#each Object.keys(aPlace.extratags) as name} -
- {aPlace.extratags[name]} ({name}) -
- {/each} -
@@ -184,7 +160,7 @@

Address

- +
@@ -199,59 +175,77 @@ {#if aPlace.address} {#each aPlace.address as addressLine} - + {/each} {/if} {#if aPlace.linked_places} - + {#each aPlace.linked_places as addressLine} - + {/each} {/if} - - {#if aPlace.keywords} - - {#each aPlace.keywords.name as keyword} - - - {#if keyword.id} - - {/if} - - {/each} + {#if !reverse_only} + + {#if api_request_params.keywords} - - {#each aPlace.keywords.address as keyword} - - - {#if keyword.id} - + {#if place_has_keywords(aPlace)} + + {#each aPlace.keywords.name as keyword} + + + {#if keyword.id} + + {/if} + + {/each} + + {#if aPlace.keywords.address} + + {#each aPlace.keywords.address as keyword} + + + {#if keyword.id} + + {/if} + + {/each} {/if} - - {/each} - {:else} - - - + {:else} + + {/if} + {:else} + + + + {/if} {/if} - - {#if aPlace.hierarchy} - - {#each Object.keys(aPlace.hierarchy) as type} - - {#each aPlace.hierarchy[type] as line} - - {/each} - {/each} + + {#if api_request_params.hierarchy} + {#if aPlace.hierarchy && typeof (aPlace.hierarchy) === 'object' + && Object.keys(aPlace.hierarchy).length} + {#each Object.keys(aPlace.hierarchy) as type} + + {#each aPlace.hierarchy[type] as line} + + {/each} + {/each} - {#if Object.keys(aPlace.hierarchy) > 500} -

There are more child objects which are not shown.

+ {#if Object.keys(aPlace.hierarchy) > 500} +

There are more child objects which are not shown.

+ {/if} + {:else} + {/if} {:else} @@ -294,27 +288,19 @@ } tr.all-columns { - background-color: white !important; + background-color: white !important; border: none; } tr.all-columns td { border-top: none !important; padding-left: 0 !important; } - - .table { - width: 100%; - } - .table td { - font-size: 0.9em; - } - .table>thead>tr>th, .table>tbody>tr>td { - padding: 2px 8px; - } - .name{ - font-weight: bold; + :global(span.noname){ + color:#800; } + #map-wrapper { + position: relative; width:100%; min-height: auto; height:300px;
Local name

Linked Places

Linked Places

Keywords

Name Keywords

{formatKeywordToken(keyword.token)}word id: {keyword.id}

Keywords

Address Keywords

{formatKeywordToken(keyword.token)}word id: {keyword.id}

Name Keywords

{formatKeywordToken(keyword.token)}word id: {keyword.id}

Address Keywords

{formatKeywordToken(keyword.token)}word id: {keyword.id}
- display keywords -
Place has no keywords
+ display keywords +

Parent Of

{type}

Parent Of

{type}

Place is not parent of other places