Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(1) Fix place quantified name retrieval issues (2) Use s2 cell-based search for all hazard search scenarios #274

Merged
merged 8 commits into from
May 25, 2022
Merged

(1) Fix place quantified name retrieval issues (2) Use s2 cell-based search for all hazard search scenarios #274

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b943724
Include upstream changes
May 13, 2022
21460ca
Merge branch 'stko-kwg' into zilong-stko-kwg
May 15, 2022
7a05500
Fix optional statements in place search
May 15, 2022
df82b7d
Fix placeQuantName retrieval issue in hazard search
May 15, 2022
2e34a16
Fix the missing info issue of placeQuantName retrieval in hazard search
May 15, 2022
0e8aba6
Use s2 cell-based search for all hazard search situations
May 15, 2022
871e828
Remove commented codes in hazard search
May 16, 2022
e1386d8
Include upstream changes
May 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 11 additions & 57 deletions dr-app/public/js/query.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,66 +807,21 @@ async function getHazardSearchResults(pageNum, recordNum, parameters) {
`;
if (placeEntities.length > 0)
{
let placesConnectedToS2 = [];
let placesLocatedIn = [];
for (let i = 0 ; i < placeEntities.length; i++)
{
if (placeEntities[i].startsWith('zipcode') || placeEntities[i].startsWith('noaaClimateDiv'))
{
placesConnectedToS2.push(placeEntities[i]);
}
if (placeEntities[i].startsWith('Earth') || placeEntities[i].startsWith('NWZone'))
{
placesLocatedIn.push(placeEntities[i]);
}
}
if (placesConnectedToS2.length > 0)
{
placeSearchQuery += `
?s2cellGNIS rdf:type kwg-ont:KWGCellLevel13 .
values ?placesConnectedToS2 {kwgr:` + placesConnectedToS2.join(' kwgr:') + `}
?s2cellGNIS kwg-ont:spatialRelation ?placesConnectedToS2.
`;
}
if (placesLocatedIn.length > 0)
{
placeSearchQuery += `
?s2cellGNIS kwg-ont:spatialRelation ?placesNonConnectedToS2.
values ?placesNonConnectedToS2 {kwgr:` + placesLocatedIn.join(' kwgr:') + `}
`;
}
placeSearchQuery += `
?s2cellGNIS rdf:type kwg-ont:KWGCellLevel13 .
values ?placesConnectedToS2 {kwgr:` + placeEntities.join(' kwgr:') + `}
?s2cellGNIS kwg-ont:spatialRelation ?placesConnectedToS2.
`;
}
}
else if (placeEntities.length > 0)
{
let placesConnectedToS2 = [];
let placesLocatedIn = [];
for (let i = 0 ; i < placeEntities.length; i++)
{
if (placeEntities[i].startsWith('zipcode') || placeEntities[i].startsWith('noaaClimateDiv'))
{
placesConnectedToS2.push(placeEntities[i]);
}
if (placeEntities[i].startsWith('Earth') || placeEntities[i].startsWith('NWZone'))
{
placesLocatedIn.push(placeEntities[i]);
}
}
if (placesConnectedToS2.length > 0)
{
placeSearchQuery += `
?entity kwg-ont:sfWithin ?s2Cell .
?s2Cell rdf:type kwg-ont:KWGCellLevel13 .
values ?placesConnectedToS2 {kwgr:` + placesConnectedToS2.join(' kwgr:') + `}
?s2Cell kwg-ont:spatialRelation ?placesConnectedToS2.
`;
}
if (placesLocatedIn.length > 0)
{
placeSearchQuery += `
values ?place {kwgr:` + placesLocatedIn.join(' kwgr:') + `}
`;
}
placeSearchQuery += `
?entity kwg-ont:spatialRelation ?s2Cell .
?s2Cell rdf:type kwg-ont:KWGCellLevel13 .
values ?placesConnectedToS2 {kwgr:` + placeEntities.join(' kwgr:') + `}
?s2Cell kwg-ont:spatialRelation ?placesConnectedToS2.
`;
}

//Filter by the date hazard occurred
Expand Down Expand Up @@ -983,7 +938,6 @@ async function getHazardSearchResults(pageNum, recordNum, parameters) {
formattedResults[counterRow]['end_date'] = row.time.value.split('||')[0];
formattedResults[counterRow]['end_date_name'] = row.endTimeLabel.value.split('||')[0];
})
console.log(formattedResults)

let countResults = await query(`select (count(*) as ?count) { ` + hazardQuery + ` LIMIT ` + recordNum*10 + `}`);
return { 'count': countResults[0].count.value, 'record': formattedResults };
Expand Down