Skip to content

#247 add "older:" keyword to Wizard #786

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

#247 add "older:" keyword to Wizard #786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions js/ffs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,14 @@ export function ffs_construct_query(
)
return `(newer:"{{date:${val}}}")`;
return `(newer:"${val}")`;
case "older":
if (
condition.val.match(
/^-?\d+ ?(seconds?|minutes?|hours?|days?|weeks?|months?|years?)?$/
)
)
return `(if: timestamp() <= date("{{date:${val}}}"))`;
return `(if: timestamp() <= date("${val}"))`;
case "user":
return `(user:"${val}")`;
case "uid":
Expand Down Expand Up @@ -252,6 +260,8 @@ export function ffs_construct_query(
return quote_comment_str(`id:${quotes(condition.val)}`);
case "newer":
return quote_comment_str(`newer:${quotes(condition.val)}`);
case "older":
return quote_comment_str(`older:${quotes(condition.val)}`);
case "user":
return quote_comment_str(`user:${quotes(condition.val)}`);
case "uid":
Expand Down
2 changes: 1 addition & 1 deletion js/ffs/ffs.pegjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ osm_type
= "node" / "way" / "relation"

meta // TODO?
= x:("user" / "uid" / "newer" / "id") _ ":" _ y:string
= x:("user" / "uid" / "newer" / "older" / "id") _ ":" _ y:string
{ return { query:"meta", meta:x, val:y } }

free_form
Expand Down
13 changes: 13 additions & 0 deletions tests/test.ffs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,19 @@ describe("ide.ffs", () => {
`node(newer:"date:1day")(bbox);${out_str}`
);
});
// older
it("older", async () => {
// regular
let search = 'older:"2000-01-01T01:01:01Z" and type:node';
await expect(construct_query(search)).resolves.to.equal(
`node(if: timestamp() <= date("2000-01-01T01:01:01Z"))(bbox);${out_str}`
);
// relative
search = "older:1day and type:node";
await expect(construct_query(search)).resolves.to.equal(
`node(if: timestamp() <= date("date:1day"))(bbox);${out_str}`
);
});
// user
it("user", async () => {
// user name
Expand Down