Removed debug println and commented out code

gordcorp · Feb 3, 2015 · 069d245 · 069d245
1 parent 9a7e6f7
commit 069d245
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/src/wfs/src/main/java/org/geoserver/wfs/json/GeoJSONGetFeatureResponse.java b/src/wfs/src/main/java/org/geoserver/wfs/json/GeoJSONGetFeatureResponse.java
@@ -201,8 +201,7 @@ else if ( id_option.length() != 0){
                         }
 
                         jsonWriter.key("geometry");
-                        System.out.println("BRENDAN");
-                        //BRENDAN GORDON - For WMS.GetFeatureInfo, removed geometry for json
+                        //For WMS.GetFeatureInfo, removed geometry for json
                         Geometry aGeom = null;
                         if (request.getService().equalsIgnoreCase("wms") && request.getRequest().equalsIgnoreCase("GetFeatureInfo"))
                         {

diff --git a/src/wms/src/test/java/org/geoserver/wms/featureinfo/GetFeatureInfoJSONTest.java b/src/wms/src/test/java/org/geoserver/wms/featureinfo/GetFeatureInfoJSONTest.java
@@ -173,15 +173,7 @@ public void testJsonGeometryIsNull() throws Exception {
         JSONObject json = (JSONObject) getAsJSON(request);
         JSONObject feature = (JSONObject) json.getJSONArray("features").get(0);
         //geometry is null for this info_format
-        assert(feature.getString("geometry").equalsIgnoreCase("<null>"));
-//        JSONObject geom = feature.getJSONObject("geometry");
-//        
-//        // unroll the geometry and get the first coordinate
-//        JSONArray coords = geom.getJSONArray("coordinates").getJSONArray(0).getJSONArray(0).getJSONArray(0);
-//        assertTrue(new NumberRange<Double>(Double.class, 500525d, 500575d).contains((Number) coords
-//                .getDouble(0)));
-//        assertTrue(new NumberRange<Double>(Double.class, 500025d, 500050d).contains((Number) coords
-//                .getDouble(1)));
+        assert(feature.getString("geometry").equalsIgnoreCase("null"));
     }