@@ -424,7 +424,7 @@ describe('leaflet_GraphThemeLayer', function () {
424424 } ) ;
425425
426426 //在专题图的要素数组 features 里面遍历每一个 feature,当 feature[property] === value 时,返回此 feature
427- xit ( 'getFeatureBy' , function ( ) {
427+ it ( 'getFeatureBy' , function ( ) {
428428 var graphThemeLayer = L . supermap . graphThemeLayer ( "BarThemeLayer" , "Bar" ) . addTo ( map ) ;
429429 graphThemeLayer . themeFields = [ "CON2009" , "CON2010" , "CON2011" , "CON2012" , "CON2013" ] ;
430430 graphThemeLayer . chartsSetting = {
@@ -459,15 +459,17 @@ describe('leaflet_GraphThemeLayer', function () {
459459 features . push ( fea ) ;
460460 }
461461 graphThemeLayer . addFeatures ( features ) ;
462- var result = graphThemeLayer . getFeatureBy ( "id" , "SuperMap.Feature_3738" ) ;
462+ var resultFeatures = graphThemeLayer . getFeatures ( ) ;
463+ var id = resultFeatures [ 0 ] . id ;
464+ var result = graphThemeLayer . getFeatureBy ( "id" , id ) ;
463465 expect ( result ) . not . toBeNull ( ) ;
464- expect ( result . id ) . toEqual ( "SuperMap.Feature_3738" ) ;
465- expect ( result . attributes . NAME ) . toEqual ( "上海市 " ) ;
466+ expect ( result . id ) . toEqual ( id ) ;
467+ expect ( result . attributes . NAME ) . toEqual ( "北京市 " ) ;
466468 graphThemeLayer . clear ( ) ;
467469 } ) ;
468470
469471 //通过给定一个 id,返回对应的矢量要素
470- xit ( 'getFeatureById' , function ( ) {
472+ it ( 'getFeatureById' , function ( ) {
471473 var graphThemeLayer = L . supermap . graphThemeLayer ( "BarThemeLayer" , "Bar" ) . addTo ( map ) ;
472474 graphThemeLayer . themeFields = [ "CON2009" , "CON2010" , "CON2011" , "CON2012" , "CON2013" ] ;
473475 graphThemeLayer . chartsSetting = {
@@ -502,9 +504,11 @@ describe('leaflet_GraphThemeLayer', function () {
502504 features . push ( fea ) ;
503505 }
504506 graphThemeLayer . addFeatures ( features ) ;
505- var result = graphThemeLayer . getFeatureById ( "SuperMap.Feature_4360" ) ;
507+ var resultFeatures = graphThemeLayer . getFeatures ( ) ;
508+ var id = resultFeatures [ 0 ] . id ;
509+ var result = graphThemeLayer . getFeatureById ( id ) ;
506510 expect ( result ) . not . toBeNull ( ) ;
507- expect ( result . id ) . toEqual ( "SuperMap.Feature_4360" ) ;
511+ expect ( result . id ) . toEqual ( id ) ;
508512 expect ( result . attributes . NAME ) . toEqual ( "北京市" ) ;
509513 graphThemeLayer . clear ( ) ;
510514 } ) ;
0 commit comments