From 4d434f9faf699dae962c4aaa986edd3d3e99190a Mon Sep 17 00:00:00 2001
From: Rob Savoye <rob@senecass.com>
Date: Sun, 6 Aug 2023 12:19:27 -0600
Subject: [PATCH] =?UTF-8?q?bump:=20version=200.3.3=20=E2=86=92=200.3.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile                                | 2 +-
 docs/Makefile                           | 5 +++++
 osm_fieldwork/__version__.py            | 2 +-
 osm_fieldwork/odk_merge.py              | 4 +---
 osm_fieldwork/xlsforms/.~lock.test.xls# | 1 -
 pyproject.toml                          | 5 +++--
 6 files changed, 11 insertions(+), 8 deletions(-)
 delete mode 100644 osm_fieldwork/xlsforms/.~lock.test.xls#

diff --git a/Makefile b/Makefile
index d781ba6e0..6649e64a7 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@
 
 PACKAGE := org.osm_fieldwork.py
 NAME := osm-fieldwork
-VERSION := 0.3.3
+VERSION := 0.3.4
 
 # Make a python package for pip
 pip:
diff --git a/docs/Makefile b/docs/Makefile
index ad899f3d3..35faa1d47 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -42,6 +42,11 @@ all: $(HTML) $(PDF)
 	$(PANDOC) $(PFLAGS) --toc --to=pdf $<  --metadata title="$${title}" -o $*.pdf
 	@echo "Wrote $*.pdf"
 
+%.man: %.md
+	@title="$(shell grep "^#" $< | head -1 | tr -d '#')"; \
+	$(PANDOC) $(PFLAGS) --toc --to=man $<  --metadata title="$${title}" -o $*.1
+	@echo "Wrote $*.man"
+
 clean: force
 	@rm -f $(HTML) $(PDF)
 
diff --git a/osm_fieldwork/__version__.py b/osm_fieldwork/__version__.py
index e19434e2e..334b89956 100644
--- a/osm_fieldwork/__version__.py
+++ b/osm_fieldwork/__version__.py
@@ -1 +1 @@
-__version__ = "0.3.3"
+__version__ = "0.3.4"
diff --git a/osm_fieldwork/odk_merge.py b/osm_fieldwork/odk_merge.py
index 9e1ea3655..4689fe161 100755
--- a/osm_fieldwork/odk_merge.py
+++ b/osm_fieldwork/odk_merge.py
@@ -462,16 +462,14 @@ def main():
 
     # if verbose, dump to the terminal.
     if args.verbose:
-        root = logging.getLogger()
         log.setLevel(logging.DEBUG)
-
         ch = logging.StreamHandler(sys.stdout)
         ch.setLevel(logging.DEBUG)
         formatter = logging.Formatter(
             "%(threadName)10s - %(name)s - %(levelname)s - %(message)s"
         )
         ch.setFormatter(formatter)
-        root.addHandler(ch)
+        log.addHandler(ch)
 
     if args.outfile:
         outfile = args.outfile
diff --git a/osm_fieldwork/xlsforms/.~lock.test.xls# b/osm_fieldwork/xlsforms/.~lock.test.xls#
deleted file mode 100644
index 96e68a62e..000000000
--- a/osm_fieldwork/xlsforms/.~lock.test.xls#
+++ /dev/null
@@ -1 +0,0 @@
-,rob,nomad.moongulch.net,04.04.2023 08:36,file:///home/rob/.config/libreoffice/4;
\ No newline at end of file
diff --git a/pyproject.toml b/pyproject.toml
index 5c820adbe..9b6a1ed35 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -21,7 +21,8 @@ dependencies = [
     "overpy>=0.6",
     "thefuzz>=0.19.0",
     "haversine>=2.8.0",
-    "flatdict>=4.0.1"
+    "flatdict>=4.0.1",
+    "ogr>=0.44.0",
 ]
 requires-python = ">=3.9"
 readme = "README.md"
@@ -63,7 +64,7 @@ pythonpath = "osm_fieldwork"
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "0.3.3"
+version = "0.3.4"
 version_files = [
     "pyproject.toml:version",
     "osm_fieldwork/__version__.py",