Skip to content

Commit 5ffd456

Browse files
MyShallowTimeMyShallowTime
committed
Merge branch 'master' of https://github.com/MyShallowTime/iClient-JavaScript into master
2 parents b6fc27a + 27edc03 commit 5ffd456

File tree

17 files changed

+1248
-1388
lines changed

17 files changed

+1248
-1388
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/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.

‎examples/mapboxgl-v2/src/application/App.tsx

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const App = () => {
2020
}, [!!map]);
2121

2222
const onLoadedMap = async (map: any) => {
23-
map.addSymbolLibrary(new (window as any).mapboxgl.supermap.SymbolLibrary("../../libs/resources/symbols"));
23+
(window as any).mapboxgl.supermap.WebSymbol.symbolUrl = "../../libs/resources/symbols";
2424
setMap(map);
2525
}
2626

@@ -47,11 +47,11 @@ const App = () => {
4747
};
4848

4949
const addMVTLayer = (options: {
50-
layerId: string;
50+
layerId: string;
5151
sourceLayer: string;
5252
type: string;
5353
layerType: string;
54-
symbol: any;
54+
symbol: any;
5555
layersInfo: any;
5656
}): void => {
5757
const {layerId, sourceLayer, type, layerType, symbol, layersInfo} = options;
@@ -125,7 +125,7 @@ const App = () => {
125125
layout: {
126126
'text-field': '{NAME}',
127127
'text-size': 20,
128-
'text-font': ['Microsoft YaHei Bold']
128+
'text-font': ['Microsoft YaHei Bold']
129129
}
130130
});
131131
const cityTextSymbol = loadCustomSymbol({
@@ -142,67 +142,67 @@ const App = () => {
142142
});
143143

144144
addMVTLayer({
145-
layerId:'chinaPolygon',
146-
sourceLayer:'China_Province_pg@China',
147-
type:'polygon',
145+
layerId:'chinaPolygon',
146+
sourceLayer:'China_Province_pg@China',
147+
type:'polygon',
148148
layerType: 'fill',
149-
symbol: chinaSymbol,
149+
symbol: chinaSymbol,
150150
layersInfo: newLayersInfo
151151
});
152152
addMVTLayer({
153-
layerId:'riverpolygon',
154-
sourceLayer: 'Main_River_pg@China',
155-
type:'polygon',
153+
layerId:'riverpolygon',
154+
sourceLayer: 'Main_River_pg@China',
155+
type:'polygon',
156156
layerType: 'fill',
157-
symbol: riverPolygonSymbol,
157+
symbol: riverPolygonSymbol,
158158
layersInfo: newLayersInfo
159159
});
160160
addMVTLayer({
161-
layerId:'RiverLine',
162-
sourceLayer: 'Main_River_ln@China',
163-
type:'line',
161+
layerId:'RiverLine',
162+
sourceLayer: 'Main_River_ln@China',
163+
type:'line',
164164
layerType: 'line',
165-
symbol: riverLineSymbol,
165+
symbol: riverLineSymbol,
166166
layersInfo: newLayersInfo
167167
});
168168
addMVTLayer({
169-
layerId:'provinceLine',
170-
sourceLayer: 'China_Province_ln@China',
171-
type:'line',
169+
layerId:'provinceLine',
170+
sourceLayer: 'China_Province_ln@China',
171+
type:'line',
172172
layerType: 'line',
173-
symbol: provinceLineSymbol,
173+
symbol: provinceLineSymbol,
174174
layersInfo: newLayersInfo
175175
});
176176
addMVTLayer({
177-
layerId:'capital',
178-
sourceLayer: 'China_Capital_pt@China',
179-
type:'point',
177+
layerId:'capital',
178+
sourceLayer: 'China_Capital_pt@China',
179+
type:'point',
180180
layerType: 'symbol',
181-
symbol: capitalSymbol,
181+
symbol: capitalSymbol,
182182
layersInfo: newLayersInfo
183183
});
184184
addMVTLayer({
185-
layerId:'city',
186-
sourceLayer: 'China_ProCenCity_pt@China',
187-
type:'point',
185+
layerId:'city',
186+
sourceLayer: 'China_ProCenCity_pt@China',
187+
type:'point',
188188
layerType: 'symbol',
189-
symbol: citySymbol,
189+
symbol: citySymbol,
190190
layersInfo: newLayersInfo
191191
});
192192
addMVTLayer({
193-
layerId:'nationText',
194-
sourceLayer: 'China_Nation_B_pt@China',
195-
type:'text',
193+
layerId:'nationText',
194+
sourceLayer: 'China_Nation_B_pt@China',
195+
type:'text',
196196
layerType: 'symbol',
197-
symbol: nationTextSymbol,
197+
symbol: nationTextSymbol,
198198
layersInfo: newLayersInfo
199199
});
200200
addMVTLayer({
201-
layerId:'cityText',
202-
sourceLayer: 'China_ProCenCity_pt@China',
203-
type:'text',
201+
layerId:'cityText',
202+
sourceLayer: 'China_ProCenCity_pt@China',
203+
type:'text',
204204
layerType: 'symbol',
205-
symbol: cityTextSymbol,
205+
symbol: cityTextSymbol,
206206
layersInfo: newLayersInfo
207207
});
208208
setLayersInfo(newLayersInfo.reverse());

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