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

Jump to bottom

fix(geo): ensure ogc filter accept today and now #1622

Merged
merged 9 commits into from
May 15, 2024
Merged

fix(geo): ensure ogc filter accept today and now #1622

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
968fe59
fix(geo): ensure ogc filter accept today and now
aziz-access Feb 1, 2024
4b28f1b
delete console log
aziz-access Feb 2, 2024
b0d9d8e
feat(geo): parse specific date like today + 1 days
aziz-access Feb 2, 2024
6116df9
code improvement variable name and variable type
aziz-access Feb 5, 2024
070f36e
delete console.log
aziz-access Feb 5, 2024
354eba0
code improvement
aziz-access Feb 6, 2024
3e17806
fix(geo): validate filter date
aziz-access Feb 7, 2024
e89d5ff
fix(geo): reset date filter button
aziz-access Feb 7, 2024
ee973c8
rename date function
aziz-access Feb 7, 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
16 changes: 8 additions & 8 deletions packages/geo/src/lib/filter/ogc-filter-time/ogc-filter-time.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,14 +143,14 @@ export class OgcFilterTimeComponent implements OnInit {
const interval = filter.match(/years|months|weeks|days|hours|seconds/);
if (filter.match(/\+/)) {
const intervalInt = parseInt(
filter.substring(filter.search('+') + 1, interval.index),
filter.substring(filter.indexOf('+') + 1, interval.index),
10
);
return moment().add(intervalInt, interval[0]).toDate();
}
if (filter.match(/\-/)) {
const intervalInt = parseInt(
filter.substring(filter.search('-') + 1, interval.index),
filter.substring(filter.indexOf('-') + 1, interval.index),
10
);
return moment().subtract(intervalInt, interval[0]).toDate();
Expand All @@ -162,14 +162,14 @@ export class OgcFilterTimeComponent implements OnInit {
const interval = filter.match(/years|months|weeks|days|hours|seconds/);
if (filter.match(/\+/)) {
const intervalInt = parseInt(
filter.substring(filter.search('+') + 1, interval.index),
filter.substring(filter.indexOf('+') + 1, interval.index),
10
);
return moment(_now).add(intervalInt, interval[0]).toDate();
}
if (filter.match(/\-/)) {
const intervalInt = parseInt(
filter.substring(filter.search('-') + 1, interval.index),
filter.substring(filter.indexOf('-') + 1, interval.index),
10
);
return moment(_now).subtract(intervalInt, interval[0]).toDate();
Expand Down Expand Up @@ -631,16 +631,16 @@ export class OgcFilterTimeComponent implements OnInit {
return this.currentFilter.begin
? this.currentFilter.begin
: this.datasource.options.minDate
? this.datasource.options.minDate
: this._defaultMin;
? this.datasource.options.minDate
: this._defaultMin;
}

public handleMax() {
return this.currentFilter.end
? this.currentFilter.end
: this.datasource.options.maxDate
? this.datasource.options.maxDate
: this._defaultMax;
? this.datasource.options.maxDate
: this._defaultMax;
}

changePropertyByPass(event) {
Expand Down
47 changes: 43 additions & 4 deletions packages/geo/src/lib/filter/shared/ogc-filter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,8 +594,8 @@ export class OgcFilterWriter {
const srsName = igoOgcFilterObject.hasOwnProperty('srsName')
? igoOgcFilterObject.srsName
: proj
? proj.getCode()
: 'EPSG:3857';
? proj.getCode()
: 'EPSG:3857';

return Object.assign(
{},
Expand Down Expand Up @@ -913,12 +913,51 @@ export class OgcFilterWriter {
public parseFilterOptionDate(value: string, defaultValue?: string): string {
if (!value) {
return defaultValue;
} else if (value === 'today') {
return undefined;
} else if (
value.toLowerCase().includes('now') ||
value.toLowerCase().includes('today')
) {
return this.parseStringDate(value);
} else if (moment(value).isValid()) {
return value;
} else {
return undefined;
}
}
/**
* this function to parse date with specific format
* exemple 'today + 1 days' or 'now + 1 years'
* @param value string date
* @returns date
*/
private parseStringDate(value: string): string {
const date = value.toLowerCase().split(' ');
alecarn marked this conversation as resolved.
Show resolved Hide resolved
const time = date[0];
alecarn marked this conversation as resolved.
Show resolved Hide resolved
const operators = ['+', '-'].includes(date[1]) ? date[1] : undefined;
alecarn marked this conversation as resolved.
Show resolved Hide resolved
const numberOfunits = /^[0-9]*$/.test(date[2]) ? date[2] : undefined;
alecarn marked this conversation as resolved.
Show resolved Hide resolved
const unit = (
['years', 'months', 'weeks', 'days', 'hours', 'seconds'].includes(date[3])
? date[3]
: undefined
) as moment.DurationInputArg2;
alecarn marked this conversation as resolved.
Show resolved Hide resolved

if (!operators || !unit || !numberOfunits) {
return time === 'now'
? moment().format()
: moment().endOf('day').format();
}

if (operators === '+') {
return time === 'now'
? moment().add(parseInt(numberOfunits, 10), unit).format()
: moment().endOf('day').add(parseInt(numberOfunits, 10), unit).format();
} else {
return time === 'now'
? moment().subtract(parseInt(numberOfunits, 10), unit).format()
: moment()
.endOf('day')
.subtract(parseInt(numberOfunits, 10), unit)
.format();
}
}
}
Loading