Skip to content

Open Infrastructure Map, a view of infrastructure data in OpenStreetMap

Fix type checking issues

Russ Garrett9a93be2c4925
diff --git a/web-backend/data.py b/web-backend/data.py
index ae2cf4a..ce783fb 100644
--- a/web-backend/data.py
+++ b/web-backend/data.py
@@ -138,7 +138,7 @@ async def get_wikidata(wikidata_id: str, client: httpx.AsyncClient) -> Optional[
@alru_cache(maxsize=1000)
async def get_commons_thumbnail(
filename: str, client: httpx.AsyncClient, width: int = 300
-) -> list:
+) -> dict:
url = (
"https://commons.wikimedia.org/w/api.php?"
f"action=query&titles=Image:{filename}&prop=imageinfo"
diff --git a/web-backend/wikidata.py b/web-backend/wikidata.py
index f4870cc..d6cba15 100644
--- a/web-backend/wikidata.py
+++ b/web-backend/wikidata.py
@@ -1,6 +1,6 @@
""" Endpoints to proxy WikiData requests for info popups on the map """
-from typing import Optional
+from typing import Any, Optional
import httpx
from starlette.exceptions import HTTPException
from starlette.responses import JSONResponse, Response
@@ -32,7 +32,7 @@ async def wikidata_json(
if data is None:
return None
- response = {}
+ response: dict[str, Any] = {"part_of": []}
response["labels"] = {
label["language"]: label["value"] for label in data["labels"].values()
}
@@ -56,12 +56,11 @@ async def wikidata_json(
]
if "P361" in data["claims"]:
- response["part_of"] = []
for claim in data["claims"]["P361"]:
- response["part_of"].append(
- await wikidata_json(
- claim["mainsnak"]["datavalue"]["value"]["id"], http_client
- )
+ part_info = await wikidata_json(
+ claim["mainsnak"]["datavalue"]["value"]["id"], http_client
)
+ if part_info is not None:
+ response["part_of"].append(part_info)
return response