🔖 prepare version 0.2.0

liuxsdev · May 5, 2023 · 1481ddf · 1481ddf
1 parent 3f67a1b
commit 1481ddf
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 13 deletions.
diff --git a/extramaps.yml b/extramaps.yml
@@ -11,20 +11,20 @@
   zmin: 0
   zmax: 21
   referer: ''
-- name: Google Map (CN) - Roadmap*
+- name: Google Map (CN) - Roadmap
   icon: googlemap_default.png
   url: https://gac-geo.googlecnapps.cn/maps/vt?lyrs=r&x={x}&y={y}&z={z}
   zmin: 0
   zmax: 21
   referer: ''
-- name: Google Map (CN) - Terrain*
+- name: Google Map (CN) - Terrain
   icon: googlemap_terrain.png
   url: https://gac-geo.googlecnapps.cn/maps/vt?lyrs=p&x={x}&y={y}&z={z}
   zmin: 0
   zmax: 21
   referer: ''
 - name: Separator
-- name: Openstreetmap
+- name: Openstreetmap🪜
   icon: osm.webp
   url: https://tile.openstreetmap.org/{z}/{x}/{y}.png
   zmin: 0
@@ -55,4 +55,40 @@
   zmin: 0
   zmax: 15
   referer: ''
-
+- name: Separator
+- name: ESRI - Imagery
+  icon: ESRI.webp
+  url: https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}
+  zmin: 0
+  zmax: 18
+  referer: ''
+- name: ESRI - Hillshade
+  icon: ESRI.webp
+  url: https://server.arcgisonline.com/arcgis/rest/services/Elevation/World_Hillshade/MapServer/tile/{z}/{y}/{x}
+  zmin: 0
+  zmax: 18
+  referer: ''
+- name: ESRI - 中国地图彩色版
+  icon: ESRI.webp
+  url: https://map.geoq.cn/ArcGIS/rest/services/ChinaOnlineCommunity/MapServer/tile/{z}/{y}/{x}
+  zmin: 0
+  zmax: 18
+  referer: ''
+- name: ESRI - 中国地图暖色版
+  icon: ESRI.webp
+  url: https://map.geoq.cn/ArcGIS/rest/services/ChinaOnlineStreetWarm/MapServer/tile/{z}/{y}/{x}
+  zmin: 0
+  zmax: 18
+  referer: ''
+- name: ESRI - 中国地图灰色版
+  icon: ESRI.webp
+  url: https://map.geoq.cn/arcgis/rest/services/ChinaOnlineStreetGray/MapServer/tile/{z}/{y}/{x}
+  zmin: 0
+  zmax: 18
+  referer: ''
+- name: ESRI - 中国地图蓝黑版
+  icon: ESRI.webp
+  url: https://map.geoq.cn/ArcGIS/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/tile/{z}/{y}/{x}
+  zmin: 0
+  zmax: 18
+  referer: ''
diff --git a/images/map_icons/ESRI.webp b/images/map_icons/ESRI.webp
diff --git a/metadata.txt b/metadata.txt
@@ -14,8 +14,10 @@ homepage=https://github.com/liuxsdev/qgis-plugin-tianditu
 tracker=https://github.com/liuxsdev/qgis-plugin-tianditu/issues
 repository=https://github.com/liuxsdev/qgis-plugin-tianditu
 changelog=
-  Version 0.2.0 2023/4/29:
-  * ✨ 保存配置文件到QGIS
+  Version 0.2.0:
+  * 💥 更改配置文件到 QGIS Setting中
+  * ✨ 新增天地图·江苏
+  * ✨ 新增底图(stamen/esri)
   * 🐛 修复一些问题
   Version 0.1.1 2023/4/29:
   * ✨ 增加子域选择

diff --git a/tianditu.yml b/tianditu.yml
@@ -29,8 +29,6 @@
     uri: crs=EPSG:4490&dpiMode=7&format=image/png&layers=historyVector_js_sldt_2017&styles=default&tileMatrixSet=default&url=http://jiangsu.tianditu.gov.cn/historyraster/rest/services/historyVector/js_sldt_2017/MapServer/WMTS/1.0.0/WMTSCapabilities.xml
   - name: 江苏-2017年矢量注记
     uri: crs=EPSG:4490&dpiMode=7&format=image/png&layers=historyVector_js_slzj_2017&styles=default&tileMatrixSet=default&url=http://jiangsu.tianditu.gov.cn/historyraster/rest/services/historyVector/js_slzj_2017/MapServer/WMTS/1.0.0/WMTSCapabilities.xml
-  - name: 江苏-2018年11月影像地图
-    uri: crs=EPSG:4490&dpiMode=7&format=image/jpgpng&layers=History_js_yxdt_2018_11thM&styles=default&tileMatrixSet=default&url=http://jiangsu.tianditu.gov.cn/historyraster/rest/services/History/js_yxdt_2018_11thM/MapServer/WMTS/1.0.0/WMTSCapabilities.xml
   - name: 江苏-2018年矢量地图
     uri: crs=EPSG:4490&dpiMode=7&format=image/png&layers=historyVector_js_sldt_2018&styles=default&tileMatrixSet=default&url=http://jiangsu.tianditu.gov.cn/historyraster/rest/services/historyVector/js_sldt_2018/MapServer/WMTS/1.0.0/WMTSCapabilities.xml
   - name: 江苏-2018年矢量注记
@@ -43,7 +41,5 @@
     uri: crs=EPSG:4490&dpiMode=7&format=image/jpgpng&layers=History_js_yxdt_2020&styles=default&tileMatrixSet=default&url=http://jiangsu.tianditu.gov.cn/historyraster/rest/services/History/js_yxdt_2020/MapServer/WMTS/1.0.0/WMTSCapabilities.xml
   - name: 江苏-2021年影像地图
     uri: crs=EPSG:4490&dpiMode=7&format=image/jpgpng&layers=History_js_yxdt_2021&styles=default&tileMatrixSet=default&url=http://jiangsu.tianditu.gov.cn/historyraster/rest/services/History/js_yxdt_2021/MapServer/WMTS/1.0.0/WMTSCapabilities.xml
-  - name: 江苏-2022年影像地图(0.5m)
-    uri: crs=EPSG:4490&dpiMode=7&format=image/jpgpng&layers=tdtjs_js_img2022_r05&styles=default&tileMatrixSet=default&url=http://jiangsu.tianditu.gov.cn/tdtsite05/rest/services/tdtjs/js_img2022_r05/MapServer/WMTS/1.0.0/WMTSCapabilities.xml
-  - name: 徐州部分地区1966-1976历史影像
-    uri: crs=EPSG:4490&dpiMode=7&format=image/jpgpng&layers=History_yxdt_xz_66to76&styles=default&tileMatrixSet=default&tilePixelRatio=0&url=http://jiangsu.tianditu.gov.cn/historyraster/rest/services/History/yxdt_xz_66to76/MapServer/WMTS/1.0.0/WMTSCapabilities.xml
+  - name: 江苏-2022年影像地图
+    uri: crs=EPSG:4490&dpiMode=7&format=image/jpgpng&layers=tdtjs_js_img2022_r05&styles=default&tileMatrixSet=default&url=http://jiangsu.tianditu.gov.cn/tdtsite05/rest/services/tdtjs/js_img2022_r05/MapServer/WMTS/1.0.0/WMTSCapabilities.xml
diff --git a/tiandituPlugin.py b/tiandituPlugin.py
@@ -85,7 +85,7 @@ def initGui(self):
             menu.addAction(icon_map, TianMapInfo[maptype], lambda maptype_=maptype: self.add_tianditu_basemap(maptype_))
         menu.addSeparator()
         # 天地图省级节点
-        self.tdt_jiangsu_action = menu.addAction(icon_other, '天地图·江苏')
+        self.tdt_jiangsu_action = menu.addAction(icon_map, '天地图·江苏')
         tdt_jiangsu_menu = QMenu()
         tianditu_jiangsu = tdt['天地图-江苏']
         for mapdata in tianditu_jiangsu: