details page: addressline.isaddress is a boolean, not t/f string

[nominatim-ui.git] / src / handlebar_helpers.js

diff --git a/src/handlebar_helpers.js b/src/handlebar_helpers.js
index 7b69d63d9298d7f4819ad444ff7fb50ae9b51aa7..7af3384df441c4818086e8d270bf6c2555ef7aa4 100644 (file)
--- a/src/handlebar_helpers.js
+++ b/src/handlebar_helpers.js
@@ -1,24 +1,28 @@
-function formatOSMType(sType, bExcludeExternal)
-{
-  if (sType == 'N') return 'node';
-  if (sType == 'W') return 'way';
-  if (sType == 'R') return 'relation';
+'use strict';
+
+function formatOSMType(sType, bExcludeExternal) {
+  if (sType === 'N') return 'node';
+  if (sType === 'W') return 'way';
+  if (sType === 'R') return 'relation';

 
   if (!bExcludeExternal) return '';
 
 
   if (!bExcludeExternal) return '';
 

-  if (sType == 'T') return 'way';
-  if (sType == 'I') return 'way';
+  if (sType === 'T') return 'way';
+  if (sType === 'I') return 'way';

 
   return '';
 }
 
 Handlebars.registerHelper({
 
   return '';
 }
 
 Handlebars.registerHelper({

-  isaddresses_unused: function(aAddressLine) {
-    return ((aAddressLine.isaddress && aAddressLine.isaddress == 'f') ? 'notused' : '');
+  shortOSMType: function (sType) {
+    if (sType === 'node') return 'N';
+    if (sType === 'way') return 'W';
+    if (sType === 'relation') return 'R';
+    return '';

   },
   // { osm_type: 'R', osm_id: 12345 }
   // <a href="https://www.openstreetmap.org/relation/12345">relation 12345</a
   },
   // { osm_type: 'R', osm_id: 12345 }
   // <a href="https://www.openstreetmap.org/relation/12345">relation 12345</a

-  osmLink: function(aPlace) {
+  osmLink: function (aPlace) {

     if (!aPlace.osm_type) return '';
     var sOSMType = formatOSMType(aPlace.osm_type, false);
     if (!sOSMType) return '';
     if (!aPlace.osm_type) return '';
     var sOSMType = formatOSMType(aPlace.osm_type, false);
     if (!sOSMType) return '';


@@ -28,14 +32,14 @@ Handlebars.registerHelper({
     );
   },
   /* en:London_Borough_of_Redbridge => https://en.wikipedia.org/wiki/London_Borough_of_Redbridge */
     );
   },
   /* en:London_Borough_of_Redbridge => https://en.wikipedia.org/wiki/London_Borough_of_Redbridge */

-  wikipediaLink: function(aPlace) {
-    if (! aPlace.calculated_wikipedia) return '';
+  wikipediaLink: function (aPlace) {
+    if (!aPlace.calculated_wikipedia) return '';

 
     var parts = aPlace.calculated_wikipedia.split(':', 2);
 
 
     var parts = aPlace.calculated_wikipedia.split(':', 2);
 

-    var sTitle = Handlebars.escapeExpression(aPlace.calculated_wikipedia),
-      sLanguage = Handlebars.escapeExpression(parts[0]),
-      sArticle = Handlebars.escapeExpression(parts[1]);
+    var sTitle = Handlebars.escapeExpression(aPlace.calculated_wikipedia);
+    var sLanguage = Handlebars.escapeExpression(parts[0]);
+    var sArticle = Handlebars.escapeExpression(parts[1]);

 
     return new Handlebars.SafeString(
       '<a href="https://' + sLanguage + '.wikipedia.org/wiki/' + sArticle + '" target="_blank">' + sTitle + '</a>'
 
     return new Handlebars.SafeString(
       '<a href="https://' + sLanguage + '.wikipedia.org/wiki/' + sArticle + '" target="_blank">' + sTitle + '</a>'


@@ -43,54 +47,66 @@ Handlebars.registerHelper({
   },
   // { osm_type: 'R', osm_id: 12345 }
   // <a href="details.html?place_id=12345">details</a>
   },
   // { osm_type: 'R', osm_id: 12345 }
   // <a href="details.html?place_id=12345">details</a>

-  detailsLink: function(aFeature, sTitle) {
+  detailsLink: function (aFeature, sTitle) {

     if (!aFeature) return '';
     if (!aFeature.place_id) return '';
 
     if (!aFeature) return '';
     if (!aFeature.place_id) return '';
 

-    sTitle = Handlebars.escapeExpression(sTitle || 'details >');
+    var sTitleEscaped = Handlebars.escapeExpression(sTitle || 'details >');

 
     return new Handlebars.SafeString(
 
     return new Handlebars.SafeString(

-      '<a href="details.html?place_id=' + aFeature.place_id + '">' + sTitle + '</a>'
+      '<a href="details.html?place_id=' + aFeature.place_id + '">' + sTitleEscaped + '</a>'

     );
   },
     );
   },

-  detailsPermaLink: function(aFeature, sTitle) {
+  detailsPermaLink: function (aFeature, sTitle) {

     if (!aFeature) return '';
 
     var sOSMType = formatOSMType(aFeature.osm_type, false);
     if (!sOSMType) return '';
 
     if (!aFeature) return '';
 
     var sOSMType = formatOSMType(aFeature.osm_type, false);
     if (!sOSMType) return '';
 

-    sTitle = Handlebars.escapeExpression(sTitle || sOSMType + ' ' + aFeature.osm_id);
+    var sTitleEscaped = Handlebars.escapeExpression(sTitle || sOSMType + ' ' + aFeature.osm_id);
+
+    var sURL = 'details.html?osmtype=' + aFeature.osm_type + '&osmid=' + aFeature.osm_id;
+    if (aFeature.category) {
+      sURL = sURL + '&class=' + aFeature.category;
+    }

 
     return new Handlebars.SafeString(
 
     return new Handlebars.SafeString(

-      '<a href="details.html?osmtype=' + aFeature.osm_type + '&osmid=' + aFeature.osm_id + '&class=' + aFeature.category + '">' + sTitle + '</a>'
+      '<a href="' + sURL + '">' + sTitleEscaped + '</a>'

     );
   },
     );
   },

-  coverageType: function(aPlace) {
+  formatPlaceType: function (aPlace) {
+    var sOut = aPlace.class + ':' + aPlace.type;
+    if (aPlace.type && aPlace.type === 'administrative' && aPlace.place_type) {
+      sOut = sOut + ' (' + aPlace.place_type + ')';
+    }
+    return new Handlebars.SafeString(sOut);
+  },
+  coverageType: function (aPlace) {

     return (aPlace.isarea ? 'Polygon' : 'Point');
   },
   // fDistance is in meters
     return (aPlace.isarea ? 'Polygon' : 'Point');
   },
   // fDistance is in meters

-  formatDistance: function(fDistanceMeters) {
+  formatDistance: function (fDistanceMeters) {

     if (fDistanceMeters < 1) return '0';
 
     if (fDistanceMeters < 1) return '0';
 

-    var formatted = (fDistanceMeters >= 1000) ?
-      Math.round(fDistanceMeters/1000, 1) + ' km' :
-      Math.round(fDistanceMeters, 0) + ' m';
+    var formatted = (fDistanceMeters >= 1000)
+      ? Math.round(fDistanceMeters / 1000, 1) + ' km'
+      : Math.round(fDistanceMeters, 0) + ' m';

 
     return new Handlebars.SafeString(
       '<abbr class="distance" title="' + fDistanceMeters + '">~' + formatted + '</abbr>'
     );
   },
   // mark partial tokens (those starting with a space) with a star for readability
 
     return new Handlebars.SafeString(
       '<abbr class="distance" title="' + fDistanceMeters + '">~' + formatted + '</abbr>'
     );
   },
   // mark partial tokens (those starting with a space) with a star for readability

-  formatKeywordToken: function(sToken) {
-    return (sToken[0] == ' ' ? '*' : '') + Handlebars.escapeExpression(sToken);
+  formatKeywordToken: function (sToken) {
+    return (sToken[0] === ' ' ? '*' : '') + Handlebars.escapeExpression(sToken);

   },
   // Any over 15 are invalid data in OSM anyway
   },
   // Any over 15 are invalid data in OSM anyway

-  formatAdminLevel: function(iLevel) {
+  formatAdminLevel: function (iLevel) {

     return (iLevel < 15 ? iLevel : '');
   },
     return (iLevel < 15 ? iLevel : '');
   },

-  formatMapIcon: function(sIcon) {
-    if (!sIcon) return;
-    
+  formatMapIcon: function (sIcon) {
+    if (!sIcon) return '';
+

     var url = sIcon;
     if (!url.match(/^http/)) url = get_config_value('Images_Base_Url') + url;
 
     var url = sIcon;
     if (!url.match(/^http/)) url = get_config_value('Images_Base_Url') + url;
 


@@ -98,75 +114,55 @@ Handlebars.registerHelper({
       '<img class="mapicon" src="' + url + '" alt="' + sIcon + '"/>'
     );
   },
       '<img class="mapicon" src="' + url + '" alt="' + sIcon + '"/>'
     );
   },

-  formatLabel: function(aPlace) {
+  formatLabel: function (aPlace) {

     if (aPlace.label) return aPlace.label;
 
     if (aPlace.label) return aPlace.label;
 

-    function capitalize(s)
-    {
+    function capitalize(s) {

       return s && s[0].toUpperCase() + s.slice(1);
     }
 
       return s && s[0].toUpperCase() + s.slice(1);
     }
 

-    if (aPlace.type && aPlace.type === 'yes') {
+    if (aPlace.type && aPlace.type === 'yes' && aPlace.class) {

       return capitalize(aPlace.class.replace(/_/g, ' '));
       return capitalize(aPlace.class.replace(/_/g, ' '));

-    } else {
+    }
+    if (aPlace.type) {

       return capitalize(aPlace.type.replace(/_/g, ' '));
     }
       return capitalize(aPlace.type.replace(/_/g, ' '));
     }

+    return '';

   },
   },

-  formatSearchRank: function(iRank) {
+  formatSearchRank: function (iRank) {

     // same as
     // https://github.com/openstreetmap/Nominatim/blob/master/sql/functions.sql
     // get_searchrank_label()
 
     // same as
     // https://github.com/openstreetmap/Nominatim/blob/master/sql/functions.sql
     // get_searchrank_label()
 

-    if (iRank < 2) {
-      return 'continent';
-    } else if (iRank < 4) {
-      return 'sea';
-    } else if (iRank < 8) {
-      return 'country';
-    } else if (iRank < 12) {
-      return 'state';
-    } else if (iRank < 16) { 
-      return 'county';
-    } else if (iRank == 16) {
-      return 'city';
-    } else if (iRank == 17) {
-      return 'town / island';
-    } else if (iRank == 18) {
-      return 'village / hamlet';
-    } else if (iRank == 20) {
-      return 'suburb';
-    } else if (iRank == 21) {
-      return 'postcode area';
-    } else if (iRank == 22) {
-      return 'croft / farm / locality / islet';
-    } else if (iRank == 23) {
-      return 'postcode area';
-    } else if (iRank == 25) {
-      return 'postcode point';
-    } else if (iRank == 26) {
-      return 'street / major landmark';
-    } else if (iRank == 27) {
-      return 'minory street / path';
-    } else if (iRank == 28) {
-      return 'house / building';
-    } else {
-      return 'other: ' + iRank;
-    }
+    if (iRank < 2) return 'continent';
+    if (iRank < 4) return 'sea';
+    if (iRank < 8) return 'country';
+    if (iRank < 12) return 'state';
+    if (iRank < 16) return 'county';
+    if (iRank === 16) return 'city';
+    if (iRank === 17) return 'town / island';
+    if (iRank === 18) return 'village / hamlet';
+    if (iRank === 20) return 'suburb';
+    if (iRank === 21) return 'postcode area';
+    if (iRank === 22) return 'croft / farm / locality / islet';
+    if (iRank === 23) return 'postcode area';
+    if (iRank === 25) return 'postcode point';
+    if (iRank === 26) return 'street / major landmark';
+    if (iRank === 27) return 'minory street / path';
+    if (iRank === 28) return 'house / building';
+    return 'other: ' + iRank;

   },
   },

-  tooManyHierarchyLinesWarning: function(aPlace) {
-    if (!aPlace.hierarchy) return;
+  tooManyHierarchyLinesWarning: function (aPlace) {
+    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>'
     );
   },
 
     return new Handlebars.SafeString(
       '<p>There are more child objects which are not shown.</p>'
     );
   },

-  zoomLevels: function(iSelectedZoom) {
+  zoomLevels: function (iSelectedZoom) {

     var aZoomLevels = [
       /*  0 */ 'Continent / Sea',
       /*  1 */ '',
     var aZoomLevels = [
       /*  0 */ 'Continent / Sea',
       /*  1 */ '',


@@ -193,13 +189,15 @@ Handlebars.registerHelper({
     ];
 
     var select = $('<select>');
     ];
 
     var select = $('<select>');

-    var option = jQuery('<option>', { value: '', text: '--'});
-    if (typeof(iSelectedZoom) === 'undefined') option.attr('selected', 'selected');
+    var option = jQuery('<option>', { value: '', text: '--' });
+    if (typeof (iSelectedZoom) === 'undefined') {
+      option.attr('selected', 'selected');
+    }

     option.appendTo(select);
 
     option.appendTo(select);
 

-    jQuery.each(aZoomLevels, function(i, title) {
-      var option = jQuery('<option>', { value: i, text: i + ' ' + title });
-      if (i == iSelectedZoom) option.attr('selected', 'selected');
+    jQuery.each(aZoomLevels, function (i, title) {
+      option = jQuery('<option>', { value: i, text: i + ' ' + title });
+      if (i === iSelectedZoom) option.attr('selected', 'selected');

       option.appendTo(select);
     });
     return new Handlebars.SafeString(select.html());
       option.appendTo(select);
     });
     return new Handlebars.SafeString(select.html());