Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove fake GPS, add newsflash GPS #2738

Merged
merged 6 commits into from
Dec 25, 2024
Merged

remove fake GPS, add newsflash GPS #2738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
35cf0d6
remove fake GPS, add newsflash GPS
atalyaalon Dec 18, 2024
3eb7c1c
add is_included, use get instead of []
atalyaalon Dec 20, 2024
68e763a
Merge branch 'dev' into 2737-street-view-gps
atalyaalon Dec 20, 2024
8f2bbb5
fix is_included
atalyaalon Dec 20, 2024
402cb0f
fix text
atalyaalon Dec 20, 2024
1cbeb2b
Update street_view_widget.py
atalyaalon Dec 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions anyway/request_params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,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 = location.get("gps", {})
location_info = location["data"]

if location_info is None:
Expand Down Expand Up @@ -223,9 +223,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
Expand All @@ -236,9 +234,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):
Expand Down Expand Up @@ -274,12 +270,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"],
}

Expand Down
8 changes: 6 additions & 2 deletions anyway/widgets/road_segment_widgets/street_view_widget.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,14 @@ def __init__(self, request_params: RequestParams):

def generate_items(self) -> None:
self.items = {
"longitude": self.request_params.gps["lon"],
"latitude": self.request_params.gps["lat"],
"longitude": self.request_params.gps.get("lon"),
"latitude": self.request_params.gps.get("lat"),
}

def is_included(self):
return self.request_params.gps and self.request_params.gps.get("lon") and self.request_params.gps.get("lat")


@staticmethod
def localize_items(request_params: RequestParams, items: Dict) -> Dict:
items["data"]["text"] = {"title": _("Street view widget")}
Expand Down
3 changes: 1 addition & 2 deletions tests/test_request_params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ class TestRequestParams(unittest.TestCase):
'resolution': BE_CONST.ResolutionCategories.SUBURBAN_JUNCTION,
'road1': 669,
'road2': 71},
'gps': {'lat': 32.82561, 'lon': 35.165395},
'name': 'location',
'text': 'צומת השיטה'}
nf = NewsFlash()
Expand All @@ -46,7 +45,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={}
)

@patch("anyway.request_params.fill_missing_non_urban_intersection_values")
Expand Down
Loading