Skip to content

Commit 4d7ba63

Browse files
songyumengsongyumeng
committed
fix ISVJ-1522
1 parent b072cde commit 4d7ba63

23 files changed

+33
-69
lines changed

‎dist/iclient9-leaflet.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63525,7 +63525,7 @@ var names = ["Van_der_Grinten_I", "VanDerGrinten", "vandg"];
6352563525
/* 396 */
6352663526
/***/ (function(module, exports) {
6352763527

63528-
module.exports = {"_args":[[{"raw":"proj4@2.4.3","scope":null,"escapedName":"proj4","name":"proj4","rawSpec":"2.4.3","spec":"2.4.3","type":"version"},"E:\\work\\iClient9"]],"_cnpm_publish_time":1488570791097,"_from":"proj4@2.4.3","_hasShrinkwrap":false,"_id":"proj4@2.4.3","_inCache":true,"_location":"/proj4","_nodeVersion":"6.9.2","_npmOperationalInternal":{"host":"packages-18-east.internal.npmjs.com","tmp":"tmp/proj4-2.4.3.tgz_1488570790416_0.3068596587982029"},"_npmUser":{"name":"cwmma","email":"calvin.metcalf@gmail.com"},"_npmVersion":"4.0.5","_phantomChildren":{},"_requested":{"raw":"proj4@2.4.3","scope":null,"escapedName":"proj4","name":"proj4","rawSpec":"2.4.3","spec":"2.4.3","type":"version"},"_requiredBy":["/"],"_resolved":"https://registry.npmjs.org/proj4/-/proj4-2.4.3.tgz","_shasum":"f3bb7e631bffc047c36a1a3cc14533a03bbe9969","_shrinkwrap":null,"_spec":"proj4@2.4.3","_where":"E:\\work\\iClient9","author":"","bugs":{"url":"https://github.com/proj4js/proj4js/issues"},"contributors":[{"name":"Mike Adair","email":"madair@dmsolutions.ca"},{"name":"Richard Greenwood","email":"rich@greenwoodmap.com"},{"name":"Calvin Metcalf","email":"calvin.metcalf@gmail.com"},{"name":"Richard Marsden","url":"http://www.winwaed.com"},{"name":"T. Mittan"},{"name":"D. Steinwand"},{"name":"S. Nelson"}],"dependencies":{"mgrs":"1.0.0","wkt-parser":"^1.1.3"},"description":"Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.","devDependencies":{"chai":"~1.8.1","curl":"git://github.com/cujojs/curl.git","grunt":"~0.4.2","grunt-cli":"~0.1.13","grunt-contrib-connect":"~0.6.0","grunt-contrib-jshint":"~1.1.0","grunt-contrib-uglify":"~0.11.1","grunt-mocha-phantomjs":"~0.4.0","grunt-rollup":"^1.0.1","istanbul":"~0.2.4","mocha":"~1.17.1","rollup":"^0.41.4","rollup-plugin-json":"^2.0.1","rollup-plugin-node-resolve":"^2.0.0","tin":"~0.4.0"},"directories":{"test":"test","doc":"docs"},"dist":{"shasum":"f3bb7e631bffc047c36a1a3cc14533a03bbe9969","size":116887,"noattachment":false,"tarball":"http://registry.npm.taobao.org/proj4/download/proj4-2.4.3.tgz"},"gitHead":"e975a5462ad7abb23e33ea75281eb749e77e1510","homepage":"https://github.com/proj4js/proj4js#readme","license":"MIT","main":"dist/proj4-src.js","maintainers":[{"name":"ahocevar","email":"andreas.hocevar@gmail.com"},{"name":"cwmma","email":"calvin.metcalf@gmail.com"}],"module":"lib/index.js","name":"proj4","optionalDependencies":{},"publish_time":1488570791097,"readme":"ERROR: No README data found!","repository":{"type":"git","url":"git://github.com/proj4js/proj4js.git"},"scripts":{"build":"grunt","build:tmerc":"grunt build:tmerc","test":"npm run build && istanbul test _mocha test/test.js"},"version":"2.4.3"}
63528+
module.exports = {"_args":[[{"raw":"proj4@2.4.3","scope":null,"escapedName":"proj4","name":"proj4","rawSpec":"2.4.3","spec":"2.4.3","type":"version"},"E:\\git\\iClient9"]],"_from":"proj4@2.4.3","_id":"proj4@2.4.3","_inCache":true,"_location":"/proj4","_nodeVersion":"6.9.2","_npmOperationalInternal":{"host":"packages-18-east.internal.npmjs.com","tmp":"tmp/proj4-2.4.3.tgz_1488570790416_0.3068596587982029"},"_npmUser":{"name":"cwmma","email":"calvin.metcalf@gmail.com"},"_npmVersion":"4.0.5","_phantomChildren":{},"_requested":{"raw":"proj4@2.4.3","scope":null,"escapedName":"proj4","name":"proj4","rawSpec":"2.4.3","spec":"2.4.3","type":"version"},"_requiredBy":["/"],"_resolved":"https://registry.npmjs.org/proj4/-/proj4-2.4.3.tgz","_shasum":"f3bb7e631bffc047c36a1a3cc14533a03bbe9969","_shrinkwrap":null,"_spec":"proj4@2.4.3","_where":"E:\\git\\iClient9","author":"","bugs":{"url":"https://github.com/proj4js/proj4js/issues"},"contributors":[{"name":"Mike Adair","email":"madair@dmsolutions.ca"},{"name":"Richard Greenwood","email":"rich@greenwoodmap.com"},{"name":"Calvin Metcalf","email":"calvin.metcalf@gmail.com"},{"name":"Richard Marsden","url":"http://www.winwaed.com"},{"name":"T. Mittan"},{"name":"D. Steinwand"},{"name":"S. Nelson"}],"dependencies":{"mgrs":"1.0.0","wkt-parser":"^1.1.3"},"description":"Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.","devDependencies":{"chai":"~1.8.1","curl":"git://github.com/cujojs/curl.git","grunt":"~0.4.2","grunt-cli":"~0.1.13","grunt-contrib-connect":"~0.6.0","grunt-contrib-jshint":"~1.1.0","grunt-contrib-uglify":"~0.11.1","grunt-mocha-phantomjs":"~0.4.0","grunt-rollup":"^1.0.1","istanbul":"~0.2.4","mocha":"~1.17.1","rollup":"^0.41.4","rollup-plugin-json":"^2.0.1","rollup-plugin-node-resolve":"^2.0.0","tin":"~0.4.0"},"directories":{"test":"test","doc":"docs"},"dist":{"shasum":"f3bb7e631bffc047c36a1a3cc14533a03bbe9969","tarball":"https://registry.npmjs.org/proj4/-/proj4-2.4.3.tgz"},"gitHead":"e975a5462ad7abb23e33ea75281eb749e77e1510","homepage":"https://github.com/proj4js/proj4js#readme","license":"MIT","main":"dist/proj4-src.js","maintainers":[{"name":"cwmma","email":"calvin.metcalf@gmail.com"},{"name":"ahocevar","email":"andreas.hocevar@gmail.com"}],"module":"lib/index.js","name":"proj4","optionalDependencies":{},"readme":"ERROR: No README data found!","repository":{"type":"git","url":"git://github.com/proj4js/proj4js.git"},"scripts":{"build":"grunt","build:tmerc":"grunt build:tmerc","test":"npm run build && istanbul test _mocha test/test.js"},"version":"2.4.3"}
6352963529

6353063530
/***/ }),
6353163531
/* 397 */

