Initial support for Slam (Sludge) pickup/week handling #2355
+26
−7
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bratanon
suggested changes
Jul 29, 2024
| @@ -192,19 +192,38 @@ def fetch(self): | |||
| response = requests.get(getUrl, params=params, timeout=30) | |||
|
|
|||
| data = json.loads(response.text) | |||
|
|
|||
| #print(json.dumps(data, indent=2)) | |||
There was a problem hiding this comment.
Suggested change
| #print(json.dumps(data, indent=2)) | |
| #print(json.dumps(data, indent=2)) |
Looks like a debug left over.
|
|
||
| # When no date is provided, check the frequency for week number | ||
| if(next_pickup == ""): | ||
| #print(item["WastePickupFrequency"]) |
| # Check if it contains the swedish word for week | ||
| if date_parts[0].lower() == "vecka": | ||
| # Assemble date from week number | ||
| #print("Week number: " + date_parts[1]) |
There was a problem hiding this comment.
Same again. Debug left over.
| #print("Week number: " + date_parts[1]) | ||
| current_year = datetime.now().year | ||
| next_pickup_date = datetime.strptime(f"{current_year} {date_parts[1]} 1", "%Y %W %w").date() | ||
| #print("Next pickup date: " + str(next_pickup_date)) |
There was a problem hiding this comment.
Same again. Debug left over.
There was a problem hiding this comment.
Yes i left the debug messages but commented them out since I thought they could be of use if this (somewhat hacky version to get the date from week numbers) doesn't work for some provider/municipality. But if it's preferred to not include them then sure
|
You could put the debug messages in the debug logs: I think cleaning the fetch function a bit might be a good idea here. Moving out some conventions in additional functions. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I got a question if it was possible to also get the sludge pickup date. I looked into it with the Borås Test 3 address. It does not return a NextWastePickup date but it does return a week number in WastePickupFrequency eg "Vecka 27".
There was already an implementation when i merged SSAM into edpevent_se where the NextWastePickup can be returned as "v32 Aug 2024". The previous implementation checked if it contained the letter "v" and then created a date from the string using a month map etc. I built on top of this to also work with a simple "Vecka 27" return value.
Not sure if this is the optimal solution for this? I guess this is a bit hard to solve for everything since different municipalities might write their NextWastePickup in a different way.