upgrade Bootstrap 4 => 5, remove jquery (#146)

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

diff --git a/src/pages/DetailsPage.svelte b/src/pages/DetailsPage.svelte
index 9d729441e5b3ec993e0d2baf5218c957e7f28c87..baac1809e9c0eceba10507bdb0180309596a25d6 100644 (file)
--- a/src/pages/DetailsPage.svelte
+++ b/src/pages/DetailsPage.svelte
@@ -76,7 +76,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>


@@ -86,7 +86,7 @@
           <tbody>
             <InfoRow title="Name">
             {#if (Array.isArray(aPlace.names)) }
           <tbody>
             <InfoRow title="Name">
             {#if (Array.isArray(aPlace.names)) }

-              <span class="noname font-weight-bold">No Name</span>
+              <span class="noname fw-bold">No Name</span>

             {:else}
               <InfoRowList items={aPlace.names} />
             {/if}
             {:else}
               <InfoRowList items={aPlace.names} />
             {/if}


@@ -163,20 +163,11 @@
             {/if}
 
             <tr class="all-columns"><td colspan="6"><h2>Keywords</h2></td></tr>
             {/if}
 
             <tr class="all-columns"><td colspan="6"><h2>Keywords</h2></td></tr>

-            {#if aPlace.keywords}
-              <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 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 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}
                   <tr>
                     <td>{formatKeywordToken(keyword.token)}</td>
                     {#if keyword.id}


@@ -184,6 +175,20 @@
                     {/if}
                   </tr>
                 {/each}
                     {/if}
                   </tr>
                 {/each}

+
+                {#if aPlace.keywords.address}
+                  <tr class="all-columns"><td colspan="6"><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}
               <tr>
               {/if}
             {:else}
               <tr>


@@ -195,17 +200,20 @@
             {/if}
 
             <tr class="all-columns"><td colspan="6"><h2>Parent Of</h2></td></tr>
             {/if}
 
             <tr class="all-columns"><td colspan="6"><h2>Parent Of</h2></td></tr>

-            {#if aPlace.hierarchy}
-
-              {#each Object.keys(aPlace.hierarchy) as type}
-                <tr class="all-columns"><td colspan="6"><h3>{type}</h3></td></tr>
-                {#each aPlace.hierarchy[type] as line}
-                  <DetailsOneRow addressLine={line} bDistanceInMeters=true />
-               {/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}
+                  <tr class="all-columns"><td colspan="6"><h3>{type}</h3></td></tr>
+                  {#each aPlace.hierarchy[type] as line}
+                    <DetailsOneRow addressLine={line} bDistanceInMeters=true />
+                 {/each}
+                {/each}

 
 

-              {#if Object.keys(aPlace.hierarchy) > 500}
-                <p>There are more child objects which are not shown.</p>
+                {#if Object.keys(aPlace.hierarchy) > 500}
+                  <p>There are more child objects which are not shown.</p>
+                {/if}
+              {:else}
+                <tr><td>Place is not parent of other places</td></tr>

               {/if}
             {:else}
               <tr>
               {/if}
             {:else}
               <tr>