add ~ files to .gitignore; add CORS headers

mattb · Jan 28, 2013 · 8d84ae8 · 8d84ae8
1 parent 42acddd
commit 8d84ae8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@ deploy.sh
 target
 data
 .*.sw*
+*~
diff --git a/src/main/java/com/hackdiary/geo/FlickrGeocodeServlet.java b/src/main/java/com/hackdiary/geo/FlickrGeocodeServlet.java
@@ -28,6 +28,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
     double lat = Double.parseDouble(req.getParameter("lat"));
     double lng = Double.parseDouble(req.getParameter("lng"));
     resp.setContentType("application/json");
+    resp.setHeader("Access-Control-Allow-Origin", "*");
     ObjectMapper mapper = new ObjectMapper();
     mapper.writerWithDefaultPrettyPrinter().writeValue(resp.getWriter(), geocode.geocode(lat, lng));
   }