Merge pull request #179 from spwoodcock/refactor/fix-types-lint-format

Fix type/indent errors after docstring additions
hotosm · Aug 21, 2023 · 5a16b4a · 5a16b4a
2 parents 7cc46d1 + 44f2894
commit 5a16b4a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/osm_fieldwork/basemapper.py b/osm_fieldwork/basemapper.py
@@ -29,7 +29,7 @@
 import queue
 import concurrent.futures
 import threading
-from osm_fieldwork.sqlite import DataFile
+from osm_fieldwork.sqlite import DataFile, MapTile
 
 # Instantiate logger
 log = logging.getLogger(__name__)

diff --git a/osm_fieldwork/odk_merge.py b/osm_fieldwork/odk_merge.py
@@ -530,9 +530,9 @@ def main():
         formatter_class=argparse.RawDescriptionHelpFormatter,
         description="This program conflates ODK data with existing features from OSM.",
         epilog="""
-This program conflates the output from Osm-Fieldwork after converting
-the JSON file from ODK Central to OSM XML. The data source for existing data can'
-be either the data extract used by the XLSForm, or a postgresql database.
+    This program conflates the output from Osm-Fieldwork after converting
+    the JSON file from ODK Central to OSM XML. The data source for existing data can'
+    be either the data extract used by the XLSForm, or a postgresql database.
 
     examples:
         odk_merge.py [OPTIONS] [OSMFILE] [DATAFILE]

diff --git a/osm_fieldwork/sqlite.py b/osm_fieldwork/sqlite.py
@@ -4,7 +4,10 @@
 #
 # This file is part of OSM-Fieldwork.
 #
-#     This is free software: you can redistribute it and/or modify
+#     This is free software: you can redistribute it and/or modify<<<<<<< refactor/fix-types-lint-format
+78
+
+
 #     it under the terms of the GNU General Public License as published by
 #     the Free Software Foundation, either version 3 of the License, or
 #     (at your option) any later version.
@@ -36,7 +39,7 @@ def __init__(self,
                  y: int = None,
                  z: int = None,
                  filespec: str = None,
-                 tile: MapTile = None,
+                 tile: 'MapTile' = None,
                  suffix="jpg",
                  ):
         """
@@ -74,7 +77,7 @@ def __init__(self,
             self.y = tmp[1].replace("." + suffix, "")
 
     def readImage(self,
-                  base: str = "./",
+                  base: str = "./,
                   ):
         """
         Read a map tile out of the disk based map tile cache