Skip to content

Commit

Permalink
revert srs related wfs uri changes from r9108 (fixes #1246)
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9156 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Aug 24, 2008
1 parent 55493aa commit 79a4988
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions src/plugins/wfs/qgswfssourceselect.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -184,22 +184,22 @@ int QgsWFSSourceSelect::getCapabilitiesGET( QString uri, std::list<QString>& typ
abstract = abstractList.at( 0 ).toElement().text();
}

//DefaultCRS is always the first entry in the feature crs list
QDomNodeList defaultCRSList = featureTypeElem.elementsByTagNameNS( WFS_NAMESPACE, "DefaultCRS" );
//DefaultSRS is always the first entry in the feature srs list
QDomNodeList defaultCRSList = featureTypeElem.elementsByTagNameNS( WFS_NAMESPACE, "DefaultSRS" );
if ( defaultCRSList.length() > 0 )
{
featureCRSList.push_back( defaultCRSList.at( 0 ).toElement().text() );
}

//OtherCRS
QDomNodeList otherCRSList = featureTypeElem.elementsByTagNameNS( WFS_NAMESPACE, "OtherCRS" );
//OtherSRS
QDomNodeList otherCRSList = featureTypeElem.elementsByTagNameNS( WFS_NAMESPACE, "OtherSRS" );
for ( unsigned int i = 0; i < otherCRSList.length(); ++i )
{
featureCRSList.push_back( otherCRSList.at( i ).toElement().text() );
}

//Support <CRS> for compatibility with older versions
QDomNodeList srsList = featureTypeElem.elementsByTagNameNS( WFS_NAMESPACE, "CRS" );
//Support <SRS> for compatibility with older versions
QDomNodeList srsList = featureTypeElem.elementsByTagNameNS( WFS_NAMESPACE, "SRS" );
for ( unsigned int i = 0; i < srsList.length(); ++i )
{
featureCRSList.push_back( srsList.at( i ).toElement().text() );
Expand Down Expand Up @@ -358,7 +358,7 @@ void QgsWFSSourceSelect::addLayer()
long epsgNr = mProjectionSelector->getSelectedEpsg();
if ( epsgNr != 0 )
{
crsString = "&CRSNAME=EPSG:" + QString::number( epsgNr );
crsString = "&SRSNAME=EPSG:" + QString::number( epsgNr );
}
}
//add a wfs layer to the map
Expand Down

0 comments on commit 79a4988

Please sign in to comment.