Skip to content

Commit fd8b5c8

Browse files
davenquinngithub-actions[bot]
authored andcommitted
Format code and sort imports
1 parent 8581e6d commit fd8b5c8

File tree

4 files changed

+16
-14
lines changed

4 files changed

+16
-14
lines changed

services/legacy-tileserver/macrostrat/legacy_tileserver/__init__.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
1+
from enum import Enum
2+
from functools import lru_cache
13
from os import environ
4+
from pathlib import Path
25

36
from buildpg import render
47
from buildpg.asyncpg import create_pool_b
5-
from enum import Enum
68
from fastapi import BackgroundTasks, Depends, FastAPI, Request
7-
from functools import lru_cache
9+
from morecantile import Tile
10+
from starlette.middleware import Middleware
11+
from starlette.middleware.cors import CORSMiddleware
12+
from starlette.responses import HTMLResponse
13+
814
from macrostrat.database import Database
915
from macrostrat.tileserver_utils import (
1016
CachedTileArgs,
@@ -14,11 +20,6 @@
1420
handle_cached_tile_request,
1521
)
1622
from macrostrat.utils import get_logger, setup_stderr_logs
17-
from morecantile import Tile
18-
from pathlib import Path
19-
from starlette.middleware import Middleware
20-
from starlette.middleware.cors import CORSMiddleware
21-
from starlette.responses import HTMLResponse
2223

2324
from .image_tiles import MapnikMapPool, get_image_tile
2425

services/legacy-tileserver/macrostrat/legacy_tileserver/image_tiles/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ async def get_image_tile(request: Request, args: CachedTileArgs) -> bytes:
4141
# Render map to image
4242
im = Image(512, 512)
4343
render(_map, im, 2)
44-
44+
4545
# Return image as binary
4646
res = im.tostring("png")
4747
return res

services/legacy-tileserver/macrostrat/legacy_tileserver/image_tiles/mapnik_styles.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
"""
55

66
from json import dumps
7-
8-
from mapnik import Datasource
97
from pathlib import Path
108
from subprocess import CalledProcessError, check_output
119
from textwrap import dedent
1210

11+
from mapnik import Datasource
12+
1313
from .config import layer_order
1414

1515
__here__ = Path(__file__).parent

services/legacy-tileserver/macrostrat/legacy_tileserver/image_tiles/pool.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
from asyncio import Queue
2-
31
import time
2+
from asyncio import Queue
43
from contextlib import asynccontextmanager
4+
5+
from mapnik import Map, load_map_from_string
6+
57
from macrostrat.database import Database
68
from macrostrat.utils import get_logger
7-
from mapnik import Map, load_map_from_string
89

910
from .config import scales
1011
from .mapnik_styles import (
11-
make_mapnik_xml,
1212
make_line_datasource,
13+
make_mapnik_xml,
1314
make_polygon_datasource,
1415
)
1516

0 commit comments

Comments
 (0)