Skip to content

Commit cc6674a

Browse files
committed
link the feature overlay using the overlay factory
1 parent 46949ec commit cc6674a

File tree

1 file changed

+2
-18
lines changed

1 file changed

+2
-18
lines changed

mapcache/src/main/java/mil/nga/mapcache/GeoPackageMapFragment.java

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@
124124
import mil.nga.geopackage.map.geom.ShapeWithChildrenMarkers;
125125
import mil.nga.geopackage.map.tiles.TileBoundingBoxMapUtils;
126126
import mil.nga.geopackage.map.tiles.overlay.BoundedOverlay;
127-
import mil.nga.geopackage.map.tiles.overlay.CompositeOverlay;
128127
import mil.nga.geopackage.map.tiles.overlay.FeatureOverlay;
129128
import mil.nga.geopackage.map.tiles.overlay.FeatureOverlayQuery;
130129
import mil.nga.geopackage.map.tiles.overlay.GeoPackageOverlayFactory;
@@ -2913,23 +2912,8 @@ private void displayFeatureTiles(GeoPackageFeatureOverlayTable featureOverlayTab
29132912
featureOverlay.setMinZoom(featureOverlayTable.getMinZoom());
29142913
featureOverlay.setMaxZoom(featureOverlayTable.getMaxZoom());
29152914

2916-
// Get the linked tile daos
2917-
FeatureTileTableLinker linker = new FeatureTileTableLinker(geoPackage);
2918-
List<TileDao> tileDaos = linker.getTileDaosForFeatureTable(featureDao.getTableName());
2919-
2920-
BoundedOverlay overlay;
2921-
if(!tileDaos.isEmpty()){
2922-
// Create a composite overlay to search for existing tiles before drawing from features
2923-
CompositeOverlay compositeOverlay = new CompositeOverlay();
2924-
for(TileDao tileDao: tileDaos){
2925-
BoundedOverlay boundedOverlay = GeoPackageOverlayFactory.getBoundedOverlay(tileDao);
2926-
compositeOverlay.addOverlay(boundedOverlay);
2927-
}
2928-
compositeOverlay.addOverlay(featureOverlay);
2929-
overlay = compositeOverlay;
2930-
}else{
2931-
overlay = featureOverlay;
2932-
}
2915+
// Get the tile linked overlay
2916+
BoundedOverlay overlay = GeoPackageOverlayFactory.getLinkedFeatureOverlay(featureOverlay, geoPackage);
29332917

29342918
GeometryColumns geometryColumns = featureDao.getGeometryColumns();
29352919
Contents contents = geometryColumns.getContents();

0 commit comments

Comments
 (0)