Skip to content

Commit 9aaef2a

Browse files
zhurczhurc
committed
mapboxgl新增支持标签专题图 & fix 若干问题
1 parent 071b846 commit 9aaef2a

16 files changed

+9041
-6589
lines changed

‎build/deps.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -941,7 +941,8 @@ deps = {
941941
"./src/mapboxgl/overlay/RangeThemeLayer.js",
942942
"./src/mapboxgl/overlay/UniqueThemeLayer.js",
943943
"./src/mapboxgl/overlay/RankSymbolThemeLayer.js",
944-
"./src/mapboxgl/overlay/GraphThemeLayer.js"
944+
"./src/mapboxgl/overlay/GraphThemeLayer.js",
945+
"./src/mapboxgl/overlay/LabelThemeLayer.js"
945946
],
946947
"modules": [{
947948
"name": "mapboxgl.supermap.RankTheme3DLayer",
@@ -961,6 +962,9 @@ deps = {
961962
}, {
962963
"name": "mapboxgl.supermap.GraphThemeLayer",
963964
"des": "统计专题图"
965+
}, {
966+
"name": "mapboxgl.supermap.LabelThemeLayer",
967+
"des": "标签专题图"
964968
}]
965969

966970
}

‎dist/iclient9-leaflet.js‎

Lines changed: 106 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18858,6 +18858,7 @@ var GeoFeatureThemeLayer = exports.GeoFeatureThemeLayer = _ThemeLayer.ThemeLayer
1885818858
me.cache = {};
1885918859
me.cacheFields = [];
1886018860
me.style = {};
18861+
me.highlightStyle = {};
1886118862
},
1886218863

1886318864
/**
@@ -21001,13 +21002,9 @@ var LabelThemeLayer = exports.LabelThemeLayer = _GeoFeatureThemeLayer.GeoFeature
2100121002
pt[1] -= yOffset;
2100221003
}
2100321004

21004-
var canvas = createCanvas();
21005-
21006-
function createCanvas() {
21007-
var canvas = document.createElement('canvas');
21008-
canvas.globalAlpha = 0;
21009-
canvas.lineWidth = 1;
21010-
}
21005+
var canvas = document.createElement('canvas');
21006+
canvas.globalAlpha = 0;
21007+
canvas.lineWidth = 1;
2101121008

2101221009
canvas.fillStyle = style.fontColor;
2101321010
canvas.globalAlpha = style.fontOpacity || 1.0;
@@ -93972,7 +93969,108 @@ exports.names = ["Van_der_Grinten_I", "VanDerGrinten", "vandg"];
9397293969
/* 466 */
9397393970
/***/ (function(module, exports) {
9397493971

93975-
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"}
93972+
module.exports = {
93973+
"_from": "proj4@2.3.15",
93974+
"_id": "proj4@2.3.15",
93975+
"_inBundle": false,
93976+
"_integrity": "sha1-WtBui8owvg/6OJpJ5FZfUfBtCJ4=",
93977+
"_location": "/proj4",
93978+
"_phantomChildren": {},
93979+
"_requested": {
93980+
"type": "version",
93981+
"registry": true,
93982+
"raw": "proj4@2.3.15",
93983+
"name": "proj4",
93984+
"escapedName": "proj4",
93985+
"rawSpec": "2.3.15",
93986+
"saveSpec": null,
93987+
"fetchSpec": "2.3.15"
93988+
},
93989+
"_requiredBy": [
93990+
"/"
93991+
],
93992+
"_resolved": "http://registry.npm.taobao.org/proj4/download/proj4-2.3.15.tgz",
93993+
"_shasum": "5ad06e8bca30be0ffa389a49e4565f51f06d089e",
93994+
"_spec": "proj4@2.3.15",
93995+
"_where": "F:\\dev\\iClient",
93996+
"author": "",
93997+
"bugs": {
93998+
"url": "https://github.com/proj4js/proj4js/issues"
93999+
},
94000+
"bundleDependencies": false,
94001+
"contributors": [
94002+
{
94003+
"name": "Mike Adair",
94004+
"email": "madair@dmsolutions.ca"
94005+
},
94006+
{
94007+
"name": "Richard Greenwood",
94008+
"email": "rich@greenwoodmap.com"
94009+
},
94010+
{
94011+
"name": "Calvin Metcalf",
94012+
"email": "calvin.metcalf@gmail.com"
94013+
},
94014+
{
94015+
"name": "Richard Marsden",
94016+
"url": "http://www.winwaed.com"
94017+
},
94018+
{
94019+
"name": "T. Mittan"
94020+
},
94021+
{
94022+
"name": "D. Steinwand"
94023+
},
94024+
{
94025+
"name": "S. Nelson"
94026+
}
94027+
],
94028+
"dependencies": {
94029+
"mgrs": "~0.0.2"
94030+
},
94031+
"deprecated": false,
94032+
"description": "Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.",
94033+
"devDependencies": {
94034+
"browserify": "~12.0.1",
94035+
"chai": "~1.8.1",
94036+
"curl": "git://github.com/cujojs/curl.git",
94037+
"grunt": "~0.4.2",
94038+
"grunt-browserify": "~4.0.1",
94039+
"grunt-cli": "~0.1.13",
94040+
"grunt-contrib-connect": "~0.6.0",
94041+
"grunt-contrib-jshint": "~0.8.0",
94042+
"grunt-contrib-uglify": "~0.11.1",
94043+
"grunt-mocha-phantomjs": "~0.4.0",
94044+
"istanbul": "~0.2.4",
94045+
"mocha": "~1.17.1",
94046+
"tin": "~0.4.0"
94047+
},
94048+
"directories": {
94049+
"test": "test",
94050+
"doc": "docs"
94051+
},
94052+
"homepage": "https://github.com/proj4js/proj4js#readme",
94053+
"jam": {
94054+
"main": "dist/proj4.js",
94055+
"include": [
94056+
"dist/proj4.js",
94057+
"README.md",
94058+
"AUTHORS",
94059+
"LICENSE.md"
94060+
]
94061+
},
94062+
"license": "MIT",
94063+
"main": "lib/index.js",
94064+
"name": "proj4",
94065+
"repository": {
94066+
"type": "git",
94067+
"url": "git://github.com/proj4js/proj4js.git"
94068+
},
94069+
"scripts": {
94070+
"test": "./node_modules/istanbul/lib/cli.js test ./node_modules/mocha/bin/_mocha test/test.js"
94071+
},
94072+
"version": "2.3.15"
94073+
};
9397694074

9397794075
/***/ }),
9397894076
/* 467 */

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