Skip to content
Permalink
Browse files

Move geocoder classes to core

  • Loading branch information
nyalldawson committed Oct 30, 2020
1 parent d484beb commit 4f6f163ead102520f54a65b4ef03448b1751434a
@@ -63,6 +63,7 @@ IF(WITH_APIDOC)
${CMAKE_SOURCE_DIR}/src/core/geometry
${CMAKE_SOURCE_DIR}/src/core/geocms
${CMAKE_SOURCE_DIR}/src/core/geocms/geonode
${CMAKE_SOURCE_DIR}/src/core/geocoding
${CMAKE_SOURCE_DIR}/src/core/gps
${CMAKE_SOURCE_DIR}/src/core/labeling
${CMAKE_SOURCE_DIR}/src/core/layertree
@@ -105,7 +106,6 @@ IF(WITH_APIDOC)
${CMAKE_SOURCE_DIR}/src/gui/vectortile
${CMAKE_SOURCE_DIR}/src/analysis
${CMAKE_SOURCE_DIR}/src/analysis/mesh
${CMAKE_SOURCE_DIR}/src/analysis/geocoding
${CMAKE_SOURCE_DIR}/src/analysis/interpolation
${CMAKE_SOURCE_DIR}/src/analysis/network
${CMAKE_SOURCE_DIR}/src/analysis/processing
@@ -113,6 +113,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/core/geometry
${CMAKE_SOURCE_DIR}/src/core/geocms
${CMAKE_SOURCE_DIR}/src/core/geocms/geonode
${CMAKE_SOURCE_DIR}/src/core/geocoding
${CMAKE_SOURCE_DIR}/src/core/gps
${CMAKE_SOURCE_DIR}/src/core/labeling
${CMAKE_SOURCE_DIR}/src/core/layertree
@@ -312,7 +313,6 @@ ENDIF (WITH_SERVER AND WITH_SERVER_PLUGINS)
IF(WITH_ANALYSIS)
INCLUDE_DIRECTORIES(BEFORE
${CMAKE_SOURCE_DIR}/src/analysis
${CMAKE_SOURCE_DIR}/src/analysis/geocoding
${CMAKE_SOURCE_DIR}/src/analysis/processing
${CMAKE_SOURCE_DIR}/src/analysis/vector
${CMAKE_SOURCE_DIR}/src/analysis/vector/geometry_checker
@@ -327,7 +327,6 @@ IF(WITH_ANALYSIS)
${CMAKE_BINARY_DIR}/src/analysis/raster
${CMAKE_BINARY_DIR}/src/analysis/network
${CMAKE_BINARY_DIR}/src/analysis/interpolation
${CMAKE_BINARY_DIR}/src/analysis/geocoding
)

