Mannivu/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Small fixes to the UK-addresses theme

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-09-22 17:15:30 +02:00
parent 285ca2e508
commit e47224ecb8
2 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Logic/ExtraFunction.ts
View file

@ -134,11 +134,18 @@ export class ExtraFunction {
args: ["list of features or layer name", "amount of features", "unique tag key (optional)", "maxDistanceInMeters (optional)"] args: ["list of features or layer name", "amount of features", "unique tag key (optional)", "maxDistanceInMeters (optional)"]
}, },
(params, feature) => { (params, feature) => {
return (features, amount, uniqueTag, maxDistanceInMeters) => ExtraFunction.GetClosestNFeatures(params, feature, features, {
maxFeatures: Number(amount), return (features, amount, uniqueTag, maxDistanceInMeters) => {
uniqueTag: uniqueTag, let distance : number = Number(maxDistanceInMeters)
maxDistance: Number(maxDistanceInMeters) if(isNaN(distance)){
}) distance = undefined
}
return ExtraFunction.GetClosestNFeatures(params, feature, features, {
maxFeatures: Number(amount),
uniqueTag: uniqueTag,
maxDistance: distance
});
}
} }
) )

12
assets/themes/uk_addresses/uk_addresses.json
View file

@ -149,17 +149,17 @@
"mappings": [ "mappings": [
{ {
"if": "addr:street:={_closest_street:0:name}", "if": "addr:street:={_closest_street:0:name}",
"then": "<b>{_closest_street:0:name}</b> {_closest_street:0:distance}m", "then": "Located in <b>{_closest_street:0:name}</b> (~{_closest_street:0:distance}m away)",
"hideInAnswer": "_closest_street:0:name=" "hideInAnswer": "_closest_street:0:name="
}, },
{ {
"if": "addr:street:={_closest_street:1:name}", "if": "addr:street:={_closest_street:1:name}",
"then": "<b>{_closest_street:1:name}</b> {_closest_street:1:distance}m", "then": "Located in <b>{_closest_street:1:name}</b> (~{_closest_street:1:distance}m away)",
"hideInAnswer": "_closest_street:1:name=" "hideInAnswer": "_closest_street:1:name="
}, },
{ {
"if": "addr:street:={_closest_street:2:name}", "if": "addr:street:={_closest_street:2:name}",
"then": "<b>{_closest_street:2:name}</b> {_closest_street:2:distance}m", "then": "Located in <b>{_closest_street:2:name}</b> (~{_closest_street:2:distance}m away)",
"hideInAnswer": "_closest_street:2:name=" "hideInAnswer": "_closest_street:2:name="
} }
], ],
@ -214,7 +214,11 @@
} }
] ]
}, },
"presets": [] "presets": [
{
}
]
}, },
{ {
"id": "named_streets", "id": "named_streets",