Skip to content

Fix adequacy.py #843

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

Open
ycchen678 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix adequacy.py #843

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 17 additions & 14 deletions backend/lib/calculate/adequacy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,21 +88,24 @@ def _get_locations_to_check_by_service_area(
address_values_list=', '.join(address_values)
)
gis_query = """
SELECT
areas.service_area_id AS service_area_id
, tmp.idx AS address_idx
FROM {service_areas} areas
JOIN {temp_table_name} tmp
ON (
ST_DWithin(areas.location, tmp.location, {radius}, FALSE)
SELECT
areas.service_area_id AS service_area_id,
tmp.idx AS address_idx
FROM {service_areas} areas
JOIN {temp_table_name} tmp ON (
ST_DWithin(areas.location, tmp.location, {radius}, FALSE)
AND NOT EXISTS ( -- Ensure no ocean crossing
SELECT 1 FROM ocean_shapes os
WHERE ST_Intersects(ST_ShortestLine(areas.location, tmp.location), os.geom)
)
WHERE 1=1
AND areas.service_area_id IN %(service_area_id_list)s
;
""".format(
temp_table_name=temp_table_name,
service_areas=service_area.ServiceArea.__tablename__,
radius=radius_in_meters,
)
WHERE 1=1
AND areas.service_area_id IN %(service_area_id_list)s
;
""".format(
temp_table_name=temp_table_name,
service_areas=service_area.ServiceArea.__tablename__,
radius=radius_in_meters,
)

full_query = """
Expand Down