Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed GetMap requests to top-level theme id with multiple themes #68

Merged
merged 1 commit into from
Mar 19, 2013
Merged

Fixed GetMap requests to top-level theme id with multiple themes #68

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/MapService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ public MapService( ServiceConfigurationType conf, XMLAdapter adapter, DeegreeWor
LOG.warn( "Theme with id {} was not available.", id );
} else {
themes.add( thm );
themeMap.put( thm.getMetadata().getName(), thm );

for ( org.deegree.layer.Layer l : Themes.getAllLayers( thm ) ) {
newLayers.put( l.getMetadata().getName(), l );
Expand Down Expand Up @@ -320,16 +321,16 @@ public void getMap( org.deegree.protocol.wms.ops.GetMap gm, List<String> headers

double scale = gm.getScale();

List<LayerQuery> queries = new ArrayList<LayerQuery>();
List<LayerQuery> queries = new ArrayList<LayerQuery>();

Iterator<LayerRef> layerItr = gm.getLayers().iterator();
List<OperatorFilter> filters = gm.getFilters();
Iterator<OperatorFilter> filterItr = filters == null ? null : filters.iterator();
while ( layerItr.hasNext() ) {
LayerRef lr = layerItr.next();
StyleRef sr = styleItr.next();
OperatorFilter f = filterItr == null ? null : filterItr.next();

LayerQuery query = buildQuery( sr, lr, options, mapOptions, f, gm );
queries.add( query );
}
Expand Down Expand Up @@ -357,16 +358,15 @@ public void getMap( org.deegree.protocol.wms.ops.GetMap gm, List<String> headers
ScaleFunction.getCurrentScaleValue().remove();
}

private LayerQuery buildQuery( StyleRef style, LayerRef lr, MapOptionsMaps options,
List<MapOptions> mapOptions, OperatorFilter f,
org.deegree.protocol.wms.ops.GetMap gm ) {

private LayerQuery buildQuery( StyleRef style, LayerRef lr, MapOptionsMaps options, List<MapOptions> mapOptions,
OperatorFilter f, org.deegree.protocol.wms.ops.GetMap gm ) {

for ( org.deegree.layer.Layer l : Themes.getAllLayers( themeMap.get( lr.getName() ) ) ) {
insertMissingOptions( l.getMetadata().getName(), options, l.getMetadata().getMapOptions(),
defaultLayerOptions );
mapOptions.add( options.get( l.getMetadata().getName() ) );
}

LayerQuery query = new LayerQuery( gm.getBoundingBox(), gm.getWidth(), gm.getHeight(), style, f,
gm.getParameterMap(), gm.getDimensions(), gm.getPixelSize(), options,
gm.getQueryBox() );
Expand Down Expand Up @@ -411,18 +411,18 @@ public FeatureCollection getFeatures( org.deegree.protocol.wms.ops.GetFeatureInf
return col;
}

private List<LayerQuery> prepareGetFeatures( org.deegree.protocol.wms.ops.GetFeatureInfo gfi ) {
private List<LayerQuery> prepareGetFeatures( org.deegree.protocol.wms.ops.GetFeatureInfo gfi ) {
List<LayerQuery> queries = new ArrayList<LayerQuery>();

Iterator<LayerRef> layerItr = gfi.getQueryLayers().iterator();
Iterator<StyleRef> styleItr = gfi.getStyles().iterator();
List<OperatorFilter> filters = gfi.getFilters();
Iterator<OperatorFilter> filterItr = filters == null ? null : filters.iterator();
while ( layerItr.hasNext() ) {
LayerRef lr = layerItr.next();
StyleRef sr = styleItr.next();
StyleRef sr = styleItr.next();
OperatorFilter f = filterItr == null ? null : filterItr.next();

LayerQuery query = new LayerQuery( gfi.getEnvelope(), gfi.getWidth(), gfi.getHeight(), gfi.getX(),
gfi.getY(), gfi.getFeatureCount(), f, sr, gfi.getParameterMap(),
gfi.getDimensions(), new MapOptionsMaps(), gfi.getEnvelope() );
Expand Down