Skip to content

Commit

Permalink
Fix for trac ticket #11.
Browse files Browse the repository at this point in the history
When a new WMS layer is opened and it is the first layer on the canvas, the project projection is now copied from that used when selecting that WMS layer.

Previously this was hard coded to EPSG:4326 / WGS 84.



git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5627 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
morb_au committed Jul 24, 2006
1 parent 6e6c1cb commit 14e1c86
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 48 deletions.
90 changes: 42 additions & 48 deletions src/raster/qgsrasterlayer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -482,6 +482,33 @@ QgsRasterLayer::~QgsRasterLayer()
}


void QgsRasterLayer::setupDestSrs()
{
QgsDebugMsg("Layer registry has " + QString::number(QgsMapLayerRegistry::instance()->count()) + "layers");

if (QgsMapLayerRegistry::instance()->count() ==0)
{
mCoordinateTransform->destSRS().createFromProj4(
mCoordinateTransform->sourceSRS().proj4String());
//first layer added will set the default project level projection
//TODO remove cast if poss!
int mySrsId = static_cast<int>(mCoordinateTransform->sourceSRS().srsid());
if (mySrsId)
{
QgsProject::instance()->writeEntry("SpatialRefSys","/ProjectSRSID",mySrsId);
}
}
else
{
mCoordinateTransform->destSRS().createFromSrsId(
QgsProject::instance()->readNumEntry("SpatialRefSys","/ProjectSRSID",0));
}
if (!mCoordinateTransform->destSRS().isValid())
{
mCoordinateTransform->destSRS().validate();
}
}


bool
QgsRasterLayer::readFile( QString const & fileName )
Expand Down Expand Up @@ -536,43 +563,12 @@ QgsRasterLayer::readFile( QString const & fileName )
{
mCoordinateTransform->sourceSRS().validate();
}
QString myDestWKT = QgsProject::instance()->readEntry("SpatialRefSys","/WKT",mySourceWKT);
//set up the coordinat transform - in the case of raster this is mainly used to convert
//the inverese projection of the map extents of the canvas when zzooming in etc. so
//that they match the coordinate system of this layer
// if no other layers exist, set the output projection to be
// the same as the input projection, otherwise set the output to the
// project srs
QgsDebugMsg("Layer registry has " + QString::number(QgsMapLayerRegistry::instance()->count()) + "layers");

if (QgsMapLayerRegistry::instance()->count() ==0)
{
mCoordinateTransform->destSRS().createFromProj4(
mCoordinateTransform->sourceSRS().proj4String());
//first layer added will set the default project level projection
//TODO remove cast if poss!
int mySrsId = static_cast<int>(mCoordinateTransform->sourceSRS().srsid());
if (mySrsId)
{
QgsProject::instance()->writeEntry("SpatialRefSys","/ProjectSRSID",mySrsId);
}
}
else
{
mCoordinateTransform->destSRS().createFromSrsId(
QgsProject::instance()->readNumEntry("SpatialRefSys","/ProjectSRSID",0));
}
if (!mCoordinateTransform->destSRS().isValid())
{
mCoordinateTransform->destSRS().validate();
}


//initialise the transform - you should do this any time one of the SRS's changes
setupDestSrs();

// initialise the transform - you should do this any time one of the SRS's changes
mCoordinateTransform->initialise();


getMetadata();

// Use the affine transform to get geo coordinates for
Expand Down Expand Up @@ -5057,21 +5053,19 @@ void QgsRasterLayer::setDataProvider( QString const & provider,
//
// Get the layers project info and set up the QgsCoordinateTransform for this layer
//

// get the project projection
// TODO: defaulting to this layer's projection if none exists....
QString myDestWKT = QgsProject::instance()->readEntry("SpatialRefSys","/WKT","");

// set up the coordinate transform - in the case of raster this is mainly used to convert
// the inverese projection of the map extents of the canvas when zooming in etc. so
// that they match the coordinate system of this layer
QgsDebugMsg("QgsRasterLayer::setDataProvider: myDestWKT: " + myDestWKT);
// Hard-code the source coordinate reference for now
// TODO: Make WMS projection-aware.
mCoordinateTransform = new QgsCoordinateTransform(4326,
myDestWKT,
QgsSpatialRefSys::EPSG);


mCoordinateTransform = new QgsCoordinateTransform();

// Setup source SRS in the QgsCoordinateTransform
QgsSpatialRefSys sourceSrs = QgsSpatialRefSys();
sourceSrs.createFromOgcWmsCrs(crs);
mCoordinateTransform->setSourceSRS(sourceSrs);

// Setup destination SRS in the QgsCoordinateTransform
setupDestSrs();

// initialise the transform - you should do this any time one of the SRS's changes
mCoordinateTransform->initialise();
}
}
else
Expand Down
10 changes: 10 additions & 0 deletions src/raster/qgsrasterlayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -968,6 +968,16 @@ public slots:
/** \brief Update the layer if it is outdated */
bool update ();

/**
set up the coordinate transform - in the case of raster this is mainly used to convert
the inverese projection of the map extents of the canvas when zooming in etc. so
that they match the coordinate system of this layer
if no other layers exist, set the output projection to be
the same as the input projection, otherwise set the output to the
project srs
*/
void setupDestSrs();

//
// Private member vars
//
Expand Down

0 comments on commit 14e1c86

Please sign in to comment.