Merge branch 'master' into fix-wms

Author: tcoupin

debian/qgis-providers.install.in

@@ -20,4 +20,4 @@ usr/lib/qgis/plugins/libwmsprovider.so
 usr/lib/qgis/plugins/libarcgismapserverprovider.so
 usr/lib/qgis/plugins/libarcgisfeatureserverprovider.so
 usr/lib/qgis/plugins/libmdalprovider.so
-{QT_PLUGINS_DIR}/sqldrivers/libqsqlspatialite.so
+#!xenial#{QT_PLUGINS_DIR}/sqldrivers/libqsqlspatialite.so

debian/rules

@@ -92,7 +92,7 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 	MAKEFLAGS += -j$(NUMJOBS)
 endif
 
-ifneq ($(DISTRIBUTION),"xenial")
+ifneq ($(DISTRIBUTION),xenial)
 	CMAKE_OPTS += -DWITH_QSPATIALITE=TRUE
 endif
 

python/gui/auto_generated/qgisinterface.sip.in

@@ -256,6 +256,13 @@ Returns a reference to the main window "File" toolbar.
     virtual QToolBar *layerToolBar() = 0;
 %Docstring
 Returns a reference to the main window "Layer" toolbar.
+%End
+
+    virtual QToolBar *dataSourceManagerToolBar() = 0;
+%Docstring
+Returns a reference to the main window "Data Source Manager" toolbar.
+
+.. versionadded:: 3.4
 %End
 
     virtual QToolBar *mapNavToolToolBar() = 0;

python/gui/auto_generated/qgssvgsourcelineedit.sip.in

@@ -0,0 +1,71 @@
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/gui/qgssvgsourcelineedit.h                                       *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/
+
+
+
+
+class QgsSvgSourceLineEdit : QWidget
+{
+%Docstring
+A line edit widget with toolbutton for setting an SVG image path.
+
+.. versionadded:: 3.4
+%End
+
+%TypeHeaderCode
+#include "qgssvgsourcelineedit.h"
+%End
+  public:
+
+    QgsSvgSourceLineEdit( QWidget *parent /TransferThis/ = 0 );
+%Docstring
+Constructor for QgsSvgSourceLineEdit, with the specified ``parent`` widget.
+%End
+
+    QString source() const;
+%Docstring
+Returns the current SVG source.
+
+.. seealso:: :py:func:`setSource`
+
+.. seealso:: :py:func:`sourceChanged`
+%End
+
+    void setLastPathSettingsKey( const QString &key );
+%Docstring
+Sets a specific settings ``key`` to use when storing the last
+used path for the SVG source.
+%End
+
+  public slots:
+
+    void setSource( const QString &source );
+%Docstring
+Sets a new ``source`` to show in the widget.
+
+.. seealso:: :py:func:`source`
+
+.. seealso:: :py:func:`sourceChanged`
+%End
+
+  signals:
+
+    void sourceChanged( const QString &source );
+%Docstring
+Emitted whenever the SVG source is changed in the widget.
+%End
+
+};
+
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/gui/qgssvgsourcelineedit.h                                       *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/

python/gui/gui_auto.sip

@@ -195,6 +195,7 @@
 %Include auto_generated/qgsstatusbar.sip
 %Include auto_generated/qgssublayersdialog.sip
 %Include auto_generated/qgssubstitutionlistwidget.sip
+%Include auto_generated/qgssvgsourcelineedit.sip
 %Include auto_generated/qgssymbolbutton.sip
 %Include auto_generated/qgstablewidgetbase.sip
 %Include auto_generated/qgstabwidget.sip

python/plugins/processing/algs/help/qgis.yaml

@@ -157,9 +157,6 @@ qgis:exportaddgeometrycolumns: >
 
   Depending on the geometry type of the vector layer, the attributes added to the table will be different.
 
-qgis:extendlines: >
-  This algorithm extends line geometries by a specified amount at the start and end of the line. Lines are extended using the bearing of the first and last segment in the line.
-
 qgis:extractbyattribute: >
   This algorithm creates a new vector layer that only contains matching features from an input layer. The criteria for adding features to the resulting layer is defined based on the values of an attribute from the input layer.
 

python/plugins/processing/algs/qgis/ExtendLines.py

@@ -65,7 +65,6 @@
 from .EliminateSelection import EliminateSelection
 from .ExecuteSQL import ExecuteSQL
 from .ExportGeometryInfo import ExportGeometryInfo
-from .ExtendLines import ExtendLines
 from .ExtentFromLayer import ExtentFromLayer
 from .ExtractSpecificVertices import ExtractSpecificVertices
 from .FieldPyculator import FieldsPyculator
@@ -118,7 +117,6 @@
 from .RectanglesOvalsDiamondsVariable import RectanglesOvalsDiamondsVariable
 from .RegularPoints import RegularPoints
 from .Relief import Relief
-from .ReverseLineDirection import ReverseLineDirection
 from .Ruggedness import Ruggedness
 from .SelectByAttribute import SelectByAttribute
 from .SelectByExpression import SelectByExpression
@@ -182,7 +180,6 @@ def getAlgs(self):
                 EliminateSelection(),
                 ExecuteSQL(),
                 ExportGeometryInfo(),
