Merge pull request #32626 from alexbruy/service-area

[processing] port service area algorithms to C++
qgis · Nov 9, 2019 · 9ab06a2 · 9ab06a2
2 parents 4b014e6 + 0799e3b
commit 9ab06a2
Show file tree

Hide file tree

Showing 38 changed files with 999 additions and 789 deletions.
diff --git a/python/plugins/processing/algs/help/qgis.yaml b/python/plugins/processing/algs/help/qgis.yaml
@@ -487,16 +487,6 @@ qgis:selectbyexpression: >
 
   For more information about expressions see the <a href ="{qgisdocs}/user_manual/working_with_vector/expression.html">user manual</a>
 
-qgis:serviceareafromlayer: >
-  This algorithm creates a new vector with all the edges or parts of edges of a network line layer that can be reached within a distance or a time, starting from features of a point layer.
-
-  The distance and the time (both referred to as "travel cost") must be specified respectively in the network layer units or in seconds.
-
-qgis:serviceareafrompoint: >
-  This algorithm creates a new vector with all the edges or parts of edges of a network line layer that can be reached within a distance or a time, starting from a point feature.
-
-  The distance and the time (both referred to as "travel cost") must be specified respectively in the network layer units or in seconds.
-
 qgis:setmvalue: >
   This algorithm sets the M value for geometries in a layer.
 

diff --git a/python/plugins/processing/algs/qgis/QgisAlgorithmProvider.py b/python/plugins/processing/algs/qgis/QgisAlgorithmProvider.py
@@ -112,8 +112,6 @@
 from .Ruggedness import Ruggedness
 from .SelectByAttribute import SelectByAttribute
 from .SelectByExpression import SelectByExpression
-from .ServiceAreaFromLayer import ServiceAreaFromLayer
-from .ServiceAreaFromPoint import ServiceAreaFromPoint
 from .SetMValue import SetMValue
 from .SetRasterStyle import SetRasterStyle
 from .SetVectorStyle import SetVectorStyle
@@ -221,8 +219,6 @@ def getAlgs(self):
                 Ruggedness(),
                 SelectByAttribute(),
                 SelectByExpression(),
-                ServiceAreaFromLayer(),
-                ServiceAreaFromPoint(),
                 SetMValue(),
                 SetRasterStyle(),
                 SetVectorStyle(),

