Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
fix dxf export for espg's with reverse axes + test
The dxf export didn't work for reverse axis projections (north, east) as the BBOX for WMS 1.3.0 comes in South, West, North, East and the dxf export treated it like West, South, East, North. The logic is taken from the normal GetMap, GetPrint requests. Backport from #41160
- Loading branch information
1 parent
21a6372
commit 2d1057d
Showing
5 changed files
with
727 additions
and
1 deletion.
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
# -*- coding: utf-8 -*- | ||
"""QGIS Unit tests for QgsServer WMS GetPrint. | ||
From build dir, run: ctest -R PyQgsServerWMSGetMapDxf -V | ||
.. note:: This program is free software; you can redistribute it and/or modify | ||
it under the terms of the GNU General Public License as published by | ||
the Free Software Foundation; either version 2 of the License, or | ||
(at your option) any later version. | ||
""" | ||
__author__ = 'Tudor Bărăscu' | ||
__date__ = '27/01/2021' | ||
__copyright__ = 'Copyright 2020, The QGIS Project' | ||
|
||
import os | ||
|
||
import urllib.parse | ||
|
||
from qgis.testing import unittest | ||
|
||
from test_qgsserver import QgsServerTestBase | ||
|
||
from qgis.core import (QgsVectorLayer) | ||
|
||
from qgis.PyQt import QtCore | ||
|
||
# Needed on Qt 5 so that the serialization of XML is consistent among all executions | ||
os.environ['QT_HASH_SEED'] = '1' | ||
|
||
|
||
class PyQgsServerWMSGetMapDxf(QgsServerTestBase): | ||
|
||
def test_dxf_export_works_with_reverse_axis_epsg(self): | ||
qs = "?" + "&".join(["%s=%s" % i for i in list({ | ||
"MAP": urllib.parse.quote(os.path.join(self.testdata_path, | ||
'test_dxf_export.qgs')), | ||
"SERVICE": "WMS", | ||
"VERSION": "1.3.0", | ||
"REQUEST": "GetMap", | ||
"BBOX": "399980,449980,400050,450100", | ||
"CRS": "EPSG:3844", | ||
"LAYERS": "test_dxf_export", | ||
"STYLES": ",", | ||
"FORMAT": "application/dxf", | ||
"SCALE": "500", | ||
"FILE_NAME": "test_dxf_export.dxf" | ||
}.items())]) | ||
|
||
r, h = self._result(self._execute_request(qs)) | ||
|
||
tempDir = QtCore.QTemporaryDir() | ||
dxf = os.path.join(tempDir.path(), 'test_dxf_export.dxf') | ||
f = open(dxf, 'wb') | ||
f.write(r) | ||
f.close() | ||
|
||
vl = QgsVectorLayer(dxf, "lyr", "ogr") | ||
myMessage = ('Expected downloaded dxf contains: %s line\nGot: %s\n' % | ||
(1, vl.featureCount())) | ||
|
||
self.assertEqual(vl.featureCount(), 1, myMessage) | ||
|
||
line_from_dxf = next(vl.getFeatures()).geometry().asWkt() | ||
line = 'LineString (450000 400000, 450100 400000)' | ||
|
||
self.assertEqual(line_from_dxf, line) | ||
|
||
|
||
if __name__ == '__main__': | ||
unittest.main() |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{ | ||
"type": "FeatureCollection", | ||
"name": "test_dxf_export", | ||
"crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:EPSG::3844" } }, | ||
"features": [ | ||
{ "type": "Feature", "properties": { }, "geometry": { "type": "LineString", "coordinates": [ [ 450000, 400000 ], [ 450100, 400000 ] ] } } | ||
] | ||
} |
Oops, something went wrong.