Skip to content

feat: buffer map results and move to non-blocking #174

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

Merged
rubensworks merged 3 commits into from
May 6, 2025
Merged

feat: buffer map results and move to non-blocking #174

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13e3323
feat: buffer map results and move to non-blocking
milafrerichs May 5, 2025
75c2d80
feat: add flag for buffering the results
milafrerichs May 6, 2025
fdacc07
chore: remove length check after PR review
milafrerichs May 6, 2025
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
117 changes: 65 additions & 52 deletions src/ldf-client-ui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -849,64 +849,77 @@ if (typeof global.process === 'undefined')
this._handleGeospatialResult(result);
}
},

// If the given result contains geospatial data, show it on the map
_handleGeospatialResult: function (bindings) {
_processMapData: function () {
var self = this;
for (const variableName in bindings) {
// Check if the value has a geospatial datatype
const value = bindings[variableName];
if (value.endsWith('^^http://www.openlinksw.com/schemas/virtrdf#Geometry') ||
const resultsToProcess = this._mapResultsBuffer.splice(0);
for (const bindings of resultsToProcess) {
for (const variableName in bindings) {
// Check if the value has a geospatial datatype
const value = bindings[variableName];
if (value.endsWith('^^http://www.openlinksw.com/schemas/virtrdf#Geometry') ||
value.endsWith('^^http://www.opengis.net/ont/geosparql#wktLiteral')) {
// Look for a corresponding variable with the 'Label' suffix.
const variableNameLabel = `${variableName}Label`;
const valueLabel = bindings[variableNameLabel];

// Interpret geometry value as WKT string
const geometry = /^"(.*)"\^\^[^\^]*$/.exec(value)[1];
const wkt = new Wkt.Wkt();
wkt.read(geometry);

// Construct geo feature for WKT string
const geoFeature = { type: 'Feature', properties: {}, geometry: wkt.toJson() };
if (valueLabel)
geoFeature.properties.name = valueLabel.split('@', 1)[0].replace(/['"]+/g, '');

// Add feature to map
let newMapLayer = L.geoJSON(geoFeature, {
onEachFeature: function (feature) {
// Determine marker position for different geometry types
let lon;
let lat;
if (feature.geometry.type === 'Polygon') {
const centroid = turf.centroid(feature);
lon = centroid.geometry.coordinates[0];
lat = centroid.geometry.coordinates[1];
}
// Handle points
if (feature.geometry.type === 'Point') {
lon = feature.geometry.coordinates[0];
lat = feature.geometry.coordinates[1];
}
if (lon && lat) {
let marker = L.circleMarker([lat, lon]);
self.mapLayer.addLayer(marker).addTo(self.map);
self.markerArray.push(marker);
if (valueLabel)
marker.bindPopup(feature.properties.name);
}
},
});
self.mapLayer.addLayer(newMapLayer).addTo(self.map);
// Look for a corresponding variable with the 'Label' suffix.
const variableNameLabel = `${variableName}Label`;
const valueLabel = bindings[variableNameLabel];

// Interpret geometry value as WKT string
const geometry = /^"(.*)"\^\^[^\^]*$/.exec(value)[1];
const wkt = new Wkt.Wkt();
wkt.read(geometry);

// Construct geo feature for WKT string
const geoFeature = { type: 'Feature', properties: {}, geometry: wkt.toJson() };
if (valueLabel)
geoFeature.properties.name = valueLabel.split('@', 1)[0].replace(/['"]+/g, '');

// Add feature to map
let newMapLayer = L.geoJSON(geoFeature, {
onEachFeature: function (feature) {
// Determine marker position for different geometry types
let lon;
let lat;
if (feature.geometry.type === 'Polygon') {
const centroid = turf.centroid(feature);
lon = centroid.geometry.coordinates[0];
lat = centroid.geometry.coordinates[1];
}
// Handle points
if (feature.geometry.type === 'Point') {
lon = feature.geometry.coordinates[0];
lat = feature.geometry.coordinates[1];
}
if (lon && lat) {
let marker = L.circleMarker([lat, lon]);
self.mapLayer.addLayer(marker).addTo(self.map);
self.markerArray.push(marker);
if (valueLabel)
marker.bindPopup(feature.properties.name);
}
},
});
self.mapLayer.addLayer(newMapLayer).addTo(self.map);

// Possibly rescale map view
self.map.fitBounds(L.featureGroup(self.markerArray).getBounds());
// Possibly rescale map view
self.map.fitBounds(L.featureGroup(self.markerArray).getBounds());

// Show map if it's not visible yet
if (!self.$mapWrapper.is(':visible'))
self.$mapWrapper.show();
// Show map if it's not visible yet
if (!self.$mapWrapper.is(':visible'))
self.$mapWrapper.show();
}
}
}
this._processingScheduled = false;
},

// If the given result contains geospatial data, show it on the map
_handleGeospatialResult: function (bindings) {
if (!this._mapResultsBuffer) this._mapResultsBuffer = [];
this._mapResultsBuffer.push(bindings);

if (!this._processingScheduled) {
this._processingScheduled = true;
requestAnimationFrame(this._processMapData.bind(this));
}
},

// Finalizes the display after all results have been added
Expand Down