Merge branch 'master' of http://gitlab.ctune.cn/DMapServer/DMapServer4.1

@@ -70,18 +70,18 @@ IF(WITH_CORE)
   #FIND_PACKAGE(Spatialindex REQUIRED)
 
   # optional
-  IF (WITH_POSTGRESQL)
-    FIND_PACKAGE(Postgres) # PostgreSQL provider
-  ENDIF (WITH_POSTGRESQL)
+  # IF (WITH_POSTGRESQL)
+  #   FIND_PACKAGE(Postgres) # PostgreSQL provider
+  # ENDIF (WITH_POSTGRESQL)
 
   #[[
   IF (NOT PROJ_FOUND OR NOT GEOS_FOUND OR NOT GDAL_FOUND)
     MESSAGE (SEND_ERROR "Some dependencies were not found! Proj: ${PROJ_FOUND}, Geos: ${GEOS_FOUND}, GDAL: ${GDAL_FOUND}")
   ENDIF (NOT PROJ_FOUND OR NOT GEOS_FOUND OR NOT GDAL_FOUND)
   ]]
-  IF (POSTGRES_FOUND)
-    SET (HAVE_POSTGRESQL TRUE)
-  ENDIF (POSTGRES_FOUND)
+  # IF (POSTGRES_FOUND)
+  #   SET (HAVE_POSTGRESQL TRUE)
+  # ENDIF (POSTGRES_FOUND)
 
 ENDIF(WITH_CORE)
 

@@ -52,8 +52,8 @@ void DmpServerManager::init(const boost::filesystem::path &modulePath)
 
     if(!LoadServices())
     {
-        std::cout << "加载服务失败！" << std::endl;
-        LOGGER_ERROR("加载服务失败！");
+        std::cout << "加载服务失败!" << std::endl;
+        LOGGER_ERROR("加载服务失败!");
     }
 }
 

@@ -53,7 +53,7 @@ void DmpServerManagerApi::executeRequest(const DmpServerApiContext &context)
         }
     }
     if(!hasMatch) {
-         context.response()->writeHtml("错误，找不到处理的模块，请确认请求接口是否正确！");
+         context.response()->writeHtml("错误，找不到处理的模块，请确认请求接口是否正确!");
     }
 }
 

@@ -34,6 +34,7 @@ class SERVER_EXPORT DmpService
     virtual std::string name() const = 0;
     virtual std::string version() const = 0;
     virtual std::string description() const = 0;
+    virtual bool validate() const { return true; }
     virtual bool allowMethod(DmpServerRequest::Method) const { return true; }
     virtual void executeRequest(const DmpServerContext &context) = 0; 
 };

@@ -105,16 +105,27 @@ bool DmpTileServer::publish(const std::string &serviceName, const std::string &t
         if(!wmtsservice) {
             return false;
         }
+        else if(!wmtsservice.validate())
+        {
+           return false;
+        }
     }
     if(capability & DmpServiceType::TMS) {
         DmpService* tmsservice = getService("TMSService");
         if(!tmsservice) {
             return false;
         }
+        else if(!tmsservice.validate())
+        {
+           return false;
+        }
     }
     DmpServerProject* serverProject = new DmpServerProject(serviceName, title, &project);
     serverProjects_[serviceName] = serverProject;
 
+
+
+
     return true;
 }
 

@@ -40,11 +40,14 @@ namespace DmpWmts
   {
     LOGGER_DEBUG("Destructing WmtsService");
   }
-  bool allowMethod(DmpServerRequest::Method method) 
+  bool DmpWMTSService::allowMethod(DmpServerRequest::Method method) 
   {
     return method == DmpServerRequest::GET_METHOD;                   
   }
-
+  bool DmpWMTSService::validate() 
+  {
+    return false;
+  }
   void DmpWMTSService::executeRequest(const DmpServerContext &context)
   {
     DmpWmtsParameters *params = nullptr;
@@ -79,6 +82,10 @@ namespace DmpWmts
       std::shared_ptr<DmpTileProvider> provider = TileProviderFactory::GetProvider(tileLayer);
       provider->WriteTile(tileRow, tileCol, tileMatrix, f, *context.response());
     }
+    else if(boost::iequals(req, "GetThumbnail"))
+    {
+       
+    }
     else if (boost::iequals(req, "GetCapabilities"))
     {
       const std::string host=context.request()->domain()+":"+context.request()->port();;

@@ -24,6 +24,7 @@ namespace DmpWmts
     std::string name() const override { return std::string("WMTSService"); }
     std::string version() const override { return std::string("1.0.0"); }
     std::string description() const override { return std::string("WMTS瓦片服务"); }
+    bool validate() const override;
     bool allowMethod(DmpServerRequest::Method method) const override { return method == DmpServerRequest::GET_METHOD;}
     void executeRequest(const DmpServerContext &context) override;