sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity
59,519 Commits 81 Branches 277 Tags
Commit Graph

59519 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthias Kuhn
10532accef
Code style 2019-12-23 16:38:00 +01:00
Samweli
965cb1344e resolved conflicts 2019-12-21 22:18:44 +03:00
Samweli
93537d3a7e resolving conflicts with master branch 2019-12-21 22:11:56 +03:00
Matthias Kuhn
59c777fd60
Merge pull request #33498 from Samweli/wms_code_convention_refactor 
Code refactor on wms capabilities files
 2019-12-21 14:14:33 +01:00
Samweli
d334e4705b refactored wms capabilities files to the project standards 2019-12-21 12:03:58 +03:00
Matthias Kuhn
602febc39f
Merge pull request #33491 from m-kuhn/windows-server-crash-fix 
[server][windows] Fix crash on startup
 2019-12-20 20:15:48 +01:00
Nyall Dawson
2371b5d50a Don't run a test under proj 6 2019-12-21 05:07:39 +10:00
Nyall Dawson
3b4ccb42c0 Disable test on proj < 6 2019-12-21 05:07:39 +10:00
Nyall Dawson
9902b3cb14 Skip a test on travis 2019-12-21 05:07:39 +10:00
Nyall Dawson
8e64277c1c [FEATURE][processing] Allow selection of specific coordinate operation 
to use when reprojecting vector layers via the "Reproject Layer" algorithm

On proj 6+ builds only!

Allows users to set a specific operation to use for a particular reprojection
task, instead of always forcing use of the current project's transformation
settings.

Useful when reprojecting a particular layer and control over the exact transformation
pipeline is required.
 2019-12-21 05:07:39 +10:00
Nyall Dawson
6bb1ad034b Auto select operation in processing widget based on project transform context 2019-12-21 05:07:39 +10:00
Nyall Dawson
521080cd13 Add API to auto set QgsCoordinateOperationWidget selection to match 
a QgsCoordinateTransformContext's state
 2019-12-21 05:07:39 +10:00
Nyall Dawson
afc24b7957 Only expose coordinate operation parameter type on Proj 6+ builds 2019-12-21 05:07:39 +10:00
Nyall Dawson
b11cb7cce7 Correctly resolve project layers to CRS values in widget 2019-12-21 05:07:39 +10:00
Nyall Dawson
c59af52c27 No margins 2019-12-21 05:07:39 +10:00
Nyall Dawson
dbc175f131 Add test for proj < 6 logic 2019-12-21 05:07:39 +10:00
Nyall Dawson
f804a0a3a1 Dumbass Travis build 2019-12-21 05:07:39 +10:00
Nyall Dawson
6408aaa05a Fix build on crufty proj 2019-12-21 05:07:39 +10:00
Nyall Dawson
8531bc87ac Unit tests 2019-12-21 05:07:39 +10:00
Nyall Dawson
90f3abfcad [processing] Add gui widget wrappers for coordinate operation parameter 2019-12-21 05:07:39 +10:00
Nyall Dawson
84f8891b60 Fix warnings 2019-12-21 05:07:39 +10:00
Nyall Dawson
b8b668888c Allow algorithms to link to multiple depandant parameters in modeler scene 2019-12-21 05:07:39 +10:00
Nyall Dawson
3e9aaaa6ea Move variant to CRS resolution out to QgsProcessingUtils for wider 
usability
 2019-12-21 05:07:39 +10:00
Nyall Dawson
fe622dd24a [API][processing] New parameter type for coordinate operations 
Allows selection of the proj coordinate operation to use when
reprojecting between two CRSes
 2019-12-21 05:07:39 +10:00
Nyall Dawson
c04d4faf7f Allow double-clicking on coordinate operation to quickly select them 2019-12-21 05:07:39 +10:00
Nyall Dawson
96645261e5 Fix changing source or dest CRS when editing a coordinate operation 
fails to correctly save the new operation
 2019-12-21 05:07:39 +10:00
