Added EHCaching for Datasets

Updated the Common Queries
Updated Datasets to ignore

.gitignore

@@ -10,3 +10,4 @@
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+/opengridservice/target/

opengridservice/pom.xml

@@ -65,6 +65,11 @@
 			<artifactId>spring-web</artifactId>
 			<version>${spring.version}</version>
 		</dependency>
+                <dependency>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-context-support</artifactId>
+                    <version>${spring.version}</version>
+                </dependency>
 		<dependency>
 		<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-ws-policy</artifactId>
@@ -130,6 +135,16 @@
 			<groupId>javax.validation</groupId>
 			<artifactId>validation-api</artifactId>
 			<version>${javax-validation.version}</version>
-		</dependency>					        
+		</dependency>
+                <dependency>
+                    <groupId>net.sf.ehcache</groupId>
+                    <artifactId>ehcache</artifactId>
+                    <version>2.7.6</version>
+                </dependency>	
+                <dependency>
+                    <groupId>net.sf.ehcache</groupId>
+                    <artifactId>ehcache-web</artifactId>
+                    <version>2.0.4</version>
+                </dependency>				        
 	</dependencies>
 </project>

opengridservice/src/main/java/org/opengrid/data/impl/PlenarioDataProvider.java

@@ -55,8 +55,11 @@ public String getData(String dataSetId, String metaCollectionName, String filter
 
                 StringBuilder sURL = new StringBuilder();
                 StringBuilder sb = new StringBuilder();
+                String defaultGeo = properties.getStringProperty("plenario.geo.default");
                 sURL.append("http://plenar.io/v1/api/detail/?dataset_name=" + dataSetId + "&dup_ver=1&obs_date__ge=2000-1-1"); //just a string
-                sURL.append("&location_geom__within={\"type\":\"Feature\",\"properties\":{},\"geometry\":{\"type\":\"Polygon\",\"coordinates\":[[[-89.961548,42.561173],[-87.033691,42.561173],[-87.033691,39.609920],[-89.961548,39.609920],[-89.961548,42.561173]]]}}");
+                sURL.append("&location_geom__within={\"type\":\"Feature\",\"properties\":{},\"geometry\":{\"type\":\"Polygon\",\"coordinates\":"
+                        + defaultGeo
+                        + "}}");
                 try
                 {
                     if (filter !=null && filter.length() > 0)
@@ -536,7 +539,7 @@ private List<OpenGridColumn> getColumnsForDataset(JsonObject rootobj) {
                 column.setGroupBy(shouldColumnBeInGroupBy(object.get("field_name").toString().replace("\"", "")));
                 column.setQuickSearch(shouldColumnBeInQuickSearch(object.get("field_name").toString().replace("\"", "")));
 
-                if(IgnoreColumn(object.get("field_name").toString().replace("\"", "")))
+                if(!IgnoreColumn(object.get("field_name").toString().replace("\"", "")))
                 {
                     column.setList(true);
                     column.setSortOrder(count);

opengridservice/src/main/resources/config/application.properties

@@ -15,4 +15,5 @@ auth.expiration=4
 
 #Plenario attribution 
 plenario.attribution.default=Chicago
-plenario.dataset.default=Cook County
+plenario.dataset.default=Cook County
+plenario.geo.default=[[[-89.961548,42.561173],[-87.033691,42.561173],[-87.033691,39.609920],[-89.961548,39.609920],[-89.961548,42.561173]]]