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

Jump to bottom

DO proxy the WMS tiles, to prevent mixing secure/insecure content #14

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

DO proxy the WMS tiles, to prevent mixing secure/insecure content #14

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
10 changes: 4 additions & 6 deletions ckanext/geoview/public/js/ol2_preview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,13 +136,11 @@
},
'wms' : function(resource, proxyUrl, proxyServiceUrl, layerProcessor) {
var parsedUrl = resource.url.split('#');
// use the original URL for the getMap, as there's no need for a proxy for image requests
var getMapUrl = parsedUrl[0].split('?')[0]; // remove query if any

var url = proxyServiceUrl || getMapUrl;

var directGetMapUrl = parsedUrl[0].split('?')[0]; // remove query if any
var url = proxyServiceUrl || directGetMapUrl;
var layerName = parsedUrl.length > 1 && parsedUrl[1];
OL_HELPERS.withWMSLayers(url, getMapUrl, layerProcessor, layerName);
// Use the proxy if available for the tiles to prevent mixed secure/insecure content
OL_HELPERS.withWMSLayers(url, url, layerProcessor, layerName);
},
'esrigeojson': function (resource, proxyUrl, proxyServiceUrl, layerProcessor) {
var url = proxyUrl || resource.url;
Expand Down