Nyall Dawson
f0f63d3802 Use QgsCoordinateOperationWidget in QgsDatumTransformDialog 2019-12-21 05:07:39 +10:00
Nyall Dawson
0cd49ca744 Avoid duplicate signals, add unit test 2019-12-21 05:07:39 +10:00
Nyall Dawson
cb8b4a8831 Move guts of datum transformation dialog to a new standalone widget 
QgsCoordinateOperationWidget

This widget shows a list of the available operations between a source
and destination CRS along with their properties
 2019-12-21 05:07:39 +10:00
Matthias Kuhn
ffd42d9dd7 [server][windows] Fix crash on startup 2019-12-20 18:15:53 +01:00
Matthias Kuhn
2a01772e46
Merge pull request #33436 from signedav/relating_values 
List referenced layer values in Expression Builder
 2019-12-20 17:29:10 +01:00
Samweli
e8fd26cc62 update on wcs docstring 2019-12-20 13:43:48 +03:00
Samweli
d614efabb0 remove abbreviated variables names in metadata link parse function 2019-12-20 11:45:02 +03:00
David Signer
ea912a170c since information 2019-12-20 09:39:50 +01:00
Samweli
22278954da refactor wcs provider to project code standards 2019-12-20 11:12:23 +03:00
Peter Petrik
d211de2204
Other average methods 3d mesh (#33426) 
[FEATURE] [MESH] add new 3d stacked mesh averaging methods (top, bottom, sigma, depth, height, elevation)

see https://fvwiki.tuflow.com/index.php?title=Depth_Averaging_Results for description of the methods. method can be selected for 3d stacked mesh dataset in the new widget added for QGIS 3.12 in the mesh layer styling dialog
 2019-12-20 07:48:39 +01:00
Nyall Dawson
cdc9a841c9 Add some proj6 test branches 2019-12-20 12:13:06 +10:00
Nyall Dawson
4fd9619ebc Fix build, fix test on proj < 6 2019-12-20 12:13:06 +10:00
Nyall Dawson
dc3846544e Round trip test CRSes via WKT 2019-12-20 12:13:06 +10:00
Nyall Dawson
948fccd052 Update test results to use WKT2 2019-12-20 12:13:06 +10:00
Nyall Dawson
a9773666c1 Don't cache WKT strings inside QgsCoordinateReferenceSystem 
There's many different formats of WKT strings, so instead play it safe
and always export in the exact specified format instead of using a cached
value which may be a different format.
 2019-12-20 12:13:06 +10:00
Nyall Dawson
f77af382a0 Prefer WKT2 when exporting CRS for use by GDAL 2019-12-20 12:13:06 +10:00
Nyall Dawson
ac47631656 Fix typo in CRS code 2019-12-20 12:13:06 +10:00
Nyall Dawson
80be192d8f Fix doxygen warning 2019-12-20 12:13:06 +10:00
Nyall Dawson
b7a440938c Layout fixes 2019-12-20 12:13:06 +10:00
Nyall Dawson
6490a170b1 Fix build on proj <6 2019-12-20 12:13:06 +10:00
Nyall Dawson
fe941e68f6 New projection dialog proj 6 tweaks and revisions 2019-12-20 12:13:06 +10:00
Nyall Dawson
2e3730179e Partial revert BoundCRS identification change 
Sync behavior with the new GDAL behavior, where a CRS defined using
a proj string alone will be considered equivalent to the underlying
source crs.
 2019-12-20 12:13:06 +10:00
Nyall Dawson
ac1ff9b291 Update test results 2019-12-20 12:13:06 +10:00
Nyall Dawson
4b5056c6f5 Revert "Don't automatically create boundcrs proj string representations of CRSes" 
Following discussion with GDAL maintainers, it's been agreed that the consistent logic
to use across projects should be:

1. Proj strings: export as bound CRS, and treat a boundcrs match to a known CRS as equivalent
to the underlying source CRS

2. WKT strings: export without change, not as bound CRS, and DON'T treat boundcrs matches
as equivalent to the underlying source CRS
 2019-12-20 12:13:06 +10:00