Skip to content
Snippets Groups Projects
Commit 76b7de0e authored by Johannes Hörmann's avatar Johannes Hörmann
Browse files

use nominatim for addressvalidation

parent 7e3104da
No related branches found
No related tags found
No related merge requests found
...@@ -134,6 +134,7 @@ ...@@ -134,6 +134,7 @@
<jDitoRecordAlias></jDitoRecordAlias> <jDitoRecordAlias></jDitoRecordAlias>
<isFilterable v="true" /> <isFilterable v="true" />
<isRequireContainerFiltering v="true" /> <isRequireContainerFiltering v="true" />
<isSortable v="true" />
<contentProcess>%aditoprj%/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js</contentProcess> <contentProcess>%aditoprj%/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
<recordFieldMappings> <recordFieldMappings>
<jDitoRecordFieldMapping> <jDitoRecordFieldMapping>
......
import("WsValidation_lib"); import("WsValidation_lib");
import("system.result"); import("system.result");
result.string(WsValidationType.get().TYPE_CITY.key); result.string(WsValidationType.get().TYPE_CITY_NOMINATIM.key);
\ No newline at end of file \ No newline at end of file
import("WsValidation_lib"); import("WsValidation_lib");
import("system.result"); import("system.result");
result.string(WsValidationType.get().TYPE_ZIP.key); result.string(WsValidationType.get().TYPE_ZIP_NOMINATIM.key);
\ No newline at end of file \ No newline at end of file
...@@ -40,9 +40,8 @@ WsValidationType.get = function(pKey) ...@@ -40,9 +40,8 @@ WsValidationType.get = function(pKey)
this._cache = { this._cache = {
// Address lookups // Address lookups
TYPE_ADDRESS_NOMINATIM: new WsValidationType("TYPE_ADDRESS_NOMINATIM", "nominatim", _processNominatimAddressLookup, _nominatimRequest, "q"), TYPE_ADDRESS_NOMINATIM: new WsValidationType("TYPE_ADDRESS_NOMINATIM", "nominatim", _processNominatimAddressLookup, _nominatimRequest, "q"),
TYPE_ADDRESS: new WsValidationType("TYPE_ADDRESS", "addressValidation", _processAllAddressLookup, _customRequest, "search"), TYPE_ZIP_NOMINATIM: new WsValidationType("TYPE_ZIP_NOMINATIM", "nominatim", _processNominatimAddressLookup, _nominatimRequest, "postalcode"),
TYPE_ZIP: new WsValidationType("TYPE_ZIP", "zipCityValidation", _processAddressLookup, _customRequest, "zip"), TYPE_CITY_NOMINATIM: new WsValidationType("TYPE_CITY_NOMINATIM", "nominatim", _processNominatimAddressLookup, _nominatimRequest, "city"),
TYPE_CITY: new WsValidationType("TYPE_CITY", "zipCityValidation", _processAddressLookup, _customRequest, "city"),
// Communication validation // Communication validation
TYPE_PHONE: new WsValidationType("TYPE_PHONE", "phoneValidation", _processCommunicationValidation, _customRequest, "Number") TYPE_PHONE: new WsValidationType("TYPE_PHONE", "phoneValidation", _processCommunicationValidation, _customRequest, "Number")
...@@ -53,104 +52,6 @@ WsValidationType.get = function(pKey) ...@@ -53,104 +52,6 @@ WsValidationType.get = function(pKey)
return this._cache; return this._cache;
/**
* [UID,
* displayName,
* zip,
* city,
* cityext,
* country,
* district,
* region,
* state,
* street,
* data.from_bn + (data.to_bn ? " - " + data.to_bn : ""),
* lon,
* lat,
* value // pValue
*/
function _processAllAddressLookup(pWsResult, pValue)
{
var resultAddresses = [];
// if error, return [] else parse the body
if (!WsValidationUtils._isError(pWsResult))
{
resultAddresses = JSON.parse(pWsResult.body);
}
return resultAddresses.map(function(pAddress, pIndex)
{
pAddress[0].value = pValue;
pAddress[0].index = pIndex;
var data = pAddress[0];
return [
JSON.stringify(data),
pAddress[1],
data.zip,
data.city,
data.cityext,
data.country,
data.district,
data.region,
data.state,
data.streat,
data.from_bn + (data.to_bn ? " - " + data.to_bn : ""),
data.lon,
data.lat,
pValue]
}, this);
}
/**
* [UID,
* displayName,
* zip,
* city,
* cityext,
* country,
* district,
* region,
* state,
* street,
* data.from_bn + (data.to_bn ? " - " + data.to_bn : ""),
* lon,
* lat,
* value // (the result. e.g. if pType was ZIP, the value is the found zip)
*/
function _processAddressLookup(pWsResult, pValue)
{
var resultAddresses = [];
// if error, return [] else parse the body
if (!WsValidationUtils._isError(pWsResult))
{
resultAddresses = JSON.parse(pWsResult.body);
}
return resultAddresses.map(function(pAddress, pIndex)
{
pAddress[0].index = pIndex;
var data = pAddress[0];
return [
JSON.stringify(data),
pAddress[1],
data.zip,
data.city,
data.cityext,
data.country,
data.district,
data.region,
data.state,
data.streat,
data.from_bn + (data.to_bn ? " - " + data.to_bn : ""),
data.lon,
data.lat,
data[this.paramName]]
}, this);
}
function _processCommunicationValidation(pWsResult, pValue) function _processCommunicationValidation(pWsResult, pValue)
{ {
if (!WsValidationUtils._isError(pWsResult)) if (!WsValidationUtils._isError(pWsResult))
...@@ -191,7 +92,7 @@ WsValidationType.get = function(pKey) ...@@ -191,7 +92,7 @@ WsValidationType.get = function(pKey)
pPlaceData.address.postcode, pPlaceData.address.postcode,
city, city,
cityext, cityext,
pPlaceData.address.country_code, pPlaceData.address.country_code.toUpperCase(),
pPlaceData.address.district, pPlaceData.address.district,
pPlaceData.address.state_district, pPlaceData.address.state_district,
pPlaceData.address.state, pPlaceData.address.state,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment