map3d.git - Gitblit

Merge remote-tracking branch 'origin/master' into master

zengh

2020-11-13 8274f20d8093486dc3d54e074d25b6e412f4e4c7

refs
author	zengh <123456>
	Friday, November 13, 2020 15:20 +0800
committer	zengh <123456>
	Friday, November 13, 2020 15:20 +0800
commit	8274f20d8093486dc3d54e074d25b6e412f4e4c7
tree	cbb37851d40e1c4935fa83bdfb0b541c97490fe9 tree \| zip \| gz
parent	4b05cf3d99a3e7311381d7caf20c2c85ea567ba9 view \| diff 4cc7ab0a8924f32074d9ebc731b15a129e17defd view \| diff

Merge remote-tracking branch 'origin/master' into master

9 files modified

26 files added

	.gitignore	3 ●●●●● diff \| view \| raw \| blame \| history
	config.json	86 ●●●●● diff \| view \| raw \| blame \| history
	images/basemaps/gaod.jpg	diff \| view \| raw \| blame \| history
	images/basemaps/gis.jpg	diff \| view \| raw \| blame \| history
	images/basemaps/guge.jpg	diff \| view \| raw \| blame \| history
	images/basemaps/mapbox.jpg	diff \| view \| raw \| blame \| history
	images/basemaps/tenx.jpg	diff \| view \| raw \| blame \| history
	jimu.js/MapManager.js	5 ●●●●● diff \| view \| raw \| blame \| history
	widgets/CoorPosition/Widget.html	43 ●●●●● diff \| view \| raw \| blame \| history
	widgets/CoorPosition/Widget.js	139 ●●●●● diff \| view \| raw \| blame \| history
	widgets/CoorPosition/css/style.css	129 ●●●●● diff \| view \| raw \| blame \| history
	widgets/CoorPosition/manifest.json	17 ●●●●● diff \| view \| raw \| blame \| history
	widgets/CoorPosition/nls/es/strings.js	5 ●●●●● diff \| view \| raw \| blame \| history
	widgets/CoorPosition/nls/strings.js	7 ●●●●● diff \| view \| raw \| blame \| history
	widgets/CoorPosition/nls/zh-cn/strings.js	5 ●●●●● diff \| view \| raw \| blame \| history
	widgets/MapPrinting/nls/zh-cn/strings.js	2 ●●●●● diff \| view \| raw \| blame \| history
	widgets/Plot/css/style.css	6 ●●●●● diff \| view \| raw \| blame \| history
	widgets/Rolling/Widget.html	2 ●●●●● diff \| view \| raw \| blame \| history
	widgets/Rolling/Widget.js	2 ●●●●● diff \| view \| raw \| blame \| history
	widgets/RouteNavigate/Widget.html	98 ●●●●● diff \| view \| raw \| blame \| history
	widgets/RouteNavigate/Widget.js	1268 ●●●●● diff \| view \| raw \| blame \| history
	widgets/RouteNavigate/css/style.css	246 ●●●●● diff \| view \| raw \| blame \| history
	widgets/RouteNavigate/manifest.json	17 ●●●●● diff \| view \| raw \| blame \| history
	widgets/RouteNavigate/nls/es/strings.js	5 ●●●●● diff \| view \| raw \| blame \| history
	widgets/RouteNavigate/nls/strings.js	7 ●●●●● diff \| view \| raw \| blame \| history
	widgets/RouteNavigate/nls/zh-cn/strings.js	5 ●●●●● diff \| view \| raw \| blame \| history
	widgets/Screen/css/style.css	4 ●●●●● diff \| view \| raw \| blame \| history
	widgets/Sign/Widget.html	81 ●●●●● diff \| view \| raw \| blame \| history
	widgets/Sign/Widget.js	606 ●●●●● diff \| view \| raw \| blame \| history
	widgets/Sign/css/style.css	335 ●●●●● diff \| view \| raw \| blame \| history
	widgets/Sign/manifest.json	17 ●●●●● diff \| view \| raw \| blame \| history
	widgets/Sign/nls/es/strings.js	5 ●●●●● diff \| view \| raw \| blame \| history
	widgets/Sign/nls/strings.js	7 ●●●●● diff \| view \| raw \| blame \| history
	widgets/Sign/nls/zh-cn/strings.js	5 ●●●●● diff \| view \| raw \| blame \| history
	widgets/Tool/Widget.js	60 ●●●●● diff \| view \| raw \| blame \| history