Skip to content

Commit 5f4deb2

Browse files
songyumengsongyumeng
committed
优化英文例子侧边栏 优化openlayers例子的引用
1 parent ef752ea commit 5f4deb2

File tree

10 files changed

+154
-167
lines changed

10 files changed

+154
-167
lines changed

‎build/server.js

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,32 @@ const serveIndex = require('serve-index')
66

77
const webpack = require('webpack');
88
const webpackDevMiddleware = require('webpack-dev-middleware');
9-
const product = process.argv[2] || 'leaflet';
10-
const config = require(`./webpack.config.${product}.js`);
11-
const entry = [`./src/${product}/index.js`];
12-
if (['leaflet', 'openlayers'].includes(product)) {
13-
entry.push(`./src/${product}/css/index.js`);
14-
}
15-
config.mode = 'development';
16-
config.entry = entry;
17-
config.output.filename = product === 'classic' ? `iclient-classic-es6.js` : `iclient9-${product}-es6.js`
18-
config.devtool = 'cheap-module-eval-source-map';
19-
20-
21-
const compiler = webpack(config);
9+
const product = process.argv[2];
2210
const app = module.exports = express();
23-
const instance = webpackDevMiddleware(compiler, {
24-
publicPath: `/dist/${product}`,
25-
stats: {
26-
colors: true
11+
if (product) {
12+
const config = require(`./webpack.config.${product}.js`);
13+
const entry = [`./src/${product}/index.js`];
14+
if (['leaflet', 'openlayers'].includes(product)) {
15+
entry.push(`./src/${product}/css/index.js`);
2716
}
28-
});
29-
app.use(instance);
17+
config.mode = 'development';
18+
config.entry = entry;
19+
config.output.filename = product === 'classic' ? `iclient-classic-es6.js` : `iclient9-${product}-es6.js`
20+
config.devtool = 'cheap-module-eval-source-map';
21+
22+
23+
const compiler = webpack(config);
24+
const instance = webpackDevMiddleware(compiler, {
25+
publicPath: `/dist/${product}`,
26+
stats: {
27+
colors: true
28+
}
29+
});
30+
app.use(instance);
31+
instance.waitUntilValid(() => {
32+
open(`http://localhost:9999/examples/${product}`);
33+
});
34+
}
3035

3136
const server = app.listen(9999, () => {
3237
const host = server.address().address;
@@ -49,6 +54,6 @@ app.use("/en/docs", express.static('docs'), serveIndex('docs'));
4954
app.use("/en/dist", express.static('dist'), serveIndex('dist'));
5055
app.use("/en/build", express.static('build'), serveIndex('build'));
5156
app.use("/en", express.static('web/en'), serveIndex('web/en'));
52-
instance.waitUntilValid(() => {
53-
open(`http://localhost:9999/examples/${product}`);
54-
});
57+
if (!product) {
58+
open(`http://localhost:9999/examples/leaflet`);
59+
}

‎dist/openlayers/include-openlayers.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,14 @@
4949
function load() {
5050
var includes = (targetScript.getAttribute('include') || "").split(",");
5151
var excludes = (targetScript.getAttribute('exclude') || "").split(",");
52-
if (!inArray(excludes, 'ol')) {
52+
if (!inArray(excludes, 'ol') && !inArray(includes, 'ol-debug')) {
5353
inputCSS("https://cdn.bootcss.com/openlayers/4.6.5/ol.css");
5454
inputScript("https://cdn.bootcss.com/openlayers/4.6.5/ol.js");
5555
}
56+
if (inArray(includes, 'ol-debug')) {
57+
inputCSS("https://cdn.bootcss.com/openlayers/4.6.5/ol-debug.css");
58+
inputScript("https://cdn.bootcss.com/openlayers/4.6.5/ol-debug.js");
59+
}
5660
if (inArray(includes, 'mapv')) {
5761
inputScript("http://mapv.baidu.com/build/mapv.min.js");
5862
}

‎examples/classic/config.js

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ var identification = {
99
var exampleConfig = {
1010
"map": {
1111
name: "地图",
12-
name_en: "map",
12+
name_en: "Map",
1313
content: {
1414
"SuperMapLayer": {
1515
name: "SuperMap地图",
@@ -56,7 +56,7 @@ var exampleConfig = {
5656
},
5757
"thirdParty": {
5858
name: "第三方地图",
59-
name_en: "third party map",
59+
name_en: "Third party map",
6060
content: [{
6161
name: "天地图",
6262
name_en: "tianditu layer",
@@ -91,7 +91,7 @@ var exampleConfig = {
9191
},
9292
"operation": {
9393
name: "地图操作",
94-
name_en: "map operation",
94+
name_en: "Map operation",
9595
content: [{
9696
name: "缩放与平移",
9797
name_en: "translation",
@@ -128,11 +128,11 @@ var exampleConfig = {
128128
},
129129
"overlay": {
130130
name: "覆盖物",
131-
name_en: "overlay",
131+
name_en: "Overlay",
132132
content: {
133133
"vectorLayer": {
134134
name: "矢量图层",
135-
name_en: "vector_layer",
135+
name_en: "Vector_layer",
136136
content: [{
137137
name: "矢量图形数据",
138138
name_en: "vector layer data",
@@ -187,7 +187,7 @@ var exampleConfig = {
187187
},
188188
"markerLayer": {
189189
name: "标记图层",
190-
name_en: "marker layer",
190+
name_en: "Marker layer",
191191
content: [{
192192
name: "标记图层",
193193
name_en: "marker layer",
@@ -199,17 +199,17 @@ var exampleConfig = {
199199
thumbnail: "overlay_markerLayerEvent.png",
200200
fileName: "overlay_markerLayerEvent"
201201
}]
202-
},
202+
}
203203

204204
}
205205
},
206206
"control": {
207207
name: "控件",
208-
name_en: "control",
208+
name_en: "Control",
209209
content: {
210210
"mapControl": {
211211
name: "地图类控件",
212-
name_en: "map control",
212+
name_en: "Map control",
213213
content: [{
214214
name: "缩放控件",
215215
name_en: "zoom control",
@@ -269,7 +269,7 @@ var exampleConfig = {
269269
},
270270
"featureControl": {
271271
name: "要素类控件",
272-
name_en: "feature control",
272+
name_en: "Feature control",
273273
content: [{
274274
name: "点线面绘制",
275275
name_en: "draw control",
@@ -301,11 +301,11 @@ var exampleConfig = {
301301
},
302302
"popup": {
303303
name: "信息框",
304-
name_en: "popup",
304+
name_en: "Popup",
305305
content: {
306306
"infoBox": {
307307
name: "信息框",
308-
name_en: "popup",
308+
name_en: "Popup",
309309
content: [{
310310
name: "简易信息框",
311311
name_en: "simple popup",
@@ -338,11 +338,11 @@ var exampleConfig = {
338338
},
339339
"query": {
340340
name: "查询",
341-
name_en: "query",
341+
name_en: "Query",
342342
content: {
343343
"mapQuery": {
344344
name: "地图查询",
345-
name_en: "map query",
345+
name_en: "Map query",
346346
content: [{
347347
name: "地图范围查询",
348348
name_en: "bounds query",
@@ -372,7 +372,7 @@ var exampleConfig = {
372372
},
373373
"datasetQuery": {
374374
name: "数据集查询",
375-
name_en: "data query",
375+
name_en: "Data query",
376376
content: [{
377377
name: "ID 查询",
378378
name_en: "ID query",
@@ -420,11 +420,11 @@ var exampleConfig = {
420420
},
421421
"theme": {
422422
name: "专题图",
423-
name_en: "thematic map",
423+
name_en: "Thematic map",
424424
content: {
425425
"serviceTheme": {
426426
name: "服务器专题图",
427-
name_en: "server thematic map",
427+
name_en: "Server thematic map",
428428
content: [{
429429
name: "点密度专题图",
430430
name_en: "dot density",
@@ -469,7 +469,7 @@ var exampleConfig = {
469469
},
470470
"clientTheme": {
471471
name: "客户端专题图",
472-
name_en: "client thematic layer",
472+
name_en: "Client thematic layer",
473473
content: [{
474474
name: "标签专题图层",
475475
name_en: "label ",
@@ -542,11 +542,11 @@ var exampleConfig = {
542542

543543
"analysis": {
544544
name: "分析",
545-
name_en: "analysis",
545+
name_en: "Analysis",
546546
content: {
547547
"spatialAnalyst": {
548548
name: "空间分析",
549-
name_en: "spatial analysis",
549+
name_en: "Spatial analysis",
550550
content: [{
551551
name: "缓冲区分析一",
552552
name_en: "buffer analysis (1)",
@@ -632,7 +632,7 @@ var exampleConfig = {
632632
},
633633
"networkAnalyst": {
634634
name: "网络分析",
635-
name_en: "network analysis",
635+
name_en: "Network analysis",
636636
content: [{
637637
name: "最近设施分析",
638638
name_en: "closest facilities",
@@ -673,7 +673,7 @@ var exampleConfig = {
673673
},
674674
"trafficTransferAnalyst": {
675675
name: "交通换乘",
676-
name_en: "traffic transfer analysis",
676+
name_en: "Traffic transfer analysis",
677677
content: [{
678678
name: "公交换乘服务",
679679
name_en: "traffic transfer",
@@ -683,7 +683,7 @@ var exampleConfig = {
683683
},
684684
"processingService": {
685685
name: "分布式分析",
686-
name_en: "distributed analysis services",
686+
name_en: "Distributed analysis services",
687687
content: [{
688688
name: "密度分析",
689689
name_en: "density",
@@ -733,7 +733,7 @@ var exampleConfig = {
733733
},
734734
"addressMatch": {
735735
name: "地址匹配",
736-
name_en: "address matching service",
736+
name_en: "Address matching service",
737737
content: [{
738738
name: "地址匹配",
739739
name_en: "address match",
@@ -746,11 +746,11 @@ var exampleConfig = {
746746
},
747747
"viz": {
748748
name: "可视化",
749-
name_en: "visualization",
749+
name_en: "Visualization",
750750
content: {
751751
"vizLayer": {
752752
name: "可视化图层",
753-
name_en: "visualization layer",
753+
name_en: "Visualization layer",
754754
content: [{
755755
name: "热点图",
756756
name_en: "heat map",
@@ -805,7 +805,7 @@ var exampleConfig = {
805805
},
806806
"animation": {
807807
name: "时空数据",
808-
name_en: "animation",
808+
name_en: "Animation",
809809
content: [{
810810
name: "基础渲染",
811811
name_en: "basic animation",
@@ -860,7 +860,7 @@ var exampleConfig = {
860860
},
861861
"vectorBlock": {
862862
name: "矢量分块",
863-
name_en: "carto CSS",
863+
name_en: "Carto CSS",
864864
content: [{
865865
name: "矢量分块图",
866866
name_en: "carto CSS vector tile layer",
@@ -947,7 +947,7 @@ var exampleConfig = {
947947
content: {
948948
"mapService": {
949949
name: "地图服务",
950-
name_en: "map service",
950+
name_en: "Map service",
951951
content: [{
952952
name: "WMTS图层",
953953
name_en: "WMTS layer",
@@ -967,7 +967,7 @@ var exampleConfig = {
967967
},
968968
"dataService": {
969969
name: "数据服务",
970-
name_en: "data service",
970+
name_en: "Data service",
971971
content: [{
972972
name: "kml",
973973
name_en: "kml",
@@ -989,11 +989,11 @@ var exampleConfig = {
989989
},
990990
"plot": {
991991
name: "动态标绘",
992-
name_en: "plot",
992+
name_en: "Plot",
993993
content: {
994994
"basic": {
995995
name: "标绘",
996-
name_en: "basic",
996+
name_en: "Basic",
997997
content: [{
998998
name: "动态标绘",
999999
name_en: "dynamic plot",
@@ -1054,7 +1054,7 @@ var exampleConfig = {
10541054
},
10551055
"trendMap": {
10561056
name: "态势图",
1057-
name_en: "trend plot",
1057+
name_en: "Trend plot",
10581058
content: [{
10591059
name: "保存和加载",
10601060
name_en: "save and load",
@@ -1074,7 +1074,7 @@ var exampleConfig = {
10741074
},
10751075
"other": {
10761076
name: "其他",
1077-
name_en: "others",
1077+
name_en: "Others",
10781078
content: [{
10791079
name: "几何查询",
10801080
name_en: "symbol geometry query",
@@ -1111,11 +1111,11 @@ var exampleConfig = {
11111111
},
11121112
"others": {
11131113
name: "其它",
1114-
name_en: "others",
1114+
name_en: "Others",
11151115
content: {
11161116
"otherFeatures": {
11171117
name: "其它功能",
1118-
name_en: "other features",
1118+
name_en: "Other features",
11191119
content: [{
11201120
name: "地图打印",
11211121
name_en: "map print",
@@ -1175,7 +1175,7 @@ var exampleConfig = {
11751175
},
11761176
"othersShows": {
11771177
name: "其它展示",
1178-
name_en: "others shows",
1178+
name_en: "Others shows",
11791179
content: [{
11801180
name: "WebGL Globe数据展示",
11811181
name_en: "WebGL Globe",

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy