feat(gis-export): add gis export for stops/routes

Author: landonreed

src/main/java/com/conveyal/datatools/editor/controllers/api/GisController.java

@@ -0,0 +1,77 @@
+package com.conveyal.datatools.editor.controllers.api;
+
+import com.conveyal.datatools.editor.jobs.GisExport;
+import com.conveyal.datatools.manager.models.JsonViews;
+import com.conveyal.datatools.manager.utils.json.JsonManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import spark.Request;
+import spark.Response;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.List;
+
+import static spark.Spark.get;
+import static spark.Spark.halt;
+
+/**
+ * Created by landon on 5/30/17.
+ */
+public class GisController {
+    public static final JsonManager<GisController> json =
+            new JsonManager<>(GisController.class, JsonViews.UserInterface.class);
+    private static final Logger LOG = LoggerFactory.getLogger(GisController.class);
+
+
+    public static FileInputStream exportGis (Request req, Response res) throws IOException {
+        String type = req.queryParams("type");
+        List<String> feedIds = Arrays.asList(req.queryParams("feedId").split(","));
+        File temp = File.createTempFile("gis_" + type, ".zip");
+
+        GisExport gisExport = new GisExport(GisExport.Type.valueOf(type), temp, feedIds);
+        gisExport.run();
+
+        FileInputStream fis = new FileInputStream(temp);
+
+        res.type("application/zip");
+        res.header("Content-Disposition", "attachment;filename=" + temp.getName().replaceAll("[^a-zA-Z0-9]", "") + ".zip");
+
+        // will not actually be deleted until download has completed
+        // http://stackoverflow.com/questions/24372279
+//        temp.delete();
+
+        return fis;
+    }
+
+//    res.raw().setContentType("application/zip");
+//    res.raw().setHeader("Content-Disposition", "attachment; filename=" + temp.getName() + ".zip");
+//
+//    try {
+//        BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(res.raw().getOutputStream());
+//        BufferedInputStream bufferedInputStream = new BufferedInputStream(new FileInputStream(temp));
+//
+//        byte[] buffer = new byte[1024];
+//        int len;
+//        while ((len = bufferedInputStream.read(buffer)) > 0) {
+//            bufferedOutputStream.write(buffer, 0, len);
+//        }
+//
+//        bufferedOutputStream.flush();
+//        bufferedOutputStream.close();
+//    } catch (Exception e) {
+//        halt(500, "Error serving GTFS+ file");
+//    }
+//
+//    return res.raw();
+
+    public static void register (String apiPrefix) {
+        get(apiPrefix + "secure/export/gis", GisController::exportGis, json::write);
+    }
+}

src/main/java/com/conveyal/datatools/editor/jobs/GisExport.java

@@ -1,7 +1,6 @@
 package com.conveyal.datatools.editor.jobs;
 
 import com.conveyal.datatools.editor.datastore.FeedTx;
-import com.conveyal.datatools.manager.models.FeedSource;
 import com.google.common.io.Files;
 import com.vividsolutions.jts.geom.Coordinate;
 import com.vividsolutions.jts.geom.GeometryFactory;
@@ -36,12 +35,12 @@
 public class GisExport implements Runnable {
     File file;
     Type type;
-    Collection<String> agencyIds;
+    Collection<String> feedIds;
 
-    public GisExport(Type type, File file, Collection<String> agencyIds) {
+    public GisExport(Type type, File file, Collection<String> feedIds) {
         this.type = type;
         this.file = file;
-        this.agencyIds = agencyIds;
+        this.feedIds = feedIds;
     }
 
     @Override
@@ -50,7 +49,7 @@ public void run() {
         File outShp = new File(outDir, file.getName().replaceAll("\\.zip", "") + ".shp");
 
         GlobalTx gtx = VersionedDataStore.getGlobalTx();
-        FeedTx atx = null;
+        FeedTx feedtx = null;
         try {
             ShapefileDataStoreFactory dataStoreFactory = new ShapefileDataStoreFactory();
 
@@ -98,11 +97,11 @@ public void run() {
                 datastore.createSchema(STOP_TYPE);
                 featureBuilder = new SimpleFeatureBuilder(STOP_TYPE);
 
-                for (String feedId : agencyIds) {
+                for (String feedId : feedIds) {
                     EditorFeed fs = gtx.feeds.get(feedId);
 
-                    atx = VersionedDataStore.getFeedTx(feedId);
-                    for (Stop s : atx.stops.values()) {
+                    feedtx = VersionedDataStore.getFeedTx(feedId);
+                    for (Stop s : feedtx.stops.values()) {
                         featureBuilder.add(s.location);
                         featureBuilder.add(s.stopName);
                         featureBuilder.add(s.stopCode);
@@ -113,7 +112,7 @@ public void run() {
                         features.add(feature);
                     }
 
-                    atx.rollback();
+                    feedtx.rollback();
                 }
             } else if (type.equals(Type.ROUTES)) {
                 collectionType = ROUTE_TYPE;
@@ -122,14 +121,14 @@ public void run() {
 
                 GeometryFactory gf = new GeometryFactory();
 
-                for (String feedId : agencyIds) {
+                for (String feedId : feedIds) {
                     EditorFeed fs = gtx.feeds.get(feedId);
 
-                    atx = VersionedDataStore.getFeedTx(feedId);
+                    feedtx = VersionedDataStore.getFeedTx(feedId);
 
                     // we loop over trip patterns. Note that this will yield several lines for routes that have
                     // multiple patterns. There's no real good way to reconcile the shapes of multiple patterns.
-                    for (TripPattern tp : atx.tripPatterns.values()) {
+                    for (TripPattern tp : feedtx.tripPatterns.values()) {
                         LineString shape;
                         if (tp.shape != null) {
                             shape = tp.shape;
@@ -138,13 +137,13 @@ public void run() {
                             Coordinate[] coords = new Coordinate[tp.patternStops.size()];
 
                             for (int i = 0; i < coords.length; i++) {
-                                coords[i] = atx.stops.get(tp.patternStops.get(i).stopId).location.getCoordinate();
+                                coords[i] = feedtx.stops.get(tp.patternStops.get(i).stopId).location.getCoordinate();
                             }
 
                             shape = gf.createLineString(coords);
                         }
 
-                        Route r = atx.routes.get(tp.routeId);
+                        Route r = feedtx.routes.get(tp.routeId);
 
                         featureBuilder.add(shape);
                         featureBuilder.add(tp.name);
@@ -165,7 +164,7 @@ public void run() {
                         features.add(feature);
                     }
 
-                    atx.rollback();
+                    feedtx.rollback();
                 }
             }
             else
@@ -208,9 +207,9 @@ public void run() {
             e.printStackTrace();
         } finally {
             if (gtx != null) gtx.rollback();
-            if (atx != null) atx.rollbackIfOpen();
+            if (feedtx != null) feedtx.rollbackIfOpen();
         }
     }
 
-    public static enum Type { ROUTES, STOPS };
+    public enum Type { ROUTES, STOPS }
 }

src/main/java/com/conveyal/datatools/editor/jobs/ProcessGisExport.java

@@ -143,6 +143,7 @@ private static void registerRoutes() throws IOException {
             SnapshotController.register(EDITOR_API_PREFIX);
             FeedInfoController.register(EDITOR_API_PREFIX);
             FareController.register(EDITOR_API_PREFIX);
+            GisController.register(EDITOR_API_PREFIX);
         }
 
         // log all exceptions to system.out