X-Git-Url: https://git.openstreetmap.org./nominatim-ui.git/blobdiff_plain/c424aac99457ff4560a840bf618c902ba4357b6f..c5d0923efd3addedf075592895d2fef3f8796e5e:/dist/handlebar_helpers.js
diff --git a/dist/handlebar_helpers.js b/dist/handlebar_helpers.js
index 7af3384..36deacd 100644
--- a/dist/handlebar_helpers.js
+++ b/dist/handlebar_helpers.js
@@ -13,12 +13,116 @@ function formatOSMType(sType, bExcludeExternal) {
return '';
}
+function formatShortOSMType(sType) {
+ if (sType === 'node') return 'N';
+ if (sType === 'way') return 'W';
+ if (sType === 'relation') return 'R';
+ return '';
+}
+
+function getIcon(aPlace) {
+ // equivalent to PHP Nominatim::ClassTypes::getIcon
+ // covers 83 of 214 available icon filenames, e.g. transport_roundabout_anticlockwise
+ // transport_rental_bicycle or place_of_worship_christian would need more data from
+ // the place.
+ var aIcons = {
+ 'boundary:administrative': 'poi_boundary_administrative',
+ 'place:city': 'poi_place_city',
+ 'place:town': 'poi_place_town',
+ 'place:village': 'poi_place_village',
+ 'place:hamlet': 'poi_place_village',
+ 'place:suburb': 'poi_place_village',
+ 'place:locality': 'poi_place_village',
+ 'place:airport': 'transport_airport2',
+ 'aeroway:aerodrome': 'transport_airport2',
+ 'railway:station': 'transport_train_station2',
+ 'amenity:place_of_worship': 'place_of_worship_unknown3',
+ 'amenity:pub': 'food_pub',
+ 'amenity:bar': 'food_bar',
+ 'amenity:university': 'education_university',
+ 'tourism:museum': 'tourist_museum',
+ 'amenity:arts_centre': 'tourist_art_gallery2',
+ 'tourism:zoo': 'tourist_zoo',
+ 'tourism:theme_park': 'poi_point_of_interest',
+ 'tourism:attraction': 'poi_point_of_interest',
+ 'leisure:golf_course': 'sport_golf',
+ 'historic:castle': 'tourist_castle',
+ 'amenity:hospital': 'health_hospital',
+ 'amenity:school': 'education_school',
+ 'amenity:theatre': 'tourist_theatre',
+ 'amenity:library': 'amenity_library',
+ 'amenity:fire_station': 'amenity_firestation3',
+ 'amenity:police': 'amenity_police2',
+ 'amenity:bank': 'money_bank2',
+ 'amenity:post_office': 'amenity_post_office',
+ 'tourism:hotel': 'accommodation_hotel2',
+ 'amenity:cinema': 'tourist_cinema',
+ 'tourism:artwork': 'tourist_art_gallery2',
+ 'historic:archaeological_site': 'tourist_archaeological2',
+ 'amenity:doctors': 'health_doctors',
+ 'leisure:sports_centre': 'sport_leisure_centre',
+ 'leisure:swimming_pool': 'sport_swimming_outdoor',
+ 'shop:supermarket': 'shopping_supermarket',
+ 'shop:convenience': 'shopping_convenience',
+ 'amenity:restaurant': 'food_restaurant',
+ 'amenity:fast_food': 'food_fastfood',
+ 'amenity:cafe': 'food_cafe',
+ 'tourism:guest_house': 'accommodation_bed_and_breakfast',
+ 'amenity:pharmacy': 'health_pharmacy_dispensing',
+ 'amenity:fuel': 'transport_fuel',
+ 'natural:peak': 'poi_peak',
+ 'natural:wood': 'landuse_coniferous_and_deciduous',
+ 'shop:bicycle': 'shopping_bicycle',
+ 'shop:clothes': 'shopping_clothes',
+ 'shop:hairdresser': 'shopping_hairdresser',
+ 'shop:doityourself': 'shopping_diy',
+ 'shop:estate_agent': 'shopping_estateagent2',
+ 'shop:car': 'shopping_car',
+ 'shop:garden_centre': 'shopping_garden_centre',
+ 'shop:car_repair': 'shopping_car_repair',
+ 'shop:bakery': 'shopping_bakery',
+ 'shop:butcher': 'shopping_butcher',
+ 'shop:apparel': 'shopping_clothes',
+ 'shop:laundry': 'shopping_laundrette',
+ 'shop:beverages': 'shopping_alcohol',
+ 'shop:alcohol': 'shopping_alcohol',
+ 'shop:optician': 'health_opticians',
+ 'shop:chemist': 'health_pharmacy',
+ 'shop:gallery': 'tourist_art_gallery2',
+ 'shop:jewelry': 'shopping_jewelry',
+ 'tourism:information': 'amenity_information',
+ 'historic:ruins': 'tourist_ruin',
+ 'amenity:college': 'education_school',
+ 'historic:monument': 'tourist_monument',
+ 'historic:memorial': 'tourist_monument',
+ 'historic:mine': 'poi_mine',
+ 'tourism:caravan_site': 'accommodation_caravan_park',
+ 'amenity:bus_station': 'transport_bus_station',
+ 'amenity:atm': 'money_atm2',
+ 'tourism:viewpoint': 'tourist_view_point',
+ 'tourism:guesthouse': 'accommodation_bed_and_breakfast',
+ 'railway:tram': 'transport_tram_stop',
+ 'amenity:courthouse': 'amenity_court',
+ 'amenity:recycling': 'amenity_recycling',
+ 'amenity:dentist': 'health_dentist',
+ 'natural:beach': 'tourist_beach',
+ 'railway:tram_stop': 'transport_tram_stop',
+ 'amenity:prison': 'amenity_prison',
+ 'highway:bus_stop': 'transport_bus_stop2'
+ };
+
+ var sCategoryPlace = aPlace.category + ':' + aPlace.type;
+
+ return aIcons[sCategoryPlace];
+}
+
+
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 '';
+ return formatShortOSMType(sType);
},
// { osm_type: 'R', osm_id: 12345 }
// relation 12345' + sTitle + ''
);
},
- // { osm_type: 'R', osm_id: 12345 }
- // details
- detailsLink: function (aFeature, sTitle) {
+ // 'details.html?osmtype=R&osmid=2181874&class=boundary'
+ detailsURL: function (aFeature) {
if (!aFeature) return '';
- if (!aFeature.place_id) return '';
-
- var sTitleEscaped = Handlebars.escapeExpression(sTitle || 'details >');
- return new Handlebars.SafeString(
- '' + sTitleEscaped + ''
- );
- },
- detailsPermaLink: function (aFeature, sTitle) {
- if (!aFeature) return '';
-
- var sOSMType = formatOSMType(aFeature.osm_type, false);
+ var sOSMType = aFeature.osm_type;
+ if (sOSMType && sOSMType.length !== 1) {
+ sOSMType = formatShortOSMType(aFeature.osm_type, false); // node => N
+ }
if (!sOSMType) return '';
- var sTitleEscaped = Handlebars.escapeExpression(sTitle || sOSMType + ' ' + aFeature.osm_id);
-
- var sURL = 'details.html?osmtype=' + aFeature.osm_type + '&osmid=' + aFeature.osm_id;
- if (aFeature.category) {
+ var sURL = 'details.html?osmtype=' + sOSMType + '&osmid=' + aFeature.osm_id;
+ if (aFeature.class) {
+ sURL = sURL + '&class=' + aFeature.class;
+ } else if (aFeature.category) {
sURL = sURL + '&class=' + aFeature.category;
}
-
- return new Handlebars.SafeString(
- '' + sTitleEscaped + ''
- );
+ return sURL;
},
formatPlaceType: function (aPlace) {
var sOut = aPlace.class + ':' + aPlace.type;
@@ -84,16 +177,25 @@ Handlebars.registerHelper({
coverageType: function (aPlace) {
return (aPlace.isarea ? 'Polygon' : 'Point');
},
- // fDistance is in meters
- formatDistance: function (fDistanceMeters) {
- if (fDistanceMeters < 1) return '0';
+ formatDistance: function (fDistance, bInMeters) {
+ if (bInMeters) {
+ if (fDistance < 1) return '0';
+ var sFormatted = (fDistance >= 1000)
+ ? Math.round(fDistance / 1000, 1) + ' km'
+ : Math.round(fDistance, 0) + ' m';
- var formatted = (fDistanceMeters >= 1000)
- ? Math.round(fDistanceMeters / 1000, 1) + ' km'
- : Math.round(fDistanceMeters, 0) + ' m';
+ return new Handlebars.SafeString(
+ '~' + sFormatted + ''
+ );
+ }
+
+ // spheric distance, http://postgis.net/docs/ST_Distance_Spheroid.html
+ if (fDistance === 0) return '0';
return new Handlebars.SafeString(
- '~' + formatted + ''
+ '~'
+ + (Math.round(fDistance * 1000, 4) / 1000)
+ + ''
);
},
// mark partial tokens (those starting with a space) with a star for readability
@@ -104,14 +206,16 @@ Handlebars.registerHelper({
formatAdminLevel: function (iLevel) {
return (iLevel < 15 ? iLevel : '');
},
- formatMapIcon: function (sIcon) {
+ formatMapIcon: function (aPlace) {
+ var sIcon = getIcon(aPlace);
+
if (!sIcon) return '';
- var url = sIcon;
- if (!url.match(/^http/)) url = get_config_value('Images_Base_Url') + url;
+ var title = 'icon for ' + aPlace.category + ' ' + aPlace.type;
+ var url = get_config_value('Images_Base_Url') + sIcon + '.p.20.png';
return new Handlebars.SafeString(
- ''
+ ''
);
},
formatLabel: function (aPlace) {
@@ -131,7 +235,7 @@ Handlebars.registerHelper({
},
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';