Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve NOMINATIM search by including viewbox bounds #1246

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Improve NOMINATIM search by including viewbox bounds #1246

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74d678e
Perform two searches, the first bounded to the viewbox, the second un…
nhamer Oct 13, 2017
c0560e7
remove duplicates from NOMINATIM search
nhamer Oct 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 31 additions & 9 deletions code/search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,17 +291,33 @@ addHook('search', function(query) {
addHook('search', function(query) {
if(!query.confirmed) return;

$.getJSON(NOMINATIM + encodeURIComponent(query.term), function(data) {
if(data.length == 0) {
query.addResult({
title: 'No results on OpenStreetMap',
icon: '//www.openstreetmap.org/favicon.ico',
onSelected: function() {return true;},
});
return;
// Viewbox search orders results so they're closer to the viewbox
var mapBounds = map.getBounds();
var viewbox = '&viewbox=' + mapBounds.getSouthWest().lng + ',' + mapBounds.getSouthWest().lat + ',' + mapBounds.getNorthEast().lng + ',' + mapBounds.getNorthEast().lat;

var resultCount = 0;
var resultMap = {};
function onQueryResult(isViewboxResult, data) {
resultCount += data.length;
if(isViewboxResult) {
// Search for things outside the viewbox
$.getJSON(NOMINATIM + encodeURIComponent(query.term) + viewbox, onQueryResult.bind(null, false));
if(resultCount === 0) { return; }
} else {
if(resultCount === 0) {
query.addResult({
title: 'No results on OpenStreetMap',
icon: '//www.openstreetmap.org/favicon.ico',
onSelected: function() {return true;},
});
return;
}
}

data.forEach(function(item) {
if(resultMap[item.place_id]) { return; } // duplicate
resultMap[item.place_id] = true;

var result = {
title: item.display_name,
description: 'Type: ' + item.type,
Expand Down Expand Up @@ -331,6 +347,12 @@ addHook('search', function(query) {

query.addResult(result);
});
});
}

// Bounded search allows amenity-only searches (e.g. "amenity=toilet") via special phrases
// http://wiki.openstreetmap.org/wiki/Nominatim/Special_Phrases/EN
var bounded = '&bounded=1';

$.getJSON(NOMINATIM + encodeURIComponent(query.term) + viewbox + bounded, onQueryResult.bind(null, true));
});