formatLabel: dont print -Yes- as label

[nominatim-ui.git] / src / lib / helpers.js

diff --git a/src/lib/helpers.js b/src/lib/helpers.js
index cbbdbc98ed81822d718d26523855ba0d1a6a9de1..de1cfd41b2fd3dad879a784645ab2f8effeee352 100644 (file)
--- a/src/lib/helpers.js
+++ b/src/lib/helpers.js
@@ -41,8 +41,8 @@ function formatLabel(aPlace) {
     return s && s[0].toUpperCase() + s.slice(1);
   }
 
-  if (aPlace.type && aPlace.type === 'yes' && aPlace.class) {
-    return capitalize(aPlace.class.replace(/_/g, ' '));
+  if (aPlace.type && aPlace.type === 'yes' && aPlace.category) {
+    return capitalize(aPlace.category.replace(/_/g, ' '));
   }
   if (aPlace.type) {
     return capitalize(aPlace.type.replace(/_/g, ' '));
@@ -100,7 +100,7 @@ function formatPlaceType(aPlace) {
 
 // Any over 15 are invalid data in OSM anyway
 function formatAdminLevel(iLevel) {
-  return (iLevel < 15 ? iLevel : '');
+  return (iLevel && iLevel < 15 ? iLevel : '');
 }
 
 function formatDistance(fDistance, bInMeters) {