[fusion-commits] r3013 - trunk/layers/MapGuide
svn_fusion at osgeo.org
svn_fusion at osgeo.org
Thu Mar 8 04:47:37 PST 2018
Author: jng
Date: 2018-03-08 04:47:36 -0800 (Thu, 08 Mar 2018)
New Revision: 3013
Modified:
trunk/layers/MapGuide/MapGuide.js
Log:
Fix: https://trac.osgeo.org/mapguide/ticket/2772
The solution is ugly namely because the selection model is not the most merge-friendly model to work with, especially when the merge subtracts features!!!
Modified: trunk/layers/MapGuide/MapGuide.js
===================================================================
--- trunk/layers/MapGuide/MapGuide.js 2017-11-22 23:59:06 UTC (rev 3012)
+++ trunk/layers/MapGuide/MapGuide.js 2018-03-08 12:47:36 UTC (rev 3013)
@@ -2101,6 +2101,16 @@
var selLayer = selLayers[i];
var selFeatures = selLayer.Feature || [];
var layerName = selLayer["@name"];
+ var layerId = selLayer["@id"];
+ var featids = [];
+ for (var l = 0; l < efi.FeatureInformation.FeatureSet.Layer.length; l++) {
+ var selClass = efi.FeatureInformation.FeatureSet.Layer[l];
+ if (selClass["@id"] == layerId) {
+ for (var j = 0; j < selClass.Class.ID.length; j++) {
+ featids.push(selClass.Class.ID[j]);
+ }
+ }
+ }
if (!result[layerName]) {
if (selLayer.LayerMetadata) {
var layerMeta = selLayer.LayerMetadata;
@@ -2115,6 +2125,7 @@
}
}
result[layerName] = {
+ layerId: layerId,
metadata: [], //NOTE: Probably a defect, but regular code path is putting blank string arrays here too
metadatanames: ["dimension", "bbox", "center", "area", "length"],
numelements: selFeatures.length,
@@ -2121,7 +2132,8 @@
propertynames: pnames,
propertytypes: ptypes,
propertyvalues: pvals,
- values: []
+ values: [],
+ featids: featids
};
layerNames.push(layerName);
}
@@ -2170,6 +2182,16 @@
var selLayer = selLayers[i];
var selFeatures = selLayer.Feature || [];
var layerName = selLayer["@name"];
+ var layerId = selLayer["@id"];
+ var featids = [];
+ for (var l = 0; l < efi.FeatureInformation.FeatureSet[0].Layer.length; l++) {
+ var selClass = efi.FeatureInformation.FeatureSet[0].Layer[l];
+ if (selClass["@id"][0] == layerId[0]) {
+ for (var j = 0; j < selClass.Class[0].ID.length; j++) {
+ featids.push(selClass.Class[0].ID[j]);
+ }
+ }
+ }
if (!result[layerName]) {
if (selLayer.LayerMetadata) {
var layerMeta = selLayer.LayerMetadata[0];
@@ -2184,6 +2206,7 @@
}
}
result[layerName] = {
+ layerId: layerId,
metadata: [], //NOTE: Probably a defect, but regular code path is putting blank string arrays here too
metadatanames: ["dimension", "bbox", "center", "area", "length"],
numelements: selFeatures.length,
@@ -2190,7 +2213,8 @@
propertynames: pnames,
propertytypes: ptypes,
propertyvalues: pvals,
- values: []
+ values: [],
+ featids: featids
};
layerNames.push(layerName);
}
@@ -2259,7 +2283,7 @@
//this.processSelectedFeatureInfo(r, false);
},
- mergeAttributes: function(attributes, prevAttributes) {
+ mergeAttributes: function(attributes, prevAttributes, prevRemovals) {
if (!prevAttributes) {
//Nothing to merge, return original
return attributes;
@@ -2276,7 +2300,7 @@
//Expand extents
if (!merged.extents && attributes.extents) {
merged.extents = attributes.extents;
- } else {
+ } else {
if (attributes.extents) {
if (attributes.extents.minx < merged.extents.minx)
merged.extents.minx = attributes.extents.minx;
@@ -2291,15 +2315,44 @@
//Bring in attributes
for (var i = 0; i < attributes.layers.length; i++) {
var layerName = attributes.layers[i][0];
+ var layerId = merged[layerName].layerId[0];
if (typeof(merged[layerName]) == 'undefined') {
merged[layerName] = attributes[layerName];
} else {
+ var newFeatIds = attributes[layerName].featids;
var newValues = attributes[layerName].values;
for (var v = 0; v < newValues.length; v++) {
- merged[layerName].values.push(newValues[v]);
- merged[layerName].numelements++;
+ var bAddThis = true;
+ //Only add if these ids are not on the removal list
+ if (prevRemovals[layerId]) {
+ if (prevRemovals[layerId].removed.indexOf(newFeatIds[v]) >= 0) {
+ bAddThis = false;
+ }
+ }
+ if (bAddThis) {
+ merged[layerName].featids.push(newFeatIds[v]);
+ merged[layerName].values.push(newValues[v]);
+ merged[layerName].numelements++;
+ }
}
}
+ //Trim off attributes at indices indicated by the previous feature key merge
+ if (prevRemovals[layerId]) {
+ var removeIndices = [];
+ for (var j = 0; j < prevRemovals[layerId].removed.length; j++) {
+ var fid = prevRemovals[layerId].removed[j];
+ var idx = merged[layerName].featids.indexOf(fid);
+ if (idx >= 0) {
+ removeIndices.push(idx);
+ }
+ }
+ removeIndices.reverse();
+ for (var j = 0; j < removeIndices.length; j++) {
+ var removeIndex = removeIndices[j];
+ merged[layerName].numelements--;
+ merged[layerName].values.splice(removeIndex, 1);
+ }
+ }
}
return merged;
},
@@ -2310,8 +2363,8 @@
var attributes = this.convertExtendedFeatureInfo(o);
if (mergeSelection == true)
{
- sel.merge(this.previousSelection);
- attributes = this.mergeAttributes(attributes, this.previousAttributes);
+ var removals = sel.merge(this.previousSelection);
+ attributes = this.mergeAttributes(attributes, this.previousAttributes, removals);
}
var selText = sel.getSelectionXml();
this.previousSelection = sel;
@@ -2478,6 +2531,7 @@
merge : function(previousSelection)
{
+ var removals = {};
if (previousSelection != null && previousSelection.nLayers > 0)
{
for (var prevSelIndex = 0; prevSelIndex < previousSelection.nLayers; prevSelIndex++)
@@ -2484,8 +2538,14 @@
{
var prevSelLayer = previousSelection.aLayers[prevSelIndex];
+ var layerName = prevSelLayer.getName();
+ if (!removals[layerName]) {
+ removals[layerName] = {
+ removed: []
+ }
+ }
// find the previously selected layer name in the current selection
- var currentLayer = this.getLayerByName(prevSelLayer.getName());
+ var currentLayer = this.getLayerByName(layerName);
if (currentLayer != null)
{
// add the previously selected features for this layer
@@ -2502,6 +2562,14 @@
currentLayer.removeFeatures(prevSelFeatureIndexes);
}
}
+ // Any feat ids in the prev selection not in the new one, record their indices so we
+ // can trim off attributes at those indices
+ for (var k = 0; k < prevSelLayer.featIds.length; k++) {
+ var fid = prevSelLayer.featIds[k];
+ if (currentLayer.featIds.indexOf(fid) < 0) {
+ removals[layerName].removed.push(fid);
+ }
+ }
if (currentLayer.featIds.length == 0)
{
this.clear();
@@ -2521,6 +2589,7 @@
}
}
}
+ return removals;
},
clear: function()
More information about the fusion-commits
mailing list