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

fix WFS access for QGIS3 clients (and others relying on metadata) #4086

Merged
merged 2 commits into from
Sep 10, 2018
Merged

fix WFS access for QGIS3 clients (and others relying on metadata) #4086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0ca3a0
fix WFS access for QGIS3 clients (and others relying on metadata)
jwkaltz Sep 5, 2018
e4f37c7
review feedback YJN, SBR
jwkaltz Sep 5, 2018
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
8 changes: 4 additions & 4 deletions c2cgeoportal/scaffolds/create/mapserver/c2cgeoportal.map.mako_tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
# Test requests:
#
# WMS GetCapabilities:
# /mapserv?service=wms&version=1.1.1&request=getcapabilities
# /wsgi/mapserv_proxy?service=wms&version=1.1.1&request=getcapabilities
#
# WMS GetMap:
# /mapserv?service=wms&version=1.1.1&request=getmap&bbox=-180,-90,180,90&layers=countries&width=600&height=400&srs=EPSG:4326&format=image/png
# /wsgi/mapserv_proxy?service=wms&version=1.1.1&request=getmap&bbox=-180,-90,180,90&layers=countries&width=600&height=400&srs=EPSG:4326&format=image/png
#
# WMS GetFeatureInfo:
# /mapserv?service=wms&version=1.1.1&request=getfeatureinfo&bbox=-180,-90,180,90&layers=countries&query_layers=countries&width=600&height=400&srs=EPSG:4326&format=image/png&x=180&y=90&info_format=application/vnd.ogc.gml
# /wsgi/mapserv_proxy?service=wms&version=1.1.1&request=getfeatureinfo&bbox=-180,-90,180,90&layers=countries&query_layers=countries&width=600&height=400&srs=EPSG:4326&format=image/png&x=180&y=90&info_format=application/vnd.ogc.gml
#

MAP
Expand Down Expand Up @@ -70,7 +70,7 @@ MAP
METADATA
"wms_title" "changeme"
"wms_abstract" "changeme"
"wms_onlineresource" "http://${host}/${instanceid}/wsgi/mapserv_proxy"
"ows_onlineresource" "http://${host}/${instanceid}/wsgi/mapserv_proxy"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On 2.3 I use ows_service_onlineresource witch is right?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@yjacolin do you know more? I find both in the docs (ows_service_onlineresource and ows_onlineresource)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here:
https://mapserver.org/ogc/wms_server.html
https://mapserver.org/ogc/wfs_server.html
I just see one strange mention of ows_onlineresource but is it's tested and working we can go ahead like it :-)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sbrunner I retested my demo instance with ows_onlineresource, this works, and with ows_service_onlineresource, but this does not work. So I will merge this PR here, and I think the 2.3 branch should be adapted to ows_onlineresource.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the tests :-)

"wms_srs" "EPSG:{{srid}}"
"wms_encoding" "UTF-8"
"wms_enable_request" "*"
Expand Down
2 changes: 1 addition & 1 deletion docker/test-mapserver/mapserver.map.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ MAP
METADATA
"wms_title" "changeme"
"wms_abstract" "changeme"
"wms_onlineresource" "changeme"
"ows_onlineresource" "changeme"
"wms_encoding" "UTF-8"
"wms_enable_request" "*"
"ows_title" "changeme"
Expand Down