# HG changeset patch # User Sascha Wilde # Date 1585301619 -3600 # Node ID 2dcfab23dc86d1c469a4dee7371ca430e3fd3449 # Parent ee559cd0731f92cfcf8bfb6e3811e570deccd895 Removed no longer used endpoint /bottlenecks diff -r ee559cd0731f -r 2dcfab23dc86 pkg/controllers/routes.go --- a/pkg/controllers/routes.go Fri Mar 27 10:17:09 2020 +0100 +++ b/pkg/controllers/routes.go Fri Mar 27 10:33:39 2020 +0100 @@ -176,11 +176,6 @@ Handle: listSurveys, })).Methods(http.MethodGet) - // Bottlenecks - api.Handle("/bottlenecks", any(&mw.JSONHandler{ - Handle: listBottlenecks, - })).Methods(http.MethodGet) - // difference calculation api.Handle("/diff", any(&mw.JSONHandler{ Input: func(*http.Request) interface{} { return new(models.DiffCalculationInput) }, diff -r ee559cd0731f -r 2dcfab23dc86 pkg/controllers/search.go --- a/pkg/controllers/search.go Fri Mar 27 10:17:09 2020 +0100 +++ b/pkg/controllers/search.go Fri Mar 27 10:33:39 2020 +0100 @@ -15,7 +15,6 @@ package controllers import ( - "database/sql" "net/http" "strings" @@ -26,18 +25,6 @@ const ( searchMostSQL = `SELECT search_most($1)::text` - - listBottlenecksSQL = ` -SELECT COALESCE(json_agg(r),'[]') -FROM ( - SELECT - objnam AS name, - ST_AsGeoJSON(ST_Centroid(area))::json AS geom, - 'bottleneck' AS type - FROM waterway.bottlenecks - WHERE validity @> current_timestamp -ORDER BY objnam) r -` ) func searchFeature(req *http.Request) (jr mw.JSONResult, err error) { @@ -66,24 +53,3 @@ jr.Result = strings.NewReader(result) return } - -func listBottlenecks(req *http.Request) (jr mw.JSONResult, err error) { - - var result string - err = mw.JSONConn(req).QueryRowContext( - req.Context(), listBottlenecksSQL).Scan(&result) - - switch { - case err == sql.ErrNoRows: - err = mw.JSONError{ - Code: http.StatusNotFound, - Message: "Cannot find any bottleneck.", - } - return - case err != nil: - return - } - - jr = mw.JSONResult{Result: strings.NewReader(result)} - return -}