Merge pull request #23 from eyeseast/geojson

GeoJSON and SpatiaLite support

Author: eyeseast

Diff for: .github/workflows/test.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python ${{ matrix.python-version }}

Diff for: .gitignore

@@ -17,4 +17,6 @@ dist/
 *.sqlite
 
 .env
-.vscode
+.vscode
+Pipfile
+Pipfile.lock

Diff for: Makefile

@@ -6,7 +6,7 @@ tests/%.db: tests/innout.geojson tests/innout.csv
 
 .PHONY: test
 test: tests/test.db
-	geocode-sqlite test tests/test.db innout_test -p tests/test.db -l "{id}" -d .1
+	geocode-sqlite test tests/test.db innout_test -p tests/test.db -l "{id}" -d .1 --spatialite
 
 .PHONY: nominatim
 nominatim: tests/nominatim.db
@@ -45,8 +45,8 @@ mapbox: tests/mapbox.db
 
 .PHONY: run
 run:
-	datasette serve tests/*.db
+	datasette serve tests/*.db --load-extension spatialite
 
 .PHONY: clean
 clean:
-	rm tests/test.db
+	rm -f tests/test.db

Diff for: README.md

@@ -73,10 +73,12 @@ Each geocoder needs to know where to find the data it's working with. These are
 
 From there, we have a set of options passed to every geocoder:
 
-- location: a [string format](https://docs.python.org/3/library/stdtypes.html#str.format) that will be expanded with each row to build a full query, to be geocoded
-- delay: a delay between each call (some services require this)
-- latitude: latitude column name
-- longitude: longitude column name
+- `location`: a [string format](https://docs.python.org/3/library/stdtypes.html#str.format) that will be expanded with each row to build a full query, to be geocoded
+- `delay`: a delay between each call (some services require this)
+- `latitude`: latitude column name
+- `longitude`: longitude column name
+- `geojson`: store results as GeoJSON, instead of in latitude and longitude columns
+- `spatialite`: store results in a SpatiaLite geometry column, instead of in latitude and longitude columns
 
 Each geocoder takes additional, specific arguments beyond these, such as API keys. Again, [geopy's documentation](https://geopy.readthedocs.io/en/latest/#module-geopy.geocoders) is an excellent resource.