828 Commits

Author SHA1 Message Date
Nyall Dawson
c452c3d85f Fix some warnings and test failures on nightlies 2016-01-15 08:32:56 +11:00
Marco Hugentobler
a91b685685 Yet another slightly different control image... 2016-01-14 18:11:47 +01:00
Marco Hugentobler
d416b14cf7 Generate test images on newer system and use tolerance of 100 pixels 2016-01-14 16:58:33 +01:00
Marco Hugentobler
561690c9ee Use render job in unit test instead of vector renderer 2016-01-14 13:26:47 +01:00
Matthias Kuhn
4e9afcec4c Expression variable for the currently rendered part
During rendering, two new variables will be available:

  * `geometry_part_count`
  * `geometry_part_num` (1-based index)

Useful to apply different styles to different parts of multipart
features
2016-01-13 08:17:49 +01:00
Nyall Dawson
f0d8efbdd4 Update test mask 2016-01-13 16:16:39 +11:00
Matthias Kuhn
04919963f7 Merge pull request #2616 from SebDieBln/FixLayerCountAttribute
Remove the 'layercount' attribute in a project file
2016-01-12 10:46:17 +01:00
Nyall Dawson
e26ef82890 Update test mask image 2016-01-12 20:07:58 +11:00
Nyall Dawson
8779091225 Fix failing tests 2016-01-12 08:24:56 +11:00
Nyall Dawson
8b28c040d1 [FEATURE] Add mode to apply label distance from symbol bounds
(only works with Cartographic point label placement). When this
setting is active, the label distance applies from the bounds
of the rendered symbol for a point, instead of the point itself.
It's especially useful when the symbol size isn't fixed, eg if
it's set by a data defined size or when using different symbols
in a categorised renderer.

Sponsored by Andreas Neumann
2016-01-12 08:24:39 +11:00
Nyall Dawson
6499439cc5 Fix failing tests, add tests for ordered placement
Sponsored by Andreas Neumann
2016-01-12 08:24:38 +11:00
rldhont
e276f170c7 [Feature][QGIS Server] Add WMS INSPIRE Capabilities
In the project properties the user can:
* activate INSPIRE capabilities
* select language of the service, 24 EU official languages + 5 regionals
* choose the scenario for service metadata and specify them

The WMS 1.3.0 capabilities reflects the INSPIRE configuration.
2016-01-11 21:12:09 +01:00
Nyall Dawson
19a47fec29 Test mask update 2016-01-10 18:48:37 +11:00
Nyall Dawson
3496f08a8d Update test mask image 2016-01-10 07:37:23 +11:00
Juergen E. Fischer
4e1cf3c081 add missing copyright headers 2016-01-08 21:32:11 +01:00
Sebastian Dietrich
d26bd46d99 remove 'layercount' attribute from project file
The 'layercount' attribute was not used anyway and the calculated number could already be outdated when loading the project file again due to changes to embedded projects.
2016-01-08 16:10:58 +01:00
Marco Hugentobler
886fd725a3 Add test for rendering of adjacent tile images 2016-01-07 13:27:43 +01:00
Nyall Dawson
bd9d41c6ee Update test masks 2016-01-07 10:17:18 +11:00
Nyall Dawson
d9bb22a370 Update test mask images 2016-01-06 16:12:18 +11:00
Nyall Dawson
5e4c14cd40 [FEATURE] Control over label rendering order
A new control for setting a label's "z-index" has been added to
the labeling properties dialog. This control (which also accepts
data-defined overrides for individual features) determines the order
in which label are rendered. Label layers with a higher z-index
are rendered on top of labels from a layer with lower z-index.

Additionally, the logic has been tweaks so that if 2 labels have
matching z-indexes, then:
- if they are from the same layer, a smaller label will be drawn
above a larger label
- if they are from different layers, the labels will be drawn in
the same order as the layers themselves (ie respecting the order
set in the legend)

Diagrams can also have their z-index set (but not data defined)
so that the order of labels and diagrams can be controlled.

Note that this does *NOT* allow labels to be drawn below the
features from other layers, it just controls the order in which
labels are drawn on top of all the layer's features.

Fix #13888, #13559
2016-01-05 22:27:22 +11:00
Martin Dobias
7b2298e574 Fix failing labeling test on my ubuntu 14.04 box (12 mismatched pixels) 2016-01-04 23:13:18 +01:00
rldhont
a32587bcd1 [FEATURE][QGIS Server] Add short name to layers, groups and project
A number of elements have both a <Name> and a <Title>. The Name is a text string used for machine-to-machine
communication while the Title is for the benefit of humans. For example, a dataset might have the descriptive Title
“Maximum Atmospheric Temperature” and be requested using the abbreviated Name “ATMAX”.

User can already set title for layers, groups and project. OWS name is based on the name used in layer tree. This name is more a label for humans than a name for machine-to-machine communication.

To add the capability to users to define Name as a text string for machine-to-machine communication, this pull-request adds:
* short name line edits to layers properties
* WMS data dialog to layer tree group (short name, title, abstract)
* short name line edits to project properties
* add a regexp validator "^[A-Za-z][A-Za-z0-9\._-]*" to short name line edit accessible through a static method
* add a TreeName element in the fullProjectSettings

