Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[FEATURE] New algorithm "Add X/Y fields to layer" 
Adds X and Y (or latitude/longitude) fields to a point layer.
The X/Y fields can be calculated in a different CRS to the
layer (e.g. creating latitude/longitude fields for a layer in
a project CRS).

Sponsored by SMEC/SJ
  • Loading branch information
@nyalldawson
nyalldawson committed Mar 21, 2019
1 parent acdb368 commit c7ac866
Show file tree
Hide file tree
Showing 9 changed files with 547 additions and 0 deletions.
95 changes: 95 additions & 0 deletions python/plugins/processing/tests/testdata/expected/add_xy_3857.gml
View file
@@ -0,0 +1,95 @@
<?xml version="1.0" encoding="utf-8" ?>
<ogr:FeatureCollection
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://ogr.maptools.org/ add_xy_3857.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:add_xy_3857 fid="points.0">
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>1,1</gml:coordinates></gml:Point></ogr:geometryProperty>
<ogr:id>1</ogr:id>
<ogr:id2>2</ogr:id2>
<ogr:p_x>111319.4907932723</ogr:p_x>
<ogr:p_y>111325.1428663849</ogr:p_y>
</ogr:add_xy_3857>
</gml:featureMember>
<gml:featureMember>
<ogr:add_xy_3857 fid="points.1">
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>3,3</gml:coordinates></gml:Point></ogr:geometryProperty>
<ogr:id>2</ogr:id>
<ogr:id2>1</ogr:id2>
<ogr:p_x>333958.4723798198</ogr:p_x>
<ogr:p_y>334111.1714019597</ogr:p_y>
</ogr:add_xy_3857>
</gml:featureMember>
<gml:featureMember>
<ogr:add_xy_3857 fid="points.2">
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>2,2</gml:coordinates></gml:Point></ogr:geometryProperty>
<ogr:id>3</ogr:id>
<ogr:id2>0</ogr:id2>
<ogr:p_x>222638.9815865475</ogr:p_x>
<ogr:p_y>222684.2085055445</ogr:p_y>
</ogr:add_xy_3857>
</gml:featureMember>
<gml:featureMember>
<ogr:add_xy_3857 fid="points.3">
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>5,2</gml:coordinates></gml:Point></ogr:geometryProperty>
<ogr:id>4</ogr:id>
<ogr:id2>2</ogr:id2>
<ogr:p_x>556597.4539663672</ogr:p_x>
<ogr:p_y>222684.2085055445</ogr:p_y>
</ogr:add_xy_3857>
</gml:featureMember>
<gml:featureMember>
<ogr:add_xy_3857 fid="points.4">
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>4,1</gml:coordinates></gml:Point></ogr:geometryProperty>
<ogr:id>5</ogr:id>
<ogr:id2>1</ogr:id2>
<ogr:p_x>445277.9631730949</ogr:p_x>
<ogr:p_y>111325.1428663849</ogr:p_y>
</ogr:add_xy_3857>
</gml:featureMember>
<gml:featureMember>
<ogr:add_xy_3857 fid="points.5">
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>0,-5</gml:coordinates></gml:Point></ogr:geometryProperty>
<ogr:id>6</ogr:id>
<ogr:id2>0</ogr:id2>
<ogr:p_x>0.0000000000</ogr:p_x>
<ogr:p_y>-557305.2572745769</ogr:p_y>
</ogr:add_xy_3857>
</gml:featureMember>
<gml:featureMember>
<ogr:add_xy_3857 fid="points.6">
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>8,-1</gml:coordinates></gml:Point></ogr:geometryProperty>
<ogr:id>7</ogr:id>
<ogr:id2>0</ogr:id2>
<ogr:p_x>890555.9263461898</ogr:p_x>
<ogr:p_y>-111325.1428663860</ogr:p_y>
</ogr:add_xy_3857>
</gml:featureMember>
<gml:featureMember>
<ogr:add_xy_3857 fid="points.7">
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>7,-1</gml:coordinates></gml:Point></ogr:geometryProperty>
<ogr:id>8</ogr:id>
<ogr:id2>0</ogr:id2>
<ogr:p_x>779236.4355529146</ogr:p_x>
<ogr:p_y>-111325.1428663860</ogr:p_y>
</ogr:add_xy_3857>
</gml:featureMember>
<gml:featureMember>
<ogr:add_xy_3857 fid="points.8">
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>0,-1</gml:coordinates></gml:Point></ogr:geometryProperty>
<ogr:id>9</ogr:id>
<ogr:id2>0</ogr:id2>
<ogr:p_x>0.0000000000</ogr:p_x>
<ogr:p_y>-111325.1428663860</ogr:p_y>
</ogr:add_xy_3857>
</gml:featureMember>
</ogr:FeatureCollection>
53 changes: 53 additions & 0 deletions python/plugins/processing/tests/testdata/expected/add_xy_3857.xsd
View file
@@ -0,0 +1,53 @@
<?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="add_xy_3857" type="ogr:add_xy_3857_Type" substitutionGroup="gml:_Feature"/>
<xs:complexType name="add_xy_3857_Type">
<xs:complexContent>
<xs:extension base="gml:AbstractFeatureType">
<xs:sequence>
<xs:element name="geometryProperty" type="gml:PointPropertyType" 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:element name="p_x" nillable="true" minOccurs="0" maxOccurs="1">
<xs:simpleType>
<xs:restriction base="xs:decimal">
<xs:totalDigits value="21"/>
<xs:fractionDigits value="10"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="p_y" nillable="true" minOccurs="0" maxOccurs="1">
<xs:simpleType>
<xs:restriction base="xs:decimal">
<xs:totalDigits value="21"/>
<xs:fractionDigits value="10"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
</xs:schema>
95 changes: 95 additions & 0 deletions python/plugins/processing/tests/testdata/expected/add_xy_4326.gml
View file
@@ -0,0 +1,95 @@
<?xml version="1.0" encoding="utf-8" ?>
<ogr:FeatureCollection
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://ogr.maptools.org/ add_xy_4326.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:add_xy_4326 fid="points.0">
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>1,1</gml:coordinates></gml:Point></ogr:geometryProperty>
<ogr:id>1</ogr:id>
<ogr:id2>2</ogr:id2>
<ogr:x>1.0000000000</ogr:x>
<ogr:y>1.0000000000</ogr:y>
</ogr:add_xy_4326>
</gml:featureMember>
<gml:featureMember>
<ogr:add_xy_4326 fid="points.1">
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>3,3</gml:coordinates></gml:Point></ogr:geometryProperty>
<ogr:id>2</ogr:id>
<ogr:id2>1</ogr:id2>
<ogr:x>3.0000000000</ogr:x>
<ogr:y>3.0000000000</ogr:y>
</ogr:add_xy_4326>
</gml:featureMember>
<gml:featureMember>
<ogr:add_xy_4326 fid="points.2">
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>2,2</gml:coordinates></gml:Point></ogr:geometryProperty>
<ogr:id>3</ogr:id>
<ogr:id2>0</ogr:id2>
<ogr:x>2.0000000000</ogr:x>
<ogr:y>2.0000000000</ogr:y>
</ogr:add_xy_4326>
</gml:featureMember>
<gml:featureMember>
<ogr:add_xy_4326 fid="points.3">
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>5,2</gml:coordinates></gml:Point></ogr:geometryProperty>
<ogr:id>4</ogr:id>
<ogr:id2>2</ogr:id2>
<ogr:x>5.0000000000</ogr:x>
<ogr:y>2.0000000000</ogr:y>
</ogr:add_xy_4326>
</gml:featureMember>
<gml:featureMember>
<ogr:add_xy_4326 fid="points.4">
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>4,1</gml:coordinates></gml:Point></ogr:geometryProperty>
<ogr:id>5</ogr:id>
<ogr:id2>1</ogr:id2>
<ogr:x>4.0000000000</ogr:x>
<ogr:y>1.0000000000</ogr:y>
</ogr:add_xy_4326>
</gml:featureMember>
<gml:featureMember>
<ogr:add_xy_4326 fid="points.5">
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>0,-5</gml:coordinates></gml:Point></ogr:geometryProperty>
<ogr:id>6</ogr:id>
<ogr:id2>0</ogr:id2>
<ogr:x>0.0000000000</ogr:x>
<ogr:y>-5.0000000000</ogr:y>
</ogr:add_xy_4326>
</gml:featureMember>
<gml:featureMember>
<ogr:add_xy_4326 fid="points.6">
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>8,-1</gml:coordinates></gml:Point></ogr:geometryProperty>
<ogr:id>7</ogr:id>
<ogr:id2>0</ogr:id2>
<ogr:x>8.0000000000</ogr:x>
<ogr:y>-1.0000000000</ogr:y>
</ogr:add_xy_4326>
</gml:featureMember>
<gml:featureMember>
<ogr:add_xy_4326 fid="points.7">
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>7,-1</gml:coordinates></gml:Point></ogr:geometryProperty>
<ogr:id>8</ogr:id>
<ogr:id2>0</ogr:id2>
<ogr:x>7.0000000000</ogr:x>
<ogr:y>-1.0000000000</ogr:y>
</ogr:add_xy_4326>
</gml:featureMember>
<gml:featureMember>
<ogr:add_xy_4326 fid="points.8">
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>0,-1</gml:coordinates></gml:Point></ogr:geometryProperty>
<ogr:id>9</ogr:id>
<ogr:id2>0</ogr:id2>
<ogr:x>0.0000000000</ogr:x>
<ogr:y>-1.0000000000</ogr:y>
</ogr:add_xy_4326>
</gml:featureMember>
</ogr:FeatureCollection>
53 changes: 53 additions & 0 deletions python/plugins/processing/tests/testdata/expected/add_xy_4326.xsd
View file
@@ -0,0 +1,53 @@
<?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="add_xy_4326" type="ogr:add_xy_4326_Type" substitutionGroup="gml:_Feature"/>
<xs:complexType name="add_xy_4326_Type">
<xs:complexContent>
<xs:extension base="gml:AbstractFeatureType">
<xs:sequence>
<xs:element name="geometryProperty" type="gml:PointPropertyType" 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:element name="x" nillable="true" minOccurs="0" maxOccurs="1">
<xs:simpleType>
<xs:restriction base="xs:decimal">
<xs:totalDigits value="21"/>
<xs:fractionDigits value="10"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="y" nillable="true" minOccurs="0" maxOccurs="1">
<xs:simpleType>
<xs:restriction base="xs:decimal">
<xs:totalDigits value="21"/>
<xs:fractionDigits value="10"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
</xs:schema>
27 changes: 27 additions & 0 deletions python/plugins/processing/tests/testdata/qgis_algorithm_tests.yaml
View file
Expand Up @@ -7287,4 +7287,31 @@ tests:
hash: 6c09e13126e16a267e36c79b0eeba7761422da7bd0387125f4c823e6
type: rasterhash

- algorithm: native:addxyfields
name: Add XY 4326
params:
CRS: EPSG:4326
INPUT:
name: points.gml|layername=points
type: vector
PREFIX: ''
results:
OUTPUT:
name: expected/add_xy_4326.gml
type: vector

- algorithm: native:addxyfields
name: Add XY 3785
params:
CRS: EPSG:3785
INPUT:
name: points.gml|layername=points
type: vector
PREFIX: p_
results:
OUTPUT:
name: expected/add_xy_3857.gml
type: vector


# See ../README.md for a description of the file format
1 change: 1 addition & 0 deletions src/analysis/CMakeLists.txt
View file
Expand Up @@ -22,6 +22,7 @@ SET(QGIS_ANALYSIS_SRCS
interpolation/Vector3D.cpp

processing/qgsalgorithmaddincrementalfield.cpp
processing/qgsalgorithmaddxyfields.cpp
processing/qgsalgorithmarraytranslatedfeatures.cpp
processing/qgsalgorithmassignprojection.cpp
processing/qgsalgorithmboundary.cpp
Expand Down

0 comments on commit c7ac866

Please sign in to comment.