Skip to content

Commit 55e9963

Browse files
committed
Merge branch 'develop' into staging
2 parents e0f953e + d1fd279 commit 55e9963

5 files changed

Lines changed: 512 additions & 265 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: CI
22

33
on:
44
push:
5-
branches: [ main, develop ]
5+
branches: [ develop ]
66
pull_request:
7-
branches: [ main, develop ]
7+
branches: [ develop ]
88

99
# Cancel any in-progress run for the same branch/PR when a newer commit lands.
1010
concurrency:

api/core/security.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -414,10 +414,8 @@ async def _validate_token_uncached(
414414

415415
# workspace roles from OSM DB
416416
result = await osm_db_session.execute(
417-
text(
418-
"SELECT workspace_id, role FROM user_workspace_roles \
419-
WHERE user_auth_uid = :auth_uid"
420-
),
417+
text("SELECT workspace_id, role FROM user_workspace_roles \
418+
WHERE user_auth_uid = :auth_uid"),
421419
{"auth_uid": str(r.user_uuid)},
422420
)
423421
workspaceRoles = list(result.mappings().all())

api/src/osm/repository.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,11 @@ async def getWorkspaceBBox(
2222
text(f"SET search_path TO 'workspace-{int(workspace_id)}', public")
2323
)
2424

25+
# OSM stores node latitude/longitude as integers scaled by 1e7
26+
# (100-nanodegree units), so divide by 1e7 to return decimal degrees.
2527
sql_query = text(
26-
"select MAX(latitude) AS max_lat, MAX(longitude) AS max_lon, \
27-
MIN(latitude) AS min_lat, MIN(longitude) AS min_lon from nodes"
28+
"select MAX(latitude) / 1e7 AS max_lat, MAX(longitude) / 1e7 AS max_lon, \
29+
MIN(latitude) / 1e7 AS min_lat, MIN(longitude) / 1e7 AS min_lon from nodes"
2830
)
2931

3032
result = await self.session.execute(sql_query)

pyproject.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@ dependencies = [
99
"asyncpg>=0.30.0",
1010
"fastapi>=0.115.6",
1111
"pydantic-settings>=2.6.1",
12-
"python-dotenv>=1.0.1",
12+
"python-dotenv>=1.2.2",
1313
"sqlalchemy>=2.0.36",
1414
"uvicorn>=0.32.1",
1515
"python-jose[cryptography]>=3.3.0",
1616
"bcrypt==4.0.1",
1717
"passlib==1.7.4",
1818
"pydantic[email]>=2.5.2",
19-
"pytest>=8.0.0",
19+
"pytest>=9.0.3",
2020
"pytest-asyncio>=0.23.5",
2121
"httpx>=0.27.0",
2222
"pytest-cov>=4.1.0",
23-
"black>=24.1.0",
23+
"black>=26.3.1",
2424
"isort>=5.13.0",
2525
"pre-commit>=4.0.1",
2626
"autoflake>=2.3.1",
27-
"python-multipart>=0.0.20",
27+
"python-multipart>=0.0.31",
2828
"greenlet>=3.1.1",
2929
"geoalchemy2>=0.18.1",
3030
"jsonschema>=4.25.1",

0 commit comments

Comments
 (0)