Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/Home.vue

@@ -9,7 +9,7 @@
         components: {},
         components: {},
         data() {
         data() {
             return {
             return {
-                viewer: undefined, 
+                viewer: undefined,
                 entity: undefined,
                 entity: undefined,
             }
             }
         },
         },
@@ -37,7 +37,7 @@
                 cullWithChildrenBounds : true
                 cullWithChildrenBounds : true
             }), height = -2440;
             }), height = -2440;
             this.viewer.scene.primitives.add(tileset);
             this.viewer.scene.primitives.add(tileset);
-            
+
             tileset.readyPromise.then(argument => {
             tileset.readyPromise.then(argument => {
                 var cartographic = Cesium.Cartographic.fromCartesian(tileset.boundingSphere.center);
                 var cartographic = Cesium.Cartographic.fromCartesian(tileset.boundingSphere.center);
                 var surface = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, cartographic.height);
                 var surface = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, cartographic.height);
@@ -49,7 +49,7 @@
 
 
 
 
 
 
-            
+
 
 
         },
         },
         methods: {
         methods: {