# analysis module
@@ -1,8 +1,5 @@
// Include auto-generated SIP files
%Include auto_generated/qgsanalysis.sip
%Include auto_generated/geocoding/qgsgeocoder.sip
%Include auto_generated/geocoding/qgsgeocodercontext.sip
%Include auto_generated/geocoding/qgsgeocoderresult.sip
%Include auto_generated/interpolation/qgsgridfilewriter.sip
%Include auto_generated/interpolation/qgsidwinterpolator.sip
%Include auto_generated/interpolation/qgsinterpolator.sip
@@ -1,4 +1,4 @@
# The following has been generated automatically from src/analysis/geocoding/qgsgeocoder.h
# The following has been generated automatically from src/core/geocoding/qgsgeocoder.h
# monkey patching scoped based enum
QgsGeocoderInterface.Flag.GeocodesStrings.__doc__ = "Can geocode string input values"
QgsGeocoderInterface.Flag.GeocodesFeatures.__doc__ = "Can geocode QgsFeature input values"
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/analysis/geocoding/qgsgeocoder.h *
* src/core/geocoding/qgsgeocoder.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
@@ -81,7 +81,7 @@ The optional ``feedback`` argument can be used to provider cancellation support.
/************************************************************************
* This file has been generated automatically from *
* *
* src/analysis/geocoding/qgsgeocoder.h *
* src/core/geocoding/qgsgeocoder.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/analysis/geocoding/qgsgeocodercontext.h *
* src/core/geocoding/qgsgeocodercontext.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
@@ -102,7 +102,7 @@ geographic area where geocoding results are desired.
/************************************************************************
* This file has been generated automatically from *
* *
* src/analysis/geocoding/qgsgeocodercontext.h *
* src/core/geocoding/qgsgeocodercontext.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/analysis/geocoding/qgsgeocoderresult.h *
* src/core/geocoding/qgsgeocoderresult.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
@@ -117,7 +117,7 @@ which may be added to features being geocoded.
/************************************************************************
* This file has been generated automatically from *
* *
* src/analysis/geocoding/qgsgeocoderresult.h *
* src/core/geocoding/qgsgeocoderresult.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
@@ -312,6 +312,9 @@
%Include auto_generated/fieldformatter/qgsvaluerelationfieldformatter.sip
%Include auto_generated/geocms/geonode/qgsgeonodeconnection.sip
%Include auto_generated/geocms/geonode/qgsgeonoderequest.sip
%Include auto_generated/geocoding/qgsgeocoder.sip
%Include auto_generated/geocoding/qgsgeocodercontext.sip
%Include auto_generated/geocoding/qgsgeocoderresult.sip
%Include auto_generated/geometry/qgsabstractgeometry.sip
%Include auto_generated/geometry/qgsbox3d.sip
%Include auto_generated/geometry/qgscircle.sip
@@ -4,10 +4,6 @@
SET(QGIS_ANALYSIS_SRCS
qgsanalysis.cpp

geocoding/qgsgeocoder.cpp
geocoding/qgsgeocodercontext.cpp
geocoding/qgsgeocoderresult.cpp

interpolation/qgsgridfilewriter.cpp
interpolation/qgsidwinterpolator.cpp
interpolation/qgsinterpolator.cpp
@@ -284,10 +280,6 @@ SET(QGIS_ANALYSIS_SRCS
SET(QGIS_ANALYSIS_HDRS
qgsanalysis.h

geocoding/qgsgeocoder.h
geocoding/qgsgeocodercontext.h
geocoding/qgsgeocoderresult.h

interpolation/Bezier3D.h
interpolation/CloughTocherInterpolator.h
interpolation/qgsdualedgetriangulation.h
@@ -421,6 +413,7 @@ ENDIF (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/src/core/
${CMAKE_SOURCE_DIR}/src/core/geocoding
${CMAKE_SOURCE_DIR}/src/core/geometry
${CMAKE_SOURCE_DIR}/src/core/labeling
${CMAKE_SOURCE_DIR}/src/core/processing
@@ -442,7 +435,6 @@ INCLUDE_DIRECTORIES(
${CMAKE_BINARY_DIR}/src/analysis
interpolation
network
geocoding
)
INCLUDE_DIRECTORIES(SYSTEM
${SPATIALINDEX_INCLUDE_DIR} # before GEOS for case-insensitive filesystems
@@ -31,6 +31,10 @@ SET(QGIS_CORE_SRCS
classification/qgsclassificationstandarddeviation.cpp
classification/qgsclassificationlogarithmic.cpp

geocoding/qgsgeocoder.cpp
geocoding/qgsgeocodercontext.cpp
geocoding/qgsgeocoderresult.cpp

gps/qgsgpsconnection.cpp
gps/qgsgpsconnectionregistry.cpp
gps/qgsgpsdconnection.cpp
@@ -1146,6 +1150,10 @@ SET(QGIS_CORE_HDRS
geocms/geonode/qgsgeonodeconnection.h
geocms/geonode/qgsgeonoderequest.h

geocoding/qgsgeocoder.h
geocoding/qgsgeocodercontext.h
geocoding/qgsgeocoderresult.h

geometry/qgsabstractgeometry.h
geometry/qgsbox3d.h
geometry/qgscircle.h
@@ -1573,6 +1581,7 @@ INCLUDE_DIRECTORIES(
geometry
geocms
geocms/geonode
geocoding
labeling
layertree
layout
File renamed without changes.
@@ -16,7 +16,7 @@
#ifndef QGSGEOCODER_H
#define QGSGEOCODER_H

#include "qgis_analysis.h"
#include "qgis_core.h"
#include "qgsgeocoderresult.h"
#include "qgsgeometry.h"
#include "qgsfields.h"
@@ -25,15 +25,15 @@ class QgsFeature;
class QgsGeocoderContext;

/**
* \ingroup analysis
* \ingroup core
* Interface for geocoders.
*
* QgsGeocoderInterface implementations are able to take either a QgsFeature or a free-form string
* and calculate the corresponding geometry of the feature.
*
* \since QGIS 3.18
*/
class ANALYSIS_EXPORT QgsGeocoderInterface
class CORE_EXPORT QgsGeocoderInterface
{

public:
File renamed without changes.
@@ -16,19 +16,19 @@
#ifndef QGSGEOCODERCONTEXT_H
#define QGSGEOCODERCONTEXT_H

#include "qgis_analysis.h"
#include "qgis_core.h"

#include "qgscoordinatetransformcontext.h"
#include "qgscoordinatereferencesystem.h"
#include "qgsgeometry.h"

/**
* \ingroup analysis
* \ingroup core
* Encapsulates the context of a geocoding operation.
*
* \since QGIS 3.18
*/
class ANALYSIS_EXPORT QgsGeocoderContext
class CORE_EXPORT QgsGeocoderContext
{

public:
File renamed without changes.
@@ -16,14 +16,14 @@
#ifndef QGSGEOCODERRESULT_H
#define QGSGEOCODERRESULT_H

#include "qgis_analysis.h"
#include "qgis_core.h"

#include "qgscoordinatereferencesystem.h"
#include "qgsgeometry.h"


/**
* \ingroup analysis
* \ingroup core
* Represents a matching result from a geocoder search.
*
* QgsGeocoderResult objects may represent valid matches, or an invalid
@@ -37,7 +37,7 @@
*
* \since QGIS 3.18
*/
class ANALYSIS_EXPORT QgsGeocoderResult
class CORE_EXPORT QgsGeocoderResult
{

public:
@@ -1316,6 +1316,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/core/auth
${CMAKE_SOURCE_DIR}/src/core/callouts
${CMAKE_SOURCE_DIR}/src/core/fieldformatter
${CMAKE_SOURCE_DIR}/src/core/geocoding
${CMAKE_SOURCE_DIR}/src/core/geometry
${CMAKE_SOURCE_DIR}/src/core/labeling
${CMAKE_SOURCE_DIR}/src/core/layertree

0 comments on commit 4f6f163

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