MRSD2018 · joshuajbennett · Apr 24, 2018
diff --git a/src/web_server/admin.html b/src/web_server/admin.html
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>GroundsBot</title>
+    <meta charset="utf-8">
+
+    <!-- Support for browsers on mobile phones. -->
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1, user-scalable=no">
+
+    <!-- Google Web Fonts. -->
+    <link href='https://fonts.googleapis.com/css?family=Roboto+Condensed'
+          rel='stylesheet' type='text/css'>
+
+    <!-- Custom CSS styles for our application. -->
+    <link rel="stylesheet" href="/static/admin.css">
+
+    <!-- The Google JavaScript loader tool (for the Maps, Charts APIs). -->
+    <script src="https://www.google.com/jsapi"></script>
+
+    <!-- Our custom JavaScript for grudsby Lights. -->
+    <script src="/static/admin.js"></script>
+
+  </head>
+  <body>
+
+    <!-- The DOM of our application. -->
+    <div class="grudsby">
+
+      <!-- The title of the application. -->
+      <h1>GroundsBot Admin</h1>
+
+      <!-- The button to draw a polygon. -->
+      <button class="addObstacle">Add New Obstacle</button>
+
+      <!-- The button to draw a polygon. -->
+      <button class="clearObstacles">Clear All Obstacles</button>
+
+      <!-- The button to draw a polygon. -->
+      <button class="drawRegion">Draw New Geofence</button>
+
+      <!-- A container which the Maps API will populate with a map. -->
+      <div class="map"></div>
+
+      <img id="grudsby" src="/static/grudsby_top_tiny.png"/>
+
+      <img id="pylon" src="/static/some_beach_tiny.png"/>
+
+      <a href="https://earthengine.google.org">
+        <img class="powered-by-ee"
+             alt="Powered by Google Earth Engine"
+             src="/static/google_earthengine_powered_400px.png">
+      </a>
+    </div>
+
+    <!-- Boot our JavaScript once the body has loaded. -->
+    <script>
+      grudsby.boot(
+          '{{ eeMapId | safe }}',
+          '{{ eeToken | safe }}');
+    </script>
+
+  </body>
+</html>
diff --git a/src/web_server/config.pyc b/src/web_server/config.pyc
diff --git a/src/web_server/index.html b/src/web_server/index.html
@@ -41,14 +41,15 @@ <h1>GroundsBot Mowing Selection</h1>
 
       <img id="grudsby" src="/static/grudsby_top_tiny.png"/>
 
+      <img id="pylon" src="/static/some_beach_tiny.png"/>
+
       <a href="https://earthengine.google.org">
         <img class="powered-by-ee"
              alt="Powered by Google Earth Engine"
              src="/static/google_earthengine_powered_400px.png">
       </a>
     </div>
 
-
     <!-- Boot our JavaScript once the body has loaded. -->
     <script>
       grudsby.boot(

diff --git a/src/web_server/pyasn1/__init__.pyc b/src/web_server/pyasn1/__init__.pyc
diff --git a/src/web_server/pyasn1/codec/__init__.pyc b/src/web_server/pyasn1/codec/__init__.pyc
diff --git a/src/web_server/pyasn1/codec/ber/__init__.pyc b/src/web_server/pyasn1/codec/ber/__init__.pyc
diff --git a/src/web_server/pyasn1/codec/ber/decoder.pyc b/src/web_server/pyasn1/codec/ber/decoder.pyc
diff --git a/src/web_server/pyasn1/codec/ber/encoder.pyc b/src/web_server/pyasn1/codec/ber/encoder.pyc
diff --git a/src/web_server/pyasn1/codec/ber/eoo.pyc b/src/web_server/pyasn1/codec/ber/eoo.pyc
diff --git a/src/web_server/pyasn1/codec/cer/__init__.pyc b/src/web_server/pyasn1/codec/cer/__init__.pyc
diff --git a/src/web_server/pyasn1/codec/cer/decoder.pyc b/src/web_server/pyasn1/codec/cer/decoder.pyc
diff --git a/src/web_server/pyasn1/codec/cer/encoder.pyc b/src/web_server/pyasn1/codec/cer/encoder.pyc
diff --git a/src/web_server/pyasn1/codec/der/__init__.pyc b/src/web_server/pyasn1/codec/der/__init__.pyc
diff --git a/src/web_server/pyasn1/codec/der/decoder.pyc b/src/web_server/pyasn1/codec/der/decoder.pyc
diff --git a/src/web_server/pyasn1/codec/der/encoder.pyc b/src/web_server/pyasn1/codec/der/encoder.pyc
diff --git a/src/web_server/pyasn1/compat/__init__.pyc b/src/web_server/pyasn1/compat/__init__.pyc
diff --git a/src/web_server/pyasn1/compat/octets.pyc b/src/web_server/pyasn1/compat/octets.pyc
diff --git a/src/web_server/pyasn1/debug.pyc b/src/web_server/pyasn1/debug.pyc
diff --git a/src/web_server/pyasn1/error.pyc b/src/web_server/pyasn1/error.pyc
diff --git a/src/web_server/pyasn1/type/__init__.pyc b/src/web_server/pyasn1/type/__init__.pyc
diff --git a/src/web_server/pyasn1/type/base.pyc b/src/web_server/pyasn1/type/base.pyc
diff --git a/src/web_server/pyasn1/type/char.pyc b/src/web_server/pyasn1/type/char.pyc
diff --git a/src/web_server/pyasn1/type/constraint.pyc b/src/web_server/pyasn1/type/constraint.pyc
diff --git a/src/web_server/pyasn1/type/error.pyc b/src/web_server/pyasn1/type/error.pyc
diff --git a/src/web_server/pyasn1/type/namedtype.pyc b/src/web_server/pyasn1/type/namedtype.pyc
diff --git a/src/web_server/pyasn1/type/namedval.pyc b/src/web_server/pyasn1/type/namedval.pyc
diff --git a/src/web_server/pyasn1/type/tag.pyc b/src/web_server/pyasn1/type/tag.pyc
diff --git a/src/web_server/pyasn1/type/tagmap.pyc b/src/web_server/pyasn1/type/tagmap.pyc
diff --git a/src/web_server/pyasn1/type/univ.pyc b/src/web_server/pyasn1/type/univ.pyc
diff --git a/src/web_server/pyasn1/type/useful.pyc b/src/web_server/pyasn1/type/useful.pyc
diff --git a/src/web_server/pyasn1_modules/__init__.pyc b/src/web_server/pyasn1_modules/__init__.pyc
diff --git a/src/web_server/pyasn1_modules/pem.pyc b/src/web_server/pyasn1_modules/pem.pyc
diff --git a/src/web_server/pyasn1_modules/rfc2251.pyc b/src/web_server/pyasn1_modules/rfc2251.pyc
diff --git a/src/web_server/pyasn1_modules/rfc2459.pyc b/src/web_server/pyasn1_modules/rfc2459.pyc
diff --git a/src/web_server/pyasn1_modules/rfc5208.pyc b/src/web_server/pyasn1_modules/rfc5208.pyc
diff --git a/src/web_server/rsa/__init__.pyc b/src/web_server/rsa/__init__.pyc
diff --git a/src/web_server/rsa/_compat.pyc b/src/web_server/rsa/_compat.pyc
diff --git a/src/web_server/rsa/common.pyc b/src/web_server/rsa/common.pyc
diff --git a/src/web_server/rsa/core.pyc b/src/web_server/rsa/core.pyc
diff --git a/src/web_server/rsa/key.pyc b/src/web_server/rsa/key.pyc
diff --git a/src/web_server/rsa/pem.pyc b/src/web_server/rsa/pem.pyc
diff --git a/src/web_server/rsa/pkcs1.pyc b/src/web_server/rsa/pkcs1.pyc
diff --git a/src/web_server/rsa/prime.pyc b/src/web_server/rsa/prime.pyc
diff --git a/src/web_server/rsa/randnum.pyc b/src/web_server/rsa/randnum.pyc
diff --git a/src/web_server/rsa/transform.pyc b/src/web_server/rsa/transform.pyc
diff --git a/src/web_server/server.py b/src/web_server/server.py
@@ -27,6 +27,45 @@ def get(self, path=''):
     template = JINJA2_ENVIRONMENT.get_template('index.html')
     self.response.out.write(template.render(template_values))
 
+class AdminHandler(webapp2.RequestHandler):
+  """A servlet to handle requests to load the main grudsby web page."""
+  def get(self, path=''):
+    mapid = GetgrudsbyMapId()
+    template_values = {
+        'eeMapId': mapid['mapid'],
+        'eeToken': mapid['token']
+    }
+    template = JINJA2_ENVIRONMENT.get_template('admin.html')
+    self.response.out.write(template.render(template_values))
+
+class GeofenceHandler(webapp2.RequestHandler):
+  """A servlet to handle requests for details about a Geofence."""
+  def get(self):
+    polygon_id = self.request.get('polygon_id')
+    loadedPath = getString(polygon_id + "_geofence")
+    try:
+      content = json.dumps(json.loads(loadedPath), sort_keys=True, indent=2)
+    except ValueError, e:
+      content = json.dumps({'error': 'Stored data not formatted correctly'})
+    self.response.headers['Content-Type'] = 'application/json'
+    self.response.out.write(content)
+
+class SaveGeofenceHandler(webapp2.RequestHandler):
+  """A servlet to save details about a Region."""
+  def get(self):
+    rawJson = str(self.request.get('jsonData'))
+    try:
+      polygonData = json.loads(rawJson)
+    except ValueError, e:
+      False  
+    if ('coordinates' in polygonData and 'regionID' in polygonData):
+      content = json.dumps({'result': 'Successfully received region ' + polygonData['regionID']}) 
+      setString(polygonData['regionID']+"_geofence", json.dumps(polygonData, ensure_ascii=False))
+    else:
+      content = json.dumps({'error': 'Request not formatted correctly'})
+    self.response.headers['Content-Type'] = 'application/json'
+    self.response.out.write(content)
+
 
 class RegionHandler(webapp2.RequestHandler):
   """A servlet to handle requests for details about a Region."""
@@ -155,13 +194,61 @@ def get(self):
     self.response.out.write(content)
 
 
+class ObstaclesHandler(webapp2.RequestHandler):
+  """A servlet to handle requests for details about an Approval."""
+  def get(self):
+    loadedPath = getString("obstacles")
+    try:
+      content = json.dumps(json.loads(loadedPath), sort_keys=True, indent=2)
+    except ValueError, e:
+      content = json.dumps({'error': 'Stored data not formatted correctly'})
+    self.response.headers['Content-Type'] = 'application/json'
+    self.response.out.write(content)
+
+
+class ClearObstaclesHandler(webapp2.RequestHandler):
+  """A servlet to handle requests for details about an Approval."""
+  def get(self):
+    setString('obstacles',"{\"obstacles\":[]}")
+    content = json.dumps({'result':'cleared the obstacles'})
+    self.response.headers['Content-Type'] = 'application/json'
+    self.response.out.write(content)
+
+
+
+class AddObstacleHandler(webapp2.RequestHandler):
+  """A servlet to add an Obstacle."""
+  def get(self):
+    rawJson = str(self.request.get('jsonData'))
+    try:
+      obstaclePos = json.loads(rawJson)
+    except ValueError, e:
+      False
+    if ('lat' in obstaclePos and 'lng' in obstaclePos):
+      content = json.dumps({'result': 'Successfully received obstacle position.'}) 
+      obstacles = getString("obstacles")
+      try:
+        obstaclesJSON = json.loads(obstacles)
+        obstaclesJSON["obstacles"].append({"lat":obstaclePos['lat'],"lng":obstaclePos['lng']})
+        setString("obstacles", json.dumps(obstaclesJSON)) 
+      except ValueError, e:
+        setString('obstacles',"{\"obstacles\":[{\"lat\":"+str(obstaclePos['lat'])+",\"lng\":"+str(obstaclePos['lng'])+"}]}")
+        content = json.dumps({'error': 'Stored data not formatted correctly. Added new obstacles object'})
+
+    else: 
+      content = json.dumps({'error': ' Received data not formatted correctly'})
+    self.response.headers['Content-Type'] = 'application/json'
+    self.response.out.write(content)
+
 
 
 # Define webapp2 routing from URL paths to web request handlers. See:
 # http://webapp-improved.appspot.com/tutorials/quickstart.html
 app = webapp2.WSGIApplication([
-    #('/details', DetailsHandler),
     ('/', MainHandler),
+    ('/admin', AdminHandler),
+    ('/geofence', GeofenceHandler),
+    ('/saveGeofence', SaveGeofenceHandler),
     ('/region', RegionHandler),
     ('/saveRegion', SaveRegionHandler),
     ('/plan', MowingPlanHandler),
@@ -170,6 +257,9 @@ def get(self):
     ('/setApproval', SetApprovalHandler),
     ('/mowerPos', MowerPosHandler),
     ('/setMowerPos', SetMowerPosHandler),
+    ('/obstacles', ObstaclesHandler),
+    ('/clearObstacles', ClearObstaclesHandler),
+    ('/addObstacle', AddObstacleHandler)
 ])
 
 

diff --git a/src/web_server/server.pyc b/src/web_server/server.pyc
diff --git a/src/web_server/six.pyc b/src/web_server/six.pyc