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

@@ -34,7 +34,6 @@ 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(std::string &filePath) { return true; }
     virtual bool allowMethod(DmpServerRequest::Method) const { return true; }
     virtual void executeRequest(const DmpServerContext &context) = 0; 
 };

@@ -66,5 +66,5 @@ namespace DmpWms
 
 
     };
-} // namespace DmpWmts
+} // namespace tileserver
 #endif //__dmpwmsparameters_h__

@@ -18,6 +18,7 @@ SET (TILESERVER_SRCS
 
 SET (TILESERVER_HDRS
   dmptileserver.h
+  wmts/dmpwmts.h
   wmts/dmpwmtsparameters.h
   wmts/dmptileprovider.h
   wmts/dmptileproviderfactory.h

@@ -19,10 +19,10 @@ namespace tileserver
 
 DmpTileServer::DmpTileServer()
 {
-    DmpService* wmtsServer = new DmpWmts::DmpWMTSService();
+    DmpService* wmtsServer = new DmpWMTSService();
     services_[wmtsServer->name()] = wmtsServer;
 
-    DmpService* tmsServer = new DmpTms::DmpTMSService();
+    DmpService* tmsServer = new DmpTMSService();
     services_[tmsServer->name()] = tmsServer;
 }
 
@@ -105,7 +105,7 @@ bool DmpTileServer::publish(const std::string &serviceName, const std::string &t
     std::string filePath=tileLayer->getDataSource();
     
     if(capability & DmpServiceType::WMTS) {
-        DmpService* wmtsservice = getService("WMTSService");
+        DmpWMTSService* wmtsservice = dynamic_cast<DmpWMTSService*>(getService("WMTSService"));
         if(!wmtsservice) {
             return false;
         }
@@ -115,7 +115,7 @@ bool DmpTileServer::publish(const std::string &serviceName, const std::string &t
         }
     }
     if(capability & DmpServiceType::TMS) {
-        DmpService* tmsservice = getService("TMSService");
+        DmpTMSService* tmsservice = dynamic_cast<DmpTMSService*>(getService("TMSService"));
         if(!tmsservice) {
             return false;
         }
@@ -135,7 +135,7 @@ DmpService* DmpTileServer::getService(const std::string &serviceType)
     ServiceMap::const_iterator iter = services_.find(serviceType);
     if (iter != services_.end())
     {
-        service = iter->second;
+        service = dynamic_cast<DmpWMTSService*>(iter->second);
     }
     return service;
 }

@@ -24,6 +24,7 @@
 #include "dmpserverutils.h"
 #include "dmpserverproject.h"
 #include "dmptilelayer.h"
+#include "wmts/dmpwmts.h"
 
 namespace tileserver 
 {

@@ -17,7 +17,7 @@
 #include "dmpproject.h"
 #include "dmptmstileprovider.h"
  
-namespace DmpTms
+namespace tileserver
 {
 
   DmpTMSService::DmpTMSService()

@@ -13,7 +13,7 @@
 #include "dmpservice.h"
 #include <iostream>
 
-namespace DmpTms
+namespace tileserver
 {
   class DmpTMSService : public DmpService 
   {
@@ -23,7 +23,7 @@ namespace DmpTms
     std::string name() const override { return std::string("TMSService"); }
     std::string version() const override { return std::string("1.0.0"); }
     std::string description() const override { return std::string("TMS瓦片服务"); }
-    bool validate(std::string &filePath) override;
+    bool validate(std::string &filePath);
     bool allowMethod(DmpServerRequest::Method method) const override { return method == DmpServerRequest::GET_METHOD;}
     void executeRequest(const DmpServerContext &context) override;
  

@@ -9,7 +9,8 @@
 #include "dmptmstileprovider.h"
 #include "dmpserverresponse.h"
 #include <math.h>
-namespace DmpTms
+#include "dmplogger.h"
+namespace tileserver
 {
     DmpTmsTileProvider::DmpTmsTileProvider(const std::string& root_path)
     {

@@ -14,7 +14,7 @@
 #include "dmptilelayer.h"
 #include "dmpproject.h"
 
-namespace DmpTms
+namespace tileserver
 {
   #define RAD2DEG pi/180.0
   class DmpTmsTileProvider 

@@ -12,7 +12,7 @@
 #include <string>
 
 using namespace std; 
-namespace DmpWmts
+namespace tileserver
 {
     DmpAbstractEsriBundleProvider::DmpAbstractEsriBundleProvider(const std::string& rootPath)
         : DmpTileProvider(rootPath)

@@ -13,7 +13,7 @@
 #include "dmptileprovider.h"
 #include <string>
 
-namespace DmpWmts
+namespace tileserver
 {
     class DmpAbstractEsriBundleProvider : public DmpTileProvider
     {

@@ -17,7 +17,7 @@
 
 
 using namespace std;
-namespace DmpWmts
+namespace tileserver
 {
    DmpCapabiliTilesOperation::DmpCapabiliTilesOperation()
    {

@@ -17,7 +17,7 @@
 
 using namespace std;
 
-namespace DmpWmts
+namespace tileserver
 {     
     class DmpCapabiliTilesOperation:public DmpCapabiliTilesProvider
     {

@@ -11,7 +11,7 @@
 #include <string>
 #include "dmpserverresponse.h"
 
-namespace DmpWmts
+namespace tileserver
 {
   class DmpCapabiliTilesProvider
   {

@@ -14,7 +14,7 @@
 #include <math.h>
 #include <cairo/cairo.h>
 
-namespace DmpWmts
+namespace tileserver
 {
     DmpEsriBundleV1Provider:: DmpEsriBundleV1Provider(const std::string& rootPath)
         : DmpAbstractEsriBundleProvider(rootPath)

@@ -14,7 +14,7 @@
 #include "dmptilelayer.h"
 #include "dmppoint.h"
 
-namespace DmpWmts
+namespace tileserver
 {
     class DmpEsriBundleV1Provider : public DmpAbstractEsriBundleProvider
     {

@@ -9,7 +9,7 @@
 #include "dmpesribundlev2provider.h"
 #include "dmpwmtsutils.h"
 
-namespace DmpWmts
+namespace tileserver
 {
     DmpEsriBundleV2Provider::DmpEsriBundleV2Provider(const std::string& rootPath)
         : DmpAbstractEsriBundleProvider(rootPath)

@@ -13,7 +13,7 @@
 #include "dmpabstractesribundleprovider.h"
 #include "dmptilelayer.h"
 
-namespace DmpWmts
+namespace tileserver
 {
     class DmpEsriBundleV2Provider : public DmpAbstractEsriBundleProvider
     {

@@ -14,7 +14,7 @@
 #include "dmptilelayer.h"
 #include <cairo/cairo.h>
 
-namespace DmpWmts
+namespace tileserver
 {
     DmpEsriTileProvider::DmpEsriTileProvider(const std::string& rootPath)
         : DmpTileProvider(rootPath)

@@ -13,7 +13,7 @@
 #include "dmptilelayer.h"
 
 
-namespace DmpWmts
+namespace tileserver
 {
   class DmpEsriTileProvider : public DmpTileProvider
   {

@@ -14,7 +14,7 @@
 #include "dmpserverresponse.h"
 #include "dmptilelayer.h"
 
-namespace DmpWmts
+namespace tileserver
 {
   class DmpTileProvider
   {

@@ -18,7 +18,7 @@
 #include "dmpwmtsutils.h"
 #include "dmptilelayer.h"
 
-namespace DmpWmts
+namespace tileserver
 {
   TileProviderFactory::TileProviderFactory()
   {

@@ -21,7 +21,7 @@
 
 //#include "dmpcapabilitiesprovider.h"
 
-namespace DmpWmts
+namespace tileserver
 {
   enum class Vendor
   {

@@ -22,13 +22,12 @@
 #include "dmplogger.h"
 #include "dmptileproviderfactory.h"
 #include "dmpserverrequest.h"
-#include "dmpwmtsservice.h"
 #include "dmpwmts.h"
 #include "dmptilelayer.h"
 
 using namespace std;
 
-namespace DmpWmts
+namespace tileserver
 {
   
   DmpWMTSService::DmpWMTSService()
@@ -136,4 +135,4 @@ namespace DmpWmts
 
     }
   }
-} // namespace DmpWmts
\ No newline at end of file
+} // namespace tileserver
\ No newline at end of file

@@ -14,7 +14,7 @@
 #include "dmpwmtsparameters.h"
 #include "dmplogger.h"
 
-namespace DmpWmts
+namespace tileserver
 {
   class DmpWMTSService : public DmpService
   {
@@ -24,7 +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(std::string &filePath) override;
+    bool validate(std::string &filePath);
     bool allowMethod(DmpServerRequest::Method method) const override { return method == DmpServerRequest::GET_METHOD;}
     void executeRequest(const DmpServerContext &context) override;
     

@@ -13,7 +13,7 @@
 #include <boost/algorithm/string.hpp>
 #include "dmplogger.h"
 #include "dmpserverutils.h"
-namespace DmpWmts
+namespace tileserver
 {
     DmpWmtsParameters::DmpWmtsParameters()
         : DmpServerParameters()
@@ -146,4 +146,4 @@ namespace DmpWmts
         }
         return Format::NONE;
     }
-} // namespace DmpWmts
\ No newline at end of file
+} // namespace tileserver
\ No newline at end of file

@@ -13,7 +13,7 @@
 
 #include "dmpserverparameters.h"
 
-namespace DmpWmts
+namespace tileserver
 {
     class DmpWmtsParameters : public DmpServerParameters
     {
@@ -39,5 +39,5 @@ namespace DmpWmts
         int TileRow() const;
         int TileCol() const;
     };
-} // namespace DmpWmts
+} // namespace tileserver
 #endif //__dmpwmtsparameters_h__

-/**************************************************************************
-* file:              dmpwmtsservice.cpp
-
-* Author:            wanzhongping
-* Date:              2021-07-28 11:34:16
-* Email:             zhongpingw@chinadci.com
-* copyright:         广州城市信息研究所有限公司
-***************************************************************************/
-#include "dmpwmtsservice.h"
-
-// DmpWMTSService::DmpWMTSService()
-//    : DmpService()
-// {
-//   map_type_ = MapServerType::WMTS_SERVER;
-//    //AddProperty("tilePath","/usr/local/dmap4/gdmap/_alllayers");
-//    //AddProperty("tilePath","/mnt/d/Code/tiles/gdmap/_alllayers");
-//    //AddProperty("tileVersion","1");  
-// }
-// DmpWMTSService::~DmpWMTSService()
-// {
-// }
-// bool DmpWMTSService::Read(boost::property_tree::ptree &pt_node) 
-// {
-//   try {
-//     enabled_ = pt_node.get<bool>("enabled");
-//     capabilities_ = pt_node.get<std::string>("capabilities");
-
-//     //读取属性
-//     for (auto property : pt_node.get_child("properties"))
-//     {
-//       std::string key = property.first;
-//       std::string val = property.second.data();
-//       AddProperty(key, val);
-//     }
-       
-//   }
-//   catch(std::exception ex) {
-//     return false;
-//   }
-//   return true;
-// }
-// bool DmpWMTSService::Write(boost::property_tree::ptree &pt_node)
-// {
-//     pt_node.put("typeName", (int)map_type_);  
-//     pt_node.put("capabilities", capabilities_);
-//     pt_node.put("enabled", enabled_);
-
-//     boost::property_tree::ptree pt_subitem;
-//     std::map<std::string, std::string>::iterator iter = properties_.begin();
-//     while(iter != properties_.end())
-//     {
-//          pt_subitem.put(iter->first, iter->second);
-//          ++iter;
-//     }
-//     pt_node.put_child("properties", pt_subitem);
-
-//     return true;
-// }

-/**************************************************************************
-* file:              dmpwmtsservice.h
-
-* Author:            wanzhongping
-* Date:              2021-07-28 11:34:06
-* Email:             zhongpingw@chinadci.com
-* copyright:         广州城市信息研究所有限公司
-***************************************************************************/
-
-#ifndef __dmpwmtsservice_h__
-#define __dmpwmtsservice_h__
-#include "dmpservice.h"
-
-
-// class DmpWMTSService : public DmpService
-// {
-//   public:
-//     DmpWMTSService();
-//     virtual ~DmpWMTSService();
-//     virtual bool Read(boost::property_tree::ptree &pt_node) override;  
-//     virtual bool Write(boost::property_tree::ptree &pt_node) override;
-    
-    
-//   protected:
-//     std::string capabilities_;
-//     bool enabled_;
-// };
-
-#endif // __dmpwmtsservice_h__

@@ -10,7 +10,7 @@
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/xml_parser.hpp>
 #include <string>
-namespace DmpWmts
+namespace tileserver
 {   
     std::string DmpWmtsUtils::IntToFormatStr(const int num)
     {

@@ -13,7 +13,7 @@
 #include <boost/property_tree/ptree.hpp>
 #include <string>
 
-namespace DmpWmts
+namespace tileserver
 {
     class DmpWmtsUtils
     {