detailsURL helper which replaces detailsLink and detailsPermaLink

[nominatim-ui.git] / dist / deletable.html

diff --git a/dist/deletable.html b/dist/deletable.html
index f82ae809e3ab01286c6f7436c136d8319111b358..6ecc5fd04c72b9359520cafd628eb534d7959e65 100644 (file)
--- a/dist/deletable.html
+++ b/dist/deletable.html
@@ -5,8 +5,8 @@
   <title>OpenStreetMap Nominatim</title>
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
   <title>OpenStreetMap Nominatim</title>
   <meta name="viewport" content="width=device-width, initial-scale=1">
 

-  <link rel="icon" type="image/png" href="/assets/images/favicon-194x194.png" sizes="194x194" />
-  <link rel="icon" type="image/png" href="/assets/images/favicon-16x16.png" sizes="16x16" />
+  <link rel="icon" type="image/png" href="assets/images/favicon-194x194.png" sizes="194x194" />
+  <link rel="icon" type="image/png" href="assets/images/favicon-16x16.png" sizes="16x16" />

 
   <link href="assets/css/leaflet.css" rel="stylesheet" />
   <link href="assets/css/Control.MiniMap.min.css" rel="stylesheet" />
 
   <link href="assets/css/leaflet.css" rel="stylesheet" />
   <link href="assets/css/Control.MiniMap.min.css" rel="stylesheet" />


@@ -127,8 +127,7 @@
     <span class="type">({{formatLabel aResult}})</span>
     <p class="coords">{{aResult.lat}},{{aResult.lon}}</p>  
 
     <span class="type">({{formatLabel aResult}})</span>
     <p class="coords">{{aResult.lat}},{{aResult.lon}}</p>  
 

-    <a class="details btn btn-outline-secondary btn-sm"
-       href="details.html?osmtype={{shortOSMType aResult.osm_type}}&osmid={{aResult.osm_id}}">details</a>
+    <a class="details btn btn-outline-secondary btn-sm" href="{{detailsURL aResult}}">details</a>

   </div>
 {{/inline}}
 
   </div>
 {{/inline}}
 


@@ -261,8 +260,7 @@
     <span class="type">{{formatLabel aResult}}</span>
     <p class="coords">{{aResult.lat}},{{aResult.lon}}</p>  
 
     <span class="type">{{formatLabel aResult}}</span>
     <p class="coords">{{aResult.lat}},{{aResult.lon}}</p>  
 

-    <a class="details btn btn-outline-secondary btn-sm"
-       href="details.html?osmtype={{shortOSMType aResult.osm_type}}&osmid={{aResult.osm_id}}">details</a>
+    <a class="details btn btn-outline-secondary btn-sm" href="{{detailsURL aResult}}">details</a>

   </div>
 {{/inline}}
 
   </div>
 {{/inline}}
 


@@ -320,7 +318,7 @@
 <script id="detailspage-template" type="text/x-handlebars-template">
 
 {{#*inline "partial_details_one_row"}}
 <script id="detailspage-template" type="text/x-handlebars-template">
 
 {{#*inline "partial_details_one_row"}}

-  <tr class="{{#unless this.isaddress}}notused{{/unless}}">
+  <tr class="{{#unless bAddressLineUsed}}notused{{/unless}}">

     <td class="name">
       {{#if this.localname}}
         {{this.localname}}
     <td class="name">
       {{#if this.localname}}
         {{this.localname}}


@@ -333,7 +331,7 @@
     <td>{{this.rank_address}}</td>
     <td>{{formatAdminLevel this.admin_level}}</td>
     <td>{{formatDistance this.distance bDistanceInMeters}}</td>
     <td>{{this.rank_address}}</td>
     <td>{{formatAdminLevel this.admin_level}}</td>
     <td>{{formatDistance this.distance bDistanceInMeters}}</td>

-    <td>{{detailsPermaLink this 'details >'}}</td>
+    <td><a href="{{detailsURL this}}">details</td>

   </tr>
 {{/inline}}
 
   </tr>
 {{/inline}}
 


@@ -360,7 +358,7 @@
     <div class="col-sm-10">
       <h1>
         {{aPlace.localname}}
     <div class="col-sm-10">
       <h1>
         {{aPlace.localname}}

-        <small>{{detailsPermaLink aPlace 'link to this page'}}</small>
+        <small><a href="{{detailsURL aPlace}}">link to this page</a></small>

       </h1>
     </div>
     <div class="col-sm-2 text-right">
       </h1>
     </div>
     <div class="col-sm-2 text-right">


@@ -480,14 +478,14 @@
         <tbody>
           {{#if aPlace.address}}
             {{#each aPlace.address}}
         <tbody>
           {{#if aPlace.address}}
             {{#each aPlace.address}}

-              {{> partial_details_one_row bDistanceInMeters=false}}
+              {{> partial_details_one_row bDistanceInMeters=false bAddressLineUsed=this.isaddress}}

             {{/each}}
           {{/if}}
 
           {{#if aPlace.linked_places}}
             {{> partial_h2 'Linked Places'}}
             {{#each aPlace.linked_places}}
             {{/each}}
           {{/if}}
 
           {{#if aPlace.linked_places}}
             {{> partial_h2 'Linked Places'}}
             {{#each aPlace.linked_places}}

-              {{> partial_details_one_row bDistanceInMeters=true}}
+              {{> partial_details_one_row bDistanceInMeters=true bAddressLineUsed=true}}

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


@@ -509,7 +507,7 @@
             {{#each aPlace.hierarchy as |lines type|}}
               {{> partial_h3 type}}
               {{#each lines}}
             {{#each aPlace.hierarchy as |lines type|}}
               {{> partial_h3 type}}
               {{#each lines}}

-                {{> partial_details_one_row bDistanceInMeters=true}}
+                {{> partial_details_one_row bDistanceInMeters=true bAddressLineUsed=true}}

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


@@ -608,7 +606,7 @@
         <tbody>
           {{#each aPolygons}}
           <tr>
         <tbody>
           {{#each aPolygons}}
           <tr>

-            <td>{{detailsLink this place_id}}</td>
+            <td><a href="{{detailsURL this}}">{{this.place_id}}</a></td>

             <td>{{country_code}}</td>
             <td>{{name}}</td>
             <td>{{osmLink this}}</td>
             <td>{{country_code}}</td>
             <td>{{name}}</td>
             <td>{{osmLink this}}</td>