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

Fix country detection, fix phone number formatting, close #103

Browse source
This commit is contained in:
Pieter Vander Vennet 2020-09-26 01:43:20 +02:00
parent 48ca24261f
commit cba72ea915
3 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Logic/FilteredLayer.ts
View file

@ -110,14 +110,17 @@ export class FilteredLayer {
if (this.filters.matches(tags)) { if (this.filters.matches(tags)) {
const centerPoint = GeoOperations.centerpoint(feature); const centerPoint = GeoOperations.centerpoint(feature);
feature.properties["_surface"] = ""+GeoOperations.surfaceAreaInSqMeters(feature); feature.properties["_surface"] = "" + GeoOperations.surfaceAreaInSqMeters(feature);
const lat = ""+centerPoint.geometry.coordinates[1]; const lat = centerPoint.geometry.coordinates[1];
const lon = ""+centerPoint.geometry.coordinates[0] const lon = centerPoint.geometry.coordinates[0]
feature.properties["_lon"] = lat; feature.properties["_lon"] = "" + lat; // We expect a string here for lat/lon
feature.properties["_lat"] = lon; feature.properties["_lat"] = "" + lon;
// But the codegrid SHOULD be a number!
FilteredLayer.grid.getCode(lat, lon, (error, code) => { FilteredLayer.grid.getCode(lat, lon, (error, code) => {
if (error === null) { if (error === null) {
feature.properties["_country"] = code; feature.properties["_country"] = code;
} else {
console.warn("Could not determine country for", feature.properties.id, error);
} }
}) })

6
UI/Input/ValidatedTextField.ts
View file

@ -87,11 +87,13 @@ export default class ValidatedTextField {
"phone", "phone",
"A phone number", "A phone number",
(str, country: any) => { (str, country: any) => {
if (str === undefined) {
return false;
}
return parsePhoneNumberFromString(str, country?.toUpperCase())?.isValid() ?? false return parsePhoneNumberFromString(str, country?.toUpperCase())?.isValid() ?? false
}, },
(str, country: any) => { (str, country: any) => {
console.log("reformatting phone nuber",str, "for locale", country) return parsePhoneNumberFromString(str, country?.toUpperCase()).formatInternational()
return parsePhoneNumberFromString(str, country?.toUpperCase()).formatInternational()
} }
) )
] ]

4
package.json
View file

@ -4,10 +4,10 @@
"repository": "https://github.com/pietervdvn/MapComplete", "repository": "https://github.com/pietervdvn/MapComplete",
"description": "A small website to edit OSM easily", "description": "A small website to edit OSM easily",
"main": "index.js", "main": "index.js",
"disabled:staticFiles": { "staticFiles": {
"staticPath": [ "staticPath": [
{ {
"staticPath": "static-assets/tiles", "staticPath": "tiles/",
"staticOutDir": "./tiles/" "staticOutDir": "./tiles/"
} }
] ]