remove fake GPS, add newsflash GPS

data-for-change · Dec 18, 2024 · 18231f9 · 18231f9
1 parent 6d334ca
commit 18231f9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/anyway/request_params.py b/anyway/request_params.py
@@ -95,7 +95,7 @@ def get_request_params_from_request_values(vals: dict) -> Optional[RequestParams
     years_ago = vals.get("years_ago", BE_CONST.DEFAULT_NUMBER_OF_YEARS_AGO)
     lang = vals.get("lang", "he")
     location_text = location["text"]
-    gps = location["gps"]
+    gps = {"lat": news_flash_obj.lat, "lon": news_flash_obj.lon}
     location_info = location["data"]
 
     if location_info is None:
@@ -220,9 +220,7 @@ def extract_road_segment_location(road_segment_id):
     data["road_segment_name"] = road_segment_name
     data["road_segment_id"] = int(road_segment_id)
     text = get_road_segment_location_text(road1, road_segment_name)
-    # fake gps - todo: fix
-    gps = {"lat": 32.825610, "lon": 35.165395}
-    return {"name": "location", "data": data, "gps": gps, "text": text}
+    return {"name": "location", "data": data, "text": text}
 
 
 # todo: fill both codes and names into location
@@ -233,9 +231,7 @@ def extract_street_location(input_vals: dict):
     for k in ["yishuv_name", "yishuv_symbol", "street1", "street1_hebrew"]:
         data[k] = vals[k]
     text = get_street_location_text(vals["yishuv_name"], vals["street1_hebrew"])
-    # fake gps - todo: fix
-    gps = {"lat": 32.825610, "lon": 35.165395}
-    return {"name": "location", "data": data, "gps": gps, "text": text}
+    return {"name": "location", "data": data, "text": text}
 
 
 def extract_street_location_suggestion_version(input_vals: dict):
@@ -271,12 +267,9 @@ def extract_non_urban_intersection_location(input_vals: dict):
     data = {"resolution": BE_CONST.ResolutionCategories.SUBURBAN_JUNCTION}
     for k in ["non_urban_intersection", "non_urban_intersection_hebrew", "road1", "road2"]:
         data[k] = vals[k]
-    # fake gps - todo: fix
-    gps = {"lat": 32.825610, "lon": 35.165395}
     return {
         "name": "location",
         "data": data,
-        "gps": gps,
         "text": vals["non_urban_intersection_hebrew"],
     }
 

diff --git a/tests/test_request_params.py b/tests/test_request_params.py
@@ -30,7 +30,7 @@ class TestRequestParams(unittest.TestCase):
                       'resolution': BE_CONST.ResolutionCategories.SUBURBAN_JUNCTION,
                       'road1': 669,
                       'road2': 71},
-             'gps': {'lat': 32.82561, 'lon': 35.165395},
+             'gps': {'lat': None, 'lon': None},
              'name': 'location',
              'text': 'צומת השיטה'}
     nf = NewsFlash()
@@ -46,7 +46,7 @@ class TestRequestParams(unittest.TestCase):
         lang='he',
         news_flash_description=nf.description,
         news_flash_title=nf.title,
-        gps={"lat": 32.825610, "lon": 35.165395}
+        gps={"lat": None, "lon": None}
     )
 
     @patch("anyway.request_params.fill_missing_non_urban_intersection_values")