svn commit: r1659873 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/core/ solr/core/src/java/org/apache/solr/handler/component/SpatialHeatmapFacets.java

[ds...@apache.org]

Author: dsmiley
Date: Sun Feb 15 02:19:51 2015
New Revision: 1659873

URL: http://svn.apache.org/r1659873
Log:
SOLR-7005: don't add facet.heatmap.format=png to shard requests unless heatmaps are in use
Not a bug; just a small cleanup.

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/solr/   (props changed)
    lucene/dev/branches/branch_5x/solr/core/   (props changed)
    lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/SpatialHeatmapFacets.java

Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/SpatialHeatmapFacets.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/SpatialHeatmapFacets.java?rev=1659873&r1=1659872&r2=1659873&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/SpatialHeatmapFacets.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/SpatialHeatmapFacets.java Sun Feb 15 02:19:51 2015
@@ -287,11 +287,9 @@ public class SpatialHeatmapFacets {
           sreq.params.set("f." + key + "." + pname, pval);
         }
       }
-      // Remove existing format specifier
-      sreq.params.remove("f." + key + "." + FacetParams.FACET_HEATMAP_FORMAT);
+      // Set format to PNG; it's the only one we parse
+      sreq.params.set("f." + key + "." + FacetParams.FACET_HEATMAP_FORMAT, FORMAT_PNG);
     }
-    // Set format to PNG (applies to all heatmaps)
-    sreq.params.set(FacetParams.FACET_HEATMAP_FORMAT, FORMAT_PNG);
   }
 
   /** Called by FacetComponent.countFacets which is in turn called by FC's impl of