Add FeatureDatabase to non-streaming start_here proto (#16)

Author: larry-safran

codelabs/Getting_Started_with_gRPC_Java/complete/src/main/java/io/grpc/examples/routeguide/RouteGuideServer.java

@@ -16,15 +16,6 @@
 
 package io.grpc.examples.routeguide;
 
-import static java.lang.Math.atan2;
-import static java.lang.Math.cos;
-import static java.lang.Math.max;
-import static java.lang.Math.min;
-import static java.lang.Math.sin;
-import static java.lang.Math.sqrt;
-import static java.lang.Math.toRadians;
-import static java.util.concurrent.TimeUnit.NANOSECONDS;
-
 import io.grpc.Grpc;
 import io.grpc.InsecureServerCredentials;
 import io.grpc.Server;

codelabs/Getting_Started_with_gRPC_Java/start_here/src/main/java/io/grpc/examples/routeguide/RouteGuideServer.java

@@ -5,8 +5,10 @@
 import io.grpc.InsecureServerCredentials;
 import io.grpc.Server;
 import io.grpc.ServerBuilder;
+import io.grpc.stub.StreamObserver;
 import java.io.IOException;
 import java.net.URL;
+import java.util.Collection;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 

codelabs/Getting_Started_with_gRPC_Java/start_here/src/main/proto/routeguide/route_guide.proto

@@ -12,13 +12,17 @@ package routeguide;
   /////////////////////////////////////////////////////////////////////////////
 
 
-message Point {
+message Feature {
   /////////////////////////////////////////////////////////////////////////////
-  // Codelab Hint: Define the Point message's contents here
+  // Codelab Hint: Define the Feature message's contents here
   /////////////////////////////////////////////////////////////////////////////
 }
 
   /////////////////////////////////////////////////////////////////////////////
-  // Codelab Hint: Define the Feature message here
+  // Codelab Hint: Define the Point message here
   /////////////////////////////////////////////////////////////////////////////
 
+// Not used in the RPC.  Instead, this is here for the form serialized to disk.
+message FeatureDatabase {
+  repeated Feature feature = 1;
+}

codelabs/Getting_Started_with_gRPC_Java_Streaming/start_here/src/main/java/io/grpc/examples/routeguide/RouteGuideClient.java

@@ -8,10 +8,13 @@
 import io.grpc.Status;
 import io.grpc.StatusRuntimeException;
 import io.grpc.examples.routeguide.RouteGuideGrpc.RouteGuideBlockingStub;
-import io.grpc.examples.routeguide.RouteGuideGrpc.RouteGuideStub; // For Phase 2
-import io.grpc.stub.StreamObserver; 				  // For Phase 2
+import io.grpc.examples.routeguide.RouteGuideGrpc.RouteGuideStub;
+import io.grpc.stub.StreamObserver;
 import java.io.IOException;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Random;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -24,6 +27,7 @@ public class RouteGuideClient {
 
   private final RouteGuideBlockingStub blockingStub;
   private final RouteGuideStub asyncStub;
+  private Random random = new Random();
 
   /** Construct client stub for accessing RouteGuide server using the existing channel. */
   public RouteGuideClient(Channel channel) {
@@ -133,8 +137,8 @@ public void onCompleted() {
      * Codelab Hint: Start the recordRoute RPC using the asyncStub
      *   - Put the return value into requestObserver
      *
-     StreamObserver<Point> requestObserver =
      ****************************************************************/
+    StreamObserver<Point> requestObserver = null; // ***** TODO Replace null ******
     try {
       // Send numPoints points randomly selected from the features list.
       for (int i = 0; i < numPoints; ++i) {
@@ -279,4 +283,9 @@ private void warning(String msg, Object... params) {
     logger.log(Level.WARNING, msg, params);
   }
 
+  private RouteNote newNote(String message, int lat, int lon) {
+    return RouteNote.newBuilder().setMessage(message)
+        .setLocation(Point.newBuilder().setLatitude(lat).setLongitude(lon).build()).build();
+  }
+
 }

codelabs/Getting_Started_with_gRPC_Java_Streaming/start_here/src/main/java/io/grpc/examples/routeguide/RouteGuideServer.java

@@ -1,13 +1,30 @@
 
 package io.grpc.examples.routeguide;
 
+import static java.lang.Math.atan2;
+import static java.lang.Math.cos;
+import static java.lang.Math.max;
+import static java.lang.Math.min;
+import static java.lang.Math.sin;
+import static java.lang.Math.sqrt;
+import static java.lang.Math.toRadians;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+
 import io.grpc.Grpc;
 import io.grpc.InsecureServerCredentials;
 import io.grpc.Server;
 import io.grpc.ServerBuilder;
+import io.grpc.stub.StreamObserver;
 import java.io.IOException;
 import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
@@ -266,6 +283,29 @@ private Feature checkFeature(Point location) {
       return Feature.newBuilder().setName("").setLocation(location).build();
     }
 
+    /**
+     * Calculate the distance between two points using the "haversine" formula.
+     * The formula is based on http://mathforum.org/library/drmath/view/51879.html.
+     *
+     * @param start The starting point
+     * @param end The end point
+     * @return The distance between the points in meters
+     */
+    private static int calcDistance(Point start, Point end) {
+      int r = 6371000; // earth radius in meters
+      double lat1 = toRadians(RouteGuideUtil.getLatitude(start));
+      double lat2 = toRadians(RouteGuideUtil.getLatitude(end));
+      double lon1 = toRadians(RouteGuideUtil.getLongitude(start));
+      double lon2 = toRadians(RouteGuideUtil.getLongitude(end));
+      double deltaLat = lat2 - lat1;
+      double deltaLon = lon2 - lon1;
+
+      double a = sin(deltaLat / 2) * sin(deltaLat / 2)
+          + cos(lat1) * cos(lat2) * sin(deltaLon / 2) * sin(deltaLon / 2);
+      double c = 2 * atan2(sqrt(a), sqrt(1 - a));
+
+      return (int) (r * c);
+    }
   }
 }