Fix ogc server encoding for IE11/Edge #3422
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
src/services/print.js
Outdated
| @@ -291,7 +291,8 @@ ngeo.Print.prototype.encodeWmsLayer_ = function(arr, opacity, url, params) { | |||
| const customParams = {'TRANSPARENT': true}; | |||
| if (url_url.searchParams) { | |||
| for (const element of url_url.searchParams) { | |||
| customParams[element[0]] = element[1]; | |||
| // work-around to normalize IE11 & Edge ogcserver encoding issue | |||
| element[0] === 'ogcserver' ? customParams[element[0]] = element[1].replace('+', ' ') : customParams[element[0]] = element[1]; | |||
There was a problem hiding this comment.
Main PNG is something we define in the Admin interface. What if the name og the ogcserver is: Mein schönes OGC server für "PNG" & nicht für "JPEG" !. (Worst name I can find).
I means, that perhaps we should escape more. Can't you have a try ?
|
@ger-benjamin I didn't escape more than spaces, I did the test with your example and the special characters, and it worked. Note that for my test, it was the default ogc server name passed to the gmf proxy, so basically a name that would not work there first would have been impossible in the print as well: Now the regex I use can change more than a plus sign. |
sbrunner
force-pushed
the
fix_ogc-server_encoding
branch
6 times, most recently
from
2c830e5
to
8aece15
Compare
sbrunner
force-pushed
the
fix_ogc-server_encoding
branch
from
8aece15
to
e27e251
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It seems that the ogcserver sent by IE11 and Edge is the following:
"ogcserver": "Main+PNG"
while the correct format sent by Chrome and Firefox is:
"ogcserver: "Main PNG"
The wrong format causes the plus sign to be encoded into %2B, and breaks the print request.
The condition I add is not doing anything in the cases when Chrome and Firefox are sending the right value.
Fixed #3417