54901 Commits

Author SHA1 Message Date
Matthias Kuhn
41a9e6fac1
Merge pull request #9719 from m-kuhn/code_modernization
Code modernization in map canvas
2019-04-05 12:48:19 +02:00
Matthias Kuhn
6958b7a251
Massive Q_FOREACH to range-based-for conversion 2019-04-05 12:06:20 +02:00
Matthias Kuhn
2bb049ecd1
Code modenization 2019-04-05 11:25:30 +02:00
rldhont
98235eb46b [Bugfix][Server] QGIS Server removes empty string in style parameter even if it describes default style
In OGC WMS standard, the empty string represents the default style.

QGIS Server when it parses the parameters, QGIS Server when it parses parameters it removes empty parts.
When all requested styles are default ones it's equal to an empty parameter STYLE, as defined in the standard.
When only one layer is requested, there is no issue with custom or default style.
When multiple layers are requested and some with custom styles, because QGIS Server does not retain empty strings, it loses the layer / style match.

To fix it, keeps empty parts for not empty styles parameters.
2019-04-05 09:29:21 +02:00
Juergen E. Fischer
870337871a move WITH_BINDINGS in front of WITH_SERVER_PLUGINS (fixes e839f277c5c1 and clean builds) 2019-04-05 09:05:30 +02:00
nirvn
ecce0f1d55 [locator] Add active layer scope to the calculator locator filter
This allows the usage of layer scope functions such as
sum("MY_FIELD")
2019-04-05 13:28:38 +07:00
Nyall Dawson
f76aa2a11c Cleanup geometry validation dock before QgsApplication exit
Refs #20283, possibly fixes it
2019-04-05 16:02:32 +10:00
Nyall Dawson
d4420c561d Fix some memory leaks 2019-04-05 16:02:32 +10:00
Marco Bernasocchi
fad4732e87 Separate the tests in two files since server uses static initialization
and thus we cannot change it's settings once it is created

Signed-off-by: Marco Bernasocchi <marco@opengis.ch>

Signed-off-by: Marco Bernasocchi <marco@opengis.ch>
2019-04-05 08:01:42 +02:00
Marco Bernasocchi
29a15ad890 Move invalid size test to its own class so it can reread os.env
Signed-off-by: Marco Bernasocchi <marco@opengis.ch>

add init_server method

Signed-off-by: Marco Bernasocchi <marco@opengis.ch>

Use own qgs application so we can change the env settings

Signed-off-by: Marco Bernasocchi <marco@opengis.ch>
2019-04-05 08:01:42 +02:00
Marco Bernasocchi
64e92c1f89 use QStringLiteral in Settings
Signed-off-by: Marco Bernasocchi <marco@opengis.ch>

remove unused mServerSettings

Signed-off-by: Marco Bernasocchi <marco@opengis.ch>

Fix typo and code style

Signed-off-by: Marco Bernasocchi <marco@opengis.ch>

Fix test

Fix test
2019-04-05 08:01:41 +02:00
Marco Bernasocchi
2cda2afe3e Add test and sip
add missing methods

Signed-off-by: Marco Bernasocchi <marco@opengis.ch>

Update src/server/qgsserversettings.cpp

Co-Authored-By: mbernasocchi <marco@opengis.ch>

Update src/server/qgsserversettings.cpp

Co-Authored-By: mbernasocchi <marco@opengis.ch>

Update tests/src/python/test_qgsserver_wms_getmap.py

Co-Authored-By: mbernasocchi <marco@opengis.ch>

Update src/server/qgsserversettings.h

Co-Authored-By: mbernasocchi <marco@opengis.ch>

Adress most review comments in PR

Signed-off-by: Marco Bernasocchi <marco@opengis.ch>
2019-04-05 08:01:41 +02:00
Marco Bernasocchi
a938507070 Allow setting wmsMaxWidth and wmsMaxHeight in the server env
created env variables code

use server settings as well

add since 3.8
2019-04-05 08:01:41 +02:00
Alessandro Pasotti
3c4b2a7e73
Merge pull request #9704 from elpaso/bugfix-21697-server-gfi-top-group-layers
[server] Allow WMS GetFeatureInfo on root layer and groups
2019-04-05 07:46:22 +02:00
nirvn
5e0fd15570 [FEATURE][processing] Add concatenate_unique support to the aggregate alg 2019-04-05 12:01:06 +07:00
nirvn
578c398219 [FEATURE][expression] Add concatenate_unique() aggregation function 2019-04-05 12:01:06 +07:00
nirvn
9fd5509ad0 Add a aggregation method to concatenate unique values 2019-04-05 12:01:06 +07:00
Nyall Dawson
4582cb8d09 Fix crash, missing points in some corner cases 2019-04-05 12:00:47 +10:00
Nyall Dawson
426382c919 [FEATURE] Average line angles for marker and hashed line symbology
Previously, when marker or hash lines were rendered using interval
or center point place placement, the symbol angles were determined
by taking the exact line orientation at the position of the symbol.

This often leads to undesirable rendering effects, where little
jaggies or corners in lines which occur at the position of the
symbol cause the marker or hash line to be oriented at a very
different angle to what the eye expects to see.

With this new option, the angle is instead calculated by averaging
the line over a specified distance either side of the symbol. E.g.
averaging the line angle over 4mm means we take the points along
the line 2mm from either side of the symbol placement, and use these
instead to calculate the line angle for that symbol. This has the
effect of smoothing (or removing) any tiny local deviations from
the overall line direction, resulting in much nicer visual
orientation of marker or hash lines.

