cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into routing-ui-tweaks-2

Browse source 
Conflicts:
	config/locales/de.yml
This commit is contained in:
Matt Amos 2015-01-26 13:14:58 +00:00
commit c3e2e6462f
381 changed files with 5384 additions and 1904 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/assets/javascripts/index/query.js
View file

@ -95,14 +95,20 @@ OSM.Query = function(map) {
if (prefixes[key]) {
if (prefixes[key][value]) {
return prefixes[key][value];
} else {
var first = value.substr(0, 1).toUpperCase(),
rest = value.substr(1).replace(/_/g, " ");
return first + rest;
}
}
}
for (var key in tags) {
var value = tags[key];
if (prefixes[key]) {
var first = value.substr(0, 1).toUpperCase(),
rest = value.substr(1).replace(/_/g, " ");
return first + rest;
}
}
}
if (!prefix) {