If a short name has been set for layers, groups and project it is used by QGIS Sever as the layer name.
2015-12-23 10:03:04 +01:00
Matthias Kuhn
e00815db33 Add test for rendering order 2015-12-22 09:12:32 +01:00
Nyall Dawson
809c925581 [FEATURE] Support Z/M dimensions in delimited WKT files 2015-12-22 13:37:51 +11:00
Nyall Dawson
f994e71d39 [FEATURE] Delimited text provider supports curved WKT geometries 2015-12-22 13:37:51 +11:00
Hugo Mercier
e60712e7cf Add a provider for virtual layers 2015-12-18 19:45:58 +02:00
Matthias Kuhn
b855b0f7b3 Fix csv test dataset 2015-12-18 18:38:19 +01:00
rldhont
e2d1320295 [BUGFIX] WFS GetCapabilities respons misses <keywords> key
Fixes #13037 WFS GetCapabilities respons misses <keywords> key

Replace KeywordList by Keywords in WFS Getcapabilities and keywords in WCS GetCapabilities.
2015-12-18 12:20:12 +01:00
rldhont
9e8e868a0f [TEST][QGIS Server] Add WFS GetFeature STARTINDEX test 2015-12-15 17:18:41 +01:00
AsgerPetersen
3d937e1deb Simple python tests of WFS responses 2015-12-15 13:51:11 +01:00
Matthias Kuhn
c9fa33410d Fix rendering geometry generators for line layers
And add more tests
2015-12-11 11:41:41 +01:00
Nyall Dawson
8602a91a1d Add provider test for mssql 2015-12-11 07:14:03 +11:00
Matthias Kuhn
aa4f28882d Add geometry generator tests 2015-12-10 12:33:43 +01:00
Nyall Dawson
89b9b67974 Handle type conversion failures for compiled expressions 2015-12-10 20:49:17 +11:00
Nyall Dawson
038646170f Fix spatialite provider test data (was missing primary key) 2015-12-10 16:18:30 +11:00
Alessandro Pasotti
0287daf8ab Merge pull request #2555 from elpaso/bugfix-pg-inherits
Additional tests for tables with inherits
2015-12-09 12:03:59 +01:00
Matthias Kuhn
be01b7eec5 [FEATURE] Add N:M relation editing possibilities
This adds the possibility to manage data on a normalized relational
database in N:M relations. On the relation editor in a form, the tools
to add, delete, link and unlink work (also) on the linking table if a
relation is visualized as N:M relation.

Configuration is done through the fields tab where on the relation a
second relation can be chosen (if there is a suitable relation in terms
of a second relation on the linking table).

Limitations
===========

QGIS is not a database management system.

It is based on assumptions about the underlying database system. In
particular it expects

 * A `ON DELETE CASCADE` or similar measure on the second relation
 * Does not take care of setting the primary key when adding features.
   Either users need to be instructed to set them manually or - if it's a
   database derived value - the layers need to be in transaction mode
   (currently only activatable through the API)
2015-12-08 15:49:01 +01:00
elpaso
96789f378e Added tests with use estimated metadata 2015-12-08 11:30:32 +01:00
elpaso
614db66129 Added failing test for tables with INHERITS 2015-12-04 17:54:54 +01:00
rldhont
5473c3394f [QGIS-Server] Help editing OWS Server general information
Fees and access constraints have a defined list of value by ISO. To help user editing these parameters, edit lines have been remplaced by editable combo box.

To enhance general information and has more INSPIRE compatibility, contact position is added to general information.
2015-11-28 15:47:40 +01:00
Nyall Dawson
4624fb88ae Update test mask images 2015-11-26 12:53:52 +11:00
Nyall Dawson
e03f5549ca Update test mask images 2015-11-25 07:48:47 +11:00
Nyall Dawson
675da0ce40 Fix PyQgsServerAccessControl on Ubuntu
Add size tolerance to legend images, add masks for legend images
2015-11-24 07:54:29 +11:00
Nyall Dawson
f1458434fb Followup 7d600bd, proper fix for failing labeling engine test
When labelFeatures is called outside of the renderering loop,
we need to make sure the renderer is prepared by calling
startRender.
2015-11-24 07:26:37 +11:00
Nyall Dawson
169989a02f Update test mask images 2015-11-23 21:03:04 +11:00
Nyall Dawson
73ac9f9acd Update test mask images 2015-11-23 06:03:44 +11:00
Nyall Dawson
7d600bdaed [FEATURE] Use rendered symbol size as obstacle for point feature labels
Previously, only the point feature itself was treated as an obstacle
for label candidates. If a large or offset symbol was used for the
point, then labels were allowed to overlap this symbol without
incurring the obstacle cost.

Sponsored by City of Uster
2015-11-22 21:30:42 +11:00
Nyall Dawson
2e0019df39 Test mask updates 2015-11-22 18:08:34 +11:00
Nyall Dawson
9cc10e2a21 [labeling] Allow different obstacle geometry to feature geometry
This change makes it possible to have a different geometry used
for labeling obstacle detection to the geometry used for generating
label position candidates.

Also fixes parts of multipolygon features were not treated as
obstacles when "label only largest part" of polygon was checked.
Some inefficiencies in pal were also fixed (eg avoiding adding
features/obstacles to pal rtree indexes when they will never
be used).

Sponsored by City of Uster
2015-11-21 22:23:16 +11:00
Nyall Dawson
47e6d3031b Update test masks 2015-11-21 22:03:19 +11:00