‎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/iclient9-openlayers.js‎

Lines changed: 6 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -12985,13 +12985,13 @@ var TileSuperMapRest = function (_ol$source$TileImage) {
1298512985

1298612986
params["redirect"] = options.redirect === true;
1298712987
//切片是否透明
12988-
params["transparent"] = options.opaque === true;
12988+
params["transparent"] = options.transparent === true;
1298912989
params["cacheEnabled"] = !(options.cacheEnabled === false);
1299012990
params["_cache"] = params["cacheEnabled"];
1299112991

1299212992
//设置切片原点
12993-
if (options.origin && options.origin instanceof Array) {
12994-
params["origin"] = JSON.stringify({ x: options.origin[0], y: options.origin[1] });
12993+
if (this.origin) {
12994+
params["origin"] = JSON.stringify({ x: this.origin[0], y: this.origin[1] });
1299512995
}
1299612996

1299712997
if (options.prjCoordSys) {
@@ -13060,12 +13060,15 @@ var TileSuperMapRest = function (_ol$source$TileImage) {
1306013060
} else {
1306113061
if (projection.getCode() === "EPSG:3857") {
1306213062
me.tileGrid = _olDebug2.default.source.TileSuperMapRest.createTileGrid([-20037508.3427892, -20037508.3427892, 20037508.3427892, 20037508.3427892]);
13063+
me.extent = [-20037508.3427892, -20037508.3427892, 20037508.3427892, 20037508.3427892];
1306313064
}
1306413065
if (projection.getCode() === "EPSG:4326") {
1306513066
me.tileGrid = _olDebug2.default.source.TileSuperMapRest.createTileGrid([-180, -90, 180, 90]);
13067+
me.extent = [-180, -90, 180, 90];
1306613068
}
1306713069
}
1306813070
}
13071+
me.origin = me.tileGrid.getOrigin(0);
1306913072
var z = tileCoord[0];
1307013073
var x = tileCoord[1];
1307113074
var y = -tileCoord[2] - 1;
@@ -19118,48 +19121,6 @@ var JSONFormat = function (_Format) {
1911819121
} catch (e) {
1911919122
// Fall through if the regexp test fails.
1912019123
}
19121-
} else try {
19122-
/**
19123-
* Parsing happens in three stages. In the first stage, we run the
19124-
* text against a regular expression which looks for non-JSON
19125-
* characters. We are especially concerned with '()' and 'new'
19126-
* because they can cause invocation, and '=' because it can
19127-
* cause mutation. But just to be safe, we will reject all
19128-
* unexpected characters.
19129-
*/
19130-
if (/^[\],:{}\s]*$/.test(json.replace(/\\["\\\/bfnrtu]/g, '@').replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']').replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
19131-
19132-
/**
19133-
* In the second stage we use the eval function to compile the
19134-
* text into a JavaScript structure. The '{' operator is
19135-
* subject to a syntactic ambiguity in JavaScript - it can
19136-
* begin a block or an object literal. We wrap the text in
19137-
* parens to eliminate the ambiguity.
19138-
*/
19139-
object = eval('(' + json + ')');
19140-
19141-
/**
19142-
* In the optional third stage, we recursively walk the new
19143-
* structure, passing each name/value pair to a filter
19144-
* function for possible transformation.
19145-
*/
19146-
if (typeof filter === 'function') {
19147-
var _walk = function _walk(k, v) {
19148-
if (v && (typeof v === 'undefined' ? 'undefined' : _typeof(v)) === 'object') {
19149-
for (var i in v) {
19150-
if (v.hasOwnProperty(i)) {
19151-
v[i] = _walk(i, v[i]);
19152-
}
19153-
}
19154-
}
19155-
return filter(k, v);
19156-
};
19157-
19158-
object = _walk('', object);
19159-
}
19160-
}
19161-
} catch (e) {
19162-
// Fall through if the regexp test fails.
1916319124
}
1916419125

1916519126
if (this.keepData) {

‎dist/iclient9-openlayers.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.

‎examples/openlayers/01_tiledMapLayerOverlapped.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
source: new ol.source.TileSuperMapRest({
3535
url: urlJinjing,
3636
origin: [-180, 90],
37-
opaque: true
37+
transparent: true
3838
}),
3939
projection: 'EPSG:4326'
4040
});

‎examples/openlayers/03_themeDotDensity.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
cacheEnabled: false,
5959
transparent: true,
6060
layersID: result.newResourceID,
61-
opaque: true
61+
transparent: true
6262
})
6363
});
6464
map.addLayer(themeLayer);

‎examples/openlayers/03_themeGraduatedSymbol.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
cacheEnabled: false,
6767
transparent: true,
6868
layersID: result.newResourceID,
69-
opaque: true
69+
transparent: true
7070
})
7171
});
7272
map.addLayer(themeLayer);

‎examples/openlayers/03_themeGraph.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
resolutions: options.tileGrid.getResolutions()
9595
}),
9696
layersID: result.newResourceID,
97-
opaque: true
97+
transparent: true
9898
})
9999
});
100100
map.addLayer(themeLayer);

‎examples/openlayers/03_themeGridRange.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
extent: extent,
153153
resolutions: options.tileGrid.getResolutions()
154154
}),
155-
opaque: true,
155+
transparent: true,
156156
})
157157
});
158158
map.addLayer(themeLayer);

‎examples/openlayers/03_themeGridUnique.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
extent: extent,
142142
resolutions: options.tileGrid.getResolutions()
143143
}),
144-
opaque: true
144+
transparent: true
145145
})
146146
});
147147
map.addLayer(themeLayer);

0 commit comments

Comments
 (0)