Merge pull request #7 from mtmail/npm-package-upgrades2

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

diff --git a/src/handlebar_helpers.js b/src/handlebar_helpers.js
index 6443d37e83c80149dbcd0502903e0b7cbd9532ce..de8778b4784d87e4f4713ac10cc59ff5e9836963 100644 (file)
--- a/src/handlebar_helpers.js
+++ b/src/handlebar_helpers.js
@@ -1,3 +1,5 @@
+'use strict';
+

 function formatOSMType(sType, bExcludeExternal) {
   if (sType === 'N') return 'node';
   if (sType === 'W') return 'way';
 function formatOSMType(sType, bExcludeExternal) {
   if (sType === 'N') return 'node';
   if (sType === 'W') return 'way';


@@ -12,8 +14,14 @@ function formatOSMType(sType, bExcludeExternal) {
 }
 
 Handlebars.registerHelper({
 }
 
 Handlebars.registerHelper({

-  isaddresses_unused: function (aAddressLine) {
-    return ((aAddressLine.isaddress && aAddressLine.isaddress === 'f') ? 'notused' : '');
+  formatOSMType: function (sType, bExcludeExternal) {
+    return formatOSMType(sType, bExcludeExternal);
+  },
+  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


@@ -60,10 +68,22 @@ Handlebars.registerHelper({
 
     var sTitleEscaped = 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 + '">' + sTitleEscaped + '</a>'
+      '<a href="' + sURL + '">' + sTitleEscaped + '</a>'

     );
   },
     );
   },

+  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');
   },
   coverageType: function (aPlace) {
     return (aPlace.isarea ? 'Polygon' : 'Point');
   },


@@ -88,7 +108,7 @@ Handlebars.registerHelper({
     return (iLevel < 15 ? iLevel : '');
   },
   formatMapIcon: function (sIcon) {
     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;
 
     var url = sIcon;
     if (!url.match(/^http/)) url = get_config_value('Images_Base_Url') + url;


@@ -104,14 +124,17 @@ Handlebars.registerHelper({
       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, ' '));
     }

-    return capitalize(aPlace.type.replace(/_/g, ' '));
+    if (aPlace.type) {
+      return capitalize(aPlace.type.replace(/_/g, ' '));
+    }
+    return '';

   },
   formatSearchRank: function (iRank) {
     // same as
   },
   formatSearchRank: function (iRank) {
     // same as

-    // https://github.com/openstreetmap/Nominatim/blob/master/sql/functions.sql
+    // https://github.com/osm-search/Nominatim/blob/master/sql/functions.sql

     // get_searchrank_label()
 
     if (iRank < 2) return 'continent';
     // get_searchrank_label()
 
     if (iRank < 2) return 'continent';


@@ -133,13 +156,10 @@ Handlebars.registerHelper({
     return 'other: ' + iRank;
   },
   tooManyHierarchyLinesWarning: function (aPlace) {
     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>'
 
     return new Handlebars.SafeString(
       '<p>There are more child objects which are not shown.</p>'


@@ -173,7 +193,9 @@ Handlebars.registerHelper({
 
     var select = $('<select>');
     var option = jQuery('<option>', { value: '', text: '--' });
 
     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) {
     option.appendTo(select);
 
     jQuery.each(aZoomLevels, function (i, title) {