Skip to content

Commit a96ff47

Browse files
songyumengsongyumeng
committed
fix onlinewebmap style dasharray
1 parent eb73966 commit a96ff47

File tree

5 files changed

+18
-111
lines changed

5 files changed

+18
-111
lines changed

‎dist/iclient9-leaflet.css‎

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

Lines changed: 10 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -33209,7 +33209,11 @@ var WebMap = exports.WebMap = _leaflet2["default"].LayerGroup.extend({
3320933209
return m;
3321033210
},
3321133211
coordsToLatLng: coordsToLatLng, style: function style(geoJsonFeature) {
33212-
return me.cartoCSSToLeaflet.getStyleFromiPortalStyle(_style ? _style : {}, geoJsonFeature.geometry.type, geoJsonFeature.properties.style);
33212+
var lStyle = me.cartoCSSToLeaflet.getStyleFromiPortalStyle(_style ? _style : {}, geoJsonFeature.geometry.type, geoJsonFeature.properties.style);
33213+
if (lStyle.dashArray && lStyle.dashArray.length == 0) {
33214+
lStyle.dashArray = null;
33215+
}
33216+
return lStyle;
3321333217
},
3321433218
opacity: opacity
3321533219
});
@@ -76487,14 +76491,14 @@ __webpack_require__(27);
7648776491

7648876492
var _Util = __webpack_require__(5);
7648976493

76490-
var _Storage = __webpack_require__(397);
76491-
76492-
var _Storage2 = _interopRequireDefault(_Storage);
76493-
7649476494
var _Painter = __webpack_require__(384);
7649576495

7649676496
var _Painter2 = _interopRequireDefault(_Painter);
7649776497

76498+
var _Storage = __webpack_require__(397);
76499+
76500+
var _Storage2 = _interopRequireDefault(_Storage);
76501+
7649876502
var _Handler = __webpack_require__(379);
7649976503

