test suite: http-proxy target was not set correctly

[nominatim-ui.git] / src / pages / DetailsPage.svelte

diff --git a/src/pages/DetailsPage.svelte b/src/pages/DetailsPage.svelte
index f824602bb732b3afd78331b9de5c259baaade800..225d1a0662ff81353acd063e5ee50ba337c493af 100644 (file)
--- a/src/pages/DetailsPage.svelte
+++ b/src/pages/DetailsPage.svelte
@@ -54,6 +54,15 @@
     }
   }
 
     }
   }
 

+  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)
+    );
+  }
+

   $: {
     let pageinfo = $page;
     if (pageinfo.tab === 'details') {
   $: {
     let pageinfo = $page;
     if (pageinfo.tab === 'details') {


@@ -61,6 +70,7 @@
       base_url = window.location.search;
     }
   }
       base_url = window.location.search;
     }
   }

+  $: reverse_only = Nominatim_Config.Reverse_Only;

 </script>
 
 <Header>
 </script>
 
 <Header>


@@ -76,7 +86,7 @@
           <small><DetailsLink feature={aPlace}>link to this page</DetailsLink></small>
         </h1>
       </div>
           <small><DetailsLink feature={aPlace}>link to this page</DetailsLink></small>
         </h1>
       </div>

-      <div class="col-sm-2 text-right">
+      <div class="col-sm-2 text-end">

         <MapIcon aPlace={aPlace} />
       </div>
     </div>
         <MapIcon aPlace={aPlace} />
       </div>
     </div>


@@ -85,10 +95,11 @@
         <table id="locationdetails" class="table table-striped table-responsive">
           <tbody>
             <InfoRow title="Name">
         <table id="locationdetails" class="table table-striped table-responsive">
           <tbody>
             <InfoRow title="Name">

