Skip to content

Tidying up callbacks.js #166

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

Tidying up callbacks.js #166

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
32 changes: 14 additions & 18 deletions public/callbacks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ define(function (require) {
const utils = require('plugins/enhanced_tilemap/utils');
const L = require('leaflet');

function addSirenPropertyToFilterMetaAndAddGeoFilter(newFilter, sirenMeta, fieldname, indexPatternId) {
filterHelper.addSirenPropertyToFilterMeta(newFilter, sirenMeta);
geoFilter.add(newFilter, fieldname, indexPatternId);
}

return {
createMarker: function (event) {
const agg = _.get(event, 'chart.geohashGridAgg');
Expand Down Expand Up @@ -66,8 +71,8 @@ define(function (require) {
}
});
});
filterHelper.addSirenPropertyToFilterMeta(boolFilter, event.sirenMeta);
geoFilter.add(boolFilter, event.field.fieldname, event.indexPatternId);

addSirenPropertyToFilterMetaAndAddGeoFilter(boolFilter, event.sirenMeta, event.field.fieldname, event.indexPatternId);
},
polygonVector: function (event) {
if (!event.args.vector) return;
Expand All @@ -83,9 +88,7 @@ define(function (require) {
newFilter.geo_polygon[field] = { polygons: event.points };
}

filterHelper.addSirenPropertyToFilterMeta(newFilter, event.args._siren);
geoFilter.add(newFilter, field, event.args.indexPattern);

addSirenPropertyToFilterMetaAndAddGeoFilter(newFilter, event.args._siren, field, event.args.indexPattern);
},
polygon: function (event) {
let newFilter;
Expand All @@ -109,24 +112,17 @@ define(function (require) {
newFilter = { geo_polygon: {} };
newFilter.geo_polygon[field] = { points: event.points };
}

filterHelper.addSirenPropertyToFilterMeta(newFilter, event.sirenMeta);
geoFilter.add(newFilter, event.field.fieldname, event.indexPatternId);
addSirenPropertyToFilterMetaAndAddGeoFilter(newFilter, event.sirenMeta, event.field.fieldname, event.indexPatternId);
},
rectangle: function (event) {
const newFilter = geoFilter.rectFilter(
event.field.fieldname, event.field.geotype, event.bounds.top_left, event.bounds.bottom_right);

filterHelper.addSirenPropertyToFilterMeta(newFilter, event.sirenMeta);
geoFilter.add(newFilter, event.field.fieldname, event.indexPatternId);
event.field.fieldname, event.field.geotype, event.bounds.top_left, event.bounds.bottom_right
);
addSirenPropertyToFilterMetaAndAddGeoFilter(newFilter, event.sirenMeta, event.field.fieldname, event.indexPatternId);
},
circle: function (event) {
const newFilter = geoFilter.circleFilter(
event.field.fieldname, event.center[0], event.center[1], event.radius
);

filterHelper.addSirenPropertyToFilterMeta(newFilter, event.sirenMeta);
geoFilter.add(newFilter, event.field.fieldname, event.indexPatternId);
const newFilter = geoFilter.circleFilter(event.field.fieldname, event.center[0], event.center[1], event.radius);
addSirenPropertyToFilterMetaAndAddGeoFilter(newFilter, event.sirenMeta, event.field.fieldname, event.indexPatternId);
}
};
};
Expand Down
1 change: 0 additions & 1 deletion public/vislib/__tests__/geoFilter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ define(function (require) {
}
}];

console.log(result);
const expectedDonutsToExcludeLength = 0;
expect(result.polygonsToFilter).to.eql(expectedPolygonFilter);
expect(result.donutsToExclude.length).to.eql(expectedDonutsToExcludeLength);
Expand Down
14 changes: 5 additions & 9 deletions public/vislib/geoFilter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,11 @@ define(function (require) {
return `${field}: ${numBoxes} ${numBoxes === 1 ? 'shape' : 'shapes'}`;
}

function _createPolygonFilter(polygonsToFilter, meta) {
function _createPolygonFilter(polygonsToFilter) {
return {
bool: {
should: polygonsToFilter
},
meta
}
};
}

Expand All @@ -39,11 +38,11 @@ define(function (require) {
const polygons = newFilter.geo_multi_polygon[field].polygons;
polygonFiltersAndDonuts = geoFilterHelper.analyseMultiPolygon(polygons, field);
numShapes = polygons.length;
newFilter = _createPolygonFilter(polygonFiltersAndDonuts.polygonsToFilter, newFilter.meta);
newFilter = _createPolygonFilter(polygonFiltersAndDonuts.polygonsToFilter);
} else if (newFilter.geo_polygon && newFilter.geo_polygon[field].polygons) {
//Only analyse vector geo polygons, i.e. not drawn ones
polygonFiltersAndDonuts = geoFilterHelper.analyseSimplePolygon(newFilter, field);
newFilter = _createPolygonFilter(polygonFiltersAndDonuts.polygonsToFilter, newFilter.meta);
newFilter = _createPolygonFilter(polygonFiltersAndDonuts.polygonsToFilter);
} else if (newFilter.bool) {
//currently this in only for multiple geo_distance filters
numShapes = newFilter.bool.should.length;
Expand Down Expand Up @@ -357,7 +356,7 @@ define(function (require) {
* @param bottom_right {Object} bottom right at and lon (decimal degrees)
* @return {Object} elasticsearch geospatial rectangle filter
*/
function rectFilter(fieldname, geotype, topLeft, bottomRight, meta) {
function rectFilter(fieldname, geotype, topLeft, bottomRight) {
let geofilter = null;
if ('geo_point' === geotype) {
geofilter = { geo_bounding_box: {} };
Expand All @@ -380,9 +379,6 @@ define(function (require) {
console.warn('unexpected geotype: ' + geotype);
}

if (meta) {
geofilter.meta = meta;
}
return geofilter;
}

Expand Down