mirror of
https://github.com/qgis/QGIS.git
synced 2025-12-04 00:06:46 -05:00
[processing] Allow merging layers with mixed attribute type
This commit is contained in:
nirvn
Mathieu Pellerin
parent
c5679668cd
commit
8fe4d3e793
1
python/plugins/processing/tests/testdata/custom/points_alt.cpg
vendored
Normal file
1
python/plugins/processing/tests/testdata/custom/points_alt.cpg
vendored
Normal file
@ -0,0 +1 @@
|
||||
UTF-8
|
||||
BIN
python/plugins/processing/tests/testdata/custom/points_alt.dbf
vendored
Normal file
BIN
python/plugins/processing/tests/testdata/custom/points_alt.dbf
vendored
Normal file
Binary file not shown.
1
python/plugins/processing/tests/testdata/custom/points_alt.prj
vendored
Normal file
1
python/plugins/processing/tests/testdata/custom/points_alt.prj
vendored
Normal file
@ -0,0 +1 @@
|
||||
GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]]
|
||||
BIN
python/plugins/processing/tests/testdata/custom/points_alt.shp
vendored
Normal file
BIN
python/plugins/processing/tests/testdata/custom/points_alt.shp
vendored
Normal file
Binary file not shown.
BIN
python/plugins/processing/tests/testdata/custom/points_alt.shx
vendored
Normal file
BIN
python/plugins/processing/tests/testdata/custom/points_alt.shx
vendored
Normal file
Binary file not shown.
176
python/plugins/processing/tests/testdata/expected/merged_points_mixed.gml
vendored
Normal file
176
python/plugins/processing/tests/testdata/expected/merged_points_mixed.gml
vendored
Normal file
@ -0,0 +1,176 @@
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<ogr:FeatureCollection
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://ogr.maptools.org/ merged_points_mixed.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:merged_points_mixed 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:layer>custom/points.shp</ogr:layer>
|
||||
<ogr:path>/home/webmaster/dev/cpp/QGIS/python/plugins/processing/tests/testdata/custom/points.shp</ogr:path>
|
||||
</ogr:merged_points_mixed>
|
||||
</gml:featureMember>
|
||||
<gml:featureMember>
|
||||
<ogr:merged_points_mixed 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:layer>custom/points.shp</ogr:layer>
|
||||
<ogr:path>/home/webmaster/dev/cpp/QGIS/python/plugins/processing/tests/testdata/custom/points.shp</ogr:path>
|
||||
</ogr:merged_points_mixed>
|
||||
</gml:featureMember>
|
||||
<gml:featureMember>
|
||||
<ogr:merged_points_mixed 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:layer>custom/points.shp</ogr:layer>
|
||||
<ogr:path>/home/webmaster/dev/cpp/QGIS/python/plugins/processing/tests/testdata/custom/points.shp</ogr:path>
|
||||
</ogr:merged_points_mixed>
|
||||
</gml:featureMember>
|
||||
<gml:featureMember>
|
||||
<ogr:merged_points_mixed 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:layer>custom/points.shp</ogr:layer>
|
||||
<ogr:path>/home/webmaster/dev/cpp/QGIS/python/plugins/processing/tests/testdata/custom/points.shp</ogr:path>
|
||||
</ogr:merged_points_mixed>
|
||||
</gml:featureMember>
|
||||
<gml:featureMember>
|
||||
<ogr:merged_points_mixed 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:layer>custom/points.shp</ogr:layer>
|
||||
<ogr:path>/home/webmaster/dev/cpp/QGIS/python/plugins/processing/tests/testdata/custom/points.shp</ogr:path>
|
||||
</ogr:merged_points_mixed>
|
||||
</gml:featureMember>
|
||||
<gml:featureMember>
|
||||
<ogr:merged_points_mixed 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:layer>custom/points.shp</ogr:layer>
|
||||
<ogr:path>/home/webmaster/dev/cpp/QGIS/python/plugins/processing/tests/testdata/custom/points.shp</ogr:path>
|
||||
</ogr:merged_points_mixed>
|
||||
</gml:featureMember>
|
||||
<gml:featureMember>
|
||||
<ogr:merged_points_mixed 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:layer>custom/points.shp</ogr:layer>
|
||||
<ogr:path>/home/webmaster/dev/cpp/QGIS/python/plugins/processing/tests/testdata/custom/points.shp</ogr:path>
|
||||
</ogr:merged_points_mixed>
|
||||
</gml:featureMember>
|
||||
<gml:featureMember>
|
||||
<ogr:merged_points_mixed 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:layer>custom/points.shp</ogr:layer>
|
||||
<ogr:path>/home/webmaster/dev/cpp/QGIS/python/plugins/processing/tests/testdata/custom/points.shp</ogr:path>
|
||||
</ogr:merged_points_mixed>
|
||||
</gml:featureMember>
|
||||
<gml:featureMember>
|
||||
<ogr:merged_points_mixed 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:layer>custom/points.shp</ogr:layer>
|
||||
<ogr:path>/home/webmaster/dev/cpp/QGIS/python/plugins/processing/tests/testdata/custom/points.shp</ogr:path>
|
||||
</ogr:merged_points_mixed>
|
||||
</gml:featureMember>
|
||||
<gml:featureMember>
|
||||
<ogr:merged_points_mixed 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:layer>custom/points_alt.shp</ogr:layer>
|
||||
<ogr:path>/home/webmaster/dev/cpp/QGIS/python/plugins/processing/tests/testdata/points_alt.shp</ogr:path>
|
||||
</ogr:merged_points_mixed>
|
||||
</gml:featureMember>
|
||||
<gml:featureMember>
|
||||
<ogr:merged_points_mixed 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:layer>custom/points_alt.shp</ogr:layer>
|
||||
<ogr:path>/home/webmaster/dev/cpp/QGIS/python/plugins/processing/tests/testdata/points_alt.shp</ogr:path>
|
||||
</ogr:merged_points_mixed>
|
||||
</gml:featureMember>
|
||||
<gml:featureMember>
|
||||
<ogr:merged_points_mixed 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:layer>custom/points_alt.shp</ogr:layer>
|
||||
<ogr:path>/home/webmaster/dev/cpp/QGIS/python/plugins/processing/tests/testdata/points_alt.shp</ogr:path>
|
||||
</ogr:merged_points_mixed>
|
||||
</gml:featureMember>
|
||||
<gml:featureMember>
|
||||
<ogr:merged_points_mixed 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:layer>custom/points_alt.shp</ogr:layer>
|
||||
<ogr:path>/home/webmaster/dev/cpp/QGIS/python/plugins/processing/tests/testdata/points_alt.shp</ogr:path>
|
||||
</ogr:merged_points_mixed>
|
||||
</gml:featureMember>
|
||||
<gml:featureMember>
|
||||
<ogr:merged_points_mixed 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:layer>custom/points_alt.shp</ogr:layer>
|
||||
<ogr:path>/home/webmaster/dev/cpp/QGIS/python/plugins/processing/tests/testdata/points_alt.shp</ogr:path>
|
||||
</ogr:merged_points_mixed>
|
||||
</gml:featureMember>
|
||||
<gml:featureMember>
|
||||
<ogr:merged_points_mixed 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:layer>custom/points_alt.shp</ogr:layer>
|
||||
<ogr:path>/home/webmaster/dev/cpp/QGIS/python/plugins/processing/tests/testdata/points_alt.shp</ogr:path>
|
||||
</ogr:merged_points_mixed>
|
||||
</gml:featureMember>
|
||||
<gml:featureMember>
|
||||
<ogr:merged_points_mixed 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:layer>custom/points_alt.shp</ogr:layer>
|
||||
<ogr:path>/home/webmaster/dev/cpp/QGIS/python/plugins/processing/tests/testdata/points_alt.shp</ogr:path>
|
||||
</ogr:merged_points_mixed>
|
||||
</gml:featureMember>
|
||||
<gml:featureMember>
|
||||
<ogr:merged_points_mixed 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:layer>custom/points_alt.shp</ogr:layer>
|
||||
<ogr:path>/home/webmaster/dev/cpp/QGIS/python/plugins/processing/tests/testdata/points_alt.shp</ogr:path>
|
||||
</ogr:merged_points_mixed>
|
||||
</gml:featureMember>
|
||||
<gml:featureMember>
|
||||
<ogr:merged_points_mixed 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:layer>custom/points_alt.shp</ogr:layer>
|
||||
<ogr:path>/home/webmaster/dev/cpp/QGIS/python/plugins/processing/tests/testdata/points_alt.shp</ogr:path>
|
||||
</ogr:merged_points_mixed>
|
||||
</gml:featureMember>
|
||||
</ogr:FeatureCollection>
|
||||
48
python/plugins/processing/tests/testdata/expected/merged_points_mixed.xsd
vendored
Normal file
48
python/plugins/processing/tests/testdata/expected/merged_points_mixed.xsd
vendored
Normal file
@ -0,0 +1,48 @@
|
||||
<?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="merged_points_mixed" type="ogr:merged_points_mixed_Type" substitutionGroup="gml:_Feature"/>
|
||||
<xs:complexType name="merged_points_mixed_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:long">
|
||||
<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:string">
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
<xs:element name="layer" nillable="true" minOccurs="0" maxOccurs="1">
|
||||
<xs:simpleType>
|
||||
<xs:restriction base="xs:string">
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
<xs:element name="path" 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>
|
||||
@ -686,6 +686,25 @@ tests:
|
||||
fid: skip
|
||||
path: skip
|
||||
|
||||
- algorithm: native:mergevectorlayers
|
||||
name: Merge points with mixed attribute types
|
||||
params:
|
||||
LAYERS:
|
||||
params:
|
||||
- name: custom/points.shp
|
||||
type: vector
|
||||
- name: custom/points_alt.shp
|
||||
type: vector
|
||||
type: multi
|
||||
results:
|
||||
OUTPUT:
|
||||
name: expected/merged_points_mixed.gml
|
||||
type: vector
|
||||
compare:
|
||||
fields:
|
||||
fid: skip
|
||||
path: skip
|
||||
|
||||
- algorithm: native:mergevectorlayers
|
||||
name: Merge polygons
|
||||
params:
|
||||
|
||||
@ -145,15 +145,18 @@ QVariantMap QgsMergeVectorAlgorithm::processAlgorithm( const QVariantMap ¶me
|
||||
for ( const QgsField &sourceField : vl->fields() )
|
||||
{
|
||||
bool found = false;
|
||||
for ( const QgsField &destField : outputFields )
|
||||
for ( QgsField &destField : outputFields )
|
||||
{
|
||||
if ( destField.name().compare( sourceField.name(), Qt::CaseInsensitive ) == 0 )
|
||||
{
|
||||
found = true;
|
||||
if ( destField.type() != sourceField.type() )
|
||||
{
|
||||
throw QgsProcessingException( QObject::tr( "%1 field in layer %2 has different data type than in other layers (%3 instead of %4)" )
|
||||
.arg( sourceField.name(), vl->name(), sourceField.typeName(), destField.typeName() ) );
|
||||
feedback->pushInfo( QObject::tr( "%1 field in layer %2 has different data type than the destination layer (%3 instead of %4)" )
|
||||
.arg( sourceField.name(), vl->name(), sourceField.typeName(), destField.typeName() ) );
|
||||
destField.setType( QVariant::String );
|
||||
destField.setSubType( QVariant::Invalid );
|
||||
destField.setLength( 0 );
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user