Include geometry

app/controllers/api/v1/routes_controller.rb

@@ -81,15 +81,19 @@ def index
     ]}
 
     respond_to do |format|
-      format.json { render paginated_json_collection(@routes).merge({ scope: { exclude_geometry: AllowFiltering.to_boolean(params[:exclude_geometry]) } }) }
+      # consider removing exclude_geometry
+      format.json { render paginated_json_collection(@routes).merge({ scope: { exclude_geometry: AllowFiltering.to_boolean(params[:exclude_geometry]),
+                                                                               include_geometry: AllowFiltering.to_boolean(params[:include_geometry])} }) }
       format.geojson { render paginated_geojson_collection(@routes) }
       format.csv { return_downloadable_csv(@routes, 'routes') }
     end
   end
 
   def show
     respond_to do |format|
-      format.json { render json: @route, scope: { exclude_geometry: AllowFiltering.to_boolean(params[:exclude_geometry]) } }
+      # consider removing exclude_geometry
+      format.json { render json: @route, scope: { exclude_geometry: AllowFiltering.to_boolean(params[:exclude_geometry]),
+                                                  include_geometry: AllowFiltering.to_boolean(params[:include_geometry])} }
       format.geojson { render json: @route, serializer: GeoJSONSerializer }
     end
   end
@@ -111,7 +115,8 @@ def query_params
       :import_level,
       :imported_from_feed,
       :imported_from_feed_version,
-      :exclude_geometry
+      :exclude_geometry,
+      :include_geometry
     )
   end
 

app/serializers/route_serializer.rb

@@ -50,7 +50,13 @@ class RouteSerializer < CurrentEntitySerializer
              :route_stop_patterns_by_onestop_id
 
   def include_geometry?
-    !(scope.present? && scope[:exclude_geometry].present? && scope[:exclude_geometry]) && !!object.try(:geometry)
+    # support exclude_geometry here, but include_geometry takes priority
+    if (scope.present? && scope.has_key?(:include_geometry) && !scope[:include_geometry].nil?)
+      return scope[:include_geometry] && !!object.try(:geometry)
+    elsif (scope.present? && scope.has_key?(:exclude_geometry) && !scope[:exclude_geometry].nil?)
+      return !scope[:exclude_geometry] && !!object.try(:geometry)
+    end
+    return true
   end
 
   def operated_by_onestop_id

spec/controllers/api/v1/routes_controller_spec.rb

@@ -190,20 +190,34 @@
         end
       end
 
-      context 'exclude_geometry' do
-        it 'include' do
+      context 'include and exclude geometry' do
+        it 'exclude_geometry=false' do
           get :index, exclude_geometry: "false"
           expect_json({ routes: -> (routes) {
             expect(routes.first.has_key?(:geometry)).to be true
           }})
         end
 
-        it 'exclude' do
+        it 'exclude_geometry=true' do
           get :index, exclude_geometry: "true"
           expect_json({ routes: -> (routes) {
             expect(routes.first.has_key?(:geometry)).to be false
           }})
         end
+
+        it 'include_geometry=false' do
+          get :index, include_geometry: "false"
+          expect_json({ routes: -> (routes) {
+            expect(routes.first.has_key?(:geometry)).to be false
+          }})
+        end
+
+        it 'include_geometry=true' do
+          get :index, include_geometry: "true"
+          expect_json({ routes: -> (routes) {
+            expect(routes.first.has_key?(:geometry)).to be true
+          }})
+        end
       end
     end