continue filling in site, geocode directories

danvk · Oct 20, 2024 · 12716a8 · 12716a8
1 parent 3956aba
commit 12716a8
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 234 deletions.
diff --git a/.github/workflows/e2etest.yml b/.github/workflows/e2etest.yml
@@ -13,7 +13,7 @@ jobs:
         tar -xzf geocache.tgz
     - name: Run geocoder
       run: |
-        poetry run ./generate-geocodes.py --ids_filter test/random200-ids.txt --images_ndjson data/images.ndjson --output_format id-location.txt --geocode > test/random200-geocoded.txt 2> test/random200.logs.txt
+        poetry run oldnyc/geocode/geocodes.py --ids_filter test/random200-ids.txt --images_ndjson data/images.ndjson --output_format id-location.txt --geocode > test/random200-geocoded.txt 2> test/random200.logs.txt
     - name: Check for diffs
       run: |
         git diff --exit-code test/

diff --git a/generate_js.py b/generate_js.py
diff --git a/grid/gold.py b/grid/gold.py
@@ -14,8 +14,8 @@
 
 from dotenv import load_dotenv
 
-import geocoder
 from nyc.boroughs import PointToBorough
+from oldnyc.geocode import geocoder
 
 
 # See http://stackoverflow.com/a/20007730/388951

diff --git a/oldnyc/geocode/generate_js.py b/oldnyc/geocode/generate_js.py
diff --git a/oldnyc/geocode/generate-geocodes.py → oldnyc/geocode/geocode.py b/oldnyc/geocode/generate-geocodes.py → oldnyc/geocode/geocode.py
@@ -18,9 +18,8 @@
 import coders.gpt
 import coders.milstein
 import coders.nyc_parks
-import geocoder
 from coders.types import Coder, Locatable, Location
-from oldnyc.geocode import generate_js
+from oldnyc.geocode import generate_js, geocoder
 from oldnyc.item import Item, load_items
 
 CODERS: dict[str, Callable[[], Coder]] = {

diff --git a/geocoder.py → oldnyc/geocode/geocoder.py b/geocoder.py → oldnyc/geocode/geocoder.py