-            {#if (Array.isArray(aPlace.names)) }
-              <span class="noname font-weight-bold">No Name</span>
-            {:else}
+            {#if aPlace.names && typeof (aPlace.names) === 'object'
+              && Object.keys(aPlace.names).length}

               <InfoRowList items={aPlace.names} />
               <InfoRowList items={aPlace.names} />

+            {:else}
+              <span class="noname fw-bold">No Name</span>

             {/if}
             </InfoRow>
             <InfoRow title="Type">{aPlace.category}:{aPlace.type}</InfoRow>
             {/if}
             </InfoRow>
             <InfoRow title="Type">{aPlace.category}:{aPlace.type}</InfoRow>


@@ -97,7 +108,9 @@
               <InfoRow title="Admin Level">{aPlace.admin_level}</InfoRow>
             {/if}
             <InfoRow title="Search Rank">{aPlace.rank_search}</InfoRow>
               <InfoRow title="Admin Level">{aPlace.admin_level}</InfoRow>
             {/if}
             <InfoRow title="Search Rank">{aPlace.rank_search}</InfoRow>

-            <InfoRow title="Address Rank">{aPlace.rank_address} ({formatAddressRank(aPlace.rank_address)})</InfoRow>
+            <InfoRow title="Address Rank">
+              {aPlace.rank_address} ({formatAddressRank(aPlace.rank_address)})
+            </InfoRow>

             {#if aPlace.calculated_importance}
               <InfoRow title="Importance">
                   {aPlace.calculated_importance}
             {#if aPlace.calculated_importance}
               <InfoRow title="Importance">
                   {aPlace.calculated_importance}


@@ -108,18 +121,24 @@
             <InfoRow title="Centre Point (lat,lon)">
                 {aPlace.centroid.coordinates[1]},{aPlace.centroid.coordinates[0]}
             </InfoRow>
             <InfoRow title="Centre Point (lat,lon)">
                 {aPlace.centroid.coordinates[1]},{aPlace.centroid.coordinates[0]}
             </InfoRow>

+            <!-- eslint-disable-next-line svelte/no-at-html-tags -->

             <InfoRow title="OSM">{@html osmLink(aPlace)}</InfoRow>
             <InfoRow title="Place Id">
                {aPlace.place_id}
             <InfoRow title="OSM">{@html osmLink(aPlace)}</InfoRow>
             <InfoRow title="Place Id">
                {aPlace.place_id}

-               (<a href="https://nominatim.org/release-docs/develop/api/Output/#place_id-is-not-a-persistent-id">on this server</a>)
+               (<a href="https://nominatim.org/release-docs/develop/api/Output/#place_id-is-not-a-persistent-id">
+                 on this server
+               </a>)

             </InfoRow>
             {#if aPlace.calculated_wikipedia}
             </InfoRow>
             {#if aPlace.calculated_wikipedia}

+              <!-- eslint-disable-next-line svelte/no-at-html-tags -->

               <InfoRow title="Wikipedia Calculated">{@html wikipediaLink(aPlace)}</InfoRow>
             {/if}
             <InfoRow title="Computed Postcode">
               {#if aPlace.calculated_postcode}
                 {aPlace.calculated_postcode}
               <InfoRow title="Wikipedia Calculated">{@html wikipediaLink(aPlace)}</InfoRow>
             {/if}
             <InfoRow title="Computed Postcode">
               {#if aPlace.calculated_postcode}
                 {aPlace.calculated_postcode}

-                <DetailsPostcodeHint postcode={aPlace.calculated_postcode} lat={aPlace.centroid.coordinates[1]} lon={aPlace.centroid.coordinates[0]} />
+                <DetailsPostcodeHint postcode={aPlace.calculated_postcode}
+                                     lat={aPlace.centroid.coordinates[1]}
+                                     lon={aPlace.centroid.coordinates[0]} />

               {/if}
             </InfoRow>
             <InfoRow title="Address Tags"><InfoRowList items={aPlace.addresstags} /></InfoRow>
               {/if}
             </InfoRow>
             <InfoRow title="Address Tags"><InfoRowList items={aPlace.addresstags} /></InfoRow>


@@ -151,34 +170,28 @@
           <tbody>
             {#if aPlace.address}
               {#each aPlace.address as addressLine}
           <tbody>
             {#if aPlace.address}
               {#each aPlace.address as addressLine}

-                <DetailsOneRow addressLine={addressLine} bMarkUnusedLines=true bDistanceInMeters=false />
+                <DetailsOneRow addressLine={addressLine}
+                               bMarkUnusedLines={true}
+                               bDistanceInMeters={false} />

               {/each}
             {/if}
 
             {#if aPlace.linked_places}
               {/each}
             {/if}
 
             {#if aPlace.linked_places}

-              <tr class="all-columns"><td colspan="6"><h2>Linked Places</h2></td></tr>
+              <tr class="all-columns"><td colspan="7"><h2>Linked Places</h2></td></tr>

               {#each aPlace.linked_places as addressLine}
               {#each aPlace.linked_places as addressLine}

-                <DetailsOneRow addressLine={addressLine} bMarkUnusedLines=true bDistanceInMeters=true />
+                <DetailsOneRow addressLine={addressLine}
+                               bMarkUnusedLines={true}
+                               bDistanceInMeters={true} />

               {/each}
             {/if}
 
               {/each}
             {/if}
 

-            <tr class="all-columns"><td colspan="6"><h2>Keywords</h2></td></tr>
-            {#if api_request_params.keywords}
-
-              {#if aPlace.keywords && (aPlace.keywords.name || aPlace.keywords.address) }
-                <tr class="all-columns"><td colspan="6"><h3>Name Keywords</h3></td></tr>
-                {#each aPlace.keywords.name as keyword}
-                  <tr>
-                    <td>{formatKeywordToken(keyword.token)}</td>
-                    {#if keyword.id}
-                      <td>word id: {keyword.id}</td>
-                    {/if}
-                  </tr>
-                {/each}
+            {#if !reverse_only}
+              <tr class="all-columns"><td colspan="7"><h2>Keywords</h2></td></tr>
+              {#if api_request_params.keywords}

 
 

-                {#if aPlace.keywords.address}
-                  <tr class="all-columns"><td colspan="6"><h3>Address Keywords</h3></td></tr>
-                  {#each aPlace.keywords.address as keyword}
+                {#if place_has_keywords(aPlace)}
+                  <tr class="all-columns"><td colspan="7"><h3>Name Keywords</h3></td></tr>
+                  {#each aPlace.keywords.name as keyword}

                     <tr>
                       <td>{formatKeywordToken(keyword.token)}</td>
                       {#if keyword.id}
                     <tr>
                       <td>{formatKeywordToken(keyword.token)}</td>
                       {#if keyword.id}


@@ -186,26 +199,39 @@
                       {/if}
                     </tr>
                   {/each}
                       {/if}
                     </tr>
                   {/each}

+
+                  {#if aPlace.keywords.address}
+                    <tr class="all-columns"><td colspan="7"><h3>Address Keywords</h3></td></tr>
+                    {#each aPlace.keywords.address as keyword}
+                      <tr>
+                        <td>{formatKeywordToken(keyword.token)}</td>
+                        {#if keyword.id}
+                          <td>word id: {keyword.id}</td>
+                        {/if}
+                      </tr>
+                    {/each}
+                  {/if}
+                {:else}
+                  <tr><td>Place has no keywords</td></tr>

                 {/if}
               {:else}
                 {/if}
               {:else}

-                <tr><td>Place has no keywords</td></tr>
+                <tr>
+                  <td>
+                     <a class="btn btn-outline-secondary btn-sm"
+                      href="{base_url}&keywords=1">display keywords</a>
+                  </td>
+                </tr>

               {/if}
               {/if}

-            {:else}
-              <tr>
-                <td>
-                   <a class="btn btn-outline-secondary btn-sm"
-                    href="{base_url}&keywords=1">display keywords</a>
-                </td>
-              </tr>

             {/if}
 
             {/if}
 

-            <tr class="all-columns"><td colspan="6"><h2>Parent Of</h2></td></tr>
+            <tr class="all-columns"><td colspan="7"><h2>Parent Of</h2></td></tr>

             {#if api_request_params.hierarchy}
             {#if api_request_params.hierarchy}

-              {#if aPlace.hierarchy && typeof (aPlace.hierarchy) === 'object' && Object.keys(aPlace.hierarchy).length}
+              {#if aPlace.hierarchy && typeof (aPlace.hierarchy) === 'object'
+                && Object.keys(aPlace.hierarchy).length}

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

-                  <tr class="all-columns"><td colspan="6"><h3>{type}</h3></td></tr>
+                  <tr class="all-columns"><td colspan="7"><h3>{type}</h3></td></tr>

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

-                    <DetailsOneRow addressLine={line} bDistanceInMeters=true />
+                    <DetailsOneRow addressLine={line} bDistanceInMeters={true} />

                  {/each}
                 {/each}
 
                  {/each}
                 {/each}
 


@@ -256,7 +282,7 @@
   }
 
   tr.all-columns {
   }
 
   tr.all-columns {

-    background-color: white !important; 
+    background-color: white !important;

     border: none;
   }
   tr.all-columns td {
     border: none;
   }
   tr.all-columns td {


@@ -268,6 +294,7 @@
   }
 
   #map-wrapper {
   }
 
   #map-wrapper {

+    position: relative;

     width:100%;
     min-height: auto;
     height:300px;
     width:100%;
     min-height: auto;
     height:300px;