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 e233eb97f5c06665ac775f533a1b22ea03fc4052..de8778b4784d87e4f4713ac10cc59ff5e9836963 100644 (file)
--- a/src/handlebar_helpers.js
+++ b/src/handlebar_helpers.js
@@ -14,15 +14,15 @@ function formatOSMType(sType, bExcludeExternal) {
 }
 
 Handlebars.registerHelper({
 }
 
 Handlebars.registerHelper({

+  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 '';
   },
   shortOSMType: function (sType) {
     if (sType === 'node') return 'N';
     if (sType === 'way') return 'W';
     if (sType === 'relation') return 'R';
     return '';
   },

-  isaddresses_unused: function (aAddressLine) {
-    return ((aAddressLine.isaddress && aAddressLine.isaddress === 'f') ? 'notused' : '');
-  },

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


@@ -77,6 +77,13 @@ Handlebars.registerHelper({
       '<a href="' + sURL + '">' + 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');
   },


@@ -127,7 +134,7 @@ Handlebars.registerHelper({
   },
   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';