diff --git a/python/plugins/processing/algs/qgis/ServiceAreaFromLayer.py b/python/plugins/processing/algs/qgis/ServiceAreaFromLayer.py
diff --git a/python/plugins/processing/algs/qgis/ServiceAreaFromPoint.py b/python/plugins/processing/algs/qgis/ServiceAreaFromPoint.py
diff --git a/python/plugins/processing/tests/testdata/expected/service_area_from_layer.dbf b/python/plugins/processing/tests/testdata/expected/service_area_from_layer.dbf
diff --git a/python/plugins/processing/tests/testdata/expected/service_area_from_layer.prj b/python/plugins/processing/tests/testdata/expected/service_area_from_layer.prj
diff --git a/python/plugins/processing/tests/testdata/expected/service_area_from_layer.qpj b/python/plugins/processing/tests/testdata/expected/service_area_from_layer.qpj
diff --git a/python/plugins/processing/tests/testdata/expected/service_area_from_layer.shp b/python/plugins/processing/tests/testdata/expected/service_area_from_layer.shp
diff --git a/python/plugins/processing/tests/testdata/expected/service_area_from_layer.shx b/python/plugins/processing/tests/testdata/expected/service_area_from_layer.shx
diff --git a/python/plugins/processing/tests/testdata/expected/service_area_from_layer_lines.dbf b/python/plugins/processing/tests/testdata/expected/service_area_from_layer_lines.dbf
diff --git a/python/plugins/processing/tests/testdata/expected/service_area_from_layer_lines.gml b/python/plugins/processing/tests/testdata/expected/service_area_from_layer_lines.gml
diff --git a/python/plugins/processing/tests/testdata/expected/service_area_from_layer_lines.prj b/python/plugins/processing/tests/testdata/expected/service_area_from_layer_lines.prj
diff --git a/python/plugins/processing/tests/testdata/expected/service_area_from_layer_lines.qpj b/python/plugins/processing/tests/testdata/expected/service_area_from_layer_lines.qpj
diff --git a/python/plugins/processing/tests/testdata/expected/service_area_from_layer_lines.shp b/python/plugins/processing/tests/testdata/expected/service_area_from_layer_lines.shp
diff --git a/python/plugins/processing/tests/testdata/expected/service_area_from_layer_lines.shx b/python/plugins/processing/tests/testdata/expected/service_area_from_layer_lines.shx
diff --git a/python/plugins/processing/tests/testdata/expected/service_area_from_layer_lines.xsd b/python/plugins/processing/tests/testdata/expected/service_area_from_layer_lines.xsd
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="http://ogr.maptools.org/" xmlns:ogr="http://ogr.maptools.org/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml" elementFormDefault="qualified" version="1.0">
+<xs:import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/2.1.2/feature.xsd"/>
+<xs:element name="FeatureCollection" type="ogr:FeatureCollectionType" substitutionGroup="gml:_FeatureCollection"/>
+<xs:complexType name="FeatureCollectionType">
+  <xs:complexContent>
+    <xs:extension base="gml:AbstractFeatureCollectionType">
+      <xs:attribute name="lockId" type="xs:string" use="optional"/>
+      <xs:attribute name="scope" type="xs:string" use="optional"/>
+    </xs:extension>
+  </xs:complexContent>
+</xs:complexType>
+<xs:element name="service_area_from_layer_lines" type="ogr:service_area_from_layer_lines_Type" substitutionGroup="gml:_Feature"/>
+<xs:complexType name="service_area_from_layer_lines_Type">
+  <xs:complexContent>
+    <xs:extension base="gml:AbstractFeatureType">
+      <xs:sequence>
+        <xs:element name="geometryProperty" type="gml:MultiLineStringPropertyType" nillable="true" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="d" nillable="true" minOccurs="0" maxOccurs="1">
+          <xs:simpleType>
+            <xs:restriction base="xs:integer">
+              <xs:totalDigits value="10"/>
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+        <xs:element name="type" nillable="true" minOccurs="0" maxOccurs="1">
+          <xs:simpleType>
+            <xs:restriction base="xs:string">
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+        <xs:element name="start" nillable="true" minOccurs="0" maxOccurs="1">
+          <xs:simpleType>
+            <xs:restriction base="xs:string">
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+      </xs:sequence>
+    </xs:extension>
+  </xs:complexContent>
+</xs:complexType>
+</xs:schema>
diff --git a/python/plugins/processing/tests/testdata/expected/service_area_from_layer_no_bounds.dbf b/python/plugins/processing/tests/testdata/expected/service_area_from_layer_no_bounds.dbf
diff --git a/python/plugins/processing/tests/testdata/expected/service_area_from_layer_no_bounds.prj b/python/plugins/processing/tests/testdata/expected/service_area_from_layer_no_bounds.prj
diff --git a/python/plugins/processing/tests/testdata/expected/service_area_from_layer_no_bounds.qpj b/python/plugins/processing/tests/testdata/expected/service_area_from_layer_no_bounds.qpj
diff --git a/python/plugins/processing/tests/testdata/expected/service_area_from_layer_no_bounds.shp b/python/plugins/processing/tests/testdata/expected/service_area_from_layer_no_bounds.shp
diff --git a/python/plugins/processing/tests/testdata/expected/service_area_from_layer_no_bounds.shx b/python/plugins/processing/tests/testdata/expected/service_area_from_layer_no_bounds.shx
diff --git a/python/plugins/processing/tests/testdata/expected/service_area_from_layer_nodes.gml b/python/plugins/processing/tests/testdata/expected/service_area_from_layer_nodes.gml
diff --git a/python/plugins/processing/tests/testdata/expected/service_area_from_layer_nodes.xsd b/python/plugins/processing/tests/testdata/expected/service_area_from_layer_nodes.xsd
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="http://ogr.maptools.org/" xmlns:ogr="http://ogr.maptools.org/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml" elementFormDefault="qualified" version="1.0">
+<xs:import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/2.1.2/feature.xsd"/>
+<xs:element name="FeatureCollection" type="ogr:FeatureCollectionType" substitutionGroup="gml:_FeatureCollection"/>
+<xs:complexType name="FeatureCollectionType">
+  <xs:complexContent>
+    <xs:extension base="gml:AbstractFeatureCollectionType">
+      <xs:attribute name="lockId" type="xs:string" use="optional"/>
+      <xs:attribute name="scope" type="xs:string" use="optional"/>
+    </xs:extension>
+  </xs:complexContent>
+</xs:complexType>
+<xs:element name="service_area_from_layer_nodes" type="ogr:service_area_from_layer_nodes_Type" substitutionGroup="gml:_Feature"/>
+<xs:complexType name="service_area_from_layer_nodes_Type">
+  <xs:complexContent>
+    <xs:extension base="gml:AbstractFeatureType">
+      <xs:sequence>
+        <xs:element name="geometryProperty" type="gml:MultiPointPropertyType" nillable="true" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="d" nillable="true" minOccurs="0" maxOccurs="1">
+          <xs:simpleType>
+            <xs:restriction base="xs:integer">
+              <xs:totalDigits value="10"/>
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+        <xs:element name="type" nillable="true" minOccurs="0" maxOccurs="1">
+          <xs:simpleType>
+            <xs:restriction base="xs:string">
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+        <xs:element name="start" nillable="true" minOccurs="0" maxOccurs="1">
+          <xs:simpleType>
+            <xs:restriction base="xs:string">
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+      </xs:sequence>
+    </xs:extension>
+  </xs:complexContent>
+</xs:complexType>
+</xs:schema>