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

Support date shortcuts; see issue #13 #21

Merged
merged 24 commits into from
Dec 5, 2024
Merged

Support date shortcuts; see issue #13 #21

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
ba2a5ae
Support date shortcuts; see issue #13
kaat0 Nov 26, 2024
7d4456c
Fix parsing error introduced by TimeZone.jl
gwehrle Nov 27, 2024
5bcc42e
Fix wrong type
gwehrle Nov 27, 2024
32150ec
Align tests with new code structure
gwehrle Nov 27, 2024
bb9bd46
Fix Formatting
gwehrle Nov 27, 2024
86a492c
Revert removed timezone
gwehrle Nov 27, 2024
9d5c3dd
moved shortcut functions in separate file
kaat0 Dec 2, 2024
86b49a8
improved documentation
kaat0 Dec 2, 2024
6619bc7
fixed quotation error
kaat0 Dec 2, 2024
4aa0a35
formatting
kaat0 Dec 2, 2024
6d23b20
regex pattern with whitespaces
kaat0 Dec 2, 2024
235d81f
unified regex pattern
kaat0 Dec 3, 2024
61b856f
Fix replace_shortcut function
gwehrle Dec 4, 2024
813fbb5
Fix check_remaining_shortcuts tests
gwehrle Dec 4, 2024
1ce42c0
Readd set_endpoint references in documentation
gwehrle Dec 4, 2024
6249240
more tests for date shortcut
kaat0 Dec 4, 2024
c42e534
fix broken tests
kaat0 Dec 4, 2024
d1653e1
Reactivate query tests
gwehrle Dec 4, 2024
1bc5454
Restructure Tests and make date tests concrete
gwehrle Dec 4, 2024
cf063c8
Seperate regex flags
gwehrle Dec 4, 2024
67f0a3f
Fix change @info to @test
gwehrle Dec 4, 2024
b63d65a
Force git to checkout overpassql files with lf line ending
gwehrle Dec 4, 2024
b3a352d
Remove Timezones as dependency
gwehrle Dec 5, 2024
f42a54f
Remove Mocking as dependency
gwehrle Dec 5, 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
6 changes: 3 additions & 3 deletions src/Overpass.jl
View file
Open in desktop
gwehrle marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ function status()::Status

status = Status(
matches[:connection_id],
DateTime(matches[:server_time], "yyyy-mm-ddTHH:MM:SSZ"),
DateTime(matches[:server_time], dateformat"yyyy-mm-ddTHH:MM:SSz"),
matches[:endpoint],
parse(Int, matches[:rate_limit]),
isnothing(matches[:avalible_slots]) ? nothing :
Expand Down Expand Up @@ -217,11 +217,11 @@ See: https://wiki.openstreetmap.org/wiki/Overpass_turbo/Extended_Overpass_Turbo_
function replace_date_shortcuts(query::AbstractString)::AbstractString
if occursin("{{date", query)
# Get the current date and time
current_date = now(tz"UTC")
current_date = now()

# Define the regex pattern for placeholders
pattern = r"\{\{date(?::([0-9]+)\s*(year|month|day|week|hour|minute|second)s?)?\}\}"

# Map string units to Dates.Period constructors
period_map = Dict(
"year" => Year,
Expand Down
Loading