cmake

 
 
 find_package(Boost 1.75 REQUIRED COMPONENTS log_setup)
 find_package(Boost 1.75 REQUIRED COMPONENTS log_setup)
 find_package(Boost 1.75 REQUIRED COMPONENTS log)
 find_package(Boost 1.75 REQUIRED COMPONENTS log)
-
+link_libraries("cairo")
 ############################################################
 ############################################################
 # sources
 # sources
 
 
@@ -110,8 +110,10 @@ SET(DMAP_CORE_HDRS
 INCLUDE_DIRECTORIES(
 INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/pgsql/include
   geometry
   geometry
   symbology
   symbology
+  renderer
 )
 )
 
 
 ADD_LIBRARY(dmap_core SHARED ${DMAP_CORE_SRCS} ${DMAP_CORE_HDRS})
 ADD_LIBRARY(dmap_core SHARED ${DMAP_CORE_SRCS} ${DMAP_CORE_HDRS})

@@ -17,6 +17,7 @@ class CORE_EXPORT DmpCoordinateReferenceSystem
 {
 {
 public:
 public:
     bool readXml(const boost::property_tree::ptree pNode);
     bool readXml(const boost::property_tree::ptree pNode);
+    long srid(){return srid_;}
 private:
 private:
     long srid_;
     long srid_;
     std::string wkt_;
     std::string wkt_;

@@ -33,7 +33,7 @@ class CORE_EXPORT DmpRectangle
 
 
     double xmax() const { return xmax_; }
     double xmax() const { return xmax_; }
     double xmin() const { return xmin_; }
     double xmin() const { return xmin_; }
-    double ymax() const { return ymin_; }
+    double ymax() const { return ymax_; }
     double ymin() const { return ymin_; }
     double ymin() const { return ymin_; }
     double width() const  { return xmax_ - xmin_; }
     double width() const  { return xmax_ - xmin_; }
     double height() const { return ymax_ - ymin_; }
     double height() const { return ymax_ - ymin_; }

@@ -4,12 +4,26 @@
 
 
 SET (MAPSERVER_SRCS
 SET (MAPSERVER_SRCS
   dmpmapserver.cpp
   dmpmapserver.cpp
+  dmppgsql.cpp
+  dmppgsqlpool.cpp
+  dmppgsqlsourcepools.cpp
+  wms/dmpwmsrenderer.cpp
   wms/dmpwms.cpp
   wms/dmpwms.cpp
+  wms/dmpwmsparameters.cpp
+  wms/dmpwmsgetcapabilities.cpp
+  wms/dmpwmsgetmap.cpp
 )
 )
 
 
 SET (MAPSERVER_HDRS
 SET (MAPSERVER_HDRS
   dmpmapserver.h
   dmpmapserver.h
+  dmppgsql.h
+  dmppgsqlpool.h
+  dmppgsqlsourcepools.h
+  wms/dmpwmsrenderer.h
   wms/dmpwms.h
   wms/dmpwms.h
+  wms/dmpwmsparameters.h
+  wms/dmpwmsgetcapabilities.h
+  wms/dmpwmsgetmap.h
 )
 )
 
 
 ########################################################
 ########################################################
@@ -21,9 +35,11 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/src/core/
   ${CMAKE_SOURCE_DIR}/src/core/
   ${CMAKE_SOURCE_DIR}/src/core/geometry
   ${CMAKE_SOURCE_DIR}/src/core/geometry
   ${CMAKE_SOURCE_DIR}/src/core/symbology
   ${CMAKE_SOURCE_DIR}/src/core/symbology
+  ${CMAKE_SOURCE_DIR}/src/core/renderer
   ${CMAKE_SOURCE_DIR}/src/server/
   ${CMAKE_SOURCE_DIR}/src/server/
   ${CMAKE_SOURCE_DIR}/src/server/services
   ${CMAKE_SOURCE_DIR}/src/server/services
   ${CMAKE_SOURCE_DIR}/src/server/services/mapserver
   ${CMAKE_SOURCE_DIR}/src/server/services/mapserver
+  ${CMAKE_SOURCE_DIR}/pgsql/include
 )
 )
 
 
 set_target_properties(mapserver
 set_target_properties(mapserver

@@ -22,7 +22,7 @@ namespace DmpWms
 
 
     DmpWmsParameters::DmpWmsParameters(const DmpServerParameters &params)
     DmpWmsParameters::DmpWmsParameters(const DmpServerParameters &params)
     {
     {
-        params_ = params.Parameters();
+        params_ = params.parameters();
     }
     }
 
 
     bool DmpWmsParameters::GetStringParameter(const char* key, std::string &value) const
     bool DmpWmsParameters::GetStringParameter(const char* key, std::string &value) const