Skip to content
Permalink
Browse files

Remove unused QgsCoordinateTransform::readXml/writeXml methods

These methods are not used in master and are of questionable
value. Better to serialise the source and dest crs separately
and create the transform when required
  • Loading branch information
nyalldawson committed Nov 5, 2017
1 parent 76ebfdf commit 2edb2d8ac795796627f81bad2bb17985f56f1a16
Showing with 1 addition and 56 deletions.
  1. +1 −1 doc/api_break.dox
  2. +0 −38 src/core/qgscoordinatetransform.cpp
  3. +0 −17 src/core/qgscoordinatetransform.h
@@ -930,7 +930,7 @@ plugins calling these methods will need to be updated.
- 'p' argument in transform() has been renamed to 'point', 'theRect' to 'rectangle', 'poly' to 'polygon'
- setDestCRSID has been removed, use setDestinationCrs() instead
- 'theNode', 'theDoc' parameters in readXML and writeXML have been renamed to 'node' and 'document' respectively
- readXML() and writeXML() have been renamed to readXml() and writeXml() for consistency
- readXML() and writeXML() have been removed.


QgsCoordinateTransformCache {#qgis_api_break_3_0_QgsCoordinateTransformCache}
@@ -574,44 +574,6 @@ bool QgsCoordinateTransform::isShortCircuited() const
return !d->mIsValid || d->mShortCircuit;
}

bool QgsCoordinateTransform::readXml( const QDomNode &node )
{
d.detach();

QgsDebugMsg( "Reading Coordinate Transform from xml ------------------------!" );

QDomNode mySrcNode = node.namedItem( QStringLiteral( "sourcesrs" ) );
d->mSourceCRS.readXml( mySrcNode );

QDomNode myDestNode = node.namedItem( QStringLiteral( "destinationsrs" ) );
d->mDestCRS.readXml( myDestNode );

d->mSourceDatumTransform = node.toElement().attribute( QStringLiteral( "sourceDatumTransform" ), QStringLiteral( "-1" ) ).toInt();
d->mDestinationDatumTransform = node.toElement().attribute( QStringLiteral( "destinationDatumTransform" ), QStringLiteral( "-1" ) ).toInt();

return d->initialize();
}

bool QgsCoordinateTransform::writeXml( QDomNode &node, QDomDocument &doc ) const
{
QDomElement myNodeElement = node.toElement();
QDomElement myTransformElement = doc.createElement( QStringLiteral( "coordinatetransform" ) );
myTransformElement.setAttribute( QStringLiteral( "sourceDatumTransform" ), QString::number( d->mSourceDatumTransform ) );
myTransformElement.setAttribute( QStringLiteral( "destinationDatumTransform" ), QString::number( d->mDestinationDatumTransform ) );

QDomElement mySourceElement = doc.createElement( QStringLiteral( "sourcesrs" ) );
d->mSourceCRS.writeXml( mySourceElement, doc );
myTransformElement.appendChild( mySourceElement );

QDomElement myDestElement = doc.createElement( QStringLiteral( "destinationsrs" ) );
d->mDestCRS.writeXml( myDestElement, doc );
myTransformElement.appendChild( myDestElement );

myNodeElement.appendChild( myTransformElement );

return true;
}

const char *finder( const char *name )
{
QString proj;
@@ -279,23 +279,6 @@ class CORE_EXPORT QgsCoordinateTransform
//!initialize is used to actually create the Transformer instance
void initialize();

/**
* Restores state from the given Dom node.
* \param node The node from which state will be restored
* \returns bool True on success, False on failure
* \see writeXml()
*/
bool readXml( const QDomNode &node );

/**
* Stores state to the given Dom node in the given document
* \param node The node in which state will be restored
* \param document The document in which state will be stored
* \returns bool True on success, False on failure
* \see readXml()
*/
bool writeXml( QDomNode &node, QDomDocument &document ) const;

private:

static void searchDatumTransform( const QString &sql, QList< int > &transforms );

0 comments on commit 2edb2d8

Please sign in to comment.
You can’t perform that action at this time.