Skip to content

Commit 3632152

Browse files
Merge branch 'master' of github.com:MyShallowTime/iClient-JavaScript
# Conflicts: # examples/mapboxgl-v2/src/application/App.tsx
2 parents 1d2841c + 27edc03 commit 3632152

File tree

576 files changed

+1769
-1899
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

576 files changed

+1769
-1899
lines changed

dist/mapboxgl/iclient-mapboxgl-es6.js

Lines changed: 83 additions & 93 deletions
Large diffs are not rendered by default.

dist/mapboxgl/iclient-mapboxgl-es6.min.js

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

dist/mapboxgl/iclient-mapboxgl.js

Lines changed: 123 additions & 180 deletions
Large diffs are not rendered by default.

dist/mapboxgl/iclient-mapboxgl.min.js

Lines changed: 428 additions & 427 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/mapboxgl-v2/docs/modules/icon-card/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const IconCard = (props: IconCardContentProps) => {
3737
}}>
3838
<div className={classNames('img-content', { 'line-img-content': type === 'line' })}>
3939
{imgUrl ?
40-
<img src={imgUrl} /> :
40+
<div style={{backgroundImage: `url(${imgUrl})`}}></div> :
4141
<div style={{ background: color }} />}
4242
</div>
4343
<div className='img-title' title={title}>

examples/mapboxgl-v2/docs/modules/icon-card/style/index.less

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,18 @@
2626
margin: 0 auto;
2727
}
2828
div {
29-
width: 65%;
30-
height: 85%;
31-
margin: 0 auto;
29+
width: 100%;
30+
height: 100%;
31+
background-position:center;
32+
background-size: contain;
33+
background-repeat: no-repeat;
34+
3235
}
3336
&.line-img-content {
34-
img {
35-
width: 100%;
36-
height: auto;
37-
margin: 0 auto;
37+
div {
38+
background-repeat: repeat-x;
39+
background-position:center;
40+
transform: rotateX(180deg);
3841
}
3942
}
4043
}

examples/mapboxgl-v2/example/DLG.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
}
140140

141141
map.on('load', async () => {
142-
map.addSymbolLibrary(new mapboxgl.supermap.SymbolLibrary("../libs/resources/symbols"));
142+
window.mapboxgl.supermap.WebSymbol.symbolUrl = "../libs/resources/symbols";
143143
await loadSymbol("line-63020004");
144144
createBOULLayer(630200, "line-63020004");
145145
await loadSymbol("line-64020004");
@@ -156,4 +156,4 @@
156156
</script>
157157
</body>
158158

159-
</html>
159+
</html>

examples/mapboxgl-v2/example/landUse.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,12 +143,12 @@
143143
}
144144

145145
map.on('load', async () => {
146-
map.addSymbolLibrary(new mapboxgl.supermap.SymbolLibrary("../libs/resources/symbols"));
146+
window.mapboxgl.supermap.WebSymbol.symbolUrl = "../libs/resources/symbols";
147147
await loadSymbols();
148148
createPolygonLayer();
149149
createLineLayer();
150150
})
151151
</script>
152152
</body>
153153

154-
</html>
154+
</html>

examples/mapboxgl-v2/example/xinjiangLanduseByVector.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,12 @@
131131
}
132132

133133
map.on('load', async () => {
134-
map.addSymbolLibrary(new mapboxgl.supermap.SymbolLibrary("../libs/resources/symbols"));
134+
window.mapboxgl.supermap.WebSymbol.symbolUrl = "../libs/resources/symbols";
135135
await loadSymbols();
136136
createLandUseLayer();
137137
createWaterLayer();
138138
})
139139
</script>
140140
</body>
141141

142-
</html>
142+
</html>

examples/mapboxgl-v2/example/yangtzeRiverDelta.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@
225225
}
226226

