gis.layer merge

packages/common/business_components/src/ui/map/lib/gis.layer.js

@@ -142,9 +142,6 @@ GisOlLayer.prototype = {
 		let returnLayer = this.makeLayer(option);
 
 		//레이어 소스 생성
-<<<<<<< HEAD
-		let source = this.getVectorSourceBbox(option);
-=======
 		let source;
 
 		let lyrTyNm = option.lyrTyNm;
@@ -159,7 +156,6 @@ GisOlLayer.prototype = {
 			source = this.getVectorTileSource(option);
 		}
 
->>>>>>> iipbs/common/main
 		returnLayer.setSource(source);
 		//스타일 추가
 		returnLayer.setStyle(this.gisStyle.getLayerStyleFunction(returnLayer, option));