fqx

@@ -47,7 +47,7 @@ bool DmpVectorLayer::writeXml(boost::property_tree::ptree &layerNode)
 
 void DmpVectorLayer::setRenderer(DmpFeatureRenderer *renderer)
 {
-   
+   s
 }
 
 void DmpVectorLayer::setDataSource(const std::string &dataSource, const std::string &baseName, const std::string &provider, bool loadDefaultStyleFlag)

-<<<<<<< HEAD
-/**************************************************************************
-* file:              dmptmstileprovider.h
-
-* Author:            lijiahuan
-* Date:              2021-12-09 17:41:00
-* Email:             jiahuanl@chinadci.com
-* copyright:         广州城市信息研究所有限公司
-***************************************************************************/
-#ifndef __dmptmstileprovider_h__
-#define __dmptmstileprovider_h__
-
-#include <string>
-#include "dmpserverresponse.h"
-
-namespace DmpTms
-{
-  class DmpTmsTileProvider 
-  {
-    public:      
-      std::string ImageFormat() const;
-      DmpTmsTileProvider(const std::string& root_path);
-      void WriteTile(const int row, const int col, const int level, const std::string& format, DmpServerResponse& response) ;
-    protected:
-      std::string file_rootPath;
-  };
-}
-
-=======
 /**************************************************************************
 * file:              dmptmstileprovider.h
 
@@ -50,9 +21,8 @@ namespace DmpTms
       DmpTmsTileProvider(const std::string& root_path);
       void WriteTile(const int row, const int col, const int level, const std::string& format, DmpServerResponse& response) ;
     protected:
-      std::string file_rootPath_;
+      std::string file_rootPath;
   };
 }
 
->>>>>>> a0b70f1dd901dc509faa58dfc314d3f47e49a34d
 #endif 
\ No newline at end of file