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

@@ -134,6 +134,11 @@ void DmpManagerApiHandler::regService(const DmpServerApiContext &context) const
                     // context.response()->setHeader("Content-Type", "text/xml;charset=utf-8");
                     // context.response()->setHeader("Content-Type", "text/xml;charset=utf-8");
                     // context.response()->write(projData);
                     // context.response()->write(projData);
                 }
                 }
+                else
+                {
+                    LOGGER_ERROR("服务发布失败");
+                    context.response()->write("{\"status\":\"false\",\"message\":\"Pulish service fail!\"}");
+                }
             }
             }
             else 
             else 
             {
             {

@@ -14,8 +14,8 @@
 using namespace std; 
 using namespace std; 
 namespace DmpWmts
 namespace DmpWmts
 {
 {
-    DmpAbstractEsriBundleProvider::DmpAbstractEsriBundleProvider(const std::string& root_path)
-        : DmpTileProvider(root_path)
+    DmpAbstractEsriBundleProvider::DmpAbstractEsriBundleProvider(const std::string& rootPath)
+        : DmpTileProvider(rootPath)
     {
     {
 
 
     }
     }
@@ -54,7 +54,7 @@ namespace DmpWmts
       }
       }
       c = "C" + c;
       c = "C" + c;
     
     
-      string bundlePath = root_path_ + "/"+l+"/"+r+c;
+      string bundlePath = rootPath_ + "/"+l+"/"+r+c;
       return bundlePath;
       return bundlePath;
     }
     }
 }
 }

@@ -18,7 +18,7 @@ namespace DmpWmts
     class DmpAbstractEsriBundleProvider : public DmpTileProvider
     class DmpAbstractEsriBundleProvider : public DmpTileProvider
     {
     {
       protected:
       protected:
-        DmpAbstractEsriBundleProvider(const std::string& root_path);
+        DmpAbstractEsriBundleProvider(const std::string& rootPath);
         std::string GetBundlePath(int level, int rGroup, int cGroup);
         std::string GetBundlePath(int level, int rGroup, int cGroup);
         const int _packetSize = 128;
         const int _packetSize = 128;
     };
     };

@@ -35,12 +35,12 @@ namespace DmpWmts
         public:
         public:
         DmpCapabiliTilesOperation();     
         DmpCapabiliTilesOperation();     
         void WriteCapabilities(DmpServerResponse& response);
         void WriteCapabilities(DmpServerResponse& response);
-        void WriteCapabilities(boost::property_tree::ptree& pt,const std::string& host_ ,const std::string& servicename,DmpServerResponse& response);
+        void WriteCapabilities(boost::property_tree::ptree& pt ,const std::string& host ,const std::string& servicename,DmpServerResponse& response);
         void GetCapabilitiesDocument(DmpServerResponse& response);
         void GetCapabilitiesDocument(DmpServerResponse& response);
-        void CreateGetCapabilitiesDocument(const std::string& host_ ,const std::string& servicename,boost::property_tree::ptree& pt);
+        void CreateGetCapabilitiesDocument(const std::string& host,const std::string& servicename,boost::property_tree::ptree& pt);
         void GetServiceIdentificationElement(const std::string& servicename,boost::property_tree::ptree& pt);
         void GetServiceIdentificationElement(const std::string& servicename,boost::property_tree::ptree& pt);
         void GetServiceProviderElement(boost::property_tree::ptree& pt);
         void GetServiceProviderElement(boost::property_tree::ptree& pt);
-        void GetServiceMetadataElement(const std::string& host_ ,const std::string& servicename,boost::property_tree::ptree& pt);
+        void GetServiceMetadataElement(const std::string& host ,const std::string& servicename,boost::property_tree::ptree& pt);
         void GetServiceTileMatrixSetElement(const std::string& servicename,boost::property_tree::ptree& pt);
         void GetServiceTileMatrixSetElement(const std::string& servicename,boost::property_tree::ptree& pt);
     };
     };
 }
 }

