Merge remote-tracking branch 'origin/develop' into develop

chenyabin

2021-03-31 97e8d550c9867f7a92c56060835db2969e6fca2e

 src/components/helpers/BasemapHelper.js

@@ -11,6 +11,7 @@
    this.basemapList = []
    this.basemapMap = new Map()
    this.basemapLayerGroup = this.L.layerGroup().addTo(options.map)
    this.currentBaseMapCode = null
  }

    /**
@@ -58,6 +59,8 @@
      this.basemapLayerGroup.addLayer(basemap.layer)
      if (showAnnotation) {
        this.basemapLayerGroup.addLayer(basemap.annotation)
      } else {
        this.basemapLayerGroup.removeLayer(basemap.annotation)
      }
    }