Fix data paths

banesullivan · Jun 3, 2023 · 4fe02d8 · 4fe02d8
1 parent 25113e2
commit 4fe02d8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,5 +1,5 @@
-graft localtileserver/tileserver/static
-graft localtileserver/tileserver/templates
+graft localtileserver/web/static
+graft localtileserver/web/templates
 global-exclude *.pyc
-graft localtileserver/tileserver/data
-exclude localtileserver/tileserver/data/*.aux.xml
+graft localtileserver/tiler/data
+exclude localtileserver/tiler/data/*.aux.xml
diff --git a/flask.env b/flask.env
@@ -1,2 +1,2 @@
-export FLASK_APP=localtileserver/tileserver/__init__.py
+export FLASK_APP=localtileserver/web/__init__.py
 export FLASK_ENV=development
diff --git a/localtileserver/tiler/data/__init__.py b/localtileserver/tiler/data/__init__.py
@@ -19,7 +19,7 @@ def get_building_docs():
 
 def get_data_path(name):
     if get_building_docs():
-        return f"https://github.com/banesullivan/localtileserver/raw/main/localtileserver/tileserver/data/{name}"
+        return f"https://github.com/banesullivan/localtileserver/raw/main/localtileserver/tiler/data/{name}"
     else:
         return DIRECTORY / name
 

diff --git a/localtileserver/tiler/utilities.py b/localtileserver/tiler/utilities.py
@@ -68,6 +68,7 @@ def is_geospatial(source: RasterioFileTileSource) -> bool:
 def get_tile_source(
     path: Union[pathlib.Path, str], projection: str = None, style: str = None, encoding: str = "PNG"
 ) -> RasterioFileTileSource:
+    path = get_clean_filename(path)
     return RasterioFileTileSource(str(path), projection=projection, style=style, encoding=encoding)