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

Show Boundary for Cloud Native Spatial Filter #4333

Merged
merged 1 commit into from
Oct 29, 2024
Merged

Show Boundary for Cloud Native Spatial Filter #4333

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
9 changes: 8 additions & 1 deletion bims/models/location_site.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,16 +341,23 @@ def add_context_group(self, group_key):
if context_groups.exists():
context_groups.update(
geocontext_group_key=group_key,
layer_identifier=context_key,
key=group_key)
context_group = context_groups.first()
else:
context_group, _ = LocationContextGroup.objects.get_or_create(
geocontext_group_key=group_key,
key=group_key,
defaults={
'name': layer.name
'name': layer.name,
}
)

if context_group.layer_identifier != context_key:
LocationContextGroup.objects.filter(
id=context_group.id
).update(layer_identifier=context_key)

for result in feature_data['result']:
if context_key in result['feature']:
LocationContext.objects.update_or_create(
Expand Down
54 changes: 51 additions & 3 deletions bims/static/js/views/filter_panel/spatial_filter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ define([
addSelectedSpatialFilterLayerFromJSON: function (json_string) {
let all = JSON.parse(json_string);
for (let i=0; i < all.length; i++) {
let parsed_data = all[0].split(',');
let parsed_data = all[i].split(',');
if (parsed_data.length === 2) {
parsed_data.push(this.groupKeyLabel);
}
Expand Down Expand Up @@ -653,6 +653,10 @@ define([
this.$el.find('.subtitle').removeClass('filter-panel-selected');
}
},
isUUID: function (value) {
const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[4][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
return uuidRegex.test(value);
},
showBoundary: function () {
// Show border in red outline to map for selected filter
if (this.selectedSpatialFilterLayers.length < 1) {
Expand All @@ -662,13 +666,57 @@ define([
Shared.Dispatcher.trigger('map:removeLayer', this.layerGroup);
this.layerGroup = new ol.layer.Group();
Shared.Dispatcher.trigger('map:addLayer', this.layerGroup);

$.each(this.selectedSpatialFilterLayers, function (key, selectedLayer) {
let $filterContainer = $(self.$el.find(`[name="${key}"]`)[0]);
let layerIdentifier = $filterContainer.data('layer-identifier');

if (self.isUUID(key)) {
$.ajax({
type: 'GET',
url: '/api/layer/',
dataType: 'json',
success: function (data) {
const layer = data.results.find(item => item.tile_url.includes(key));
const layerStyle = function(feature, resolution) {
if (selectedLayer.includes(feature.get(layerIdentifier))) {
return new ol.style.Style({
stroke: new ol.style.Stroke({
color: 'red',
width: 3,
}),
});
} else {
return null;
}
};
let vectorSource = null;
if (layer.pmtile) {
vectorSource = new olpmtiles.PMTilesVectorSource({
url: `/api/serve-pmtile/${key}/`,
attributions: []
});
} else {
vectorSource = new ol.source.VectorTile({
attributions: [],
url: layer.tile_url,
format: new ol.format.MVT()
})
}
let vectorLayer = new ol.layer.VectorTile({
title: '',
source: vectorSource,
tileGrid: ol.tilegrid.createXYZ(),
declutter: true,
style: layerStyle,
})
self.layerGroup.getLayers().getArray().push(vectorLayer);
}
})
}

let wmsUrl = '/bims_proxy/' + $filterContainer.data('wms-url');
let wmsLayer = $filterContainer.data('layer-name');
let wmsFormat = $filterContainer.data('wms-format');
let layerIdentifier = $filterContainer.data('layer-identifier');
let cqlFilters = null;
if (!wmsUrl) {
return true;
Expand Down
Loading