Like all symbol settings, the average angle smoothing distance
can be set using mm/pixels/map units/etc, and supports data-defined
values.

Closed rings also correctly consider wrapping around these average
angles from the start/end vertex.

(Sponsored by an anonymous corporate backer)
2019-04-05 12:00:47 +10:00
Nyall Dawson
4d7f0c2f50 More unit tests 2019-04-05 11:33:08 +10:00
Nyall Dawson
af2286323a Correctly handle inverse transforms with reversed axis CRS in proj 6.0 builds
This logic is too complex and fragile -- we should drop support for proj 6.0
as soon as we can, so that we can the inbuilt handling which
is enabled for proj >= 6.1 only.
2019-04-05 11:33:08 +10:00
Nyall Dawson
2e11c3493c Rename variable for clarity 2019-04-05 11:33:08 +10:00
Nyall Dawson
e2396aadf3 Use proj_normalize_for_visualization on proj >= 6.1 2019-04-05 11:33:08 +10:00
Nyall Dawson
83dc159cc5 Correctly handle swapped axis order for proj 6.0 2019-04-05 11:33:08 +10:00
Nyall Dawson
905ccc0917 Fix proj4 build 2019-04-05 11:33:08 +10:00
Nyall Dawson
353060dc36 Add helper method to determine whether a proj string uses angular units 2019-04-05 11:33:08 +10:00
Nyall Dawson
7095eff708 Remove debug noise 2019-04-05 11:33:08 +10:00
Nyall Dawson
250d0d1670 Fix proj4 build 2019-04-05 11:33:08 +10:00
Nyall Dawson
70a8d49d14 Use proj6 for custom projections dialog 2019-04-05 11:33:08 +10:00
Nyall Dawson
c2cac5aab0 Use unique_ptrs for proj object storage
Sponsored by ICSM
2019-04-05 11:33:08 +10:00
Nyall Dawson
95c0d4f182 Port QgsCoordinateTransform to proj 6 API
Sponsored by ICSM
2019-04-05 11:33:08 +10:00
Juergen E. Fischer
eabf56bfb3 fix #21774 2019-04-05 01:15:16 +02:00
Denis Rouzaud
81cfde2ff5
forward declaration of unique_ptr (#9708) 2019-04-04 15:44:58 -05:00
Denis Rouzaud
0a10dc504d
[theme] fix invisible text in field expression widget in dark themes (#9701)
* [theme] fix invisile text in field expression widget in dark themes

only on MacOS at the moment

* switch back to original palette

* remove useless includes

* don't use pointer
2019-04-04 15:42:28 -05:00
Juergen E. Fischer
f1dbcc3c53 processing: fix grass' r.quantile parameter (fixes #21751) 2019-04-04 16:46:37 +02:00
Juergen E. Fischer
9aaaad3ab8 trim crssync include directories (followup 8851328) 2019-04-04 16:42:54 +02:00
Denis Rouzaud
580e7eb6ba
remove forcing Night Mapping theme (#9700)
This hack was introduced when Qt had poor support of Mac Dark Theme so that the combination of the default QGIS theme and Dark Theme on the OS was forcing to use QGIS Night Mapping theme.
Since Qt 5.12, it does look good and it's the last Qt LTS version.
2019-04-04 07:37:29 -05:00
Denis Rouzaud
4d566a34b3
Merge pull request #9695 from 3nids/vertextool_sync_fix
[vertex tool] fixes some editor-tool synchronization issues
2019-04-04 07:33:54 -05:00
Alessandro Pasotti
d995070a8e Add missing reference file for gfi test 2019-04-04 14:28:27 +02:00
Alessandro Pasotti
258b9a5a8a Const copy in for loop 2019-04-04 13:53:15 +02:00
Alessandro Pasotti
a8ffb334cc Fix queryable on top getprojectsettings 2019-04-04 13:29:56 +02:00
rldhont
7de6eeb6d8
Merge pull request #9654 from rldhont/fix-regression-server-print-selection-pdf-master
[Unit-test]To avoid regression in Server printing to PDF output format
2019-04-04 12:28:38 +02:00
Alessandro Pasotti
548af40511 Code layout 2019-04-04 12:19:16 +02:00
Alessandro Pasotti
9a689aff55 [server] Allow WMS GetFeatureInfo on root layer and groups
If the group (or the root) has any queryable child, it is flagged as queryable

Also fixes an issue with json enconding with rasters.

Fixes #21697

Funded by: Kanton Zug
2019-04-04 11:47:25 +02:00
Nyall Dawson
037a8283fa Fix crash when searching in layer properties
Fixes #21769
2019-04-04 15:23:39 +10:00
Denis Rouzaud
7410fb0a52
clearer definition of flaky tests (#9693) 2019-04-03 11:02:30 -05:00
Matthias Kuhn
e04395455c
Merge pull request #9291 from dmarteau/fix-HAVE_SERVER_PYTHON_PLUGINS
Fix build without HAVE_SERVER_PYTHON_PLUGINS
2019-04-03 15:57:50 +02:00
David Marteau
e839f277c5 Disable WITH_SERVER_PLUGINS when WITH_BINDINGS=FALSE 2019-04-03 14:48:24 +02:00
Matthias Kuhn
21e08c2f82 Update src/server/services/wms/qgswmsgetlegendgraphics.cpp
Co-Authored-By: dmarteau <dhmarteau@gmail.com>
2019-04-03 14:38:35 +02:00
David Marteau
47fba3266e Fix build without HAVE_SERVER_PYTHON_PLUGINS 2019-04-03 14:38:35 +02:00