Skip to content

Commit 55b4b07

Browse files
qiulinFVqiulinFV
committed
[update]web符号示例优化；添加copyright；
1 parent 7cc3f83 commit 55b4b07

20 files changed

+105
-34
lines changed

‎examples/locales/en-US/resources.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -712,6 +712,15 @@ window.examplesResources = {
712712
"title_object_detection": "Object Detection",
713713
"title_fgb_all": "FGB Full Load",
714714
"title_fgb_extent": "FGB Extent Load",
715+
"title_websymbol_DLG_I49": "DLG_I49",
716+
"title_websymbol_2019ChinaGDP": "2019 China's GDP by Province",
717+
"title_websymbol_editor": "WebSymbol Editor",
718+
"title_websymbol_gallery": "WebSymbol Gallery",
719+
"title_websymbol_YangtzeRiverdelta": "Yangtze River Delta",
720+
"title_websymbol_landuseOfXinjiang": "Land Use of Xinjiang",
721+
"title_websymbol_landuseOfJingjin": "Land Use of Jingjin",
722+
"title_websymbol_landuse": "Land Use",
723+
"title_websymbol_customWebSymbol": "Custom WebSymbol",
715724

716725
"text_district_search": "Administrative region search",
717726
"text_rectangle_search": "Rectangle retrieval",
@@ -1791,7 +1800,7 @@ window.examplesResources = {
17911800
"msg_clickLayerToPopup": 'Please click the layer\'s feature to check properties',
17921801
"msg_addSuccess": "Added successfully!",
17931802
"msg_addFailed": "Added failed!",
1794-
"msg_addWebSymbolFailed": "Added websymbol failed!",
1803+
"msg_addWebSymbolFailed": "Added WebSymbol failed!",
17951804

17961805
"set_style": "",
17971806
"style_width420px": 'width: 500px',

‎examples/locales/zh-CN/resources.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -666,6 +666,15 @@ window.examplesResources = {
666666
"title_object_detection": "目标检测",
667667
"title_fgb_all": "FGB 全量加载",
668668
"title_fgb_extent": "FGB 按需加载",
669+
"title_websymbol_DLG_I49": "数字线划地图",
670+
"title_websymbol_2019ChinaGDP": "2019年中国各省GDP",
671+
"title_websymbol_editor": "Web符号编辑器",
672+
"title_websymbol_gallery": "Web符号库",
673+
"title_websymbol_YangtzeRiverdelta": "长江三角洲",
674+
"title_websymbol_landuseOfXinjiang": "新疆土地利用",
675+
"title_websymbol_landuseOfJingjin": "京津地区土地利用现状图",
676+
"title_websymbol_landuse": "土地利用",
677+
"title_websymbol_customWebSymbol":"自定义Web符号",
669678

670679
"text_district_search": "行政区检索",
671680
"text_rectangle_search": "矩形检索",

‎examples/mapboxgl/websymbol-editor/js/websymbol-editor.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/mapboxgl/websymbol-gallery/js/websymbol-gallery.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/mapboxgl/websymbol_2019ChinaGDP.html

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1+
<!--********************************************************************
2+
* Copyright© 2000 - 2023 SuperMap Software Co.Ltd. All rights reserved.
3+
*********************************************************************-->
14
<!DOCTYPE html>
2-
<html lang="zh">
5+
<html>
36

47
<head>
58
<meta charset="UTF-8">
69
<meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
7-
<title>2019年中国各省GDP</title>
10+
<title data-i18n="resources.title_websymbol_2019ChinaGDP"></title>
811
<style>
912
body {
1013
margin: 0;
@@ -27,7 +30,8 @@
2730
<script type="text/javascript" include="bootstrap,widgets.alert" src="../js/include-web.js"></script>
2831
<script type="text/javascript" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
2932
<script>
30-
var serviceUrl = "https://iserver.supermap.io/iserver/services/map-china400/rest/maps/China";
33+
var host = window.isLocal ? window.server : "https://iserver.supermap.io";
34+
var serviceUrl = host + "/iserver/services/map-china400/rest/maps/China";
3135
var map = new mapboxgl.Map({
3236
container: "map",
3337
style: {

‎examples/mapboxgl/websymbol_DLG_I49.html

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1+
<!--********************************************************************
2+
* Copyright© 2000 - 2023 SuperMap Software Co.Ltd. All rights reserved.
3+
*********************************************************************-->
14
<!DOCTYPE html>
2-
<html lang="zh">
5+
<html>
36

47
<head>
58
<meta charset="UTF-8">
69
<meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
7-
<title>数字线划地图</title>
10+
<title data-i18n="resources.title_websymbol_DLG_I49"></title>
811
<style>
912
body {
1013
margin: 0;
@@ -23,12 +26,12 @@
2326

2427
<body>
2528
<div id="map"></div>
26-
27-
<script type="text/javascript" include="bootstrap,widgets.alert" src="../js/include-web.js"></script>
29+
<script type="text/javascript" include="bootstrap,widgets.alert" src="../js/include-web.js"></script>
2830
<script type="text/javascript" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
2931
<script>
30-
var baseServiceUrl = "https://iserver.supermap.io/iserver/services/map-china400/rest/maps/China";
31-
var serverUrl = "https://iserver.supermap.io/iserver/services/map-DLG_100W/restjsr/v1/vectortile/maps/DLGI49";
32+
var host = window.isLocal ? window.server : "https://iserver.supermap.io";
33+
var baseServiceUrl = host + "/iserver/services/map-china400/rest/maps/China";
34+
var serverUrl = host + "/iserver/services/map-DLG_100W/restjsr/v1/vectortile/maps/DLGI49";
3235
var map = new mapboxgl.Map({
3336
container: "map",
3437
style: {

‎examples/mapboxgl/websymbol_YangtzeRiverdelta.html

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1+
<!--********************************************************************
2+
* Copyright© 2000 - 2023 SuperMap Software Co.Ltd. All rights reserved.
3+
*********************************************************************-->
14
<!DOCTYPE html>
2-
<html lang="zh">
5+
<html>
36

47
<head>
58
<meta charset="UTF-8">
69
<meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
7-
<title>长江三角洲发展结构图</title>
10+
<title data-i18n="resources.title_websymbol_YangtzeRiverdelta"></title>
811
<style>
912
body {
1013
margin: 0;
@@ -26,8 +29,9 @@
2629
<script type="text/javascript" include="bootstrap,widgets.alert" src="../js/include-web.js"></script>
2730
<script type="text/javascript" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
2831
<script>
32+
var host = window.isLocal ? window.server : "https://iserver.supermap.io";
2933
var serverUrl =
30-
"https://iserver.supermap.io/iserver/services/map-YangtzeRiverDelta/restjsr/v1/vectortile/maps/长江三角洲发展结构图";
34+
host + "/iserver/services/map-YangtzeRiverDelta/restjsr/v1/vectortile/maps/长江三角洲发展结构图";
3135
var map = new mapboxgl.Map({
3236
container: "map",
3337
style: {

‎examples/mapboxgl/websymbol_customWebSymbol.html

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1+
<!--********************************************************************
2+
* Copyright© 2000 - 2023 SuperMap Software Co.Ltd. All rights reserved.
3+
*********************************************************************-->
14
<!DOCTYPE html>
2-
<html lang="zh">
5+
<html>
36

47
<head>
58
<meta charset="UTF-8">
69
<meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
7-
<title>自定义符号</title>
10+
<title data-i18n="resources.title_websymbol_customWebSymbol"></title>
811
<style>
912
body {
1013
margin: 0;
@@ -25,10 +28,10 @@
2528
<div id="map"></div>
2629
<script type="text/javascript" include="bootstrap,widgets.alert" src="../js/include-web.js"></script>
2730
<script type="text/javascript" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
28-
2931
<script>
30-
var baseServiceUrl = "https://iserver.supermap.io/iserver/services/map-china400/rest/maps/China";
31-
var serverUrl = "https://iserver.supermap.io/iserver/services/map-Population/rest/maps/PopulationDistribution";
32+
var host = window.isLocal ? window.server : "https://iserver.supermap.io";
33+
var baseServiceUrl = host + "/iserver/services/map-china400/rest/maps/China";
34+
var serverUrl = host + "/iserver/services/map-Population/rest/maps/PopulationDistribution";
3235
var map = new mapboxgl.Map({
3336
container: "map",
3437
style: {

‎examples/mapboxgl/websymbol_editor.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
1+
<!--********************************************************************
2+
* Copyright© 2000 - 2023 SuperMap Software Co.Ltd. All rights reserved.
3+
*********************************************************************-->
14
<!doctype html>
25
<html>
36

47
<head>
58
<meta charset="UTF-8">
69
<meta name="viewport" content="initial-scale=1,user-scalable=no,width=device-width">
7-
<title>Web符号编辑器</title>
10+
<title data-i18n="resources.title_websymbol_editor"></title>
811
<link href="./websymbol-editor/css/websymbol-editor.css" rel="stylesheet">
912
</head>
1013

1114
<body>
1215
<div id="root"></div>
1316
<script type="text/javascript" src="./websymbol-editor/static/fonts/iconfont.js"></script>
17+
<script type="text/javascript" src="../js/include-web.js"></script>
1418
<script type="text/javascript" include="mapbox-gl-enhance" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
1519
<script type="text/javascript" src="./websymbol-editor/js/websymbol-editor.js"></script>
1620
</body>

‎examples/mapboxgl/websymbol_gallery.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1+
<!--********************************************************************
2+
* Copyright© 2000 - 2023 SuperMap Software Co.Ltd. All rights reserved.
3+
*********************************************************************-->
14
<!doctype html>
25
<html>
36

47
<head>
58
<meta charset="UTF-8">
69
<meta name="viewport" content="initial-scale=1,user-scalable=no,width=device-width">
7-
<title>Web符号库</title>
10+
<title data-i18n="resources.title_websymbol_gallery"></title>
811
<link href="./websymbol-gallery/css/websymbol-gallery.css" rel="stylesheet">
912
</head>
1013

1114
<body>
1215
<div id="root"></div>
16+
<script type="text/javascript" src="../js/include-web.js"></script>
1317
<script type="text/javascript" src="./websymbol-gallery/js/websymbol-gallery.js"></script>
1418
</body>
1519

‎examples/mapboxgl/websymbol_landuse.html

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1+
<!--********************************************************************
2+
* Copyright© 2000 - 2023 SuperMap Software Co.Ltd. All rights reserved.
3+
*********************************************************************-->
14
<!DOCTYPE html>
2-
<html lang="zh">
5+
<html>
36

47
<head>
58
<meta charset="UTF-8">
69
<meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
7-
<title>土地利用</title>
10+
<title data-i18n="resources.title_websymbol_landuse"></title>
811
<style>
912
body {
1013
margin: 0;
@@ -23,11 +26,11 @@
2326

2427
<body>
2528
<div id="map"></div>
26-
27-
<script type="text/javascript" include="bootstrap,widgets.alert" src="../js/include-web.js"></script>
29+
<script type="text/javascript" include="bootstrap,widgets.alert" src="../js/include-web.js"></script>
2830
<script type="text/javascript" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
2931
<script>
30-
var serverUrl = "https://iserver.supermap.io/iserver/services/map-mvt-landuse2/rest/maps/landuse";
32+
var host = window.isLocal ? window.server : "https://iserver.supermap.io";
33+
var serverUrl = host + "/iserver/services/map-mvt-landuse2/rest/maps/landuse";
3134
var map = new mapboxgl.Map({
3235
container: "map",
3336
style: {

‎examples/mapboxgl/websymbol_landuseOfJingjin.html

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1+
<!--********************************************************************
2+
* Copyright© 2000 - 2023 SuperMap Software Co.Ltd. All rights reserved.
3+
*********************************************************************-->
14
<!DOCTYPE html>
2-
<html lang="zh">
5+
<html>
36

47
<head>
58
<meta charset="UTF-8">
69
<meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
7-
<title>京津地区土地利用现状图</title>
10+
<title data-i18n="resources.title_websymbol_landuseOfJingjin"></title>
811
<style>
912
body {
1013
margin: 0;
@@ -27,7 +30,8 @@
2730
<script type="text/javascript" include="bootstrap,widgets.alert" src="../js/include-web.js"></script>
2831
<script type="text/javascript" include="mapbox-gl-enhance" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
2932
<script>
30-
var serviceUrl = "https://iserver.supermap.io/iserver/services/map-jingjin/rest/maps/京津地区土地利用现状图";
33+
var host = window.isLocal ? window.server : "https://iserver.supermap.io";
34+
var serviceUrl = host + "/iserver/services/map-jingjin/rest/maps/京津地区土地利用现状图";
3135
var map = new mapboxgl.Map({
3236
container: "map",
3337
style: {

‎examples/mapboxgl/websymbol_landuseOfXinjiang.html

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1+
<!--********************************************************************
2+
* Copyright© 2000 - 2023 SuperMap Software Co.Ltd. All rights reserved.
3+
*********************************************************************-->
14
<!DOCTYPE html>
2-
<html lang="zh">
5+
<html>
36

47
<head>
58
<meta charset="UTF-8">
69
<meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
7-
<title>新疆土地利用类型空间分布图</title>
10+
<title data-i18n="resources.title_websymbol_landuseOfXinjiang"></title>
811
<style>
912
body {
1013
margin: 0;
@@ -23,12 +26,13 @@
2326

2427
<body>
2528
<div id="map"></div>
26-
<script type="text/javascript" include="bootstrap,widgets.alert" src="../js/include-web.js"></script>
29+
<script type="text/javascript" include="bootstrap,widgets.alert" src="../js/include-web.js"></script>
2730
<script type="text/javascript" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
2831
<script>
29-
var baseServiceUrl = "https://iserver.supermap.io/iserver/services/map-china400/rest/maps/China";
32+
var host = window.isLocal ? window.server : "https://iserver.supermap.io";
33+
var baseServiceUrl = host + "/iserver/services/map-china400/rest/maps/China";
3034
var serverUrl =
31-
"https://iserver.supermap.io/iserver/services/map-Xinjiang/restjsr/v1/vectortile/maps/新疆土地利用类型空间分布图";
35+
host + "/iserver/services/map-Xinjiang/restjsr/v1/vectortile/maps/新疆土地利用类型空间分布图";
3236
var map = new mapboxgl.Map({
3337
container: "map",
3438
style: {

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"build-docs-mapboxgl": "rimraf ./docs/mapboxgl && jsdoc -c ./build/jsdocs/mapboxgl/docs.json -R ./build/jsdocs/mapboxgl/index.md",
4848
"build-docs-maplibregl": "rimraf ./docs/maplibregl && jsdoc -c ./build/jsdocs/maplibregl/docs.json -R ./build/jsdocs/maplibregl/index.md",
4949
"build-docs-classic": "rimraf ./docs/classic && jsdoc -c ./build/jsdocs/classic/docs.json -R ./build/jsdocs/classic/index.md",
50-
"pre-publish": "node ./build/publish.js --leaflet && node ./build/publish.js --openlayers && node ./build/publish.js --mapboxgl && node ./build/publish.js --maplibregl && node ./build/publish.js --classic && npm run pre-publish-symbol",
50+
"pre-publish": "node ./build/publish.js --leaflet && node ./build/publish.js --openlayers && node ./build/publish.js --mapboxgl && npm run pre-publish-symbol && node ./build/publish.js --maplibregl && node ./build/publish.js --classic",
5151
"publish": "npm run pre-publish && cd ./src/common && npm publish && cd ../leaflet && npm publish && cd ../openlayers && npm publish && cd ../mapboxgl && npm publish && cd ../maplibregl && npm publish && cd ../classic && npm publish",
5252
"pre-publish-symbol": "copyfiles -u 1 ./dist/resources/** ./src/mapboxgl/ "
5353
},

‎src/mapboxgl/overlay/symbol/CompositeSymbolRender.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/* Copyright© 2000 - 2023 SuperMap Software Co.Ltd. All rights reserved.
2+
* This program are made available under the terms of the Apache License, Version 2.0
3+
* which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
14
import { Util } from "@supermap/iclient-common/commontypes/Util";
25
import SingleSymbolRender from "./SingleSymbolRender";
36

‎src/mapboxgl/overlay/symbol/SingleSymbolRender.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/* Copyright© 2000 - 2023 SuperMap Software Co.Ltd. All rights reserved.
2+
* This program are made available under the terms of the Apache License, Version 2.0
3+
* which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
14
/**
25
* 单个符号
36
* @returns {Object}

‎src/mapboxgl/overlay/symbol/SymbolHandler.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/* Copyright© 2000 - 2023 SuperMap Software Co.Ltd. All rights reserved.
2+
* This program are made available under the terms of the Apache License, Version 2.0
3+
* which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
14
import { Util } from "@supermap/iclient-common/commontypes/Util";
25
import CompositeSymbolRender from "./CompositeSymbolRender";
36
import SingleSymbolRender from "./SingleSymbolRender";

‎src/mapboxgl/overlay/symbol/SymbolManager.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/* Copyright© 2000 - 2023 SuperMap Software Co.Ltd. All rights reserved.
2+
* This program are made available under the terms of the Apache License, Version 2.0
3+
* which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
14
class SymbolManager {
25
symbols;// addSymbol接口添加的symbol信息
36
images; // 在loadImage的时候存下image

‎src/mapboxgl/overlay/symbol/SymbolUtil.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/* Copyright© 2000 - 2023 SuperMap Software Co.Ltd. All rights reserved.
2+
* This program are made available under the terms of the Apache License, Version 2.0
3+
* which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
14
const LayerType = {
25
circle: 'circle',
36
symbol: 'symbol',

‎src/mapboxgl/overlay/symbol/WebSymbol.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/* Copyright© 2000 - 2023 SuperMap Software Co.Ltd. All rights reserved.
2+
* This program are made available under the terms of the Apache License, Version 2.0
3+
* which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
14
import mapboxgl from "mapbox-gl";
25
import './MapExtendSymbol';
36
/**

0 commit comments

Comments
 (0)