From fa1fff96029f32363291846e5b5976659a5b3349 Mon Sep 17 00:00:00 2001 From: Mark Joshwel Date: Tue, 5 Sep 2023 04:39:10 +0000 Subject: [PATCH] s+: convert to pluscode --- surplus/surplus.py | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/surplus/surplus.py b/surplus/surplus.py index 01744bb..aaa8334 100644 --- a/surplus/surplus.py +++ b/surplus/surplus.py @@ -49,6 +49,7 @@ from typing import ( from geopy import Location as _geopy_Location # type: ignore from geopy.geocoders import Nominatim as _geopy_Nominatim # type: ignore from pluscodes import PlusCode as _PlusCode # type: ignore +from pluscodes import encode as _PlusCode_encode # type: ignore from pluscodes.validator import Validator as _PlusCode_Validator # type: ignore from pluscodes.openlocationcode import ( # type: ignore # isort: skip @@ -1040,13 +1041,25 @@ def surplus(query: Query | str, behaviour: Behaviour) -> Result[str]: return Result[str](text) case ConversionResultTypeEnum.PLUS_CODE: - # TODO: https://github.com/markjoshwel/surplus/issues/18 - return Result[str]( - text, - error=UnavailableFeatureError( - "converting to Plus Code is not implemented yet" - ), - ) + if isinstance(query, PlusCodeQuery): + return Result[str](str(query)) + + # get latlong and handle result + latlong = query.to_lat_long_coord(geocoder=behaviour.geocoder) + + if not latlong: + return Result[str]("", error=latlong.error) + + if behaviour.debug: + print(f"debug: cli: {latlong.get()=}", file=behaviour.stderr) + + try: + pluscode: str = _PlusCode_encode(lat=latlong.get().latitude, lon=latlong.get().longitude) + + except Exception as exc: + return Result[str]("", error=exc) + + return Result[str](pluscode) case ConversionResultTypeEnum.LOCAL_CODE: # TODO: https://github.com/markjoshwel/surplus/issues/18