Skip to content

Commit

Permalink
revert qgsabstractgeocoderlocatorfilter.cpp from master
Browse files Browse the repository at this point in the history
  • Loading branch information
uprel committed Feb 25, 2025
1 parent 460dcc9 commit 518bd8d
Showing 1 changed file with 0 additions and 18 deletions.
18 changes: 0 additions & 18 deletions src/core/geocoding/qgsabstractgeocoderlocatorfilter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
#include "moc_qgsabstractgeocoderlocatorfilter.cpp"
#include "qgsgeocoder.h"
#include "qgsgeocodercontext.h"
#include "qgsnominatimgeocoder.h"
#include "qgssettings.h"

QgsAbstractGeocoderLocatorFilter::QgsAbstractGeocoderLocatorFilter( const QString &name, const QString &displayName, const QString &prefix, QgsGeocoderInterface *geocoder, const QgsRectangle &boundingBox )
: mName( name )
Expand Down Expand Up @@ -47,26 +45,10 @@ QString QgsAbstractGeocoderLocatorFilter::prefix() const

void QgsAbstractGeocoderLocatorFilter::fetchResults( const QString &string, const QgsLocatorContext &context, QgsFeedback *feedback )
{
if ( !mGeocoder )
{
return;
}

QgsGeocoderContext geocodeContext( context.transformContext );
geocodeContext.setAreaOfInterest( QgsGeometry::fromRect( context.targetExtent ) );
geocodeContext.setAreaOfInterestCrs( context.targetExtentCrs );

// Check if we have QgsNominatimLocatorFilter instance
QgsNominatimGeocoder *nominatimGeocoder = dynamic_cast<QgsNominatimGeocoder *>( mGeocoder );
if ( nominatimGeocoder )
{
// Read countryCodes from settings
QgsSettings settings;
QString countryCodes = settings.value( "locator_filters/nominatim_geocoder/country_codes", "", QgsSettings::App ).toString().trimmed();

nominatimGeocoder->setCountryCodes( countryCodes );
}

const QList< QgsGeocoderResult > results = mGeocoder->geocodeString( string, geocodeContext, feedback );
for ( const QgsGeocoderResult &result : results )
{
Expand Down

0 comments on commit 518bd8d

Please sign in to comment.