-                ExtendLines(),
                 ExtentFromLayer(),
                 ExtractSpecificVertices(),
                 FieldsCalculator(),
@@ -235,7 +232,6 @@ def getAlgs(self):
                 RectanglesOvalsDiamondsVariable(),
                 RegularPoints(),
                 Relief(),
-                ReverseLineDirection(),
                 Ruggedness(),
                 SelectByAttribute(),
                 SelectByExpression(),

python/plugins/processing/algs/qgis/QgisAlgorithmProvider.py

@@ -48,7 +48,7 @@ class SelectByAttribute(QgisAlgorithm):
     OUTPUT = 'OUTPUT'
 
     OPERATORS = ['=',
-                 '!=',
+                 '≠',
                  '>',
                  '>=',
                  '<',
@@ -80,7 +80,7 @@ def flags(self):
 
     def initAlgorithm(self, config=None):
         self.operators = ['=',
-                          '!=',
+                          '≠',
                           '>',
                           '>=',
                           '<',

python/plugins/processing/algs/qgis/ReverseLineDirection.py

@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]

python/plugins/processing/algs/qgis/SelectByAttribute.py

@@ -0,0 +1 @@
+GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]

python/plugins/processing/tests/testdata/expected/filter_by_m.dbf

@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]

python/plugins/processing/tests/testdata/expected/filter_by_m.prj

@@ -0,0 +1 @@
+GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]

python/plugins/processing/tests/testdata/expected/filter_by_m.qpj

@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]

python/plugins/processing/tests/testdata/expected/filter_by_m.shp

@@ -0,0 +1 @@
+GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]

python/plugins/processing/tests/testdata/expected/filter_by_m.shx

@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]

python/plugins/processing/tests/testdata/expected/filter_by_m_no_max.dbf

@@ -0,0 +1 @@
+GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]

python/plugins/processing/tests/testdata/expected/filter_by_m_no_max.prj

@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]

python/plugins/processing/tests/testdata/expected/filter_by_m_no_max.qpj

@@ -0,0 +1 @@
+GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]

python/plugins/processing/tests/testdata/expected/filter_by_m_no_max.shp

@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]

python/plugins/processing/tests/testdata/expected/filter_by_m_no_max.shx

@@ -0,0 +1 @@
+GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]

python/plugins/processing/tests/testdata/expected/filter_by_m_no_min.dbf

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ogr:FeatureCollection
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://ogr.maptools.org/ reverse_multiline.xsd"
+     xmlns:ogr="http://ogr.maptools.org/"
+     xmlns:gml="http://www.opengis.net/gml">
+  <gml:boundedBy>
+    <gml:Box>
+      <gml:coord><gml:X>-1</gml:X><gml:Y>-1</gml:Y></gml:coord>
+      <gml:coord><gml:X>5.58042226487524</gml:X><gml:Y>4.119769673704415</gml:Y></gml:coord>
+    </gml:Box>
+  </gml:boundedBy>
+                                                                                                                               
+  <gml:featureMember>
+    <ogr:reverse_multiline fid="lines.1">
+      <ogr:geometryProperty><gml:MultiLineString srsName="EPSG:4326"><gml:lineStringMember><gml:LineString><gml:coordinates>1,-1 -1,-1</gml:coordinates></gml:LineString></gml:lineStringMember></gml:MultiLineString></ogr:geometryProperty>
+    </ogr:reverse_multiline>
+  </gml:featureMember>
+  <gml:featureMember>
+    <ogr:reverse_multiline fid="lines.2">
+      <ogr:geometryProperty><gml:MultiLineString srsName="EPSG:4326"><gml:lineStringMember><gml:LineString><gml:coordinates>5,1 3,1</gml:coordinates></gml:LineString></gml:lineStringMember><gml:lineStringMember><gml:LineString><gml:coordinates>5,1 5.02418426103647,2.4147792706334</gml:coordinates></gml:LineString></gml:lineStringMember></gml:MultiLineString></ogr:geometryProperty>
+    </ogr:reverse_multiline>
+  </gml:featureMember>
+  <gml:featureMember>
+    <ogr:reverse_multiline fid="lines.3">
+    </ogr:reverse_multiline>
+  </gml:featureMember>
+  <gml:featureMember>
+    <ogr:reverse_multiline fid="lines.4">
+      <ogr:geometryProperty><gml:MultiLineString srsName="EPSG:4326"><gml:lineStringMember><gml:LineString><gml:coordinates>3,3 3,2 2,2 2,0</gml:coordinates></gml:LineString></gml:lineStringMember><gml:lineStringMember><gml:LineString><gml:coordinates>5.4595009596929,4.11976967370441 2.94433781190019,4.04721689059501</gml:coordinates></gml:LineString></gml:lineStringMember><gml:lineStringMember><gml:LineString><gml:coordinates>5.58042226487524,2.9468330134357 3,3</gml:coordinates></gml:LineString></gml:lineStringMember></gml:MultiLineString></ogr:geometryProperty>
+    </ogr:reverse_multiline>
+  </gml:featureMember>
+</ogr:FeatureCollection>