X-Git-Url: https://git.openstreetmap.org./nominatim-ui.git/blobdiff_plain/42f03f0660c5815d4a5faeb4a1c087f507ff59a0..ecea2eedea2d87492f28ca713c2c1a4b7382256c:/src/pages/DetailsPage.svelte?ds=inline diff --git a/src/pages/DetailsPage.svelte b/src/pages/DetailsPage.svelte index 585ce3b..e5325e2 100644 --- a/src/pages/DetailsPage.svelte +++ b/src/pages/DetailsPage.svelte @@ -4,21 +4,25 @@ 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 DetailsIndex from '../components/DetailsIndex.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 errorResponse; - let base_url = window.location.search; - let current_result; + let base_url; + let api_request_params; + let api_request_finished = false; function loaddata(search_params) { - var api_request_params = { + api_request_params = { place_id: search_params.get('place_id'), osmtype: search_params.get('osmtype'), osmid: search_params.get('osmid'), @@ -30,6 +34,7 @@ polygon_geojson: 1, format: 'json' }; + api_request_finished = false; if (api_request_params.place_id || (api_request_params.osmtype && api_request_params.osmid)) { @@ -41,146 +46,99 @@ fetch_from_api('details', api_request_params, function (data) { window.scrollTo(0, 0); - if (data.error) { - errorResponse = data; - current_result = undefined; - } else { - aPlace = data; - errorResponse = undefined; - current_result = data; - } + api_request_finished = true; + aPlace = (data && !data.error) ? data : undefined; }); } else { aPlace = undefined; } } + function place_has_keywords(aThisPlace) { + // Return false if Nominatim API sends 'keywords: { name: [], address: [] }' + return ( + aThisPlace.keywords && aThisPlace.keywords.name && aThisPlace.keywords.address + && (aThisPlace.keywords.name.length > 0 || aThisPlace.keywords.address.length > 0) + ); + } + $: { let pageinfo = $page; if (pageinfo.tab === 'details') { loaddata(pageinfo.params); + base_url = window.location.search; } } + $: reverse_only = Nominatim_Config.Reverse_Only; -{#if errorResponse} - {errorResponse.error.message} -{/if} -{#if aPlace} -
+
+ +
+ +
+ {#if aPlace}

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

-
+
- +
- - - - - - - - - - - - + + {#if (Array.isArray(aPlace.names)) } + No Name + {:else} + + {/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} -
- +
@@ -202,59 +160,71 @@ {#if aPlace.address} {#each aPlace.address as addressLine} - + {/each} {/if} {#if aPlace.linked_places} -

Linked Places

+

Linked Places

{#each aPlace.linked_places as addressLine} - + {/each} {/if} -

Keywords

- {#if aPlace.keywords} -

Name Keywords

- {#each aPlace.keywords.name as keyword} - - {formatKeywordToken(keyword.token)} - {#if keyword.id} - word id: {keyword.id} - {/if} - - {/each} + {#if !reverse_only} +

Keywords

+ {#if api_request_params.keywords} -

Address Keywords

- {#each aPlace.keywords.address as keyword} - - {formatKeywordToken(keyword.token)} - {#if keyword.id} - word id: {keyword.id} + {#if place_has_keywords(aPlace)} +

Name Keywords

+ {#each aPlace.keywords.name as keyword} + + {formatKeywordToken(keyword.token)} + {#if keyword.id} + word id: {keyword.id} + {/if} + + {/each} + + {#if aPlace.keywords.address} +

Address Keywords

+ {#each aPlace.keywords.address as keyword} + + {formatKeywordToken(keyword.token)} + {#if keyword.id} + word id: {keyword.id} + {/if} + + {/each} {/if} - - {/each} - {:else} - - - display keywords - - + {:else} + Place has no keywords + {/if} + {:else} + + + display keywords + + + {/if} {/if} -

Parent Of

- {#if aPlace.hierarchy} - - {#each Object.keys(aPlace.hierarchy) as type} -

{type}

- {#each aPlace.hierarchy[type] as line} - - {/each} - {/each} +

Parent Of

+ {#if api_request_params.hierarchy} + {#if aPlace.hierarchy && typeof (aPlace.hierarchy) === 'object' && Object.keys(aPlace.hierarchy).length} + {#each Object.keys(aPlace.hierarchy) as type} +

{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} + Place is not parent of other places {/if} {:else} @@ -268,12 +238,10 @@
-
-{:else if (window.location.search === '')} - -{:else} - No such place found. -{/if} + {:else if (window.location.search !== '' && api_request_finished)} + No such place found. + {/if} + @@ -306,20 +274,12 @@ 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;