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

@@ -41,9 +41,9 @@ bool DmpTileLayer::readXml(const boost::property_tree::ptree &layerNode)
     extent_ = DmpXmlUtils::readRectangle(pExtent);
     extent_ = DmpXmlUtils::readRectangle(pExtent);
     style_ = layerNode.get<std::string>("style");
     style_ = layerNode.get<std::string>("style");
     format_ = layerNode.get<std::string>("format");
     format_ = layerNode.get<std::string>("format");
-    vector_ = layerNode.get<std::string>("vendor");
+    vendor_ = layerNode.get<std::string>("vendor");
     datasource_ = layerNode.get<std::string>("datasource");
     datasource_ = layerNode.get<std::string>("datasource");
-    if(strcmp(vector_.c_str(),"QGIS")==0)return true;
+    if(strcmp(vendor_.c_str(),"QGIS")==0)return true;
     boost::property_tree::ptree pMatrixSets = layerNode.get_child("tileMatrixSets");
     boost::property_tree::ptree pMatrixSets = layerNode.get_child("tileMatrixSets");
     for (BOOST_AUTO(pos, pMatrixSets.begin()); pos != pMatrixSets.end(); ++pos)
     for (BOOST_AUTO(pos, pMatrixSets.begin()); pos != pMatrixSets.end(); ++pos)
     {
     {
@@ -72,9 +72,9 @@ bool DmpTileLayer::writeXml(boost::property_tree::ptree &layerNode)
 {
 {
   return false;
   return false;
 }
 }
-std::string DmpTileLayer::getVector()
+std::string DmpTileLayer::getVendor()
 {
 {
-  return vector_;
+  return vendor_;
 }
 }
 std::string DmpTileLayer::getDataSource()
 std::string DmpTileLayer::getDataSource()
 {
 {

@@ -22,7 +22,7 @@ public:
 
 
     bool readXml(const boost::property_tree::ptree &layerNode);
     bool readXml(const boost::property_tree::ptree &layerNode);
     bool writeXml(boost::property_tree::ptree &layerNode);
     bool writeXml(boost::property_tree::ptree &layerNode);
-    std::string getVector();
+    std::string getVendor();
     std::string getDataSource();
     std::string getDataSource();
     void getTileMatrixSets(std::vector<DmpTileMatrixSet*>& tileMatrixSets);
     void getTileMatrixSets(std::vector<DmpTileMatrixSet*>& tileMatrixSets);
     std::string getFormat();
     std::string getFormat();
@@ -31,7 +31,7 @@ public:
 private:
 private:
     std::string style_;
     std::string style_;
     std::string format_;
     std::string format_;
-    std::string vector_;
+    std::string vendor_;
     std::string datasource_;
     std::string datasource_;
     std::vector<DmpTileMatrixSet*> tileMatrixSets_;
     std::vector<DmpTileMatrixSet*> tileMatrixSets_;
 };
 };

@@ -29,22 +29,23 @@ namespace DmpWmts
     std::shared_ptr<DmpTileProvider> provider;
     std::shared_ptr<DmpTileProvider> provider;
     try
     try
     {
     {
-      std::string tileVersion= dmpTileLayer->getVector();
+      std::string tileVersion= dmpTileLayer->getVendor();
       std::string tilePath=dmpTileLayer->getDataSource();
       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);    
       int iver=StringToVector(tileVersion);    
-      Vector version = (Vector)boost::lexical_cast<int>(iver);
+      Vendor version = (Vendor)boost::lexical_cast<int>(iver);
       switch(version)
       switch(version)
 		  {
 		  {
-			  case Vector::ESRI_V0: 
+			  case Vendor::ESRI_V0: 
           provider = std::make_shared<DmpEsriTileProvider>(tilePath);
           provider = std::make_shared<DmpEsriTileProvider>(tilePath);
 				  break;
 				  break;
-    	  case Vector::ESRI_V1:
+    	  case Vendor::ESRI_V1:
           provider = std::make_shared<DmpEsriBundleV1Provider>(tilePath);
           provider = std::make_shared<DmpEsriBundleV1Provider>(tilePath);
 				  break;
 				  break;
-        case Vector::ESRI_V2: 
+        case Vendor::ESRI_V2: 
           provider = std::make_shared<DmpEsriBundleV2Provider>(tilePath);
           provider = std::make_shared<DmpEsriBundleV2Provider>(tilePath);
+
 				  break;
 				  break;
 			  default:
 			  default:
           provider = nullptr;
           provider = nullptr;

@@ -18,7 +18,7 @@
 
 
 namespace DmpWmts
 namespace DmpWmts
 {
 {
-  enum class Vector
+  enum class Vendor
   {
   {
     ESRI_V0 = 0,
     ESRI_V0 = 0,
     ESRI_V1 = 1,
     ESRI_V1 = 1,
@@ -36,13 +36,5 @@ namespace DmpWmts
   private:
   private:
     TileProviderFactory();
     TileProviderFactory();
   };
   };
-
-  // class CapabiliTileProviderFactory
-  // {
-  //   public:
-  //     static std::shared_ptr<DmpCapabiliTilesProvider> GetProvider();   
-  //   private:
-  //     CapabiliTileProviderFactory();
-  // };
 }
 }
 #endif //__dmptileproviderfactory_h__
 #endif //__dmptileproviderfactory_h__