正在显示
2 个修改的文件
包含
2 行增加
和
32 行删除
... | ... | @@ -47,7 +47,7 @@ bool DmpVectorLayer::writeXml(boost::property_tree::ptree &layerNode) |
47 | 47 | |
48 | 48 | void DmpVectorLayer::setRenderer(DmpFeatureRenderer *renderer) |
49 | 49 | { |
50 | - | |
50 | + s | |
51 | 51 | } |
52 | 52 | |
53 | 53 | void DmpVectorLayer::setDataSource(const std::string &dataSource, const std::string &baseName, const std::string &provider, bool loadDefaultStyleFlag) | ... | ... |
1 | -<<<<<<< HEAD | |
2 | -/************************************************************************** | |
3 | -* file: dmptmstileprovider.h | |
4 | - | |
5 | -* Author: lijiahuan | |
6 | -* Date: 2021-12-09 17:41:00 | |
7 | -* Email: jiahuanl@chinadci.com | |
8 | -* copyright: 广州城市信息研究所有限公司 | |
9 | -***************************************************************************/ | |
10 | -#ifndef __dmptmstileprovider_h__ | |
11 | -#define __dmptmstileprovider_h__ | |
12 | - | |
13 | -#include <string> | |
14 | -#include "dmpserverresponse.h" | |
15 | - | |
16 | -namespace DmpTms | |
17 | -{ | |
18 | - class DmpTmsTileProvider | |
19 | - { | |
20 | - public: | |
21 | - std::string ImageFormat() const; | |
22 | - DmpTmsTileProvider(const std::string& root_path); | |
23 | - void WriteTile(const int row, const int col, const int level, const std::string& format, DmpServerResponse& response) ; | |
24 | - protected: | |
25 | - std::string file_rootPath; | |
26 | - }; | |
27 | -} | |
28 | - | |
29 | -======= | |
30 | 1 | /************************************************************************** |
31 | 2 | * file: dmptmstileprovider.h |
32 | 3 | |
... | ... | @@ -50,9 +21,8 @@ namespace DmpTms |
50 | 21 | DmpTmsTileProvider(const std::string& root_path); |
51 | 22 | void WriteTile(const int row, const int col, const int level, const std::string& format, DmpServerResponse& response) ; |
52 | 23 | protected: |
53 | - std::string file_rootPath_; | |
24 | + std::string file_rootPath; | |
54 | 25 | }; |
55 | 26 | } |
56 | 27 | |
57 | ->>>>>>> a0b70f1dd901dc509faa58dfc314d3f47e49a34d | |
58 | 28 | #endif |
\ No newline at end of file | ... | ... |
请
注册
或
登录
后发表评论