Fix block query

project-open-data · 26b92786ee9f2c1bb655d00544c97f0b6d72adcc · jmarin committed Oct 19, 2012 · Oct 19, 2012 · 26b9278
1 parent 13f2742
commit 26b92786ee9f2c1bb655d00544c97f0b6d72adcc
Unified Split

Showing with 21 additions and 13 deletions.

+8 −4 src/main/java/org/geo/spatialsearch/service/impl/CensusServiceImpl.java

+12 −9 src/main/java/org/geo/spatialsearch/util/Message.java

+1 −0 src/main/resources/applicationContext-hibernate.xml
diff --git a/src/main/java/org/geo/spatialsearch/service/impl/CensusServiceImpl.java b/src/main/java/org/geo/spatialsearch/service/impl/CensusServiceImpl.java
@@ -86,31 +86,35 @@ public CensusLookupResponse findByCoordinates(
         return apiResponse;
     }
 
+    @Transactional(readOnly = true)
     private void findAllByPoint(CensusLookupResponse apiResponse, Point point) {
         // TODO Auto-generated method stub
 
     }
 
+    @Transactional(readOnly = true)
     private void findBlockByPoint(CensusLookupResponse apiResponse, Point point) {
-        final Criteria stateCriteria = block2010DAO.createCriteria();
-        stateCriteria.add(SpatialRestrictions.contains("geometry", point));
-        Block2010 block = block2010DAO.findByCriteria(stateCriteria);
+        final Criteria blockCriteria = block2010DAO.createCriteria();
+        blockCriteria.add(SpatialRestrictions.contains("geometry", point));
+        Block2010 block = block2010DAO.findByCriteria(blockCriteria);
         if (block != null) {
             block.setEnvelope(new Envelope(block.getGeometry()
                     .getEnvelopeInternal()));
             apiResponse.getCensusLookupBaseResponse().getBlocks().add(block);
         }
         ValidationUtil.isEmptyResult(apiResponse, apiResponse
                 .getCensusLookupBaseResponse().getStates(),
-                Message.NO_STATE_RESULTS_FOUND, null);
+                Message.NO_BLOCK_RESULTS_FOUND, null);
 
     }
 
+    @Transactional(readOnly = true)
     private void findTractByPoint(CensusLookupResponse apiResponse, Point point) {
         // TODO Auto-generated method stub
 
     }
 
+    @Transactional(readOnly = true)
     private void findCountyByPoint(CensusLookupResponse apiResponse, Point point) {
         // TODO Auto-generated method stub
 
diff --git a/src/main/java/org/geo/spatialsearch/util/Message.java b/src/main/java/org/geo/spatialsearch/util/Message.java
@@ -2,17 +2,20 @@
 
 public enum Message {
 
-    GEOGRAPHY_TYPE_NOT_VALID("Malformed URL: Geography Type not valid"), NO_STATE_RESULTS_FOUND(
-            "No State results found"), NO_RESULTS_FOUND("No results found");
+	GEOGRAPHY_TYPE_NOT_VALID("Malformed URL: Geography Type not valid"), NO_STATE_RESULTS_FOUND(
+			"No tate results found"), NO_COUNTY_RESULTS_FOUND(
+			"No county results found"), NO_TRACT_RESULTS_FOUND(
+			"No tract results found"), NO_BLOCK_RESULTS_FOUND(
+			"No block results found"), NO_RESULTS_FOUND("No results found");
 
-    private String message;
+	private String message;
 
-    private Message(String message) {
-        this.message = message;
-    }
+	private Message(String message) {
+		this.message = message;
+	}
 
-    public String getMessage() {
-        return message;
-    }
+	public String getMessage() {
+		return message;
+	}
 
 }
diff --git a/src/main/resources/applicationContext-hibernate.xml b/src/main/resources/applicationContext-hibernate.xml
@@ -50,6 +50,7 @@
 		<property name="annotatedClasses">
 			<list>
 				<value>org.geo.spatialsearch.census.model.State2010</value>
+				<value>org.geo.spatialsearch.census.model.Block2010</value>
 			</list>
 		</property>
 	</bean>