解决冲突

wangrong

2022-10-24 7462b259c1ee67760d6e0a9f98d7bd79ce05086a

解决冲突

 js/function.js

@@ -272,28 +272,4 @@
});
map.addLayer(geoJsonLayer);
    }
<<<<<<< HEAD
    debugger;
    //geojson 各行政区边界线
      geoJsonLayer = new mars3d.layer.GeoJsonLayer({
        url: "./data/"+regionCode+".geojson",
        mask: true, //标识为遮罩层【重点参数】 
        symbol: {
          styleOptions: {
            fill: true,
            color: "rgb(2,26,79)",
            outline: true,
            outlineColor: "#39E09B",
            outlineWidth: 3,
            outlineOpacity: 0.5,
            arcType: Cesium.ArcType.GEODESIC,
            clampToGround: true,
          },
        },
      });
      map.addLayer(geoJsonLayer);
=======
   
>>>>>>> 165c834d414f2c5f56ad6d259b5f18c26921cc94
}