robbond/pedwfrontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated coords and address fix

Browse Source
This commit is contained in:
robbond
2025-03-14 15:20:06 +00:00
parent 9eace1b626
commit 68d03ed93d
15 changed files with 347 additions and 727 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pages/api/endpoint/getbasicsearch_by_address_api.js
+237 -196
View File
@@ -347,214 +347,255 @@ export default async function ApiProxy(req, res) {
let container = {};
var queryUrl =
item.LogicalCollectionName +
"?$count=true&$filter=" +
(addressline1 != ""
? "(contains(" +
(item.LogicalCollectionName == "pinswg_ldps" ||
item.LogicalCollectionName ==
"pinswg_harbourrevisionorders" ||
item.LogicalCollectionName == "pinswg_electricityacts" ||
item.LogicalCollectionName ==
"pinswg_transportandworkacts" ||
item.LogicalCollectionName == "pinswg_dnses" ||
item.LogicalCollectionName == "pinswg_sipses"
? "pinswg_addressline1"
: "pinswg_siteaddressline1") +
", '" +
addressline1 +
"')) "
: "") +
(town != ""
? (addressline1 != "" ? " and " : "") +
" (contains(" +
(item.LogicalCollectionName == "pinswg_ldps" ||
item.LogicalCollectionName ==
"pinswg_harbourrevisionorders"
? "pinswg_town"
: item.LogicalCollectionName ==
"pinswg_transportandworkacts" ||
item.LogicalCollectionName == "pinswg_sipses"
? item.LogicalCollectionName +
"?$count=true&$filter=" +
(addressline1 != ""
? "(contains(pinswg_projectlocation,'" +
addressline1 +
"')) "
: "") +
(town != ""
? "(contains(pinswg_projectlocation,'" + town + "')) "
: "") +
(county != ""
? "(contains(pinswg_projectlocation,'" +
county +
"')) "
: "") +
(postcode != ""
? "(contains(pinswg_projectlocation,'" +
postcode +
"')) "
: "") +
"&$orderby=createdon desc&$select=modifiedon,_pinswg_appellant_value,pinswg_name,_pinswg_sipscase_value,pinswg_projectlocation,_pinswg_associatedlpa_value,statuscode,pinswg_validnoticeofintentiontosubmit,pinswg_decision"
: item.LogicalCollectionName +
"?$count=true&$filter=" +
(addressline1 != ""
? "(contains(" +
(item.LogicalCollectionName == "pinswg_ldps" ||
item.LogicalCollectionName ==
"pinswg_harbourrevisionorders" ||
item.LogicalCollectionName ==
"pinswg_electricityacts" ||
item.LogicalCollectionName ==
"pinswg_transportandworkacts" ||
item.LogicalCollectionName == "pinswg_dnses" ||
item.LogicalCollectionName == "pinswg_sipses"
? "pinswg_addresstown"
: "pinswg_siteaddresstown") +
", '" +
town +
"')) "
: "") +
(county != ""
? (addressline1 != "" || town != "" || postcode != ""
? " and "
? "pinswg_addressline1"
: "pinswg_siteaddressline1") +
", '" +
addressline1 +
"')) "
: "") +
" (contains(" +
(item.LogicalCollectionName == "pinswg_ldps" ||
item.LogicalCollectionName ==
"pinswg_harbourrevisionorders"
? "pinswg_county"
: item.LogicalCollectionName ==
"pinswg_transportandworkacts" ||
(town != ""
? (addressline1 != "" ? " and " : "") +
" (contains(" +
(item.LogicalCollectionName == "pinswg_ldps" ||
item.LogicalCollectionName ==
"pinswg_electricityacts" ||
item.LogicalCollectionName == "pinswg_dnses" ||
item.LogicalCollectionName == "pinswg_sipses"
? "pinswg_addresscounty"
: item.LogicalCollectionName == "pinswg_rows"
? "pinswg_sitecounty"
: "pinswg_siteaddresscounty") +
", '" +
county +
"')) "
: "") +
(postcode != ""
? (addressline1 != "" || town != "" || county != ""
? " and "
"pinswg_harbourrevisionorders"
? "pinswg_town"
: item.LogicalCollectionName ==
"pinswg_transportandworkacts" ||
item.LogicalCollectionName ==
"pinswg_electricityacts" ||
item.LogicalCollectionName ==
"pinswg_dnses" ||
item.LogicalCollectionName == "pinswg_sipses"
? "pinswg_addresstown"
: "pinswg_siteaddresstown") +
", '" +
town +
"')) "
: "") +
" (contains(" +
(item.LogicalCollectionName == "pinswg_ldps" ||
item.LogicalCollectionName ==
"pinswg_harbourrevisionorders"
? "pinswg_postcode"
: item.LogicalCollectionName ==
"pinswg_transportandworkacts" ||
(county != ""
? (addressline1 != "" || town != "" || postcode != ""
? " and "
: "") +
" (contains(" +
(item.LogicalCollectionName == "pinswg_ldps" ||
item.LogicalCollectionName ==
"pinswg_electricityacts" ||
item.LogicalCollectionName == "pinswg_dnses"
? "pinswg_postcode"
: "pinswg_siteaddresspostcode") +
", '" +
postcode +
"')) "
: "") +
"&$orderby=createdon desc&$select=modifiedon,_pinswg_appellant_value,pinswg_name," +
(item.LogicalCollectionName == "pinswg_planningappeals78s" ||
item.LogicalCollectionName ==
"pinswg_lawfuldevelopmentcertificates" ||
item.LogicalCollectionName == "pinswg_householderappealhases" ||
item.LogicalCollectionName == "pinswg_advertses" ||
item.LogicalCollectionName == "pinswg_callinss77s" ||
item.LogicalCollectionName == "pinswg_commonlands" ||
item.LogicalCollectionName ==
"pinswg_communityinfrastructurelevys117118119s" ||
item.LogicalCollectionName ==
"pinswg_compulsorypurchaseorderses" ||
item.LogicalCollectionName ==
"pinswg_enforcementnoticeappeals174s" ||
item.LogicalCollectionName ==
"pinswg_environmentalpermittings" ||
item.LogicalCollectionName ==
"pinswg_hedgeshedgerowstreepreservationreplacems" ||
item.LogicalCollectionName ==
"pinswg_lawfuldevelopmentcertificates" ||
item.LogicalCollectionName == "pinswg_miscellaneouscaseworks" ||
item.LogicalCollectionName ==
"pinswg_planningconditionss73s79s" ||
item.LogicalCollectionName ==
"pinswg_planningobligationappeals106s" ||
item.LogicalCollectionName == "pinswg_rows" ||
item.LogicalCollectionName == "pinswg_wayleaves"
? "pinswg_startdate,pinswg_finalcommentsduedate,"
: "") +
(item.LogicalCollectionName ==
"pinswg_enforcementlistedbuildingconservationaps" ||
item.LogicalCollectionName == "pinswg_maintenanceoflands217s"
? "pinswg_startdates,pinswg_finalcommentsduedate,"
: "") +
(item.LogicalCollectionName == "pinswg_nonvalidations"
? "pinswg_validdate,"
: "") +
(item.LogicalCollectionName == "pinswg_electricityacts" ||
item.LogicalCollectionName == "pinswg_dnses" ||
item.LogicalCollectionName == "pinswg_transportandworkacts"
? "pinswg_applicationacceptedasvalid,pinswg_endofrepresentationperiod,"
: "") +
(item.LogicalCollectionName == "pinswg_ldps" ||
item.LogicalCollectionName == "pinswg_harbourrevisionorders"
? "pinswg_addresstown,pinswg_addressline1,pinswg_addresscounty,pinswg_addressline2,pinswg_addresspostcode"
: item.LogicalCollectionName == "pinswg_electricityacts" ||
"pinswg_harbourrevisionorders"
? "pinswg_county"
: item.LogicalCollectionName ==
"pinswg_transportandworkacts" ||
item.LogicalCollectionName ==
"pinswg_electricityacts" ||
item.LogicalCollectionName ==
"pinswg_dnses" ||
item.LogicalCollectionName == "pinswg_sipses"
? "pinswg_addresscounty"
: item.LogicalCollectionName == "pinswg_rows"
? "pinswg_sitecounty"
: "pinswg_siteaddresscounty") +
", '" +
county +
"')) "
: "") +
(postcode != ""
? (addressline1 != "" || town != "" || county != ""
? " and "
: "") +
" (contains(" +
(item.LogicalCollectionName == "pinswg_ldps" ||
item.LogicalCollectionName ==
"pinswg_harbourrevisionorders"
? "pinswg_postcode"
: item.LogicalCollectionName ==
"pinswg_transportandworkacts" ||
item.LogicalCollectionName ==
"pinswg_electricityacts" ||
item.LogicalCollectionName == "pinswg_dnses"
? "pinswg_postcode"
: "pinswg_siteaddresspostcode") +
", '" +
postcode +
"')) "
: "") +
"&$orderby=createdon desc&$select=modifiedon,_pinswg_appellant_value,pinswg_name," +
(item.LogicalCollectionName ==
"pinswg_planningappeals78s" ||
item.LogicalCollectionName ==
"pinswg_lawfuldevelopmentcertificates" ||
item.LogicalCollectionName ==
"pinswg_householderappealhases" ||
item.LogicalCollectionName == "pinswg_advertses" ||
item.LogicalCollectionName == "pinswg_callinss77s" ||
item.LogicalCollectionName == "pinswg_commonlands" ||
item.LogicalCollectionName ==
"pinswg_communityinfrastructurelevys117118119s" ||
item.LogicalCollectionName ==
"pinswg_compulsorypurchaseorderses" ||
item.LogicalCollectionName ==
"pinswg_enforcementnoticeappeals174s" ||
item.LogicalCollectionName ==
"pinswg_environmentalpermittings" ||
item.LogicalCollectionName ==
"pinswg_hedgeshedgerowstreepreservationreplacems" ||
item.LogicalCollectionName ==
"pinswg_lawfuldevelopmentcertificates" ||
item.LogicalCollectionName ==
"pinswg_miscellaneouscaseworks" ||
item.LogicalCollectionName ==
"pinswg_planningconditionss73s79s" ||
item.LogicalCollectionName ==
"pinswg_planningobligationappeals106s" ||
item.LogicalCollectionName == "pinswg_rows" ||
item.LogicalCollectionName == "pinswg_wayleaves"
? "pinswg_startdate,pinswg_finalcommentsduedate,"
: "") +
(item.LogicalCollectionName ==
"pinswg_enforcementlistedbuildingconservationaps" ||
item.LogicalCollectionName ==
"pinswg_maintenanceoflands217s"
? "pinswg_startdates,pinswg_finalcommentsduedate,"
: "") +
(item.LogicalCollectionName == "pinswg_nonvalidations"
? "pinswg_validdate,"
: "") +
(item.LogicalCollectionName == "pinswg_electricityacts" ||
item.LogicalCollectionName == "pinswg_dnses" ||
item.LogicalCollectionName == "pinswg_sipses" ||
item.LogicalCollectionName ==
"pinswg_transportandworkacts"
? "pinswg_addresstown,pinswg_addressline1,pinswg_addresscounty,pinswg_addressline2,pinswg_postcode"
: item.LogicalCollectionName == "pinswg_rows"
? "pinswg_siteaddresstown,pinswg_siteaddressline1,pinswg_sitecounty,pinswg_siteaddressline2,pinswg_siteaddresspostcode"
: "pinswg_siteaddresstown,pinswg_siteaddressline1,pinswg_siteaddresscounty,pinswg_siteaddressline2,pinswg_siteaddresspostcode") +
"," +
(item.LogicalCollectionName == "pinswg_dnses" ||
item.LogicalCollectionName == "pinswg_transportandworkacts"
? "pinswg_dateofdecision,"
: item.LogicalCollectionName == "pinswg_nonvalidations"
? "pinswg_decisionissueddate,"
: item.LogicalCollectionName == "pinswg_electricityacts"
? "pinswg_datedecision,"
: item.LogicalCollectionName == "pinswg_sipses"
? ""
: "pinswg_casedecisiondate,") +
(item.LogicalCollectionName == "pinswg_planningappeals78s"
? "pinswg_dicision"
: item.LogicalCollectionName ==
"pinswg_transportandworkacts"
? "pinswg_decsision"
: item.LogicalCollectionName == "pinswg_nonvalidations"
? "pinswg_decisionissued"
: "pinswg_decision") +
"," +
(item.LogicalCollectionName == "pinswg_nonvalidations" ||
item.LogicalCollectionName == "pinswg_sipses"
? ""
: "pinswg_dateeventrequested,") +
"statuscode" +
(item.LogicalCollectionName == "pinswg_sipses"
? ""
: ",_" + item.NavigationProperty.toLowerCase() + "_value") +
(item.LogicalCollectionName == "pinswg_planningappeals78s"
? ",_pinswg_localplanningauthority_value"
: "") +
(item.LogicalCollectionName ==
"pinswg_compulsorypurchaseorderses" ||
item.LogicalCollectionName ==
"pinswg_enforcementnoticeappeals174s" ||
item.LogicalCollectionName ==
"pinswg_planningconditionss73s79s" ||
item.LogicalCollectionName ==
"pinswg_planningobligationappeals106s" ||
item.LogicalCollectionName ==
"pinswg_hedgeshedgerowstreepreservationreplacems" ||
item.LogicalCollectionName == "pinswg_householderappealhases" ||
item.LogicalCollectionName ==
"pinswg_lawfuldevelopmentcertificates" ||
item.LogicalCollectionName == "pinswg_adverts" ||
item.LogicalCollectionName ==
"pinswg_communityinfrastructurelevys117118119s" ||
item.LogicalCollectionName == "pinswg_callinss77s" ||
item.LogicalCollectionName == "pinswg_wayleaves" ||
item.LogicalCollectionName ==
"pinswg_environmentalpermittings" ||
item.LogicalCollectionName == "pinswg_miscellaneouscaseworks" ||
item.LogicalCollectionName == "pinswg_commonlands" ||
item.LogicalCollectionName == "pinswg_rows" ||
item.LogicalCollectionName == "pinswg_maintenanceoflands217s" ||
item.LogicalCollectionName ==
"pinswg_enforcementlistedbuildingconservationaps" ||
item.LogicalCollectionName == "pinswg_dnses" ||
item.LogicalCollectionName == "pinswg_sipses"
? ",_pinswg_associatedlpa_value"
: "") +
(item.LogicalCollectionName == "pinswg_sipses"
? ",_pinswg_sipscase_value"
: ",_" + item.PrimaryIdAttribute + "s_value");
? "pinswg_applicationacceptedasvalid,pinswg_endofrepresentationperiod,"
: "") +
(item.LogicalCollectionName == "pinswg_ldps" ||
item.LogicalCollectionName ==
"pinswg_harbourrevisionorders"
? "pinswg_addresstown,pinswg_addressline1,pinswg_addresscounty,pinswg_addressline2,pinswg_addresspostcode"
: item.LogicalCollectionName ==
"pinswg_electricityacts" ||
item.LogicalCollectionName == "pinswg_dnses" ||
item.LogicalCollectionName == "pinswg_sipses" ||
item.LogicalCollectionName ==
"pinswg_transportandworkacts"
? "pinswg_addresstown,pinswg_addressline1,pinswg_addresscounty,pinswg_addressline2,pinswg_postcode"
: item.LogicalCollectionName == "pinswg_rows"
? "pinswg_siteaddresstown,pinswg_siteaddressline1,pinswg_sitecounty,pinswg_siteaddressline2,pinswg_siteaddresspostcode"
: "pinswg_siteaddresstown,pinswg_siteaddressline1,pinswg_siteaddresscounty,pinswg_siteaddressline2,pinswg_siteaddresspostcode") +
"," +
(item.LogicalCollectionName == "pinswg_dnses" ||
item.LogicalCollectionName ==
"pinswg_transportandworkacts"
? "pinswg_dateofdecision,"
: item.LogicalCollectionName ==
"pinswg_nonvalidations"
? "pinswg_decisionissueddate,"
: item.LogicalCollectionName ==
"pinswg_electricityacts"
? "pinswg_datedecision,"
: item.LogicalCollectionName == "pinswg_sipses"
? ""
: "pinswg_casedecisiondate,") +
(item.LogicalCollectionName == "pinswg_planningappeals78s"
? "pinswg_dicision"
: item.LogicalCollectionName ==
"pinswg_transportandworkacts"
? "pinswg_decsision"
: item.LogicalCollectionName ==
"pinswg_nonvalidations"
? "pinswg_decisionissued"
: "pinswg_decision") +
"," +
(item.LogicalCollectionName == "pinswg_nonvalidations" ||
item.LogicalCollectionName == "pinswg_sipses"
? ""
: "pinswg_dateeventrequested,") +
"statuscode" +
(item.LogicalCollectionName == "pinswg_sipses"
? ""
: ",_" +
item.NavigationProperty.toLowerCase() +
"_value") +
(item.LogicalCollectionName == "pinswg_planningappeals78s"
? ",_pinswg_localplanningauthority_value"
: "") +
(item.LogicalCollectionName ==
"pinswg_compulsorypurchaseorderses" ||
item.LogicalCollectionName ==
"pinswg_enforcementnoticeappeals174s" ||
item.LogicalCollectionName ==
"pinswg_planningconditionss73s79s" ||
item.LogicalCollectionName ==
"pinswg_planningobligationappeals106s" ||
item.LogicalCollectionName ==
"pinswg_hedgeshedgerowstreepreservationreplacems" ||
item.LogicalCollectionName ==
"pinswg_householderappealhases" ||
item.LogicalCollectionName ==
"pinswg_lawfuldevelopmentcertificates" ||
item.LogicalCollectionName == "pinswg_adverts" ||
item.LogicalCollectionName ==
"pinswg_communityinfrastructurelevys117118119s" ||
item.LogicalCollectionName == "pinswg_callinss77s" ||
item.LogicalCollectionName == "pinswg_wayleaves" ||
item.LogicalCollectionName ==
"pinswg_environmentalpermittings" ||
item.LogicalCollectionName ==
"pinswg_miscellaneouscaseworks" ||
item.LogicalCollectionName == "pinswg_commonlands" ||
item.LogicalCollectionName == "pinswg_rows" ||
item.LogicalCollectionName ==
"pinswg_maintenanceoflands217s" ||
item.LogicalCollectionName ==
"pinswg_enforcementlistedbuildingconservationaps" ||
item.LogicalCollectionName == "pinswg_dnses" ||
item.LogicalCollectionName == "pinswg_sipses"
? ",_pinswg_associatedlpa_value"
: "") +
(item.LogicalCollectionName == "pinswg_sipses"
? ",_pinswg_sipscase_value"
: ",_" + item.PrimaryIdAttribute + "s_value");
// console.log(
// "\n==========================================\n",
// "basic search: " + queryUrl,
// "\n\n",
// item.LogicalCollectionName,
// "\n\n",
// WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
// "\n==========================================\n"
// );
console.log(
"\n==========================================\n",
"basic search: " + queryUrl,
"\n\n",
item.LogicalCollectionName,
"\n\n",
WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
"\n==========================================\n"
);
const resultObj = axios
.get(