Merge branch 'master' of https://github.com/SuperMap/iClient9

caoxinke@supermap.com · caoxinke@supermap.com · commit 8f4e36af150f · 2017-08-28T11:57:56.000+08:00
diff --git a/dist/iclient9-mapboxgl.js b/dist/iclient9-mapboxgl.js
@@ -20572,6 +20572,7 @@ var MapvDataSet = exports.MapvDataSet = {
                         coordinates: data.geometry.coordinates
                     }
                 });
+                return data;
             });
             return new _mapv.DataSet(mPoints);
         }
@@ -20594,6 +20595,7 @@ var MapvDataSet = exports.MapvDataSet = {
                         coordinates: cv
                     }
                 });
+                return data;
             });
             return new _mapv.DataSet(lineData);
         }
@@ -20619,6 +20621,7 @@ var MapvDataSet = exports.MapvDataSet = {
                         time: j
                     });
                 }
+                return data;
             });
             return new _mapv.DataSet(timeData);
         }
diff --git a/dist/iclient9-mapboxgl.min.js b/dist/iclient9-mapboxgl.min.js
diff --git a/examples/css/header.css b/examples/css/header.css
@@ -3,7 +3,7 @@
 }
 
 .main-header .navbar-brand {
-    padding-top: 10px;
+    padding-right: 5px;
 }
 
 .navbar .project-title {
@@ -98,8 +98,8 @@
     font-size: 16px;
     color: #FFFFFF;
     height: 52px;
-    padding-left: 10px;
-    padding-top: 16px;
+    padding-left: 5px;
+    padding-top: 17px;
     padding-bottom: 15px;
     float: left;
 }
diff --git a/src/mapboxgl/overlay/mapv/MapvDataSet.js b/src/mapboxgl/overlay/mapv/MapvDataSet.js
@@ -32,6 +32,7 @@ export var MapvDataSet = {
                         coordinates: data.geometry.coordinates
                     },
                 });
+                return data;
             });
             return new DataSet(mPoints);
         }
@@ -54,6 +55,7 @@ export var MapvDataSet = {
                         coordinates: cv
                     }
                 });
+                return data;
             });
             return new DataSet(lineData);
         }
@@ -79,6 +81,7 @@ export var MapvDataSet = {
                         time: j
                     });
                 }
+                return data
             });
             return new DataSet(timeData);
         }

Original file line number	Diff line number	Diff line change
`@@ -20572,6 +20572,7 @@ var MapvDataSet = exports.MapvDataSet = {`
`20572`	`20572`	`coordinates: data.geometry.coordinates`
`20573`	`20573`	`}`
`20574`	`20574`	`});`
	`20575`	`+ return data;`
`20575`	`20576`	`});`
`20576`	`20577`	`return new _mapv.DataSet(mPoints);`
`20577`	`20578`	`}`
`@@ -20594,6 +20595,7 @@ var MapvDataSet = exports.MapvDataSet = {`
`20594`	`20595`	`coordinates: cv`
`20595`	`20596`	`}`
`20596`	`20597`	`});`
	`20598`	`+ return data;`
`20597`	`20599`	`});`
`20598`	`20600`	`return new _mapv.DataSet(lineData);`
`20599`	`20601`	`}`
`@@ -20619,6 +20621,7 @@ var MapvDataSet = exports.MapvDataSet = {`
`20619`	`20621`	`time: j`
`20620`	`20622`	`});`
`20621`	`20623`	`}`
	`20624`	`+ return data;`
`20622`	`20625`	`});`
`20623`	`20626`	`return new _mapv.DataSet(timeData);`
`20624`	`20627`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`.main-header .navbar-brand {`
`6`		`- padding-top: 10px;`
	`6`	`+ padding-right: 5px;`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`.navbar .project-title {`
`@@ -98,8 +98,8 @@`
`98`	`98`	`font-size: 16px;`
`99`	`99`	`color: #FFFFFF;`
`100`	`100`	`height: 52px;`
`101`		`- padding-left: 10px;`
`102`		`- padding-top: 16px;`
	`101`	`+ padding-left: 5px;`
	`102`	`+ padding-top: 17px;`
`103`	`103`	`padding-bottom: 15px;`
`104`	`104`	`float: left;`
`105`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ export var MapvDataSet = {`
`32`	`32`	`coordinates: data.geometry.coordinates`
`33`	`33`	`},`
`34`	`34`	`});`
	`35`	`+ return data;`
`35`	`36`	`});`
`36`	`37`	`return new DataSet(mPoints);`
`37`	`38`	`}`
`@@ -54,6 +55,7 @@ export var MapvDataSet = {`
`54`	`55`	`coordinates: cv`
`55`	`56`	`}`
`56`	`57`	`});`
	`58`	`+ return data;`
`57`	`59`	`});`
`58`	`60`	`return new DataSet(lineData);`
`59`	`61`	`}`
`@@ -79,6 +81,7 @@ export var MapvDataSet = {`
`79`	`81`	`time: j`
`80`	`82`	`});`
`81`	`83`	`}`
	`84`	`+ return data`
`82`	`85`	`});`
`83`	`86`	`return new DataSet(timeData);`
`84`	`87`	`}`