Merge pull request deegree#518 from gritGmbH/3.4-bugfix-featureinfo-queryable

MrSnyder · MrSnyder · commit 73e2cc2e5314 · 2015-04-24T18:18:03.000+02:00
3.4 bugfix featureinfo queryable
diff --git a/deegree-core/deegree-core-layer/src/main/java/org/deegree/layer/config/ConfigUtils.java b/deegree-core/deegree-core-layer/src/main/java/org/deegree/layer/config/ConfigUtils.java
@@ -212,7 +212,7 @@ public static MapOptions parseLayerOptions( LayerOptionsType cfg ) {
         Quality quali = null;
         Interpolation interpol = null;
         int maxFeats = -1;
-        int rad = 1;
+        int rad = -1;
         try {
             alias = Antialias.valueOf( cfg.getAntiAliasing() );
         } catch ( Throwable e ) {
@@ -231,10 +231,14 @@ public static MapOptions parseLayerOptions( LayerOptionsType cfg ) {
         if ( cfg.getMaxFeatures() != null ) {
             maxFeats = cfg.getMaxFeatures();
         }
-        if ( cfg.getFeatureInfo() != null && cfg.getFeatureInfo().isEnabled() ) {
-            rad = cfg.getFeatureInfo().getPixelRadius().intValue();
+        if ( cfg.getFeatureInfo() != null ) {
+            if ( cfg.getFeatureInfo().isEnabled() ) {
+                rad = Math.max( 0, cfg.getFeatureInfo().getPixelRadius().intValue() );
+            } else {
+                rad = 0;
+            }
         } else if ( cfg.getFeatureInfoRadius() != null ) {
-            rad = cfg.getFeatureInfoRadius();
+            rad = Math.max( 0, cfg.getFeatureInfoRadius() );
         }
         return new MapOptions( quali, interpol, alias, maxFeats, rad );
     }
diff --git a/deegree-core/deegree-core-layer/src/main/java/org/deegree/layer/metadata/LayerMetadata.java b/deegree-core/deegree-core-layer/src/main/java/org/deegree/layer/metadata/LayerMetadata.java
@@ -165,13 +165,16 @@ public void setCascaded( int cascaded ) {
     }
 
     /**
-     * @return the queryable
+     * @return true if the layer can be queried
+     * @see MapOptions#getFeatureInfoRadius()
      */
     public boolean isQueryable() {
         if ( mapOptions == null ) {
             return true;
         }
-        return mapOptions.getFeatureInfoRadius() > 0;
+        
+        //TRICKY assume that, the service is query able by default (<0) 
+        return mapOptions.getFeatureInfoRadius() != 0;
     }
 
     /**
diff --git a/deegree-core/deegree-core-rendering-2d/src/main/java/org/deegree/rendering/r2d/context/MapOptions.java b/deegree-core/deegree-core-rendering-2d/src/main/java/org/deegree/rendering/r2d/context/MapOptions.java
@@ -38,9 +38,7 @@
 /**
  * 
  * @author <a href="mailto:schmitz@lat-lon.de">Andreas Schmitz</a>
- * @author last edited by: $Author: stranger $
- * 
- * @version $Revision: $, $Date: $
+ * @author <a href="mailto:reichhelm@grit.de">Stephan Reichhelm</a>
  */
 public class MapOptions {
 
@@ -60,7 +58,7 @@ public MapOptions( Quality quality, Interpolation interpol, Antialias antialias,
         this.interpol = interpol;
         this.antialias = antialias;
         this.maxFeatures = maxFeatures;
-        this.setFeatureInfoRadius( featureInfoRadius );
+        this.featureInfoRadius = featureInfoRadius;
     }
 
     /**
@@ -124,15 +122,15 @@ public void setMaxFeatures( int maxFeatures ) {
     }
 
     /**
-     * @return the featureInfoRadius, a value < 1 means disabled
+     * @return the featureInfoRadius, a value < 1 means default, 0 means disabled and > 0 for the radius
      */
     public int getFeatureInfoRadius() {
         return featureInfoRadius;
     }
 
     /**
      * @param featureInfoRadius
-     *            the featureInfoRadius to set, a value < 1 means disabled
+     *            the featureInfoRadius to set, a value < 1 means default, 0 means disabled and > 0 for the radius
      */
     public void setFeatureInfoRadius( int featureInfoRadius ) {
         this.featureInfoRadius = featureInfoRadius;
@@ -246,5 +244,4 @@ public Interpolation getOption( String layer ) {
             }
         };
     }
-
 }
diff --git a/deegree-layers/deegree-layers-coverage/src/main/java/org/deegree/layer/persistence/coverage/CoverageLayer.java b/deegree-layers/deegree-layers-coverage/src/main/java/org/deegree/layer/persistence/coverage/CoverageLayer.java
@@ -130,7 +130,11 @@ private InterpolationType determineInterpolation( Interpolation fromRequest ) {
     public CoverageLayerData infoQuery( LayerQuery query, List<String> headers )
                             throws OWSException {
         try {
-            Envelope bbox = query.calcClickBox( query.getRenderingOptions().getFeatureInfoRadius( getMetadata().getName() ) );
+            int layerRadius = -1;
+            if ( getMetadata().getMapOptions() != null ) {
+                layerRadius = getMetadata().getMapOptions().getFeatureInfoRadius();
+            }
+            final Envelope bbox = query.calcClickBox( layerRadius > -1 ? layerRadius : query.getLayerRadius() );
 
             RangeSet filter = dimensionHandler.getDimensionFilter( query.getDimensions(), headers );
 
diff --git a/deegree-layers/deegree-layers-feature/src/main/java/org/deegree/layer/persistence/feature/FeatureLayer.java b/deegree-layers/deegree-layers-feature/src/main/java/org/deegree/layer/persistence/feature/FeatureLayer.java
@@ -166,7 +166,11 @@ public FeatureLayerData infoQuery( final LayerQuery query, List<String> headers
         filter = Filters.and( filter, getStyleFilters( style, query.getScale() ) );
         filter = Filters.and( filter, query.getFilter() );
 
-        final Envelope clickBox = query.calcClickBox( query.getLayerRadius() );
+        int layerRadius = -1;
+        if ( getMetadata().getMapOptions() != null ) {
+            layerRadius = getMetadata().getMapOptions().getFeatureInfoRadius();
+        }
+        final Envelope clickBox = query.calcClickBox( layerRadius > -1 ? layerRadius : query.getLayerRadius() );
 
         filter = (OperatorFilter) addBBoxConstraint( clickBox, filter, null, false );
 
diff --git a/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/MapService.java b/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/MapService.java
@@ -292,6 +292,11 @@ public FeatureCollection getFeatures( org.deegree.protocol.wms.ops.GetFeatureInf
                      || l.getMetadata().getScaleDenominators().second < scale ) {
                     continue;
                 }
+                
+                if (!l.getMetadata().isQueryable()) {
+                    continue;
+                }
+                
                 list.add( l.infoQuery( query, headers ) );
             }
         }
@@ -325,15 +330,7 @@ private List<LayerQuery> prepareGetFeatures( org.deegree.protocol.wms.ops.GetFea
             LayerRef lr = layerItr.next();
             StyleRef sr = styleItr.next();
             OperatorFilter f = filterItr == null ? null : filterItr.next();
-            int layerRadius = 0;
-            for ( org.deegree.layer.Layer l : Themes.getAllLayers( themeMap.get( lr.getName() ) ) ) {
-                if ( l.getMetadata().getMapOptions() != null
-                     && l.getMetadata().getMapOptions().getFeatureInfoRadius() != 1 ) {
-                    layerRadius = l.getMetadata().getMapOptions().getFeatureInfoRadius();
-                } else {
-                    layerRadius = defaultLayerOptions.getFeatureInfoRadius();
-                }
-            }
+            final int layerRadius = defaultLayerOptions.getFeatureInfoRadius();
             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(),
@@ -376,7 +373,7 @@ public Pair<Integer, Integer> getLegendSize( Style style ) {
         return getLegendHandler.getLegendSize( style );
     }
 
-    public BufferedImage getLegend( GetLegendGraphic req ) {
+    public BufferedImage getLegend( GetLegendGraphic req ) throws OWSException {
         return getLegendHandler.getLegend( req );
     }
 
diff --git a/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/controller/capabilities/theme/LayerMetadataMerger.java b/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/controller/capabilities/theme/LayerMetadataMerger.java
@@ -48,18 +48,26 @@ Occam Labs UG (haftungsbeschränkt)
 import org.deegree.commons.utils.DoublePair;
 import org.deegree.layer.Layer;
 import org.deegree.layer.metadata.LayerMetadata;
+import org.deegree.rendering.r2d.context.MapOptions;
 import org.deegree.theme.Theme;
 import org.deegree.theme.Themes;
 
 /**
  * Merges {@link LayerMetadata} of {@link Theme} objects.
  *
  * @author <a href="mailto:schneider@occamlabs.de">Markus Schneider</a>
+ * @author <a href="mailto:reichhelm@grit.de">Stephan Reichhelm</a>
  *
  * @since 3.3
  */
 class LayerMetadataMerger {
-
+    
+    private static final int QUERYABLE_DEFAULT_MASK = 1;
+    
+    private static final int QUERYABLE_DISABLED_MASK = 2;
+    
+    private static final int QUERYABLE_ENABLED_MASK = 4;
+    
     /**
      * Returns the combined layer metadata for the given theme/sublayers.
      *
@@ -72,14 +80,30 @@ class LayerMetadataMerger {
     LayerMetadata merge( final Theme theme ) {
         final LayerMetadata themeMetadata = theme.getLayerMetadata();
         LayerMetadata layerMetadata = null;
+        
+        int queryable = 0;
+        
         for ( final Layer l : Themes.getAllLayers( theme ) ) {
+            queryable |= analyseQueryable( l.getMetadata() );
+            
             if ( layerMetadata == null ) {
                 layerMetadata = l.getMetadata();
             } else {
                 layerMetadata.merge( l.getMetadata() );
             }
         }
         themeMetadata.merge( layerMetadata );
+        
+        if ( themeMetadata.getMapOptions() == null ) {
+            themeMetadata.setMapOptions( new MapOptions( null, null, null, -1, -1 ) );
+        }
+        
+        if ( queryable == QUERYABLE_DISABLED_MASK ) {
+            themeMetadata.getMapOptions().setFeatureInfoRadius( 0 );
+        } else {
+            themeMetadata.getMapOptions().setFeatureInfoRadius( -1 );
+        }
+            
         return themeMetadata;
     }
 
@@ -117,4 +141,17 @@ DoublePair mergeScaleDenominators( final Theme theme ) {
         return new DoublePair( min, max );
     }
 
+    private int analyseQueryable( LayerMetadata m ) {
+        if ( m.getMapOptions() == null )
+            return QUERYABLE_DEFAULT_MASK;
+        
+        int r = m.getMapOptions().getFeatureInfoRadius();
+        
+        if ( r < 0 )
+            return QUERYABLE_DEFAULT_MASK;
+        else if ( r == 0 )
+            return QUERYABLE_DISABLED_MASK;
+        else
+            return QUERYABLE_ENABLED_MASK;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -165,13 +165,16 @@ public void setCascaded( int cascaded ) {`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`/**`
`168`		`- * @return the queryable`
	`168`	`+ * @return true if the layer can be queried`
	`169`	`+ * @see MapOptions#getFeatureInfoRadius()`
`169`	`170`	`*/`
`170`	`171`	`public boolean isQueryable() {`
`171`	`172`	`if ( mapOptions == null ) {`
`172`	`173`	`return true;`
`173`	`174`	`}`
`174`		`- return mapOptions.getFeatureInfoRadius() > 0;`
	`175`	`+`
	`176`	`+ //TRICKY assume that, the service is query able by default (<0)`
	`177`	`+ return mapOptions.getFeatureInfoRadius() != 0;`
`175`	`178`	`}`
`176`	`179`
`177`	`180`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,7 @@`
`38`	`38`	`/**`
`39`	`39`	`*`
`40`	`40`	`* @author <a href="mailto:[email protected]">Andreas Schmitz</a>`
`41`		`- * @author last edited by: $Author: stranger $`
`42`		`- *`
`43`		`- * @version $Revision: $, $Date: $`
	`41`	`+ * @author <a href="mailto:[email protected]">Stephan Reichhelm</a>`
`44`	`42`	`*/`
`45`	`43`	`public class MapOptions {`
`46`	`44`
`@@ -60,7 +58,7 @@ public MapOptions( Quality quality, Interpolation interpol, Antialias antialias,`
`60`	`58`	`this.interpol = interpol;`
`61`	`59`	`this.antialias = antialias;`
`62`	`60`	`this.maxFeatures = maxFeatures;`
`63`		`- this.setFeatureInfoRadius( featureInfoRadius );`
	`61`	`+ this.featureInfoRadius = featureInfoRadius;`
`64`	`62`	`}`
`65`	`63`
`66`	`64`	`/**`
`@@ -124,15 +122,15 @@ public void setMaxFeatures( int maxFeatures ) {`
`124`	`122`	`}`
`125`	`123`
`126`	`124`	`/**`
`127`		`- * @return the featureInfoRadius, a value < 1 means disabled`
	`125`	`+ * @return the featureInfoRadius, a value < 1 means default, 0 means disabled and > 0 for the radius`
`128`	`126`	`*/`
`129`	`127`	`public int getFeatureInfoRadius() {`
`130`	`128`	`return featureInfoRadius;`
`131`	`129`	`}`
`132`	`130`
`133`	`131`	`/**`
`134`	`132`	`* @param featureInfoRadius`
`135`		`- * the featureInfoRadius to set, a value < 1 means disabled`
	`133`	`+ * the featureInfoRadius to set, a value < 1 means default, 0 means disabled and > 0 for the radius`
`136`	`134`	`*/`
`137`	`135`	`public void setFeatureInfoRadius( int featureInfoRadius ) {`
`138`	`136`	`this.featureInfoRadius = featureInfoRadius;`
`@@ -246,5 +244,4 @@ public Interpolation getOption( String layer ) {`
`246`	`244`	`}`
`247`	`245`	`};`
`248`	`246`	`}`
`249`		`-`
`250`	`247`	`}`