mirror of
https://github.com/qgis/QGIS.git
synced 2025-02-27 00:33:48 -05:00
Add tests for k-neighbour concave hull
This commit is contained in:
parent
f3e2d268f6
commit
4482c39fc8
@ -232,9 +232,9 @@ def euclidian_distance(point1, point2):
|
||||
|
||||
def nearest_points(list_of_points, point, k):
|
||||
"""
|
||||
Returns a list of the indices of the k closest neighbors from list_of_points to the specified point.
|
||||
The measure of proximity is the Euclidean distance. Internally, k becomes the minimum between the given value
|
||||
for k and the number of points in list_of_points
|
||||
Returns a list of the indices of the k closest neighbors from list_of_points to the specified point. The measure
|
||||
of proximity is the Euclidean distance. Internally, k becomes the minimum between the given value for k and the
|
||||
number of points in list_of_points
|
||||
|
||||
:param list_of_points: list of tuples
|
||||
:param point: tuple (x, y)
|
||||
@ -397,9 +397,9 @@ def extract_points(geom):
|
||||
|
||||
def sort_by_angle(list_of_points, last_point, last_angle):
|
||||
"""
|
||||
returns the points in list_of_points in descending order of angle to the last segment of the envelope,
|
||||
measured in a clockwise direction. Thus, the rightmost of the neighboring points is always selected. The first
|
||||
point of this list will be the next point of the envelope.
|
||||
returns the points in list_of_points in descending order of angle to the last segment of the envelope, measured
|
||||
in a clockwise direction. Thus, the rightmost of the neighboring points is always selected. The first point of
|
||||
this list will be the next point of the envelope.
|
||||
"""
|
||||
def getkey(item):
|
||||
return angle_difference(last_angle, angle(last_point, item))
|
||||
|
20
python/plugins/processing/tests/testdata/expected/knearest_concave_hull_points_7.gml
vendored
Normal file
20
python/plugins/processing/tests/testdata/expected/knearest_concave_hull_points_7.gml
vendored
Normal file
@ -0,0 +1,20 @@
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<ogr:FeatureCollection
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://ogr.maptools.org/ knearest_concave_hull_points_7.xsd"
|
||||
xmlns:ogr="http://ogr.maptools.org/"
|
||||
xmlns:gml="http://www.opengis.net/gml">
|
||||
<gml:boundedBy>
|
||||
<gml:Box>
|
||||
<gml:coord><gml:X>0</gml:X><gml:Y>-5</gml:Y></gml:coord>
|
||||
<gml:coord><gml:X>8</gml:X><gml:Y>3</gml:Y></gml:coord>
|
||||
</gml:Box>
|
||||
</gml:boundedBy>
|
||||
|
||||
<gml:featureMember>
|
||||
<ogr:knearest_concave_hull_points_7 fid="knearest_concave_hull_points_7.0">
|
||||
<ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>0,-5 7,-1 8,-1 5,2 3,3 2,2 1,1 0,-1 0,-5</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
|
||||
<ogr:id>0</ogr:id>
|
||||
</ogr:knearest_concave_hull_points_7>
|
||||
</gml:featureMember>
|
||||
</ogr:FeatureCollection>
|
30
python/plugins/processing/tests/testdata/expected/knearest_concave_hull_points_7.xsd
vendored
Normal file
30
python/plugins/processing/tests/testdata/expected/knearest_concave_hull_points_7.xsd
vendored
Normal file
@ -0,0 +1,30 @@
|
||||
<?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="knearest_concave_hull_points_7" type="ogr:knearest_concave_hull_points_7_Type" substitutionGroup="gml:_Feature"/>
|
||||
<xs:complexType name="knearest_concave_hull_points_7_Type">
|
||||
<xs:complexContent>
|
||||
<xs:extension base="gml:AbstractFeatureType">
|
||||
<xs:sequence>
|
||||
<xs:element name="geometryProperty" type="gml:PolygonPropertyType" nillable="true" minOccurs="0" maxOccurs="1"/>
|
||||
<xs:element name="id" nillable="true" minOccurs="0" maxOccurs="1">
|
||||
<xs:simpleType>
|
||||
<xs:restriction base="xs:integer">
|
||||
<xs:totalDigits value="10"/>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
</xs:extension>
|
||||
</xs:complexContent>
|
||||
</xs:complexType>
|
||||
</xs:schema>
|
26
python/plugins/processing/tests/testdata/expected/knearest_concave_hull_points_id2.gfs
vendored
Normal file
26
python/plugins/processing/tests/testdata/expected/knearest_concave_hull_points_id2.gfs
vendored
Normal file
@ -0,0 +1,26 @@
|
||||
<GMLFeatureClassList>
|
||||
<GMLFeatureClass>
|
||||
<Name>knearest_concave_hull_points_id2</Name>
|
||||
<ElementPath>knearest_concave_hull_points_id2</ElementPath>
|
||||
<!--POINT-->
|
||||
<GeometryType>1</GeometryType>
|
||||
<SRSName>EPSG:4326</SRSName>
|
||||
<DatasetSpecificInfo>
|
||||
<FeatureCount>9</FeatureCount>
|
||||
<ExtentXMin>0.00000</ExtentXMin>
|
||||
<ExtentXMax>8.00000</ExtentXMax>
|
||||
<ExtentYMin>-5.00000</ExtentYMin>
|
||||
<ExtentYMax>3.00000</ExtentYMax>
|
||||
</DatasetSpecificInfo>
|
||||
<PropertyDefn>
|
||||
<Name>id</Name>
|
||||
<ElementPath>id</ElementPath>
|
||||
<Type>Integer</Type>
|
||||
</PropertyDefn>
|
||||
<PropertyDefn>
|
||||
<Name>id2</Name>
|
||||
<ElementPath>id2</ElementPath>
|
||||
<Type>Integer</Type>
|
||||
</PropertyDefn>
|
||||
</GMLFeatureClass>
|
||||
</GMLFeatureClassList>
|
21
python/plugins/processing/tests/testdata/expected/knearest_concave_hull_points_id2.gml
vendored
Normal file
21
python/plugins/processing/tests/testdata/expected/knearest_concave_hull_points_id2.gml
vendored
Normal file
@ -0,0 +1,21 @@
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<ogr:FeatureCollection
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://ogr.maptools.org/ knearest_concave_hull_points_id2.xsd"
|
||||
xmlns:ogr="http://ogr.maptools.org/"
|
||||
xmlns:gml="http://www.opengis.net/gml">
|
||||
<gml:boundedBy>
|
||||
<gml:Box>
|
||||
<gml:coord><gml:X>0</gml:X><gml:Y>-5</gml:Y></gml:coord>
|
||||
<gml:coord><gml:X>8</gml:X><gml:Y>2</gml:Y></gml:coord>
|
||||
</gml:Box>
|
||||
</gml:boundedBy>
|
||||
|
||||
<gml:featureMember>
|
||||
<ogr:knearest_concave_hull_points_id2 fid="knearest_concave_hull_points_id2.0">
|
||||
<ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>0,-5 7,-1 8,-1 2,2 0,-1 0,-5</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
|
||||
<ogr:id>0</ogr:id>
|
||||
<ogr:id2>0</ogr:id2>
|
||||
</ogr:knearest_concave_hull_points_id2>
|
||||
</gml:featureMember>
|
||||
</ogr:FeatureCollection>
|
37
python/plugins/processing/tests/testdata/expected/knearest_concave_hull_points_id2.xsd
vendored
Normal file
37
python/plugins/processing/tests/testdata/expected/knearest_concave_hull_points_id2.xsd
vendored
Normal file
@ -0,0 +1,37 @@
|
||||
<?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="knearest_concave_hull_points_id2" type="ogr:knearest_concave_hull_points_id2_Type" substitutionGroup="gml:_Feature"/>
|
||||
<xs:complexType name="knearest_concave_hull_points_id2_Type">
|
||||
<xs:complexContent>
|
||||
<xs:extension base="gml:AbstractFeatureType">
|
||||
<xs:sequence>
|
||||
<xs:element name="geometryProperty" type="gml:PolygonPropertyType" nillable="true" minOccurs="0" maxOccurs="1"/>
|
||||
<xs:element name="id" 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="id2" nillable="true" minOccurs="0" maxOccurs="1">
|
||||
<xs:simpleType>
|
||||
<xs:restriction base="xs:integer">
|
||||
<xs:totalDigits value="10"/>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
</xs:extension>
|
||||
</xs:complexContent>
|
||||
</xs:complexType>
|
||||
</xs:schema>
|
@ -5326,6 +5326,31 @@ tests:
|
||||
name: expected/concave_hull_points_07.gml
|
||||
type: vector
|
||||
|
||||
- algorithm: qgis:knearestconcavehull
|
||||
name: K-nearest Neighbour Concave Hull - Points (7)
|
||||
params:
|
||||
KNEIGHBORS: 7
|
||||
INPUT:
|
||||
name: points.gml
|
||||
type: vector
|
||||
results:
|
||||
OUTPUT:
|
||||
name: expected/knearest_concave_hull_points_7.gml
|
||||
type: vector
|
||||
|
||||
- algorithm: qgis:knearestconcavehull
|
||||
name: K-nearest Neighbour Concave Hull - Group by field
|
||||
params:
|
||||
KNEIGHBORS: 3
|
||||
FIELD: id2
|
||||
INPUT:
|
||||
name: points.gml
|
||||
type: vector
|
||||
results:
|
||||
OUTPUT:
|
||||
name: expected/knearest_concave_hull_points_id2.gml
|
||||
type: vector
|
||||
|
||||
- algorithm: native:swapxy
|
||||
name: Swap XY coordinates
|
||||
params:
|
||||
|
Loading…
x
Reference in New Issue
Block a user