]> git.openstreetmap.org Git - nominatim-ui.git/commitdiff
update /dist after eslint fixes
authormarc tobias <mtmail@gmx.net>
Sun, 23 Feb 2020 02:18:16 +0000 (03:18 +0100)
committermarc tobias <mtmail@gmx.net>
Sun, 23 Feb 2020 02:18:16 +0000 (03:18 +0100)
TODO.md
dist/assets/js/nominatim-ui.js
dist/details.html
dist/detailspage-index.hbs
dist/detailspage.hbs
dist/handlebar_helpers.js
dist/reverse.html
dist/reversepage.hbs
dist/search.html
dist/searchpage.hbs

diff --git a/TODO.md b/TODO.md
index 5e2a2959d2bc9b9b561c99c755a68b89ffb88a9e..0a07f6786fbf23808e9de3be7e4bf83dced1a3bd 100644 (file)
--- a/TODO.md
+++ b/TODO.md
@@ -1,7 +1,5 @@
 # TODO list
 
-* check output of /dist into repository?
-
 
 ## Might never work
 
 
 ## Nice-to-have
 
-* support nearlat,nearlon parameters
 * should images/mapicons/ be served from API server or this repo?
-* different content for official OSM, e.g. github urls
 * cache `update_data_date` result somehow?
 * a new search causes a new pageview
 * add tests with fixtures
-* detailpage: make linkedplaces, childplaces optional (rarely used? second click to enable?)
 * set better alt tag for icons
 * print text "loading..." instead of an error (which the user sees for a split second)
 * concatenate/minify JS and CSS
