fix ugc example, mapextend 增加movelayer判断

Author: xilanhuaweidapao

examples/openlayers/ugc_resample.html

@@ -129,7 +129,10 @@ <h5 class="panel-title text-center">重采样</h5>
         var lineLayer = new ol.layer.Vector({
           source: lineSource,
           style: new ol.style.Style({
-            stroke: new ol.style.Stroke(style)
+            stroke: new ol.style.Stroke(style),
+            fill: new ol.style.Fill({
+                color: style.color
+            })
           })
         });
         map.addLayer(lineLayer);

examples/openlayers/ugc_spatialRelationship.html

@@ -157,8 +157,11 @@ <h5 class="panel-title text-center">空间关系</h5>
           source: polygonSource,
           style: new ol.style.Style({
             stroke: new ol.style.Stroke({
-              color: style.color || 'blue',
+              color: style.color || 'rgba(0, 0, 255, 0.6)',
               width: 3
+            }),
+            fill: new ol.style.Fill({
+                color: style.color || 'rgba(0, 0, 255, 0.6)',
             })
           })
         });

src/mapboxgl/core/MapExtend.js

@@ -99,11 +99,11 @@ export var MapExtend = (function () {
           : this._moveToHandler(id, beforeId);
         return this;
       }
-      if (this.style._layers[id]) {
+      if (this.style._layers[id] && this.style._layers[beforeId]) {
         this.style.moveLayer(id, beforeId);
         this._update(true);
-        return this;
       }
+      return this;
     }
 
     removeLayer(id) {
@@ -305,11 +305,13 @@ export var MapExtend = (function () {
           });
         }
       }
-      if (layer && beforeLayer) {
-        beforeLayer.parentNode.insertBefore(layer, beforeLayer);
-      } else {
-        //当没有传入beforeLayerID ，则默认将图层移动到最上面
-        layer.parentNode.appendChild(layer);
+      if (layer) {
+        if (beforeLayer) {
+          beforeLayer.parentNode.insertBefore(layer, beforeLayer);
+        } else {
+          //当没有传入beforeLayerID ，则默认将图层移动到最上面
+          layer.parentNode.appendChild(layer);
+        }
       }
     }