Skip to content

Commit 819bd94

Browse files
zhurczhurc
committed
leaflet公开接口统一命名空间 & 更改链接icltest->iclient
1 parent 101d218 commit 819bd94

File tree

65 files changed

+140
-138
lines changed

Some content is hidden

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

65 files changed

+140
-138
lines changed

‎dist/iclient9-leaflet.js‎

Lines changed: 45 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -6650,7 +6650,7 @@ L.supermap.VectorTileFormat = {
66506650

66516651
__webpack_require__(6);
66526652
var L = __webpack_require__(1);
6653-
L.TileLayer.WMTS = L.TileLayer.extend({
6653+
var WMTSLayer = L.TileLayer.extend({
66546654
options: {
66556655
version: '1.0.0',
66566656
style: '',
@@ -6659,7 +6659,7 @@ L.TileLayer.WMTS = L.TileLayer.extend({
66596659
tileSize: 256,
66606660
matrixIds: null,
66616661
layer: '',
6662-
attribution: 'with <a href="http://icltest.supermapol.com/">SuperMap iClient</a>'
6662+
attribution: 'with <a href="http://iclient.supermapol.com/">SuperMap iClient</a>'
66636663
},
66646664
//todo 自动获取Capabilities
66656665
initialize: function (url, options) { // (String, Object)
@@ -6688,10 +6688,10 @@ L.TileLayer.WMTS = L.TileLayer.extend({
66886688
}
66896689
});
66906690

6691-
L.tileLayer.wmts = function (url, options) {
6692-
return new L.TileLayer.WMTS(url, options);
6691+
L.supermap.wmtsLayer = function (url, options) {
6692+
return new WMTSLayer(url, options);
66936693
};
6694-
module.exports = L.TileLayer.WMTS;
6694+
module.exports = WMTSLayer;
66956695

66966696
/***/ }),
66976697
/* 57 */
@@ -11191,7 +11191,7 @@ var GeoFeatureThemeLayer = ThemeLayer.extend({
1119111191
if (hoverone && hoverone.refDataID) {
1119211192
hoverFid = hoverone.refDataID;
1119311193
}
11194-
bounds = L.CommontypesConversion.toSuperMapBounds(bounds);
11194+
bounds = L.supermap.CommontypesConversion.toSuperMapBounds(bounds);
1119511195
//清除当前所有可视元素
1119611196
me.renderer.clearAll();
1119711197

@@ -11423,7 +11423,7 @@ var ThemeLayer = L.Layer.extend({
1142311423
// {Array} 专题要素事件临时存储，临时保存图层未添加到 map 前用户添加的事件监听，待图层添加到 map 后把这些事件监听添加到图层上，清空此图层。
1142411424
//这是一个二维数组，组成二维数组的每个一维数组长度为 2，分别是 event, callback。
1142511425
TFEvents: null,
11426-
attribution: 'Map Data <a href="http://support.supermap.com.cn/product/iServer.aspx">SuperMap iServer</a> with <a href="http://icltest.supermapol.com/">SuperMap iClient</a>'
11426+
attribution: 'Map Data <a href="http://support.supermap.com.cn/product/iServer.aspx">SuperMap iServer</a> with <a href="http://iclient.supermapol.com/">SuperMap iClient</a>'
1142711427
},
1142811428

1142911429
initialize: function (name, options) {
@@ -11874,7 +11874,7 @@ L.Canvas.Renderer = L.Canvas.extend({
1187411874
}
1187511875
});
1187611876

11877-
L.canvas.renderer = function (tileCoord, tileSize, opts) {
11877+
L.supermap.canvasRenderer = function (tileCoord, tileSize, opts) {
1187811878
return new L.Canvas.Renderer(tileCoord, tileSize, opts);
1187911879
};
1188011880
module.exports = L.Canvas.Renderer;
@@ -11971,7 +11971,7 @@ L.SVG.Renderer = L.SVG.extend({
1197111971
}
1197211972
});
1197311973

11974-
L.svg.renderer = function (tileCoord, tileSize, opts) {
11974+
L.supermap.svgRenderer = function (tileCoord, tileSize, opts) {
1197511975
return new L.SVG.Renderer(tileCoord, tileSize, opts);
1197611976
};
1197711977
module.exports = L.SVG.Renderer;
@@ -12875,7 +12875,7 @@ var BaiduTileLayer = L.TileLayer.extend({
1287512875
maxZoom: 19,
1287612876
bounds: L.latLngBounds(L.latLng(-85.0511287798, -180), L.latLng(85.0511287798, 180)),
1287712877
retina: L.Browser.retina,
12878-
attribution: 'Map Data © 2017 Baidu - GS(2016)2089号 - Data © 长地万方 with <a href="http://icltest.supermapol.com/">SuperMap iClient</a>'
12878+
attribution: 'Map Data © 2017 Baidu - GS(2016)2089号 - Data © 长地万方 with <a href="http://iclient.supermapol.com/">SuperMap iClient</a>'
1287912879
},
1288012880
initialize: function (url, options) {
1288112881
if (url) {
@@ -12925,7 +12925,7 @@ var CloudTileLayer = L.TileLayer.extend({
1292512925
type: "web",
1292612926
minZoom: 3,
1292712927
maxZoom: 18,
12928-
attribution: 'Map Data ©2013 SuperMap - GS(2011)6014号-data©Navinfo with <a href="http://icltest.supermapol.com/">SuperMap iClient</a>'
12928+
attribution: 'Map Data ©2013 SuperMap - GS(2011)6014号-data©Navinfo with <a href="http://iclient.supermapol.com/">SuperMap iClient</a>'
1292912929

1293012930
},
1293112931
initialize: function (url, options) {
@@ -12957,7 +12957,7 @@ var TiandituTileLayer = WMTS.extend({
1295712957
tilematrixSet: "w",
1295812958
format: "tiles",
1295912959
subdomains: [0, 1, 2, 3, 4, 5, 6, 7],
12960-
attribution: 'Map Data <a href="http://www.tianditu.com"><img style="background-color:transparent;bottom:2px;opacity:1;" src="http://api.tianditu.com/img/map/logo.png" width="53px" height="22px" opacity="0"></a> with <a href="http://icltest.supermapol.com/">SuperMap iClient</a>'
12960+
attribution: 'Map Data <a href="http://www.tianditu.com"><img style="background-color:transparent;bottom:2px;opacity:1;" src="http://api.tianditu.com/img/map/logo.png" width="53px" height="22px" opacity="0"></a> with <a href="http://iclient.supermapol.com/">SuperMap iClient</a>'
1296112961

1296212962

1296312963
},
@@ -13011,7 +13011,7 @@ var TiledMapLayer = L.TileLayer.extend({
1301113011
crs: null,
1301213012
serverType: SuperMap.ServerType.ISERVER,
1301313013

13014-
attribution: 'Map Data <a href="http://support.supermap.com.cn/product/iServer.aspx">SuperMap iServer</a> with <a href="http://icltest.supermapol.com/">SuperMap iClient</a>'
13014+
attribution: 'Map Data <a href="http://support.supermap.com.cn/product/iServer.aspx">SuperMap iServer</a> with <a href="http://iclient.supermapol.com/">SuperMap iClient</a>'
1301513015
},
1301613016

1301713017
initialize: function (url, options) {
@@ -13199,7 +13199,7 @@ var WebMap = L.LayerGroup.extend({
1319913199
featureLayerPopup: null,
1320013200
credentialValue: null,
1320113201
credentialKey: 'key',
13202-
attribution: 'Map Data <a href="http://www.supermapol.com">SuperMap Online</a> with <a href="http://icltest.supermapol.com/">SuperMap iClient</a>'
13202+
attribution: 'Map Data <a href="http://www.supermapol.com">SuperMap Online</a> with <a href="http://iclient.supermapol.com/">SuperMap iClient</a>'
1320313203
},
1320413204
defaultFeatureLayerPopup: function (layer) {
1320513205
return layer.feature.properties.attributes.title + ":" + layer.feature.properties.attributes.description;
@@ -13383,7 +13383,7 @@ var WebMap = L.LayerGroup.extend({
1338313383
mapOptions.resolutions = this.getResolutionsFromScales(scales, 90.71446714322, layerInfo.units);
1338413384
var identifier = layerInfo.identifier;
1338513385
var layerName = identifier.substring(identifier.indexOf("_") + 1);
13386-
layer = L.tileLayer.wmts(layerInfo.url,
13386+
layer = L.supermap.wmtsLayer(layerInfo.url,
1338713387
{
1338813388
layer: layerName,
1338913389
style: "default",
@@ -13580,15 +13580,15 @@ try {
1358013580
}
1358113581
var EchartsMapLayer = L.Layer.extend({
1358213582
options: {
13583-
attribution: '© 2017 百度 ECharts with <a href="http://icltest.supermapol.com/">SuperMap iClient</a>'
13583+
attribution: '© 2017 百度 ECharts with <a href="http://iclient.supermapol.com/">SuperMap iClient</a>'
1358413584
},
1358513585
includes: [],
1358613586
_echartsContainer: null,
1358713587
_map: null,
1358813588
_ec: null,
1358913589
_ecOption: null,
1359013590

13591-
initialize: function (echartsOptions,options) {
13591+
initialize: function (echartsOptions, options) {
1359213592
this._ecOption = echartsOptions;
1359313593
L.Util.setOptions(this, options);
1359413594
},
@@ -13745,8 +13745,8 @@ Geo.prototype = {
1374513745
}
1374613746
};
1374713747

13748-
L.echartsMapLayer = function (echartsOptions,options) {
13749-
return new EchartsMapLayer(echartsOptions,options);
13748+
L.supermap.echartsMapLayer = function (echartsOptions, options) {
13749+
return new EchartsMapLayer(echartsOptions, options);
1375013750
};
1375113751
module.exports = EchartsMapLayer;
1375213752

@@ -13760,7 +13760,7 @@ __webpack_require__(6);
1376013760
__webpack_require__(374);
1376113761
__webpack_require__(375);
1376213762
var L = __webpack_require__(1);
13763-
L.supermap.GraphicGroup = L.Path.extend({
13763+
var GraphicGroup = L.Path.extend({
1376413764

1376513765
initialize: function (graphics, options) {
1376613766
options = options || {};
@@ -13854,10 +13854,10 @@ L.Canvas.include({
1385413854
});
1385513855

1385613856
L.supermap.graphicGroup = function (graphics, options) {
13857-
return new L.supermap.GraphicGroup(graphics, options);
13857+
return new GraphicGroup(graphics, options);
1385813858
};
1385913859

13860-
module.exports = L.supermap.GraphicGroup;
13860+
module.exports = GraphicGroup;
1386113861

1386213862
/***/ }),
1386313863
/* 101 */
@@ -13872,7 +13872,7 @@ var MapVRenderer = __webpack_require__(121);
1387213872
var MapVLayer = L.Layer.extend({
1387313873

1387413874
options: {
13875-
attribution: '© 2017 百度 MapV with <a href="http://icltest.supermapol.com/">SuperMap iClient</a>'
13875+
attribution: '© 2017 百度 MapV with <a href="http://iclient.supermapol.com/">SuperMap iClient</a>'
1387613876
},
1387713877

1387813878
initialize: function (dataSet, mapVOptions, options) {
@@ -14211,7 +14211,7 @@ var TileVectorLayer = L.VectorGrid.extend({
1421114211
subdomains: 'abc',
1421214212

1421314213
timeout: 10000,
14214-
attribution: ' with <a href="http://icltest.supermapol.com/">SuperMap iClient</a>'
14214+
attribution: ' with <a href="http://iclient.supermapol.com/">SuperMap iClient</a>'
1421514215
},
1421614216

1421714217
initialize: function (url, options) {
@@ -14808,7 +14808,7 @@ var ChartService = ServiceBase.extend({
1480814808
}
1480914809

1481014810
if (params.bounds) {
14811-
params.bounds = L.CommontypesConversion.toSuperMapBounds(params.bounds);
14811+
params.bounds = L.supermap.CommontypesConversion.toSuperMapBounds(params.bounds);
1481214812
}
1481314813
},
1481414814
_processFormat: function (resultFormat) {
@@ -15000,7 +15000,7 @@ var FeatureService = ServiceBase.extend({
1500015000
params.toIndex = params.toIndex ? params.toIndex : -1;
1500115001
params.isUseBatch = (params.isUseBatch == null) ? false : params.isUseBatch;
1500215002
if (params.bounds) {
15003-
params.bounds = L.CommontypesConversion.toSuperMapBounds(params.bounds);
15003+
params.bounds = L.supermap.CommontypesConversion.toSuperMapBounds(params.bounds);
1500415004
}
1500515005
if (params.geometry) {
1500615006
params.geometry = Util.toSuperMapGeometry(params.geometry);
@@ -16209,10 +16209,10 @@ var ProcessingJobsService = ServiceBase.extend({
1620916209
return {};
1621016210
}
1621116211
if (params.query) {
16212-
params.query = L.CommontypesConversion.toSuperMapBounds(params.query).toBBOX();
16212+
params.query = L.supermap.CommontypesConversion.toSuperMapBounds(params.query).toBBOX();
1621316213
}
1621416214
if (params.bounds) {
16215-
params.bounds = L.CommontypesConversion.toSuperMapBounds(params.bounds).toBBOX();
16215+
params.bounds = L.supermap.CommontypesConversion.toSuperMapBounds(params.bounds).toBBOX();
1621616216
}
1621716217
return params;
1621816218
},
@@ -16359,7 +16359,7 @@ var QueryService = ServiceBase.extend({
1635916359
}
1636016360

1636116361
if (params.bounds ) {
16362-
params.bounds=L.CommontypesConversion.toSuperMapBounds(params.bounds);
16362+
params.bounds=L.supermap.CommontypesConversion.toSuperMapBounds(params.bounds);
1636316363
}
1636416364

1636516365
if (params.geometry) {
@@ -16719,7 +16719,7 @@ var SpatialAnalystService = ServiceBase.extend({
1671916719
return {};
1672016720
}
1672116721
if (params.bounds) {
16722-
params.bounds = L.CommontypesConversion.toSuperMapBounds(params.bounds);
16722+
params.bounds = L.supermap.CommontypesConversion.toSuperMapBounds(params.bounds);
1672316723
}
1672416724
if (params.inputPoints) {
1672516725
for (var i = 0; i < params.inputPoints.length; i++) {
@@ -48835,10 +48835,11 @@ module.exports = SuperMap.CartoCSS;
4883548835
/*
4883648836
Leaflet对象和SuperMap对象转换工具
4883748837
*/
48838+
__webpack_require__(6);
4883848839
var L = __webpack_require__(1);
4883948840
var SuperMap = __webpack_require__(0);
48840-
L.CommontypesConversion = {};
48841-
L.CommontypesConversion.toSuperMapBounds = function (bounds) {
48841+
L.supermap.CommontypesConversion = {};
48842+
L.supermap.CommontypesConversion.toSuperMapBounds = function (bounds) {
4884248843
if (bounds instanceof L.LatLngBounds) {
4884348844
return new SuperMap.Bounds(
4884448845
bounds.getSouthWest().lng,
@@ -48857,7 +48858,7 @@ L.CommontypesConversion.toSuperMapBounds = function (bounds) {
4885748858
}
4885848859
return new SuperMap.Bounds();
4885948860
};
48860-
module.exports = L.CommontypesConversion;
48861+
module.exports = L.supermap.CommontypesConversion;
4886148862

4886248863
/***/ }),
4886348864
/* 369 */
@@ -49425,7 +49426,7 @@ L.supermap.CompOpMap = {
4942549426

4942649427
__webpack_require__(6);
4942749428
var L = __webpack_require__(1);
49428-
L.supermap.CircleStyle = L.Class.extend({
49429+
var CircleStyle = L.Class.extend({
4942949430

4943049431
options: {
4943149432
stroke: true,
@@ -49481,9 +49482,9 @@ L.supermap.CircleStyle = L.Class.extend({
4948149482
});
4948249483

4948349484
L.supermap.circleStyle = function (options) {
49484-
return new L.supermap.CircleStyle(options);
49485+
return new CircleStyle(options);
4948549486
};
49486-
module.exports = L.supermap.CircleStyle;
49487+
module.exports = CircleStyle;
4948749488

4948849489

4948949490
/***/ }),
@@ -49493,7 +49494,7 @@ module.exports = L.supermap.CircleStyle;
4949349494
__webpack_require__(6);
4949449495
var L = __webpack_require__(1);
4949549496

49496-
L.supermap.Graphic = L.Class.extend({
49497+
var Graphic = L.Class.extend({
4949749498

4949849499
initialize: function (options) {
4949949500
options = options || {};
@@ -49520,9 +49521,9 @@ L.supermap.Graphic = L.Class.extend({
4952049521
});
4952149522

4952249523
L.supermap.graphic = function (options) {
49523-
return new L.supermap.Graphic(options);
49524+
return new Graphic(options);
4952449525
};
49525-
module.exports = L.supermap.Graphic;
49526+
module.exports = Graphic;
4952649527

4952749528
/***/ }),
4952849529
/* 376 */
@@ -49638,7 +49639,7 @@ var GraphThemeLayer = ThemeLayer.extend({
4963849639
//清除当前所有可视元素
4963949640
me.renderer.clearAll();
4964049641
var features = me.features;
49641-
bounds = L.CommontypesConversion.toSuperMapBounds(bounds);
49642+
bounds = L.supermap.CommontypesConversion.toSuperMapBounds(bounds);
4964249643
for (var i = 0, len = features.length; i < len; i++) {
4964349644
var feature = features[i];
4964449645
// 要素范围判断
@@ -50390,7 +50391,7 @@ var L = __webpack_require__(1);
5039050391
L.VectorGrid = L.GridLayer.extend({
5039150392
options: {
5039250393
format: L.supermap.VectorTileFormat.JSON,
50393-
renderer: L.svg.renderer,
50394+
renderer: L.supermap.svgRenderer,
5039450395
vectorTileLayerStyles: {},
5039550396
interactive: true
5039650397
},
@@ -50412,8 +50413,8 @@ L.VectorGrid = L.GridLayer.extend({
5041250413
}
5041350414
delete me._vectorTiles[key];
5041450415
}, me);
50415-
me.on('tileerror ',me._renderText, me);
50416-
me.on('load',me._renderText, me);
50416+
me.on('tileerror ', me._renderText, me);
50417+
me.on('load', me._renderText, me);
5041750418
me._dataLayerNames = {};
5041850419
},
5041950420

@@ -50428,7 +50429,7 @@ L.VectorGrid = L.GridLayer.extend({
5042850429
renderer._features = {};
5042950430

5043050431
L.supermap.vectorTile({
50431-
layer: this,
50432+
layer: me,
5043250433
format: me.options.format,
5043350434
coords: coords,
5043450435
renderer: renderer

‎dist/iclient9-leaflet.min.js‎

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

0 commit comments

Comments
 (0)