Skip to content

WIP implement-quick-search-context-outside #3340

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
ramtob wants to merge 1 commit into
base: master
Choose a base branch
from
Open

WIP implement-quick-search-context-outside #3340

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
2 changes: 1 addition & 1 deletion confd/templates/production.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@
"blacklist": []
},
"PLANET": {
"inActive": {{ getv "/ansyn/overlay/planet/inactive" "true" }},
"inActive": {{ getv "/ansyn/overlay/planet/inactive" "false" }},
"whitelist": [
{
"name": "Entire Earth",
Expand Down
12 changes: 10 additions & 2 deletions src/app/@ansyn/ansyn/app-providers/overlay-source-providers/planet/planet-source-provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { forkJoin, Observable } from 'rxjs';
import { Observable } from 'rxjs';
import { Inject } from '@angular/core';
import { HttpClient, HttpErrorResponse, HttpHeaders } from '@angular/common/http';
import {
Expand Down Expand Up @@ -26,7 +26,6 @@ import {
BaseOverlaySourceProvider,
IFetchParams,
IOverlayFilter,
IStartAndEndDate,
timeIntersection
} from '../../../modules/overlays/models/base-overlay-source-provider.model';
import { OverlaySourceProvider } from '../../../modules/overlays/models/overlays-source-providers';
Expand Down Expand Up @@ -118,14 +117,19 @@ export class PlanetSourceProvider extends BaseOverlaySourceProvider {
}*/

buildFetchObservables(fetchParams: IFetchParams, filters: IOverlayFilter[]): Observable<any>[] {
console.log('buildFetchObservables', fetchParams, filters)
const regionFeature = feature(<any>fetchParams.region);
const fetchParamsTimeRange = {
start: new Date(fetchParams.timeRange.start),
end: new Date(fetchParams.timeRange.end)
};

const planetFilters: IPlanetFilter[] = filters
// If the criterion customSensorToFilter exists, take only sensors that are included there
.filter(({ sensor }) => !fetchParams.customSensorToFilter || fetchParams.customSensorToFilter.includes(sensor))
// For each filter object, change "sensor" field to "sensors" = [sensor]
.map(({ sensor, ...restItem }) => ({ ...restItem, sensors: sensor ? [sensor] : [] }))
// Replace similar filter objects with one filter object with a larger "sensors" array
.reduce((res, item) => {
const equalItem = res.find((f) => isEqual({
coverage: f.coverage,
Expand All @@ -137,6 +141,7 @@ export class PlanetSourceProvider extends BaseOverlaySourceProvider {
}
return [...res, item];
}, [])
// For each filter object, cross its criteria with the corresponding criteria from fetchParams
.map((item): Partial<IFetchParams> => {
const intersection = intersect(regionFeature, item.coverage);
const time = timeIntersection(fetchParamsTimeRange, item.timeRange);
Expand All @@ -147,7 +152,9 @@ export class PlanetSourceProvider extends BaseOverlaySourceProvider {
sensors
};
})
// Remove empty fetch params
.filter(({ timeRange, region }: IFetchParams) => Boolean(timeRange && region))
// Convert fetch params to Planet filters format
.map(this.paramsToFilter);
if (!planetFilters.length) {
return [];
Expand All @@ -158,6 +165,7 @@ export class PlanetSourceProvider extends BaseOverlaySourceProvider {
})];
}

// Convert fetch params to Planet filters format
paramsToFilter(fetchParams: IFetchParams): IPlanetFilter {

const filters: IPlanetFilter = {
Expand Down