7650076504
var _Handler2 = _interopRequireDefault(_Handler);
@@ -94656,108 +94660,7 @@ exports.names = ["Van_der_Grinten_I", "VanDerGrinten", "vandg"];
9465694660
/* 471 */
9465794661
/***/ (function(module, exports) {
9465894662

94659-
module.exports = {
94660-
"_from": "proj4@2.3.15",
94661-
"_id": "proj4@2.3.15",
94662-
"_inBundle": false,
94663-
"_integrity": "sha1-WtBui8owvg/6OJpJ5FZfUfBtCJ4=",
94664-
"_location": "/proj4",
94665-
"_phantomChildren": {},
94666-
"_requested": {
94667-
"type": "version",
94668-
"registry": true,
94669-
"raw": "proj4@2.3.15",
94670-
"name": "proj4",
94671-
"escapedName": "proj4",
94672-
"rawSpec": "2.3.15",
94673-
"saveSpec": null,
94674-
"fetchSpec": "2.3.15"
94675-
},
94676-
"_requiredBy": [
94677-
"/"
94678-
],
94679-
"_resolved": "http://registry.npm.taobao.org/proj4/download/proj4-2.3.15.tgz",
94680-
"_shasum": "5ad06e8bca30be0ffa389a49e4565f51f06d089e",
94681-
"_spec": "proj4@2.3.15",
94682-
"_where": "F:\\dev\\iClient",
94683-
"author": "",
94684-
"bugs": {
94685-
"url": "https://github.com/proj4js/proj4js/issues"
94686-
},
94687-
"bundleDependencies": false,
94688-
"contributors": [
94689-
{
94690-
"name": "Mike Adair",
94691-
"email": "madair@dmsolutions.ca"
94692-
},
94693-
{
94694-
"name": "Richard Greenwood",
94695-
"email": "rich@greenwoodmap.com"
94696-
},
94697-
{
94698-
"name": "Calvin Metcalf",
94699-
"email": "calvin.metcalf@gmail.com"
94700-
},
94701-
{
94702-
"name": "Richard Marsden",
94703-
"url": "http://www.winwaed.com"
94704-
},
94705-
{
94706-
"name": "T. Mittan"
94707-
},
94708-
{
94709-
"name": "D. Steinwand"
94710-
},
94711-
{
94712-
"name": "S. Nelson"
94713-
}
94714-
],
94715-
"dependencies": {
94716-
"mgrs": "~0.0.2"
94717-
},
94718-
"deprecated": false,
94719-
"description": "Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.",
94720-
"devDependencies": {
94721-
"browserify": "~12.0.1",
94722-
"chai": "~1.8.1",
94723-
"curl": "git://github.com/cujojs/curl.git",
94724-
"grunt": "~0.4.2",
94725-
"grunt-browserify": "~4.0.1",
94726-
"grunt-cli": "~0.1.13",
94727-
"grunt-contrib-connect": "~0.6.0",
94728-
"grunt-contrib-jshint": "~0.8.0",
94729-
"grunt-contrib-uglify": "~0.11.1",
94730-
"grunt-mocha-phantomjs": "~0.4.0",
94731-
"istanbul": "~0.2.4",
94732-
"mocha": "~1.17.1",
94733-
"tin": "~0.4.0"
94734-
},
94735-
"directories": {
94736-
"test": "test",
94737-
"doc": "docs"
94738-
},
94739-
"homepage": "https://github.com/proj4js/proj4js#readme",
94740-
"jam": {
94741-
"main": "dist/proj4.js",
94742-
"include": [
94743-
"dist/proj4.js",
94744-
"README.md",
94745-
"AUTHORS",
94746-
"LICENSE.md"
94747-
]
94748-
},
94749-
"license": "MIT",
94750-
"main": "lib/index.js",
94751-
"name": "proj4",
94752-
"repository": {
94753-
"type": "git",
94754-
"url": "git://github.com/proj4js/proj4js.git"
94755-
},
94756-
"scripts": {
94757-
"test": "./node_modules/istanbul/lib/cli.js test ./node_modules/mocha/bin/_mocha test/test.js"
94758-
},
94759-
"version": "2.3.15"
94760-
};
94663+
module.exports = {"_args":[[{"raw":"proj4@2.3.15","scope":null,"escapedName":"proj4","name":"proj4","rawSpec":"2.3.15","spec":"2.3.15","type":"version"},"E:\\git\\iClient9"]],"_from":"proj4@2.3.15","_id":"proj4@2.3.15","_inCache":true,"_location":"/proj4","_nodeVersion":"6.1.0","_npmOperationalInternal":{"host":"packages-12-west.internal.npmjs.com","tmp":"tmp/proj4-2.3.15.tgz_1471808262546_0.6752060337457806"},"_npmUser":{"name":"ahocevar","email":"andreas.hocevar@gmail.com"},"_npmVersion":"3.8.6","_phantomChildren":{},"_requested":{"raw":"proj4@2.3.15","scope":null,"escapedName":"proj4","name":"proj4","rawSpec":"2.3.15","spec":"2.3.15","type":"version"},"_requiredBy":["/"],"_resolved":"https://registry.npmjs.org/proj4/-/proj4-2.3.15.tgz","_shasum":"5ad06e8bca30be0ffa389a49e4565f51f06d089e","_shrinkwrap":null,"_spec":"proj4@2.3.15","_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":"~0.0.2"},"description":"Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.","devDependencies":{"browserify":"~12.0.1","chai":"~1.8.1","curl":"git://github.com/cujojs/curl.git","grunt":"~0.4.2","grunt-browserify":"~4.0.1","grunt-cli":"~0.1.13","grunt-contrib-connect":"~0.6.0","grunt-contrib-jshint":"~0.8.0","grunt-contrib-uglify":"~0.11.1","grunt-mocha-phantomjs":"~0.4.0","istanbul":"~0.2.4","mocha":"~1.17.1","tin":"~0.4.0"},"directories":{"test":"test","doc":"docs"},"dist":{"shasum":"5ad06e8bca30be0ffa389a49e4565f51f06d089e","tarball":"https://registry.npmjs.org/proj4/-/proj4-2.3.15.tgz"},"gitHead":"9fa5249c1f4183d5ddee3c4793dfd7b9f29f1886","homepage":"https://github.com/proj4js/proj4js#readme","jam":{"main":"dist/proj4.js","include":["dist/proj4.js","README.md","AUTHORS","LICENSE.md"]},"license":"MIT","main":"lib/index.js","maintainers":[{"name":"cwmma","email":"calvin.metcalf@gmail.com"},{"name":"ahocevar","email":"andreas.hocevar@gmail.com"}],"name":"proj4","optionalDependencies":{},"readme":"ERROR: No README data found!","repository":{"type":"git","url":"git://github.com/proj4js/proj4js.git"},"scripts":{"test":"./node_modules/istanbul/lib/cli.js test ./node_modules/mocha/bin/_mocha test/test.js"},"version":"2.3.15"}
9476194664

9476294665
/***/ }),
9476394666
/* 472 */

‎dist/iclient9-leaflet.min.css‎

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

‎src/leaflet/mapping/WebMap.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,11 @@ export var WebMap = L.LayerGroup.extend({
437437
return m;
438438
},
439439
coordsToLatLng: coordsToLatLng, style: function (geoJsonFeature) {
440-
return me.cartoCSSToLeaflet.getStyleFromiPortalStyle(style ? style : {}, geoJsonFeature.geometry.type, geoJsonFeature.properties.style);
440+
let lStyle = me.cartoCSSToLeaflet.getStyleFromiPortalStyle(style ? style : {}, geoJsonFeature.geometry.type, geoJsonFeature.properties.style);
441+
if (lStyle.dashArray && lStyle.dashArray.length == 0) {
442+
lStyle.dashArray = null;
443+
}
444+
return lStyle;
441445
},
442446
opacity: opacity
443447
});

0 commit comments

Comments
 (0)