Skip to content

Commit b944f80

Browse files
author
caoxinke
committed
2 parents 3b14a5c + bca29e9 commit b944f80

File tree

17 files changed

+38
-20
lines changed

17 files changed

+38
-20
lines changed

‎dist/iclient9-leaflet.js‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7593,8 +7593,8 @@
75937593
},
75947594
getTileUrl: function (coords) { // (Point, Number) -> String
75957595
var zoom = this._getZoomForUrl();
7596-
ident = this.options.matrixIds ? this.options.matrixIds[zoom].identifier : zoom;
7597-
url = L.Util.template(this._url, {s: this._getSubdomain(coords)});
7596+
var ident = this.options.matrixIds ? this.options.matrixIds[zoom].identifier : zoom;
7597+
var url = L.Util.template(this._url, {s: this._getSubdomain(coords)});
75987598
var obj = {
75997599
service: 'WMTS',
76007600
request: 'GetTile',
@@ -7654,6 +7654,7 @@
76547654
var L = __webpack_require__(3);
76557655
var Util = __webpack_require__(16);
76567656
var Request = __webpack_require__(20);
7657+
var SuperMap = __webpack_require__(4);
76577658
var WebMap = L.LayerGroup.extend({
76587659
options: {
76597660
map: 'map',
@@ -7891,7 +7892,7 @@
78917892
if (type == "ter")type = "cta"
78927893
}
78937894
wmtsURL = wmtsURL.replace("{type}", type).replace("{proj}", proj);
7894-
layer = L.tileLayer.wmts(wmtsURL,
7895+
var layer = L.tileLayer.wmts(wmtsURL,
78957896
{
78967897
layer: type,
78977898
style: "default",
@@ -17859,6 +17860,7 @@
1785917860
* })
1786017861
*/
1786117862
var L = __webpack_require__(3);
17863+
var SuperMap = __webpack_require__(4);
1786217864
var ServiceBase = __webpack_require__(24);
1786317865
var ChartQueryService = __webpack_require__(91);
1786417866
var ChartFeatureInfoSpecsService = __webpack_require__(94);
@@ -18087,7 +18089,7 @@
1808718089
serviceProcessCompleted: function (result) {
1808818090
var me = this;
1808918091
result = SuperMap.Util.transformResult(result);
18090-
if (result && result.recordsets && me.format === Format.GEOJSON) {
18092+
if (result && result.recordsets && me.format === SuperMap.DataFormat.GEOJSON) {
1809118093
for (var i = 0, recordsets = result.recordsets, len = recordsets.length; i < len; i++) {
1809218094
if (recordsets[i].features) {
1809318095
var geoJSONFormat = new GeoJSONFormat();
@@ -18632,7 +18634,7 @@
1863218634
dataSetName = params.dataSetName;
1863318635

1863418636
url += "/datasources/" + dataSourceName + "/datasets/" + dataSetName;
18635-
editFeatureService = new EditFeaturesService(url, {
18637+
var editFeatureService = new EditFeaturesService(url, {
1863618638
eventListeners: {
1863718639

1863818640
processCompleted: callback,
@@ -32375,7 +32377,7 @@
3237532377
__webpack_require__(226);
3237632378
var L = __webpack_require__(3);
3237732379
var CartoCSSToLeaflet = __webpack_require__(238);
32378-
32380+
var SuperMap = __webpack_require__(4);
3237932381
var TileVectorLayer = L.VectorGrid.extend({
3238032382

3238132383
options: {
@@ -33079,6 +33081,7 @@
3307933081
__webpack_require__(235);
3308033082
__webpack_require__(236);
3308133083
var L = __webpack_require__(3);
33084+
var SuperMap = __webpack_require__(4);
3308233085
var TileFeatureProcessor = __webpack_require__(237);
3308333086
var VectorTile = L.Class.extend({
3308433087

@@ -33849,6 +33852,7 @@
3384933852
__webpack_require__(239);
3385033853
__webpack_require__(240);
3385133854
var CartoCSS = __webpack_require__(241);
33855+
var SuperMap = __webpack_require__(4);
3385233856
var L = __webpack_require__(3);
3385333857

3385433858
L.supermap.CartoCSSToLeaflet = {
@@ -37665,7 +37669,7 @@
3766537669
return shaderAttrs;
3766637670
},
3766737671
clone: function (filters) {
37668-
if (filters) assert.ok(filters instanceof SuperMap.CartoCSS.Tree.Filterset);
37672+
//if (filters) assert.ok(filters instanceof SuperMap.CartoCSS.Tree.Filterset);
3766937673
var clone = Object.create(SuperMap.CartoCSS.Tree.Definition.prototype);
3767037674
clone.rules = this.rules.slice();
3767137675
clone.ruleIndex = _.clone(this.ruleIndex);
@@ -39238,6 +39242,7 @@
3923839242
var L = __webpack_require__(3);
3923939243
var Pbf = __webpack_require__(243);
3924039244
var VectorTile = __webpack_require__(245);
39245+
var SuperMap = __webpack_require__(4);
3924139246

3924239247
L.PBFTileVectorLayer = L.VectorGrid.extend({
3924339248

‎dist/iclient9-openlayers.js‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272

7373
__webpack_require__(2);
7474
var ol = __webpack_require__(3);
75+
var SuperMap = __webpack_require__(4);
7576
ol.supermap.TileSuperMapRest = function (options) {
7677
if (options.url === undefined) {
7778
return;
@@ -1403,6 +1404,7 @@
14031404
__webpack_require__(2);
14041405
var ol = __webpack_require__(3);
14051406
var Request = __webpack_require__(11);
1407+
var SuperMap = __webpack_require__(4);
14061408
ol.supermap.WebMap = function (id, options) {
14071409
ol.Observable.call(this);
14081410
this.id = id;
@@ -1688,7 +1690,7 @@
16881690
isVisible = layerInfo.isVisible;
16891691
//todo readonly = layerInfo.readonly;
16901692
if (!layerInfo.url) {
1691-
layer = new ol.layer.Vector({
1693+
var layer = new ol.layer.Vector({
16921694
source: new ol.source.Vector({
16931695
features: (new ol.format.GeoJSON()).readFeatures(ol.supermap.Util.toGeoJSON(layerInfo.features)),
16941696
wrapX: false
@@ -3272,6 +3274,7 @@
32723274
__webpack_require__(2);
32733275
var ol = __webpack_require__(3);
32743276
var GeoJSONFormat = __webpack_require__(21);
3277+
var SuperMap = __webpack_require__(4);
32753278

32763279
ol.supermap.Util.toGeoJSON = function (smObj) {
32773280
if (smObj) {
@@ -11778,7 +11781,7 @@
1177811781
serviceProcessCompleted: function (result) {
1177911782
var me = this;
1178011783
result = SuperMap.Util.transformResult(result);
11781-
if (result && result.recordsets && me.format === Format.GEOJSON) {
11784+
if (result && result.recordsets && me.format === SuperMap.DataFormat.GEOJSON) {
1178211785
for (var i = 0, recordsets = result.recordsets, len = recordsets.length; i < len; i++) {
1178311786
if (recordsets[i].features) {
1178411787
var geoJSONFormat = new GeoJSONFormat();
@@ -12323,7 +12326,7 @@
1232312326
dataSetName = params.dataSetName;
1232412327

1232512328
url += "/datasources/" + dataSourceName + "/datasets/" + dataSetName;
12326-
editFeatureService = new EditFeaturesService(url, {
12329+
var editFeatureService = new EditFeaturesService(url, {
1232712330
eventListeners: {
1232812331
processCompleted: callback,
1232912332
processFailed: callback
@@ -29780,7 +29783,7 @@
2978029783
return shaderAttrs;
2978129784
},
2978229785
clone: function (filters) {
29783-
if (filters) assert.ok(filters instanceof SuperMap.CartoCSS.Tree.Filterset);
29786+
//if (filters) assert.ok(filters instanceof SuperMap.CartoCSS.Tree.Filterset);
2978429787
var clone = Object.create(SuperMap.CartoCSS.Tree.Definition.prototype);
2978529788
clone.rules = this.rules.slice();
2978629789
clone.ruleIndex = _.clone(this.ruleIndex);
@@ -31354,6 +31357,7 @@
3135431357
__webpack_require__(222);
3135531358
__webpack_require__(223);
3135631359
var ol = __webpack_require__(3);
31360+
var SuperMap = __webpack_require__(4);
3135731361
ol.supermap.StyleUtils = {
3135831362
getValidStyleFromLayerInfo: function (layerInfo, feature, url) {
3135931363
var type = feature.getProperties().type,

‎src/common/iServer/ChartQueryService.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ SuperMap.REST.ChartQueryService = SuperMap.Class(SuperMap.ServiceBase, {
142142
serviceProcessCompleted: function (result) {
143143
var me = this;
144144
result = SuperMap.Util.transformResult(result);
145-
if (result && result.recordsets && me.format === Format.GEOJSON) {
145+
if (result && result.recordsets && me.format === SuperMap.DataFormat.GEOJSON) {
146146
for (var i = 0, recordsets = result.recordsets, len = recordsets.length; i < len; i++) {
147147
if (recordsets[i].features) {
148148
var geoJSONFormat = new GeoJSONFormat();

‎src/common/style/CartoCSS.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3380,7 +3380,7 @@ SuperMap.CartoCSS.Tree.Definition = SuperMap.Class({
33803380
return shaderAttrs;
33813381
},
33823382
clone: function (filters) {
3383-
if (filters) assert.ok(filters instanceof SuperMap.CartoCSS.Tree.Filterset);
3383+
//if (filters) assert.ok(filters instanceof SuperMap.CartoCSS.Tree.Filterset);
33843384
var clone = Object.create(SuperMap.CartoCSS.Tree.Definition.prototype);
33853385
clone.rules = this.rules.slice();
33863386
clone.ruleIndex = _.clone(this.ruleIndex);

‎src/leaflet/mapping/TileLayer.WMTS.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ L.TileLayer.WMTS = L.TileLayer.extend({
1717
},
1818
getTileUrl: function (coords) { // (Point, Number) -> String
1919
var zoom = this._getZoomForUrl();
20-
ident = this.options.matrixIds ? this.options.matrixIds[zoom].identifier : zoom;
21-
url = L.Util.template(this._url, {s: this._getSubdomain(coords)});
20+
var ident = this.options.matrixIds ? this.options.matrixIds[zoom].identifier : zoom;
21+
var url = L.Util.template(this._url, {s: this._getSubdomain(coords)});
2222
var obj = {
2323
service: 'WMTS',
2424
request: 'GetTile',

‎src/leaflet/mapping/WebMap.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ require('../core/Base');
22
var L = require("leaflet");
33
var Util = require('../core/Util');
44
var Request = require('../../common/util/Request');
5+
var SuperMap = require('../../common/SuperMap');
56
var WebMap = L.LayerGroup.extend({
67
options: {
78
map: 'map',
@@ -239,7 +240,7 @@ var WebMap = L.LayerGroup.extend({
239240
if (type == "ter")type = "cta"
240241
}
241242
wmtsURL = wmtsURL.replace("{type}", type).replace("{proj}", proj);
242-
layer = L.tileLayer.wmts(wmtsURL,
243+
var layer = L.tileLayer.wmts(wmtsURL,
243244
{
244245
layer: type,
245246
style: "default",

‎src/leaflet/overlay/PBFTileVectorLayer.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
var L = require("leaflet");
22
var Pbf = require('pbf');
33
var VectorTile = require('vector-tile');
4+
var SuperMap = require('../../common/SuperMap');
45

56
L.PBFTileVectorLayer = L.VectorGrid.extend({
67

‎src/leaflet/overlay/TileVectorLayer.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require('../core/Base');
88
require('./vectortile/VectorGrid');
99
var L = require("leaflet");
1010
var CartoCSSToLeaflet = require('./carto/CartoCSSToLeaflet');
11-
11+
var SuperMap = require('../../common/SuperMap');
1212
var TileVectorLayer = L.VectorGrid.extend({
1313

1414
options: {

‎src/leaflet/overlay/carto/CartoCSSToLeaflet.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ require('../../core/Base');
55
require('./CartoDeaultStyle');
66
require('./CartoStyleMap');
77
var CartoCSS = require('../../../common/style/CartoCSS');
8+
var SuperMap = require('../../../common/SuperMap');
89
var L = require("leaflet");
910

1011
L.supermap.CartoCSSToLeaflet = {

‎src/leaflet/overlay/vectortile/VectorTile.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ require('./PointSymbolizer');
55
require('./LineSymbolizer');
66
require('./RegionSymbolizer');
77
var L = require("leaflet");
8+
var SuperMap = require('../../../common/SuperMap');
89
var TileFeatureProcessor = require('./TileFeatureProcessor');
910
var VectorTile = L.Class.extend({
1011

0 commit comments

Comments
 (0)