227227
map.on('load', async () => {
228-
map.addSymbolLibrary(new mapboxgl.supermap.SymbolLibrary("../libs/resources/symbols"));
228+
window.mapboxgl.supermap.WebSymbol.symbolUrl = "../libs/resources/symbols";
229229
window.map = map;
230230
await loadSymbols();
231231
createPolygonLayer("Frame", "polygon-955463");
@@ -249,4 +249,4 @@
249249
</script>
250250
</body>
251251

252-
</html>
252+
</html>

examples/mapboxgl-v2/libs/mapboxgl/iclient-mapboxgl.js

Lines changed: 123 additions & 180 deletions
Large diffs are not rendered by default.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-21010301"}}
1+
{"paint":{"line-pattern":"line-21010301","line-width":7}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-21010403"}}
1+
{"paint":{"line-pattern":"line-21010403","line-width":3}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-21010404"}}
1+
{"paint":{"line-pattern":"line-21010404","line-width":3}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-22010005"}}
1+
{"paint":{"line-pattern":"line-22010005","line-width":2}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-22030201"}}
1+
{"paint":{"line-pattern":"line-22030201","line-width":11}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-22030202"}}
1+
{"paint":{"line-pattern":"line-22030202","line-width":11}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-22040003"}}
1+
{"paint":{"line-pattern":"line-22040003","line-width":3}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-22040004"}}
1+
{"paint":{"line-pattern":"line-22040004","line-width":3}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-22050002"}}
1+
{"paint":{"line-pattern":"line-22050002","line-width":9}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-22060001"}}
1+
{"paint":{"line-pattern":"line-22060001","line-width":5}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-22060002"}}
1+
{"paint":{"line-pattern":"line-22060002","line-width":5}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-22060003"}}
1+
{"paint":{"line-pattern":"line-22060003","line-width":5}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-22060004"}}
1+
{"paint":{"line-pattern":"line-22060004","line-width":5}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-22070002"}}
1+
{"paint":{"line-pattern":"line-22070002","line-width":5}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-22070003"}}
1+
{"paint":{"line-pattern":"line-22070003","line-width":5}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-22070004"}}
1+
{"paint":{"line-pattern":"line-22070004","line-width":5}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-22080002"}}
1+
{"paint":{"line-pattern":"line-22080002","line-width":5}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-22080003"}}
1+
{"paint":{"line-pattern":"line-22080003","line-width":5}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-22090001"}}
1+
{"paint":{"line-pattern":"line-22090001","line-width":4}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-22090002"}}
1+
{"paint":{"line-pattern":"line-22090002","line-width":3}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-22090003"}}
1+
{"paint":{"line-pattern":"line-22090003","line-width":1}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-22100001"}}
1+
{"paint":{"line-pattern":"line-22100001","line-width":5}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-22100003"}}
1+
{"paint":{"line-pattern":"line-22100003","line-width":3}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-24020001"}}
1+
{"paint":{"line-pattern":"line-24020001","line-width":2}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-24020003"}}
1+
{"paint":{"line-pattern":"line-24020003","line-width":3}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-24020014"}}
1+
{"paint":{"line-pattern":"line-24020014","line-width":5}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-24020024"}}
1+
{"paint":{"line-pattern":"line-24020024","line-width":9}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-24030001"}}
1+
{"paint":{"line-pattern":"line-24030001","line-width":3}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-25030001"}}
1+
{"paint":{"line-pattern":"line-25030001","line-width":3}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-25030002"}}
1+
{"paint":{"line-pattern":"line-25030002","line-width":3}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-25030003"}}
1+
{"paint":{"line-pattern":"line-25030003","line-width":3}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-25030004"}}
1+
{"paint":{"line-pattern":"line-25030004","line-width":3}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-25040301"}}
1+
{"paint":{"line-pattern":"line-25040301","line-width":7}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-25040302"}}
1+
{"paint":{"line-pattern":"line-25040302","line-width":7}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-25040303"}}
1+
{"paint":{"line-pattern":"line-25040303","line-width":7}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-25040304"}}
1+
{"paint":{"line-pattern":"line-25040304","line-width":7}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-25040401"}}
1+
{"paint":{"line-pattern":"line-25040401","line-width":8}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-25040402"}}
1+
{"paint":{"line-pattern":"line-25040402","line-width":8}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-25040403"}}
1+
{"paint":{"line-pattern":"line-25040403","line-width":8}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-25040404"}}
1+
{"paint":{"line-pattern":"line-25040404","line-width":3}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-25040903"}}
1+
{"paint":{"line-pattern":"line-25040903","line-width":4}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-25040904"}}
1+
{"paint":{"line-pattern":"line-25040904","line-width":5}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-25060204"}}
1+
{"paint":{"line-pattern":"line-25060204","line-width":7}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-25060304"}}
1+
{"paint":{"line-pattern":"line-25060304","line-width":7}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-26060004"}}
1+
{"paint":{"line-pattern":"line-26060004","line-width":9}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-26100001"}}
1+
{"paint":{"line-pattern":"line-26100001","line-width":11}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-26110001"}}
1+
{"paint":{"line-pattern":"line-26110001","line-width":4}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-26110003"}}
1+
{"paint":{"line-pattern":"line-26110003","line-width":4}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-26130414"}}
1+
{"paint":{"line-pattern":"line-26130414","line-width":10}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-26130424"}}
1+
{"paint":{"line-pattern":"line-26130424","line-width":10}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-27010101"}}
1+
{"paint":{"line-pattern":"line-27010101","line-width":7}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-27010102"}}
1+
{"paint":{"line-pattern":"line-27010102","line-width":7}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-27010103"}}
1+
{"paint":{"line-pattern":"line-27010103","line-width":2}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-27010105"}}
1+
{"paint":{"line-pattern":"line-27010105","line-width":5}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-27010106"}}
1+
{"paint":{"line-pattern":"line-27010106","line-width":5}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-27010114"}}
1+
{"paint":{"line-pattern":"line-27010114","line-width":5}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-27010124"}}
1+
{"paint":{"line-pattern":"line-27010124","line-width":5}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-27010134"}}
1+
{"paint":{"line-pattern":"line-27010134","line-width":5}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-27010144"}}
1+
{"paint":{"line-pattern":"line-27010144","line-width":5}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"paint":{"line-pattern":"line-27010201"}}
1+
{"paint":{"line-pattern":"line-27010201","line-width":5}}

0 commit comments

Comments
 (0)