@@ -17,7 +17,7 @@ namespace DmpWmts
   {
   {
     public:
     public:
       void WriteCapabilities(DmpServerResponse& respons); 
       void WriteCapabilities(DmpServerResponse& respons); 
-      void WriteCapabilities(boost::property_tree::ptree& pt_,const std::string& host_ ,const std::string& servicename ,DmpServerResponse& respons);   
+      void WriteCapabilities(boost::property_tree::ptree& pt,const std::string& host ,const std::string& servicename ,DmpServerResponse& respons);   
      
      
     protected:
     protected:
       std::string file_rootPath;
       std::string file_rootPath;

@@ -11,8 +11,8 @@
 #include <iostream>
 #include <iostream>
 namespace DmpWmts
 namespace DmpWmts
 {
 {
-    DmpEsriBundleV1Provider:: DmpEsriBundleV1Provider(const std::string& root_path)
-        : DmpAbstractEsriBundleProvider(root_path)
+    DmpEsriBundleV1Provider:: DmpEsriBundleV1Provider(const std::string& rootPath)
+        : DmpAbstractEsriBundleProvider(rootPath)
     {
     {
         // _rootPath ="/mnt/d/Data/tile/GDMap/_alllayers";
         // _rootPath ="/mnt/d/Data/tile/GDMap/_alllayers";
     }
     }

@@ -16,7 +16,7 @@ namespace DmpWmts
     class DmpEsriBundleV1Provider : public DmpAbstractEsriBundleProvider
     class DmpEsriBundleV1Provider : public DmpAbstractEsriBundleProvider
     {
     {
       public:
       public:
-        DmpEsriBundleV1Provider(const std::string& root_path);
+        DmpEsriBundleV1Provider(const std::string& rootPath);
         void WriteTile(const int row, const int col, const int level, const std::string& format, DmpServerResponse& response) override;
         void WriteTile(const int row, const int col, const int level, const std::string& format, DmpServerResponse& response) override;
     };
     };
 }
 }

@@ -11,8 +11,8 @@
 
 
 namespace DmpWmts
 namespace DmpWmts
 {
 {
-    DmpEsriBundleV2Provider::DmpEsriBundleV2Provider(const std::string& root_path)
-        : DmpAbstractEsriBundleProvider(root_path)
+    DmpEsriBundleV2Provider::DmpEsriBundleV2Provider(const std::string& rootPath)
+        : DmpAbstractEsriBundleProvider(rootPath)
     {
     {
         // _rootPath ="/mnt/d/Data/SDZT_DIANZDT_2016_FS2K/Layers/_alllayers";
         // _rootPath ="/mnt/d/Data/SDZT_DIANZDT_2016_FS2K/Layers/_alllayers";
     }
     }

@@ -16,7 +16,7 @@ namespace DmpWmts
     class DmpEsriBundleV2Provider : public DmpAbstractEsriBundleProvider
     class DmpEsriBundleV2Provider : public DmpAbstractEsriBundleProvider
     {
     {
       public:
       public:
-        DmpEsriBundleV2Provider(const std::string& root_path);
+        DmpEsriBundleV2Provider(const std::string& rootPath);
         void WriteTile(const int row, const int col, const int level, const std::string& format, DmpServerResponse& response) override;
         void WriteTile(const int row, const int col, const int level, const std::string& format, DmpServerResponse& response) override;
     };
     };
 }
 }

@@ -12,8 +12,8 @@
 
 
 namespace DmpWmts
 namespace DmpWmts
 {
 {
-    DmpEsriTileProvider::DmpEsriTileProvider(const std::string& root_path)
-        : DmpTileProvider(root_path)
+    DmpEsriTileProvider::DmpEsriTileProvider(const std::string& rootPath)
+        : DmpTileProvider(rootPath)
     {
     {
         // this->_rootPath ="/mnt/d/Data/tile/ShareMap2014/Layers/_alllayers/";
         // this->_rootPath ="/mnt/d/Data/tile/ShareMap2014/Layers/_alllayers/";
     }
     }
@@ -32,7 +32,7 @@ namespace DmpWmts
         std::string row_str = "R" + IntToHex8Str(row);
         std::string row_str = "R" + IntToHex8Str(row);
         std::string col_str = "C" + IntToHex8Str(col);
         std::string col_str = "C" + IntToHex8Str(col);
         
         
-        std::string tile_path = root_path_ + level_str + "/"+ row_str+"/"+ col_str + "." + format;
+        std::string tile_path = rootPath_ + level_str + "/"+ row_str+"/"+ col_str + "." + format;
 
 
         std::ifstream fread(tile_path, std::ifstream::binary);
         std::ifstream fread(tile_path, std::ifstream::binary);
         if(!fread)
         if(!fread)

@@ -16,7 +16,7 @@ namespace DmpWmts
   class DmpEsriTileProvider : public DmpTileProvider
   class DmpEsriTileProvider : public DmpTileProvider
   {
   {
     public:
     public:
-      DmpEsriTileProvider(const std::string& root_path);
+      DmpEsriTileProvider(const std::string& rootPath);
       void WriteTile(const int row, const int col, const int level, const std::string& format, DmpServerResponse& response) override;
       void WriteTile(const int row, const int col, const int level, const std::string& format, DmpServerResponse& response) override;
     private:
     private:
       std::string IntToHex8Str(const int num);
       std::string IntToHex8Str(const int num);

@@ -18,11 +18,11 @@ namespace DmpWmts
   class DmpTileProvider
   class DmpTileProvider
   {
   {
     public:
     public:
-      DmpTileProvider(const std::string& root_path) { root_path_ = root_path ;}
+      DmpTileProvider(const std::string& rootPath) { rootPath_ = rootPath ;}
       virtual void WriteTile(const int row, const int col, const int level, const std::string& format, DmpServerResponse& respons) = 0;   
       virtual void WriteTile(const int row, const int col, const int level, const std::string& format, DmpServerResponse& respons) = 0;   
     
     
     protected:
     protected:
-      std::string root_path_;
+      std::string rootPath_;
   };
   };
 }
 }
 #endif //__dmptileprovider_h__
 #endif //__dmptileprovider_h__

@@ -24,17 +24,17 @@ namespace DmpWmts
   {
   {
   }
   }
   
   
-  std::shared_ptr<DmpTileProvider> TileProviderFactory::GetProvider(DmpTileLayer* dmpTileLayer_)
+  std::shared_ptr<DmpTileProvider> TileProviderFactory::GetProvider(DmpTileLayer* dmpTileLayer)
   {
   {
     std::shared_ptr<DmpTileProvider> provider;
     std::shared_ptr<DmpTileProvider> provider;
     try
     try
     {
     {
-      std::string tileVersion_= dmpTileLayer_->getVendor();
-      std::string tilePath_=dmpTileLayer_->getDataSource();
+      std::string tileVersion= dmpTileLayer->getVendor();
+      std::string tilePath_=dmpTileLayer->getDataSource();
       //std::string tilePath_ = "/mnt/d/Code/tiles/gdmap/_alllayers";
       //std::string tilePath_ = "/mnt/d/Code/tiles/gdmap/_alllayers";
       //std::string tileVersion_ = "ESRI_V1";
       //std::string tileVersion_ = "ESRI_V1";
-      int iver_=StringToVector(tileVersion_);      
-      Vendor version = (Vendor)boost::lexical_cast<int>(iver_);
+      int iver=StringToVector(tileVersion);      
+      Vendor version = (Vendor)boost::lexical_cast<int>(iver);
       switch(version)
       switch(version)
 		  {
 		  {
 			  case Vendor::ESRI_V0: 
 			  case Vendor::ESRI_V0: 

@@ -31,7 +31,7 @@ namespace DmpWmts
   class TileProviderFactory 
   class TileProviderFactory 
   {
   {
   public:
   public:
-    static std::shared_ptr<DmpTileProvider> GetProvider( DmpTileLayer* dmpTileLayer_);   
+    static std::shared_ptr<DmpTileProvider> GetProvider( DmpTileLayer* dmpTileLayer);   
   private:
   private:
     TileProviderFactory();
     TileProviderFactory();
   };
   };

@@ -31,18 +31,18 @@ namespace DmpWmts
         delete[] buffer;
         delete[] buffer;
         return str;
         return str;
     }
     }
-    int StringToVector(std::string& strVector_)
+    int StringToVector(std::string& strVector)
     {
     {
         int iVector_=-1;
         int iVector_=-1;
-        if(std::strcmp(strVector_.c_str(),"ESRI_V0")==0)
+        if(std::strcmp(strVector.c_str(),"ESRI_V0")==0)
         {
         {
             iVector_=0;
             iVector_=0;
         }
         }
-        else if(std::strcmp(strVector_.c_str(),"ESRI_V1")==0)
+        else if(std::strcmp(strVector.c_str(),"ESRI_V1")==0)
         {
         {
              iVector_=1;
              iVector_=1;
         }    
         }    
-        else if(std::strcmp(strVector_.c_str(),"ESRI_V2")==0)
+        else if(std::strcmp(strVector.c_str(),"ESRI_V2")==0)
         {
         {
              iVector_=2;
              iVector_=2;
         } 
         } 

@@ -17,7 +17,7 @@ namespace DmpWmts
 {
 {
     std::string IntToFormatStr(const int num);
     std::string IntToFormatStr(const int num);
     std::string IntToHexStr(const int num);
     std::string IntToHexStr(const int num);
-    int StringToVector(std::string& strVector_);  
+    int StringToVector(std::string& strVector);  
 }
 }
 
 
 #endif //__dmpwmtsutils_h__
 #endif //__dmpwmtsutils_h__