Skip to content

Commit 3d624c2

Browse files
songyumengsongyumeng
committed
fix sonar fix 非4326graph不显示的bug
1 parent 66b4ade commit 3d624c2

File tree

5 files changed

+90
-85
lines changed

5 files changed

+90
-85
lines changed

‎dist/iclient9-leaflet.js‎

Lines changed: 51 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -20055,6 +20055,10 @@ var GraphThemeLayer = exports.GraphThemeLayer = _ThemeLayer.ThemeLayer.extend({
2005520055
//清除当前所有可视元素
2005620056
me.renderer.clearAll();
2005720057
var features = me.features;
20058+
if (bounds && bounds instanceof _leaflet2["default"].LatLngBounds) {
20059+
var crs = this._map.options.crs;
20060+
bounds = _leaflet2["default"].bounds(crs.project(bounds.getSouthWest()), crs.project(bounds.getNorthEast()));
20061+
}
2005820062
bounds = _CommontypesConversion2["default"].toSuperMapBounds(bounds);
2005920063
for (var i = 0, len = features.length; i < len; i++) {
2006020064
var feature = features[i];
@@ -20360,7 +20364,9 @@ var GraphThemeLayer = exports.GraphThemeLayer = _ThemeLayer.ThemeLayer.extend({
2036020364
var me = this;
2036120365
// 压盖判断所需 chartsBounds 集合
2036220366
var mapBounds = me._map.getBounds();
20363-
mapBounds = new _SuperMap2["default"].Bounds(mapBounds.getWest(), mapBounds.getSouth(), mapBounds.getEast(), mapBounds.getNorth());
20367+
var crs = this._map.options.crs;
20368+
mapBounds = _leaflet2["default"].bounds(crs.project(mapBounds.getSouthWest()), crs.project(mapBounds.getNorthEast()));
20369+
mapBounds = _CommontypesConversion2["default"].toSuperMapBounds(mapBounds);
2036420370
var charts = me.charts;
2036520371
var chartsBounds = [];
2036620372
// 获取地图像素 bounds
@@ -76497,14 +76503,14 @@ __webpack_require__(27);
7649776503

7649876504
var _Util = __webpack_require__(5);
7649976505

76500-
var _Painter = __webpack_require__(384);
76501-
76502-
var _Painter2 = _interopRequireDefault(_Painter);
76503-
7650476506
var _Storage = __webpack_require__(397);
7650576507

7650676508
var _Storage2 = _interopRequireDefault(_Storage);
7650776509

76510+
var _Painter = __webpack_require__(384);
76511+
76512+
var _Painter2 = _interopRequireDefault(_Painter);
76513+
7650876514
var _Handler = __webpack_require__(379);
7650976515

7651076516
var _Handler2 = _interopRequireDefault(_Handler);
@@ -81042,7 +81048,7 @@ var CartoCSS = function () {
8104281048

8104381049
// This function is called after all files
8104481050
// have been imported through `@import`.
81045-
var finish = function finish() {
81051+
var finish = function finish() {//NOSONAR
8104681052
//所有文件导入完成之后调用
8104781053
};
8104881054

@@ -81242,25 +81248,29 @@ var CartoCSS = function () {
8124281248

8124381249
switch (c) {
8124481250
case '{':
81251+
//NOSONAR
8124581252
if (!inParam) {
8124681253
level++;
8124781254
chunk.push(c);
8124881255
break;
8124981256
}
8125081257
case '}':
81258+
//NOSONAR
8125181259
if (!inParam) {
8125281260
level--;
8125381261
chunk.push(c);
8125481262
chunks[++j] = chunk = [];
8125581263
break;
8125681264
}
8125781265
case '(':
81266+
//NOSONAR
8125881267
if (!inParam) {
8125981268
inParam = true;
8126081269
chunk.push(c);
8126181270
break;
8126281271
}
8126381272
case ')':
81273+
//NOSONAR
8126481274
if (inParam) {
8126581275
inParam = false;
8126681276
chunk.push(c);
@@ -81733,14 +81743,17 @@ var CartoCSS = function () {
8173381743

8173481744
while (s = $(this.selector)) {
8173581745
selectors.push(s);
81736-
while ($(this.comment)) {}
81746+
while ($(this.comment)) {//NOSONAR
81747+
}
8173781748
if (!$(q)) {
8173881749
break;
8173981750
}
81740-
while ($(this.comment)) {}
81751+
while ($(this.comment)) {//NOSONAR
81752+
}
8174181753
}
8174281754
if (s) {
81743-
while ($(this.comment)) {}
81755+
while ($(this.comment)) {//NOSONAR
81756+
}
8174481757
}
8174581758

8174681759
if (selectors.length > 0 && (rules = $(this.block))) {
@@ -81928,27 +81941,7 @@ var CartoCSS = function () {
8192881941

8192981942
var shaders = {};
8193081943
var keys = [];
81931-
for (var i = 0, len0 = defs.length; i < len0; ++i) {
81932-
var def = defs[i];
81933-
var element_str = [];
81934-
for (var j = 0, len1 = def.elements.length; j < len1; j++) {
81935-
element_str.push(def.elements[j]);
81936-
}
81937-
var filters = def.filters.filters;
81938-
var filterStr = [];
81939-
for (var attr in filters) {
81940-
filterStr.push(filters[attr].id);
81941-
}
81942-
var key = element_str.join("/") + "::" + def.attachment + "_" + filterStr.join("_");
81943-
keys.push(key);
81944-
var shader = shaders[key] = shaders[key] || {};
81945-
//shader.frames = [];
81946-
shader.zoom = _SuperMap2["default"].CartoCSS.Tree.Zoom.all;
81947-
var props = def.toJS(this.env);
81948-
for (var v in props) {
81949-
(shader[v] = shader[v] || []).push(props[v].join('\n'));
81950-
}
81951-
}
81944+
this._toShaders(shaders, keys, defs);
8195281945

8195381946
var ordered_shaders = [];
8195481947

@@ -82005,12 +81998,12 @@ var CartoCSS = function () {
8200581998
}
8200681999
return {
8200782000
"property": prop,
82008-
"getValue": Function("attributes", "zoom", "seftFilter", "var _value = null; var isExcute=typeof seftFilter=='function'?sefgFilter():seftFilter;if(isExcute){" + body + ";} return _value; ")
82001+
"getValue": Function("attributes", "zoom", "seftFilter", "var _value = null; var isExcute=typeof seftFilter=='function'?sefgFilter():seftFilter;if(isExcute){" + body + ";} return _value; ") //NOSONAR
8200982002
};
8201082003
} else {
8201182004
return {
8201282005
"property": prop,
82013-
"getValue": Function("attributes", "zoom", "var _value = null;" + body + "; return _value; ")
82006+
"getValue": Function("attributes", "zoom", "var _value = null;" + body + "; return _value; ") //NOSONAR
8201482007
};
8201582008
}
8201682009
}(shader[prop], shaderArray);
@@ -82042,7 +82035,31 @@ var CartoCSS = function () {
8204282035
}
8204382036
return null;
8204482037
}
82045-
82038+
}, {
82039+
key: "_toShaders",
82040+
value: function _toShaders(shaders, keys, defs) {
82041+
for (var i = 0, len0 = defs.length; i < len0; ++i) {
82042+
var def = defs[i];
82043+
var element_str = [];
82044+
for (var j = 0, len1 = def.elements.length; j < len1; j++) {
82045+
element_str.push(def.elements[j]);
82046+
}
82047+
var filters = def.filters.filters;
82048+
var filterStr = [];
82049+
for (var attr in filters) {
82050+
filterStr.push(filters[attr].id);
82051+
}
82052+
var key = element_str.join("/") + "::" + def.attachment + "_" + filterStr.join("_");
82053+
keys.push(key);
82054+
var shader = shaders[key] = shaders[key] || {};
82055+
//shader.frames = [];
82056+
shader.zoom = _SuperMap2["default"].CartoCSS.Tree.Zoom.all;
82057+
var props = def.toJS(this.env);
82058+
for (var v in props) {
82059+
(shader[v] = shader[v] || []).push(props[v].join('\n'));
82060+
}
82061+
}
82062+
}
8204682063
/**
8204782064
* @function SuperMap.CartoCSS.prototype.getShaders
8204882065
* @description 获取CartoCSS着色器
@@ -85048,8 +85065,6 @@ _SuperMap2["default"].CartoCSS.Tree.Reference = {
8504885065
if (_SuperMap2["default"].CartoCSS.mapnik_reference.version.hasOwnProperty(version)) {
8504985066
this.setData(_SuperMap2["default"].CartoCSS.mapnik_reference.version[version]);
8505085067
return true;
85051-
} else {
85052-
return false;
8505385068
}
8505485069
return false;
8505585070
},
@@ -85649,10 +85664,6 @@ _SuperMap2["default"].CartoCSS.Tree.Variable = function () {
8564985664
}, {
8565085665
key: "ev",
8565185666
value: function ev(env) {
85652-
var variable,
85653-
v,
85654-
name = this.name;
85655-
8565685667
if (this._css) {
8565785668
return this._css;
8565885669
}
@@ -85698,10 +85709,7 @@ _SuperMap2["default"].CartoCSS.Tree.Zoom = function () {
8569885709
}, {
8569985710
key: "ev",
8570085711
value: function ev(env) {
85701-
var start = 0,
85702-
end = Infinity,
85703-
value = parseInt(this.value.ev(env).toString(), 10),
85704-
zoom = 0;
85712+
var value = parseInt(this.value.ev(env).toString(), 10);
8570585713

8570685714
if (value > _SuperMap2["default"].CartoCSS.Tree.Zoom.maxZoom || value < 0) {
8570785715
env.error({

‎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.

‎dist/include-leaflet.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
inputScript("http://cdn.bootcss.com/elasticsearch/13.0.1/elasticsearch.min.js");
6262
}
6363
if (!inArray(excludes, 'iclient9-leaflet')) {
64-
inputScript("../../dist/iclient9-leaflet.min.js");
64+
inputScript("../../dist/iclient9-leaflet.js");
6565
}
6666
if (inArray(includes, 'iclient9-leaflet-css')) {
6767
inputCSS("../../dist/iclient9-leaflet.min.css");

‎src/common/style/CartoCSS.js‎

Lines changed: 30 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ export default class CartoCSS {
7676

7777
// This function is called after all files
7878
// have been imported through `@import`.
79-
var finish = function () {
79+
var finish = function () {//NOSONAR
8080
//所有文件导入完成之后调用
8181
};
8282

@@ -722,16 +722,16 @@ export default class CartoCSS {
722722

723723
while (s = $(this.selector)) {
724724
selectors.push(s);
725-
while ($(this.comment)) {
725+
while ($(this.comment)) {//NOSONAR
726726
}
727727
if (!$(q)) {
728728
break;
729729
}
730-
while ($(this.comment)) {
730+
while ($(this.comment)) {//NOSONAR
731731
}
732732
}
733733
if (s) {
734-
while ($(this.comment)) {
734+
while ($(this.comment)) {//NOSONAR
735735
}
736736
}
737737

@@ -895,27 +895,7 @@ export default class CartoCSS {
895895

896896
var shaders = {};
897897
var keys = [];
898-
for (var i = 0, len0 = defs.length; i < len0; ++i) {
899-
var def = defs[i];
900-
var element_str = [];
901-
for (var j = 0, len1 = def.elements.length; j < len1; j++) {
902-
element_str.push(def.elements[j]);
903-
}
904-
var filters = def.filters.filters;
905-
var filterStr = [];
906-
for (var attr in filters) {
907-
filterStr.push(filters[attr].id);
908-
}
909-
var key = element_str.join("/") + "::" + def.attachment + "_" + filterStr.join("_");
910-
keys.push(key);
911-
var shader = shaders[key] = (shaders[key] || {});
912-
//shader.frames = [];
913-
shader.zoom = SuperMap.CartoCSS.Tree.Zoom.all;
914-
var props = def.toJS(this.env);
915-
for (var v in props) {
916-
(shader[v] = (shader[v] || [])).push(props[v].join('\n'))
917-
}
918-
}
898+
this._toShaders(shaders,keys,defs);
919899

920900
var ordered_shaders = [];
921901

@@ -1010,7 +990,29 @@ export default class CartoCSS {
1010990
return null;
1011991
}
1012992

1013-
993+
_toShaders(shaders, keys,defs) {
994+
for (let i = 0, len0 = defs.length; i < len0; ++i) {
995+
let def = defs[i];
996+
let element_str = [];
997+
for (let j = 0, len1 = def.elements.length; j < len1; j++) {
998+
element_str.push(def.elements[j]);
999+
}
1000+
let filters = def.filters.filters;
1001+
let filterStr = [];
1002+
for (let attr in filters) {
1003+
filterStr.push(filters[attr].id);
1004+
}
1005+
let key = element_str.join("/") + "::" + def.attachment + "_" + filterStr.join("_");
1006+
keys.push(key);
1007+
let shader = shaders[key] = (shaders[key] || {});
1008+
//shader.frames = [];
1009+
shader.zoom = SuperMap.CartoCSS.Tree.Zoom.all;
1010+
let props = def.toJS(this.env);
1011+
for (let v in props) {
1012+
(shader[v] = (shader[v] || [])).push(props[v].join('\n'))
1013+
}
1014+
}
1015+
}
10141016
/**
10151017
* @function SuperMap.CartoCSS.prototype.getShaders
10161018
* @description 获取CartoCSS着色器
@@ -4856,10 +4858,6 @@ SuperMap.CartoCSS.Tree.Variable = class Variable {
48564858
}
48574859

48584860
ev(env) {
4859-
var variable,
4860-
v,
4861-
name = this.name;
4862-
48634861
if (this._css) {return this._css;}
48644862

48654863
var thisframe = env.frames.filter(function (f) {
@@ -4895,10 +4893,8 @@ SuperMap.CartoCSS.Tree.Zoom = class Zoom {
48954893
}
48964894

48974895
ev(env) {
4898-
var start = 0,
4899-
end = Infinity,
4900-
value = parseInt(this.value.ev(env).toString(), 10),
4901-
zoom = 0;
4896+
var value = parseInt(this.value.ev(env).toString(), 10);
4897+
49024898

49034899
if (value > SuperMap.CartoCSS.Tree.Zoom.maxZoom || value < 0) {
49044900
env.error({

‎src/leaflet/overlay/GraphThemeLayer.js‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,10 @@ export var GraphThemeLayer = ThemeLayer.extend({
110110
//清除当前所有可视元素
111111
me.renderer.clearAll();
112112
var features = me.features;
113+
if (bounds && bounds instanceof L.LatLngBounds) {
114+
var crs = this._map.options.crs;
115+
bounds = L.bounds(crs.project(bounds.getSouthWest()), crs.project(bounds.getNorthEast()));
116+
}
113117
bounds = CommontypesConversion.toSuperMapBounds(bounds);
114118
for (var i = 0, len = features.length; i < len; i++) {
115119
var feature = features[i];
@@ -417,12 +421,9 @@ export var GraphThemeLayer = ThemeLayer.extend({
417421
var me = this;
418422
// 压盖判断所需 chartsBounds 集合
419423
var mapBounds = me._map.getBounds();
420-
mapBounds = new SuperMap.Bounds(
421-
mapBounds.getWest(),
422-
mapBounds.getSouth(),
423-
mapBounds.getEast(),
424-
mapBounds.getNorth()
425-
);
424+
var crs = this._map.options.crs;
425+
mapBounds = L.bounds(crs.project(mapBounds.getSouthWest()), crs.project(mapBounds.getNorthEast()));
426+
mapBounds = CommontypesConversion.toSuperMapBounds(mapBounds);
426427
var charts = me.charts;
427428
var chartsBounds = [];
428429
// 获取地图像素 bounds

0 commit comments

Comments
 (0)