fix 漏提交（mbgl专题图相关问题）

zhurc · zhurc · commit bdc72ba41fa5 · 2018-03-15T11:54:32.000+08:00
diff --git a/dist/iclient9-mapboxgl.js b/dist/iclient9-mapboxgl.js
@@ -51533,6 +51533,7 @@ var Theme3DLayer = exports.Theme3DLayer = function () {
             var layerId = this.id ? this.id : "theme3DLayer";
             if (this.map.getLayer(layerId)) {
                 this.map.off('mousemove', layerId, this._onMouseMove.bind(this));
+                this.map.on('mouseout', layerId, this._onMouseMove.bind(this));
                 this.map.removeLayer(layerId);
             }
             //移除高亮图层
@@ -51664,6 +51665,7 @@ var Theme3DLayer = exports.Theme3DLayer = function () {
 
             this._selectFeatureId = null;
             map.on('mousemove', this.id, this._onMouseMove.bind(this));
+            map.on('mouseout', this.id, this._onMouseMove.bind(this));
         }
     }, {
         key: '_onMouseMove',
@@ -51678,14 +51680,15 @@ var Theme3DLayer = exports.Theme3DLayer = function () {
 
             if (!features || features.length < 1) {
                 me._clearHighlight.call(me);
+                me._selectFeatureId = null;
                 return;
             }
             var id = features[0].id;
-            if (this._selectFeatureId === id) {
+            if (me._selectFeatureId === id) {
                 return;
             }
-            this._selectFeatureId = id;
-            map.setFilter("highlightLayer", ['==', '$id', this._selectFeatureId]);
+            me._selectFeatureId = id;
+            map.setFilter("highlightLayer", ['==', '$id', me._selectFeatureId]);
         }
     }, {
         key: '_clearHighlight',
diff --git a/dist/iclient9-mapboxgl.min.js b/dist/iclient9-mapboxgl.min.js
diff --git a/dist/include-mapboxgl.js b/dist/include-mapboxgl.js
@@ -58,7 +58,7 @@
             inputScript("https://cdn.bootcss.com/three.js/90/three.min.js");
         }
         if (!inArray(excludes, 'iclient9-mapboxgl')) {
-            inputScript("../../dist/iclient9-mapboxgl.js");
+            inputScript("../../dist/iclient9-mapboxgl.min.js");
         }
         if (inArray(includes, 'proj4')) {
             inputScript("https://cdn.bootcss.com/proj4js/2.4.3/proj4.js");
diff --git a/examples/mapboxgl/graphThemeLayer.html b/examples/mapboxgl/graphThemeLayer.html
@@ -429,7 +429,7 @@
             }
             contentHTML += "</div>";
 
-            var tempPoint = map.unproject(new window.mapboxgl.Point(e.event.x, e.event.y));
+            var tempPoint = map.unproject({x:e.event.x, y:e.event.y});
             popup = new mapboxgl.Popup({closeOnClick: false})
                 .setLngLat([tempPoint.lng, tempPoint.lat])
                 .setHTML(contentHTML)
diff --git a/examples/mapboxgl/rangeTheme3DLayer.html b/examples/mapboxgl/rangeTheme3DLayer.html
@@ -27,7 +27,8 @@
     var host = window.isLocal ? window.server : "http://117.122.248.69:8090";
     var dataUrl = host + "/iserver/services/data-jingjin/rest/data";
 
-    var center = [116.640545, 40.531714], themeField = "POP_DENSITY99", popup;
+    var center = [116.640545, 40.531714], themeField = "POP_DENSITY99",
+        themeLayer, popup;
 
     var map = new mapboxgl.Map({
         container: 'map',
@@ -86,7 +87,7 @@
     //创建专题图图层
     function createThemeLayer(data) {
         popup = new mapboxgl.Popup({closeOnClick: true}).addTo(map);
-        var themeLayer = new mapboxgl.supermap.RangeTheme3DLayer("range3DThemeLayer", {
+        themeLayer = new mapboxgl.supermap.RangeTheme3DLayer("range3DThemeLayer", {
             heightField: themeField,
             themeField: themeField,
             parseNumber: true,
diff --git a/src/mapboxgl/overlay/theme/Theme3DLayer.js b/src/mapboxgl/overlay/theme/Theme3DLayer.js
@@ -234,6 +234,7 @@ export class Theme3DLayer {
         var layerId = this.id ? this.id : "theme3DLayer";
         if (this.map.getLayer(layerId)) {
             this.map.off('mousemove', layerId, this._onMouseMove.bind(this));
+            this.map.on('mouseout', layerId, this._onMouseMove.bind(this));
             this.map.removeLayer(layerId);
         }
         //移除高亮图层
@@ -354,6 +355,7 @@ export class Theme3DLayer {
 
         this._selectFeatureId = null;
         map.on('mousemove', this.id, this._onMouseMove.bind(this));
+        map.on('mouseout', this.id, this._onMouseMove.bind(this));
     }
 
     _onMouseMove(e) {
@@ -366,14 +368,15 @@ export class Theme3DLayer {
 
         if (!features || features.length < 1) {
             me._clearHighlight.call(me);
+            me._selectFeatureId = null;
             return;
         }
         var id = features[0].id;
-        if (this._selectFeatureId === id) {
+        if (me._selectFeatureId === id) {
             return;
         }
-        this._selectFeatureId = id;
-        map.setFilter("highlightLayer", ['==', '$id', this._selectFeatureId]);
+        me._selectFeatureId = id;
+        map.setFilter("highlightLayer", ['==', '$id', me._selectFeatureId]);
     }
 
     _clearHighlight() {

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@`
`58`	`58`	`inputScript("https://cdn.bootcss.com/three.js/90/three.min.js");`
`59`	`59`	`}`
`60`	`60`	`if (!inArray(excludes, 'iclient9-mapboxgl')) {`
`61`		`- inputScript("../../dist/iclient9-mapboxgl.js");`
	`61`	`+ inputScript("../../dist/iclient9-mapboxgl.min.js");`
`62`	`62`	`}`
`63`	`63`	`if (inArray(includes, 'proj4')) {`
`64`	`64`	`inputScript("https://cdn.bootcss.com/proj4js/2.4.3/proj4.js");`
Original file line number	Diff line number	Diff line change
`@@ -429,7 +429,7 @@`
`429`	`429`	`}`
`430`	`430`	`contentHTML += "</div>";`
`431`	`431`
`432`		`- var tempPoint = map.unproject(new window.mapboxgl.Point(e.event.x, e.event.y));`
	`432`	`+ var tempPoint = map.unproject({x:e.event.x, y:e.event.y});`
`433`	`433`	`popup = new mapboxgl.Popup({closeOnClick: false})`
`434`	`434`	`.setLngLat([tempPoint.lng, tempPoint.lat])`
`435`	`435`	`.setHTML(contentHTML)`
Original file line number	Diff line number	Diff line change
`@@ -234,6 +234,7 @@ export class Theme3DLayer {`
`234`	`234`	`var layerId = this.id ? this.id : "theme3DLayer";`
`235`	`235`	`if (this.map.getLayer(layerId)) {`
`236`	`236`	`this.map.off('mousemove', layerId, this._onMouseMove.bind(this));`
	`237`	`+ this.map.on('mouseout', layerId, this._onMouseMove.bind(this));`
`237`	`238`	`this.map.removeLayer(layerId);`
`238`	`239`	`}`
`239`	`240`	`//移除高亮图层`
`@@ -354,6 +355,7 @@ export class Theme3DLayer {`
`354`	`355`
`355`	`356`	`this._selectFeatureId = null;`
`356`	`357`	`map.on('mousemove', this.id, this._onMouseMove.bind(this));`
	`358`	`+ map.on('mouseout', this.id, this._onMouseMove.bind(this));`
`357`	`359`	`}`
`358`	`360`
`359`	`361`	`_onMouseMove(e) {`
`@@ -366,14 +368,15 @@ export class Theme3DLayer {`
`366`	`368`
`367`	`369`	`if (!features \|\| features.length < 1) {`
`368`	`370`	`me._clearHighlight.call(me);`
	`371`	`+ me._selectFeatureId = null;`
`369`	`372`	`return;`
`370`	`373`	`}`
`371`	`374`	`var id = features[0].id;`
`372`		`- if (this._selectFeatureId === id) {`
	`375`	`+ if (me._selectFeatureId === id) {`
`373`	`376`	`return;`
`374`	`377`	`}`
`375`		`- this._selectFeatureId = id;`
`376`		`- map.setFilter("highlightLayer", ['==', '$id', this._selectFeatureId]);`
	`378`	`+ me._selectFeatureId = id;`
	`379`	`+ map.setFilter("highlightLayer", ['==', '$id', me._selectFeatureId]);`
`377`	`380`	`}`
`378`	`381`
`379`	`382`	`_clearHighlight() {`