CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-03-31 01:09:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Address field improvements and bugfixes

Browse Source 
(closes #3553)

* eliminate duplicate values in suggestions
* set minItems(1) on all combo boxes
* setup dropdowns for all common address fields
This commit is contained in:
Bryan Housel
2016-11-05 23:44:15 -04:00
parent f2752cf8d6
commit cb6801c2b6
1 changed files with 39 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
modules/ui/fields/address.js
View File

@@ -30,12 +30,12 @@ export function uiFieldAddress(field, context) {
};
function getStreets() {
function getNearStreets() {
var extent = entity.extent(context.graph()),
l = extent.center(),
box = geoExtent(l).padByMeters(200);
return context.intersects(box)
var streets = context.intersects(box)
.filter(isAddressable)
.map(function(d) {
var loc = context.projection([
@@ -47,22 +47,25 @@ export function uiFieldAddress(field, context) {
value: d.tags.name,
dist: choice.distance
};
}).sort(function(a, b) {
})
.sort(function(a, b) {
return a.dist - b.dist;
});
return _.uniqBy(streets, 'value');
function isAddressable(d) {
return d.tags.highway && d.tags.name && d.type === 'way';
}
}
function getCities() {
function getNearCities() {
var extent = entity.extent(context.graph()),
l = extent.center(),
box = geoExtent(l).padByMeters(200);
return context.intersects(box)
var cities = context.intersects(box)
.filter(isAddressable)
.map(function(d) {
return {
@@ -70,10 +73,14 @@ export function uiFieldAddress(field, context) {
value: d.tags['addr:city'] || d.tags.name,
dist: geoSphericalDistance(d.extent(context.graph()).center(), l)
};
}).sort(function(a, b) {
})
.sort(function(a, b) {
return a.dist - b.dist;
});
return _.uniqBy(cities, 'value');
function isAddressable(d) {
if (d.tags.name &&
(d.tags.admin_level === '8' || d.tags.border_type === 'city'))
@@ -92,26 +99,27 @@ export function uiFieldAddress(field, context) {
}
function getPostCodes() {
function getNearValues(key) {
var extent = entity.extent(context.graph()),
l = extent.center(),
box = geoExtent(l).padByMeters(200);
return context.intersects(box)
.filter(isAddressable)
var results = context.intersects(box)
.filter(function hasTag(d) {
return d.tags[key];
})
.map(function(d) {
return {
title: d.tags['addr:postcode'],
value: d.tags['addr:postcode'],
title: d.tags[key],
value: d.tags[key],
dist: geoSphericalDistance(d.extent(context.graph()).center(), l)
};
}).sort(function(a, b) {
})
.sort(function(a, b) {
return a.dist - b.dist;
});
function isAddressable(d) {
return d.tags['addr:postcode'];
}
return _.uniqBy(results, 'value');
}
@@ -151,23 +159,24 @@ export function uiFieldAddress(field, context) {
.style('width', function (d) { return d.width * 100 + '%'; });
// Update
wrap.selectAll('.addr-street')
.call(d3combobox()
.fetcher(function(value, callback) {
callback(getStreets());
}));
// setup dropdowns for common address tags
var addrTags = [
'street', 'city', 'state', 'province', 'district',
'subdistrict', 'suburb', 'place', 'postcode'
];
wrap.selectAll('.addr-city')
.call(d3combobox()
.fetcher(function(value, callback) {
callback(getCities());
}));
addrTags.forEach(function(tag) {
var nearValues = (tag === 'street') ? getNearStreets
: (tag === 'city') ? getNearCities
: getNearValues;
wrap.selectAll('.addr-postcode')
.call(d3combobox()
.fetcher(function(value, callback) {
callback(getPostCodes());
}));
wrap.selectAll('.addr-' + tag)
.call(d3combobox()
.minItems(1)
.fetcher(function(value, callback) {
callback(nearValues('addr:' + tag));
}));
});
wrap.selectAll('input')
.on('blur', change())