Skip to content
This repository was archived by the owner on May 6, 2021. It is now read-only.

Checks if layers are inRange #654

Merged
offtherailz merged 2 commits into from
Apr 29, 2015
Merged

Checks if layers are inRange #654

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
355901b
Checks if layers are inRange
Apr 28, 2015
321337c
Added to hover query too
Apr 29, 2015
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
51 changes: 50 additions & 1 deletion mapcomposer/app/static/externals/gxp/src/script/plugins/WMSGetFeatureInfoMenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ if(this.infoAction=='click'){

queryableLayers.each(function(x){
var l = x.getLayer();

var vendorParams = {};
Ext.apply(vendorParams, x.getLayer().vendorParams || this.vendorParams || {});
if(!vendorParams.env || vendorParams.env.indexOf('locale:') == -1) {
Expand Down Expand Up @@ -429,6 +429,29 @@ if(this.infoAction=='click'){
scope: this
}
});
//Override control function to add check for inRangeLayer
control.findLayers= function() {
var candidates = this.layers || this.map.layers;
var layers = [];
var layer, url;
for(var i = candidates.length - 1; i >= 0; --i) {
layer = candidates[i];
if(layer instanceof OpenLayers.Layer.WMS &&
(!this.queryVisible || (layer.getVisibility() && layer.calculateInRange())) ) {
url = OpenLayers.Util.isArray(layer.url) ? layer.url[0] : layer.url;
// if the control was not configured with a url, set it
// to the first layer url
if(this.drillDown === false && !this.url) {
this.url = url;
}
if(this.drillDown === true || this.urlMatches(url)) {
layers.push(layer);
}
}
}
return layers;
};

map.addControl(control);
info.controls.push(control);
if(infoButton.checked || infoButton.pressed ) {
Expand Down Expand Up @@ -831,10 +854,36 @@ if(this.infoAction=='click'){
},deactivate: cleanup
}
});

//Override control function to add check for inRangeLayer
control.findLayers= function() {
var candidates = this.layers || this.map.layers;
var layers = [];
var layer, url;
for(var i = candidates.length - 1; i >= 0; --i) {
layer = candidates[i];
if(layer instanceof OpenLayers.Layer.WMS &&
(!this.queryVisible || (layer.getVisibility() && layer.calculateInRange())) ) {
url = OpenLayers.Util.isArray(layer.url) ? layer.url[0] : layer.url;
// if the control was not configured with a url, set it
// to the first layer url
if(this.drillDown === false && !this.url) {
this.url = url;
}
if(this.drillDown === true || this.urlMatches(url)) {
layers.push(layer);
}
}
}
return layers;
};

this.target.mapPanel.map.addControl(control);
this.activeControl=control;
control.activate();

}, this);


},

Expand Down