Skip to content

Commit

Permalink
Merge pull request #273 from hotosm/hotfix/usermetadata
Browse files Browse the repository at this point in the history 
Fix : Fixes bug on includeuserinfo when attribtues are selected
  • Loading branch information
@kshitijrajsharma
kshitijrajsharma authored Aug 30, 2024
2 parents 8d3de47 + e69ddd2 commit 8ab7160
Show file tree
Hide file tree
Showing 2 changed files with 80 additions and 4 deletions.
29 changes: 25 additions & 4 deletions src/query_builder/builder.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ def create_column_filter(
output_type="geojson",
use_centroid=False,
include_osm_type=True,
include_user_metadata=False,
):
"""generates column filter , which will be used to filter column in output will be used on select query - Rawdata extraction"""

Expand All @@ -135,11 +136,17 @@ def create_column_filter(
filter_col.append("osm_id")
if include_osm_type:
filter_col.append("tableoid::regclass AS osm_type")

if include_user_metadata:
filter_col.extend(["uid", f""" "user" """, "timestamp"])
if create_schema:
schema = {}
schema["osm_id"] = "int64"
schema["type"] = "str"
if include_user_metadata:
schema["uid"] = "int64"
schema["user"] = "str"
schema["timestamp"] = "str"

if "*" in columns:
filter_col.append("tags")
if create_schema:
Expand Down Expand Up @@ -167,6 +174,8 @@ def create_column_filter(
return select_condition, schema
return select_condition
else:
if include_user_metadata:
return f"""osm_id, tableoid::regclass AS osm_type, tags,changeset, uid, "user", timestamp,{'ST_Centroid(geom) as geom' if use_centroid else 'geom'}"""
return f"osm_id, tableoid::regclass AS osm_type, tags,changeset,timestamp,{'ST_Centroid(geom) as geom' if use_centroid else 'geom'}" # this is default attribute that we will deliver to user if user defines his own attribute column then those will be appended with osm_id only


Expand Down Expand Up @@ -234,10 +243,14 @@ def generate_tag_filter_query(filter, join_by=" OR ", plain_query_filter=False):


def extract_geometry_type_query(
params, ogr_export=False, g_id=None, c_id=None, country_export=False
params,
ogr_export=False,
g_id=None,
c_id=None,
country_export=False,
):
"""used for specifically focused on export tool , this will generate separate queries for line point and polygon can be used on other datatype support - Rawdata extraction"""

include_user_metadata = params.include_user_metadata
geom_filter = create_geom_filter(
params.geometry,
"ST_within" if params.use_st_within is True else "ST_intersects",
Expand Down Expand Up @@ -296,6 +309,7 @@ def extract_geometry_type_query(
output_type=params.output_type,
columns=master_attribute_filter,
create_schema=True,
include_user_metadata=include_user_metadata,
)
if master_tag_filter:
attribute_filter = generate_tag_filter_query(master_tag_filter)
Expand All @@ -310,6 +324,7 @@ def extract_geometry_type_query(
output_type=params.output_type,
columns=point_attribute_filter,
create_schema=True,
include_user_metadata=include_user_metadata,
)
where_clause_for_nodes = generate_where_clause_indexes_case(
geom_filter, g_id, c_id, country_export, "nodes"
Expand Down Expand Up @@ -337,6 +352,7 @@ def extract_geometry_type_query(
output_type=params.output_type,
columns=line_attribute_filter,
create_schema=True,
include_user_metadata=include_user_metadata,
)
where_clause_for_line = generate_where_clause_indexes_case(
geom_filter, g_id, c_id, country_export, "ways_line"
Expand Down Expand Up @@ -377,6 +393,7 @@ def extract_geometry_type_query(
output_type=params.output_type,
columns=poly_attribute_filter,
create_schema=True,
include_user_metadata=include_user_metadata,
)

where_clause_for_poly = generate_where_clause_indexes_case(
Expand Down Expand Up @@ -505,7 +522,7 @@ def raw_currentdata_extraction_query(
country_export=False,
):
"""Default function to support current snapshot extraction with all of the feature that export_tool_api has"""

include_user_metadata = params.include_user_metadata
geom_lookup_by = "ST_within" if params.use_st_within is True else "ST_intersects"
geom_filter = create_geom_filter(params.geometry, geom_lookup_by)

Expand Down Expand Up @@ -590,6 +607,7 @@ def raw_currentdata_extraction_query(
use_centroid=params.centroid,
output_type=params.output_type,
columns=master_attribute_filter,
include_user_metadata=include_user_metadata,
)
# if master attribute is supplied it will be applied to other geom type as well even though value is supplied they will be ignored
point_select_condition = select_condition
Expand All @@ -602,20 +620,23 @@ def raw_currentdata_extraction_query(
use_centroid=params.centroid,
output_type=params.output_type,
columns=point_attribute_filter,
include_user_metadata=include_user_metadata,
)
if line_attribute_filter:
if len(line_attribute_filter) > 0:
line_select_condition = create_column_filter(
use_centroid=params.centroid,
output_type=params.output_type,
columns=line_attribute_filter,
include_user_metadata=include_user_metadata,
)
if poly_attribute_filter:
if len(poly_attribute_filter) > 0:
poly_select_condition = create_column_filter(
use_centroid=params.centroid,
output_type=params.output_type,
columns=poly_attribute_filter,
include_user_metadata=include_user_metadata,
)

if tags:
Expand Down
55 changes: 55 additions & 0 deletions tests/test_API.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -668,6 +668,61 @@ def test_snapshot_and_filter():
wait_for_task_completion(track_link)


def test_snapshot_and_filter_with_usermetadata():
headers = {"access-token": access_token}

response = client.post(
"/v1/snapshot/",
json={
"fileName": "Destroyed_Buildings_Turkey",
"includeUserMetadata": True,
"geometry": {
"type": "Polygon",
"coordinates": [
[
[36.70588085657477, 37.1979648807274],
[36.70588085657477, 37.1651408422983],
[36.759267544807194, 37.1651408422983],
[36.759267544807194, 37.1979648807274],
[36.70588085657477, 37.1979648807274],
]
],
},
"outputType": "geojson",
"geometryType": ["polygon"],
"filters": {
"tags": {
"point": {},
"line": {},
"polygon": {
"join_or": {},
"join_and": {
"destroyed:building": ["yes"],
"damage:date": ["2023-02-06"],
},
},
},
"attributes": {
"point": [],
"line": [],
"polygon": [
"building",
"destroyed:building",
"damage:date",
"name",
"source",
],
},
},
},
headers=headers
)
assert response.status_code == 200
res = response.json()
track_link = res["track_link"]
wait_for_task_completion(track_link)


def test_snapshot_authentication_uuid():
headers = {"access-token": access_token}
payload = {
Expand Down

0 comments on commit 8ab7160

Please sign in to comment.