index 3e651561294e9e5216d9c63ec9a26b0314fefd4f..4101705517a1b6b6359d4f6deb9c19ba307c7e2a 100644 (file)
@@ -62,9 +62,14 @@ function map_viewbox_as_string() {
 
 function fetch_from_api(endpoint_name, params, callback) {
   // `&a=&b=&c=1` => '&c='
-  for (var k in params) {
-    if (typeof (params[k]) === 'undefined' || params[k] === '' || params[k] === null) {
-      delete params[k];
+  // fetch_from_api
+
+  // var c = ;
+  var keys = Object.keys(params);
+  for (var i = 0; i < keys.length; i += 1) {
+    var val = params[keys[i]];
+    if (typeof (val) === 'undefined' || val === '' || val === null) {
+      delete params[keys[i]];
     }
   }
 
index 8aa00cd68f6de02e54822ce6c9be7515ac53ad29..d22be818acdf32e1a871709f5e44d7a15f5e5d9a 100644 (file)
 <div class="container">
   <div class="row">
     <div class="col-sm-10">
-      <h1>{{aPlace.localname}} <small>{{detailsPermaLink aPlace 'link to this page'}}</small></h1>
+      <h1>
+        {{aPlace.localname}}
+        <small>{{detailsPermaLink aPlace 'link to this page'}}</small>
+      </h1>
     </div>
     <div class="col-sm-2 text-right">
       {{formatMapIcon aPlace.icon}}
           <td>Name</td>
           <td>
             {{#each aPlace.names}}
-              <div class="line"><span class="name">{{this}}</span> ({{@key}})</div>
+              <div class="line">
+                <span class="name">{{this}}</span> ({{@key}})
+              </div>
             {{/each}}
           </td>
         </tr>
         </tr>
         <tr>
           <td>Centre Point (lat,lon)</td>
-          <td>{{aPlace.centroid.coordinates.[1]}},{{aPlace.centroid.coordinates.[0]}}</td>
+          <td>
+            {{aPlace.centroid.coordinates.[1]}},{{aPlace.centroid.coordinates.[0]}}
+          </td>
         </tr>
         <tr>
           <td>OSM</td>
           <td>{{osmLink aPlace}}
         </tr>
         <tr>
-          <td>Place Id (<a href="https://nominatim.org/release-docs/develop/api/Output/#place_id-is-not-a-persistent-id">on this server</a>)</td>
+          <td>
+            Place Id
+            (<a href="https://nominatim.org/release-docs/develop/api/Output/#place_id-is-not-a-persistent-id">on this server</a>)
+          </td>
           <td>{{aPlace.place_id}}</td>
         </tr>
         {{#if aPlace.calculated_wikipedia}}
           <td>Address Tags</td>
           <td>
             {{#each aPlace.addresstags}}
-              <div class="line"><span class="name">{{this}}</span> ({{@key}})</div>
+              <div class="line">
+                <span class="name">{{this}}</span> ({{@key}})
+              </div>
             {{/each}}
           </td>
         </tr>
           <td>Extra Tags</td>
           <td>
             {{#each aPlace.extratags}}
-              <div class="line"><span class="name">{{this}}</span> ({{@key}})</div>
+              <div class="line">
+                <span class="name">{{this}}</span> ({{@key}})
+              </div>
             {{/each}}
           </td>
         </tr>
           {{else}}
             <tr>
               <td>
-                <a class="btn btn-default btn-xs" href="{{base_url}}&hierarchy=1">display child places</a>
+                <a class="btn btn-default btn-xs"
+                  href="{{base_url}}&hierarchy=1">display child places</a>
               </td>
             </tr>
           {{/if}}
         <h4>Search by place id</h4>
 
         <form class="form-inline" action="details.html">
-          <input type="edit" class="form-control input-sm" pattern="^[0-9]+$" name="place_id" placeholder="12345" />
-          <input type="submit" class="btn btn-primary btn-sm" value="Show" />
+          <input type="edit"
+                 class="form-control input-sm"
+                 pattern="^[0-9]+$"
+                 name="place_id"
+                 placeholder="12345" />
+          <input type="submit"
+                 class="btn btn-primary btn-sm"
+                 value="Show" />
         </form>
       </div>
 
       <div class="search-form">
         <h4>Search by OSM type and OSM id</h4>
 
-        <form id="form-by-type-and-id" class="form-inline" action="details.html">
-          <input type="edit" class="form-control input-sm" pattern="^[NWR][0-9]+$" placeholder="N123 or W123 or R123" />
+        <form id="form-by-type-and-id"
+              class="form-inline"
+              action="details.html">
+          <input type="edit"
+                 class="form-control input-sm"
+                 pattern="^[NWR][0-9]+$"
+                 placeholder="N123 or W123 or R123" />
           <input type="hidden" name="osmtype" />
           <input type="hidden" name="osmid" />
           <input type="submit" class="btn btn-primary btn-sm" value="Show" />
       <div class="search-form">
         <h4>Search by openstreetmap.org URL</h4>
 
-        <form id="form-by-osm-url" class="form-inline" action="details.html">
-          <input type="edit" class="form-control input-sm" pattern=".*openstreetmap.*" placeholder="https://www.openstreetmap.org/relation/123" />
+        <form id="form-by-osm-url"
+              class="form-inline"
+              action="details.html">
+          <input type="edit"
+                 class="form-control input-sm"
+                 pattern=".*openstreetmap.*"
+                 placeholder="https://www.openstreetmap.org/relation/123" />
           <input type="hidden" name="osmtype" />
           <input type="hidden" name="osmid" />
           <input type="submit" class="btn btn-primary btn-sm" value="Show" />
index b2ecf7de8963a9b5cb70fce564dd7c577c70b04e..c81d525223bcfe9de1d0a877aa39a29b2632f311 100644 (file)
@@ -8,16 +8,27 @@
         <h4>Search by place id</h4>
 
         <form class="form-inline" action="details.html">
-          <input type="edit" class="form-control input-sm" pattern="^[0-9]+$" name="place_id" placeholder="12345" />
-          <input type="submit" class="btn btn-primary btn-sm" value="Show" />
+          <input type="edit"
+                 class="form-control input-sm"
+                 pattern="^[0-9]+$"
+                 name="place_id"
+                 placeholder="12345" />
+          <input type="submit"
+                 class="btn btn-primary btn-sm"
+                 value="Show" />
         </form>
       </div>
 
       <div class="search-form">
         <h4>Search by OSM type and OSM id</h4>
 
-        <form id="form-by-type-and-id" class="form-inline" action="details.html">
-          <input type="edit" class="form-control input-sm" pattern="^[NWR][0-9]+$" placeholder="N123 or W123 or R123" />
+        <form id="form-by-type-and-id"
+              class="form-inline"
+              action="details.html">
+          <input type="edit"
+                 class="form-control input-sm"
+                 pattern="^[NWR][0-9]+$"
+                 placeholder="N123 or W123 or R123" />
           <input type="hidden" name="osmtype" />
           <input type="hidden" name="osmid" />
           <input type="submit" class="btn btn-primary btn-sm" value="Show" />
       <div class="search-form">
         <h4>Search by openstreetmap.org URL</h4>
 
-        <form id="form-by-osm-url" class="form-inline" action="details.html">
-          <input type="edit" class="form-control input-sm" pattern=".*openstreetmap.*" placeholder="https://www.openstreetmap.org/relation/123" />
+        <form id="form-by-osm-url"
+              class="form-inline"
+              action="details.html">
+          <input type="edit"
+                 class="form-control input-sm"
+                 pattern=".*openstreetmap.*"
+                 placeholder="https://www.openstreetmap.org/relation/123" />
           <input type="hidden" name="osmtype" />
           <input type="hidden" name="osmid" />
           <input type="submit" class="btn btn-primary btn-sm" value="Show" />
index 8f9ff76af9e54b9dd26902c30636897369075f39..929cf718bed813bc6b1fcf79c6ea2f544ad3b1b4 100644 (file)
 <div class="container">
   <div class="row">
     <div class="col-sm-10">
-      <h1>{{aPlace.localname}} <small>{{detailsPermaLink aPlace 'link to this page'}}</small></h1>
+      <h1>
+        {{aPlace.localname}}
+        <small>{{detailsPermaLink aPlace 'link to this page'}}</small>
+      </h1>
     </div>
     <div class="col-sm-2 text-right">
       {{formatMapIcon aPlace.icon}}
@@ -51,7 +54,9 @@
           <td>Name</td>
           <td>
             {{#each aPlace.names}}
-              <div class="line"><span class="name">{{this}}</span> ({{@key}})</div>
+              <div class="line">
+                <span class="name">{{this}}</span> ({{@key}})
+              </div>
             {{/each}}
           </td>
         </tr>
         </tr>
         <tr>
           <td>Centre Point (lat,lon)</td>
-          <td>{{aPlace.centroid.coordinates.[1]}},{{aPlace.centroid.coordinates.[0]}}</td>
+          <td>
+            {{aPlace.centroid.coordinates.[1]}},{{aPlace.centroid.coordinates.[0]}}
+          </td>
         </tr>
         <tr>
           <td>OSM</td>
           <td>{{osmLink aPlace}}
         </tr>
         <tr>
-          <td>Place Id (<a href="https://nominatim.org/release-docs/develop/api/Output/#place_id-is-not-a-persistent-id">on this server</a>)</td>
+          <td>
+            Place Id
+            (<a href="https://nominatim.org/release-docs/develop/api/Output/#place_id-is-not-a-persistent-id">on this server</a>)
+          </td>
           <td>{{aPlace.place_id}}</td>
         </tr>
         {{#if aPlace.calculated_wikipedia}}
           <td>Address Tags</td>
           <td>
             {{#each aPlace.addresstags}}
-              <div class="line"><span class="name">{{this}}</span> ({{@key}})</div>
+              <div class="line">
+                <span class="name">{{this}}</span> ({{@key}})
+              </div>
             {{/each}}
           </td>
         </tr>
           <td>Extra Tags</td>
           <td>
             {{#each aPlace.extratags}}
-              <div class="line"><span class="name">{{this}}</span> ({{@key}})</div>
+              <div class="line">
+                <span class="name">{{this}}</span> ({{@key}})
+              </div>
             {{/each}}
           </td>
         </tr>
           {{else}}
             <tr>
               <td>
-                <a class="btn btn-default btn-xs" href="{{base_url}}&hierarchy=1">display child places</a>
+                <a class="btn btn-default btn-xs"
+                  href="{{base_url}}&hierarchy=1">display child places</a>
               </td>
             </tr>
           {{/if}}
index 358ac36ae54613406eda4c363c1efa81acef0b86..e233eb97f5c06665ac775f533a1b22ea03fc4052 100644 (file)
@@ -1,3 +1,5 @@
+'use strict';
+
 function formatOSMType(sType, bExcludeExternal) {
   if (sType === 'N') return 'node';
   if (sType === 'W') return 'way';
@@ -12,7 +14,7 @@ function formatOSMType(sType, bExcludeExternal) {
 }
 
 Handlebars.registerHelper({
-  shortOSMType: function(sType) {
+  shortOSMType: function (sType) {
     if (sType === 'node') return 'N';
     if (sType === 'way') return 'W';
     if (sType === 'relation') return 'R';
@@ -99,7 +101,7 @@ Handlebars.registerHelper({
     return (iLevel < 15 ? iLevel : '');
   },
   formatMapIcon: function (sIcon) {
-    if (!sIcon) return;
+    if (!sIcon) return '';
 
     var url = sIcon;
     if (!url.match(/^http/)) url = get_config_value('Images_Base_Url') + url;
@@ -117,7 +119,8 @@ Handlebars.registerHelper({
 
     if (aPlace.type && aPlace.type === 'yes' && aPlace.class) {
       return capitalize(aPlace.class.replace(/_/g, ' '));
-    } else if (aPlace.type) {
+    }
+    if (aPlace.type) {
       return capitalize(aPlace.type.replace(/_/g, ' '));
     }
     return '';
@@ -146,13 +149,10 @@ Handlebars.registerHelper({
     return 'other: ' + iRank;
   },
   tooManyHierarchyLinesWarning: function (aPlace) {
-    if (!aPlace.hierarchy) return;
+    if (!aPlace.hierarchy) return '';
 
-    var c = 0;
-    for (var type in aPlace.hierarchy) {
-      c = c + type.length + 1;
-    }
-    if (c < 500) return;
+    var c = Object.keys(aPlace.hierarchy);
+    if (c < 500) return '';
 
     return new Handlebars.SafeString(
       '<p>There are more child objects which are not shown.</p>'
@@ -186,7 +186,9 @@ Handlebars.registerHelper({
 
     var select = $('<select>');
     var option = jQuery('<option>', { value: '', text: '--' });
-    if (typeof (iSelectedZoom) === 'undefined') option.attr('selected', 'selected');
+    if (typeof (iSelectedZoom) === 'undefined') {
+      option.attr('selected', 'selected');
+    }
     option.appendTo(select);
 
     jQuery.each(aZoomLevels, function (i, title) {
index e472719c67d7675a48afab94a991b04f63ee4d5b..390a812a9154548fd5184d2c602753e4dded0d29 100644 (file)
     <span class="type">{{formatLabel aResult}}</span>
     <p class="coords">{{aResult.lat}},{{aResult.lon}}</p>  
 
-    <a class="btn btn-default btn-xs details" href="details.html?osmtype={{shortOSMType aResult.osm_type}}&osmid={{aResult.osm_id}}">details</a>
+    <a class="btn btn-default btn-xs details"
+       href="details.html?osmtype={{shortOSMType aResult.osm_type}}&osmid={{aResult.osm_id}}">details</a>
   </div>
 {{/inline}}
 
 <form class="form-inline" role="search" accept-charset="UTF-8" action="">
   <div class="form-group">
     <input name="format" type="hidden" value="html">
-    <input name="lat" type="text" class="form-control input-sm" placeholder="latitude"  value="{{fLat}}">
+    <input name="lat"
+           type="text"
+           class="form-control input-sm"
+           placeholder="latitude"
+           value="{{fLat}}" />
     <span id="switch-coords">&lt;&gt;</span>
-    <input name="lon" type="text" class="form-control input-sm" placeholder="longitude" value="{{fLon}}">
+    <input name="lon"
+           type="text"
+           class="form-control input-sm"
+           placeholder="longitude"
+           value="{{fLon}}" />
     max zoom
     <select name="zoom" class="form-control input-sm" value="{{iZoom}}">
       {{zoomLevels iZoom}}
     </select>
   </div>
   <div class="form-group search-button-group">
-    <button type="submit" class="btn btn-primary btn-sm">Search</button>
+    <button type="submit" class="btn btn-primary btn-sm">
+      Search
+    </button>
   </div>
   <div class="search-type-link">
     <a href="/search.html">forward search</a>
index 80bd4bc8459325a3cc2995b9b4acaa3076b5dc4f..43c60f3c56669c1dfab1e36c3277b2d9720d17c2 100644 (file)
     <span class="type">{{formatLabel aResult}}</span>
     <p class="coords">{{aResult.lat}},{{aResult.lon}}</p>  
 
-    <a class="btn btn-default btn-xs details" href="details.html?osmtype={{shortOSMType aResult.osm_type}}&osmid={{aResult.osm_id}}">details</a>
+    <a class="btn btn-default btn-xs details"
+       href="details.html?osmtype={{shortOSMType aResult.osm_type}}&osmid={{aResult.osm_id}}">details</a>
   </div>
 {{/inline}}
 
 <form class="form-inline" role="search" accept-charset="UTF-8" action="">
   <div class="form-group">
     <input name="format" type="hidden" value="html">
-    <input name="lat" type="text" class="form-control input-sm" placeholder="latitude"  value="{{fLat}}">
+    <input name="lat"
+           type="text"
+           class="form-control input-sm"
+           placeholder="latitude"
+           value="{{fLat}}" />
     <span id="switch-coords">&lt;&gt;</span>
-    <input name="lon" type="text" class="form-control input-sm" placeholder="longitude" value="{{fLon}}">
+    <input name="lon"
+           type="text"
+           class="form-control input-sm"
+           placeholder="longitude"
+           value="{{fLon}}" />
     max zoom
     <select name="zoom" class="form-control input-sm" value="{{iZoom}}">
       {{zoomLevels iZoom}}
     </select>
   </div>
   <div class="form-group search-button-group">
-    <button type="submit" class="btn btn-primary btn-sm">Search</button>
+    <button type="submit" class="btn btn-primary btn-sm">
+      Search
+    </button>
   </div>
   <div class="search-type-link">
     <a href="/search.html">forward search</a>
index 8decc7acb8dad2be4e89f46740be37cc2f0b6126..1e2fab82b003c97f3f474a1ce80816ddb4da305b 100644 (file)
     <span class="type">({{formatLabel aResult}})</span>
     <p class="coords">{{aResult.lat}},{{aResult.lon}}</p>  
 
-    <a class="btn btn-default btn-xs details" href="details.html?osmtype={{shortOSMType aResult.osm_type}}&osmid={{aResult.osm_id}}">details</a>
+    <a class="btn btn-default btn-xs details"
+       href="details.html?osmtype={{shortOSMType aResult.osm_type}}&osmid={{aResult.osm_id}}">details</a>
   </div>
 {{/inline}}
 
 
 <form class="form-inline" role="search" accept-charset="UTF-8" action="">
   <div class="form-group">
-    <input id="q" name="q" type="text" class="form-control input-sm" placeholder="Search" value="{{sQuery}}">
+    <input id="q"
+           name="q"
+           type="text"
+           class="form-control input-sm"
+           placeholder="Search"
+           value="{{sQuery}}" />
   </div>
   <div class="form-group search-button-group">
     <button type="submit" class="btn btn-primary btn-sm">Search</button>
     {{/if}}
     <input type="hidden" name="viewbox" value="{{sViewBox}}" />
     <div class="checkbox-inline">
-      <input type="checkbox" id="use_viewbox" {{#if sViewBox}}checked="checked"{{/if}}>
+      <input type="checkbox"
+             id="use_viewbox" {{#if sViewBox}}checked="checked"{{/if}}>
       <label for="use_viewbox">apply viewbox</label>
     </div>
   </div>
       {{#if aSearchResults}}
         {{#if sMoreURL}}
           <div class="more">
-            <a class="btn btn-primary" href="{{sMoreURL}}">Search for more results</a>
+            <a class="btn btn-primary" href="{{sMoreURL}}">
+              Search for more results
+            </a>
           </div>
         {{/if}}
       {{else}}
     <div id="intro" class="sidebar">
       <h2>Welcome to Nominatim</h2>
 
-      <p>Nominatim is a search engine for <a href="https://www.openstreetmap.org">OpenStreetMap</a>
-      data. This is the debugging interface. You may search for a name or address(forward search) or
-      look up data by its geographic coordinate(reverse search). Each result comes with a
-      link to a details page where you can inspect what data about the object is saved in 
-      the database and investigate how the address of the object has been computed.</p>
-
-      For more information visit the <a href="https://nominatim.org">Nominatim home page</a>.
+      <p>
+        Nominatim is a search engine for
+        <a href="https://www.openstreetmap.org">OpenStreetMap</a> data. This
+        is the debugging interface. You may search for a name or address
+        (forward search) or look up data by its geographic coordinate (reverse
+        search). Each result comes with a link to a details page where you
+        can inspect what data about the object is saved in the database and
+        investigate how the address of the object has been computed.
+      </p>
+
+      For more information visit the
+      <a href="https://nominatim.org">Nominatim home page</a>.
     </div>
 
   {{/if}}
index 8516f0883e939d913734e8a07d8ad01b6d2dd470..a4c220d7e97d6671e8af8cba00a45bcdd0c18600 100644 (file)
@@ -9,14 +9,20 @@
     <span class="type">({{formatLabel aResult}})</span>
     <p class="coords">{{aResult.lat}},{{aResult.lon}}</p>  
 
-    <a class="btn btn-default btn-xs details" href="details.html?osmtype={{shortOSMType aResult.osm_type}}&osmid={{aResult.osm_id}}">details</a>
+    <a class="btn btn-default btn-xs details"
+       href="details.html?osmtype={{shortOSMType aResult.osm_type}}&osmid={{aResult.osm_id}}">details</a>
   </div>
 {{/inline}}
 
 
 <form class="form-inline" role="search" accept-charset="UTF-8" action="">
   <div class="form-group">
-    <input id="q" name="q" type="text" class="form-control input-sm" placeholder="Search" value="{{sQuery}}">
+    <input id="q"
+           name="q"
+           type="text"
+           class="form-control input-sm"
+           placeholder="Search"
+           value="{{sQuery}}" />
   </div>
   <div class="form-group search-button-group">
     <button type="submit" class="btn btn-primary btn-sm">Search</button>
@@ -25,7 +31,8 @@
     {{/if}}
     <input type="hidden" name="viewbox" value="{{sViewBox}}" />
     <div class="checkbox-inline">
-      <input type="checkbox" id="use_viewbox" {{#if sViewBox}}checked="checked"{{/if}}>
+      <input type="checkbox"
+             id="use_viewbox" {{#if sViewBox}}checked="checked"{{/if}}>
       <label for="use_viewbox">apply viewbox</label>
     </div>
   </div>
@@ -45,7 +52,9 @@
       {{#if aSearchResults}}
         {{#if sMoreURL}}
           <div class="more">
-            <a class="btn btn-primary" href="{{sMoreURL}}">Search for more results</a>
+            <a class="btn btn-primary" href="{{sMoreURL}}">
+              Search for more results
+            </a>
           </div>
         {{/if}}
       {{else}}
     <div id="intro" class="sidebar">
       <h2>Welcome to Nominatim</h2>
 
-      <p>Nominatim is a search engine for <a href="https://www.openstreetmap.org">OpenStreetMap</a>
-      data. This is the debugging interface. You may search for a name or address(forward search) or
-      look up data by its geographic coordinate(reverse search). Each result comes with a
-      link to a details page where you can inspect what data about the object is saved in 
-      the database and investigate how the address of the object has been computed.</p>
+      <p>
+        Nominatim is a search engine for
+        <a href="https://www.openstreetmap.org">OpenStreetMap</a> data. This
+        is the debugging interface. You may search for a name or address
+        (forward search) or look up data by its geographic coordinate (reverse
+        search). Each result comes with a link to a details page where you
+        can inspect what data about the object is saved in the database and
+        investigate how the address of the object has been computed.
+      </p>
 
-      For more information visit the <a href="https://nominatim.org">Nominatim home page</a>.
+      For more information visit the
+      <a href="https://nominatim.org">Nominatim home page</a>.
     </div>
 
   {{/if}}