diff --git a/.github/workflows/nominatim-docker-test.yml b/.github/workflows/nominatim-docker-test.yml index a373ebd4b..5a6cc1ad1 100644 --- a/.github/workflows/nominatim-docker-test.yml +++ b/.github/workflows/nominatim-docker-test.yml @@ -28,5 +28,5 @@ jobs: - name: Test nominatim env: - GEOFABRIK_QUERY_URL: https://geocoding.geofabrik.de/${{secrets.GEOFABRIK_API}} + GEOFABRIK_QUERY_URL: "https://geocoding.geofabrik.de/${{secrets.GEOFABRIK_API}}"" run: docker-compose -f emission/integrationTests/docker-compose.yml up --exit-code-from web-server diff --git a/emission/individual_tests/TestNominatim.py b/emission/individual_tests/TestNominatim.py index e1792a886..6a8cbe335 100644 --- a/emission/individual_tests/TestNominatim.py +++ b/emission/individual_tests/TestNominatim.py @@ -20,7 +20,8 @@ #temporarily sets NOMINATIM_QUERY_URL to the environment variable for testing. NOMINATIM_QUERY_URL_env = os.environ.get("NOMINATIM_QUERY_URL", "") NOMINATIM_QUERY_URL = NOMINATIM_QUERY_URL_env if NOMINATIM_QUERY_URL_env != "" else eco.NOMINATIM_QUERY_URL -GEOFABRIK_QUERY_URL = os.environ.get("GEOFABRIK_QUERY_URL", "") +GEOFABRIK_QUERY_URL = os.environ.get("GEOFABRIK_QUERY_URL") +# GEOFABRIK_QUERY_URL = os.environ["GEOFABRIK_QUERY_URL"] #Creates a fake place in Rhode Island to use for testing. fake_id = "rhodeislander" @@ -42,8 +43,9 @@ def test_geofabrik_and_nominatim(self): # and reverse geocodes with the coordinates. def test_get_filtered_place(self): raw_result = ecww.WrapperBase.__getattr__(clean.get_filtered_place(fake_place), "data") + print(NOMINATIM_QUERY_URL) actual_result = ecww.WrapperBase.__getattr__(raw_result, "display_name") - expected_result = "Fulton Street, Providence" + expected_result = "Dorrance Street, Providence" self.assertEqual(expected_result, actual_result) def test_make_url_geo(self): @@ -90,9 +92,7 @@ def test_nominatim_api(self): nominatim_result = nominatim_result_raw.json()['display_name'] # NOMINATIM_QUERY_URL = eco.NOMINATIM_QUERY_URL docker_result = eco.Geocoder.reverse_geocode(41.832942092439694, -71.41558148857203) - print("HEYYY") print(docker_result) - print("hey2") print(nominatim_result) self.assertEqual(nominatim_result, docker_result) diff --git a/emission/net/ext_service/geocoder/nominatim.py b/emission/net/ext_service/geocoder/nominatim.py index a068252df..4c3f8e0ac 100644 --- a/emission/net/ext_service/geocoder/nominatim.py +++ b/emission/net/ext_service/geocoder/nominatim.py @@ -14,6 +14,7 @@ from emission.core.wrapper.trip_old import Coordinate try: NOMINATIM_QUERY_URL_env = os.environ.get("NOMINATIM_QUERY_URL", "") + logging.info(f"NOMINATIM_QUERY_URL_env: {NOMINATIM_QUERY_URL_env}") NOMINATIM_QUERY_URL = NOMINATIM_QUERY_URL_env if NOMINATIM_QUERY_URL_env != "" else "http://nominatim.openstreetmap.org" except: