szczanieckiej.git

diff --git a/api/api.go b/api/api.go
index 476c0eea9d8cf4f9dfea771492a564dd8539289d..ed4228b091acbdefb8fffe341084de5693662020 100644
--- a/api/api.go
+++ b/api/api.go
@@ -304,7 +304,7 @@ 	return success, nil
 }
 
 func CreateSuccessQueryablesV3(query string, items []traffic.Queryable, context traffic.Context, t *traffic.Traffic, other QueryablesResponse, sortByDistance bool) (QueryablesResponse, error) {
-	success := QueryablesResponseDev{
+	success := QueryablesResponseV3{
 		Queryables: []QueryableV3{},
 	}
 	for _, item := range items {
@@ -318,7 +318,7 @@ 		} else {
 			continue
 		}
 	}
-	if otherV3, ok := other.(QueryablesResponseDev); ok {
+	if otherV3, ok := other.(QueryablesResponseV3); ok {
 		success.Queryables = append(success.Queryables, otherV3.Queryables...)
 	} else {
 		return success, errors.New("wrong version of other")
@@ -355,16 +355,16 @@ 		} else {
 			queryables = r.(QueryablesResponseV2).Queryables[offset : offset+limit]
 		}
 		result = QueryablesResponseV2{queryables}
-	case QueryablesResponseDev:
+	case QueryablesResponseV3:
 		var queryables []QueryableV3
-		if int(offset) > len(r.(QueryablesResponseDev).Queryables) {
+		if int(offset) > len(r.(QueryablesResponseV3).Queryables) {
 			queryables = []QueryableV3{}
-		} else if len(r.(QueryablesResponseDev).Queryables) < int(offset+limit) {
-			queryables = r.(QueryablesResponseDev).Queryables[offset:]
+		} else if len(r.(QueryablesResponseV3).Queryables) < int(offset+limit) {
+			queryables = r.(QueryablesResponseV3).Queryables[offset:]
 		} else {
-			queryables = r.(QueryablesResponseDev).Queryables[offset : offset+limit]
+			queryables = r.(QueryablesResponseV3).Queryables[offset : offset+limit]
 		}
-		result = QueryablesResponseDev{queryables}
+		result = QueryablesResponseV3{queryables}
 
 	}
 
@@ -532,7 +532,7 @@ 	return success, nil
 }
 
 func CreateSuccessLocatablesV3(locatables []traffic.Locatable, context traffic.Context, t *traffic.Traffic, other LocatablesResponse) (LocatablesResponse, error) {
-	success := LocatablesResponseDev{
+	success := LocatablesResponseV3{
 		Locatables: []LocatableV3{},
 	}
 	for _, locatable := range locatables {
@@ -547,7 +547,7 @@ 			}
 			success.Locatables = append(success.Locatables, LocatableV3(v))
 		}
 	}
-	if otherV3, ok := other.(LocatablesResponseDev); ok {
+	if otherV3, ok := other.(LocatablesResponseV3); ok {
 		success.Locatables = append(success.Locatables, otherV3.Locatables...)
 	} else {
 		return success, errors.New("wrong version of other")
@@ -572,9 +572,9 @@ func CreateSuccessLineV2(line traffic.Line, context traffic.Context, t *traffic.Traffic) (LineResponse, error) {
 	l := convertTrafficLineV2(line, context.FeedID)
 	l, err := convertTrafficLineGraphsV1forLineV2(line, l, context, t)
 	if err != nil {
-		return LineResponseDev{}, fmt.Errorf("while converting graph: %w", err)
+		return LineResponseV2{}, fmt.Errorf("while converting graph: %w", err)
 	}
-	success := LineResponseDev{
+	success := LineResponseV2{
 		Line: l,
 	}
 
@@ -771,7 +771,7 @@ 			departure.Status = convertVehicleStatusV1(trafficDeparture.Update.VehicleStatus.Status, timeToArrival)
 		}
 		d = append(d, departure)
 	}
-	success = DeparturesResponseDev{
+	success = DeparturesResponseV3{
 		Stop:       convertTrafficStopV2(stop, ctx.FeedID),
 		Departures: d,
 		Alerts:     convertTrafficAlerts(alerts, preferredLanguages),




diff --git a/api/feedsResponse.go b/api/feedsResponse.go
index 8cfd354281614c49cba9dfdf12f860b3140a245a..26c8299a16df53d31a33a64c73a4bcd46a8a15ed 100644
--- a/api/feedsResponse.go
+++ b/api/feedsResponse.go
@@ -53,7 +53,7 @@
 func MakeFeedsResponse(feedInfos map[string]traffic.FeedInfo, lastUpdates map[string]time.Time, accept uint, preferredLanguages []language.Tag) (FeedsResponse, error) {
 	switch accept {
 	case 0:
-		response := FeedsResponseDev{
+		response := FeedsResponseV2{
 			Feeds: []FeedInfoV2{},
 		}
 		for id, feedInfo := range feedInfos {




diff --git a/api/lineResponse.go b/api/lineResponse.go
index 5e48b99fa84080e9be0e9c703f586cdf5718b962..8eb490064c9fddd428f0546f1e2e6e5504df0535 100644
--- a/api/lineResponse.go
+++ b/api/lineResponse.go
@@ -11,7 +11,7 @@
 func MakeLineResponse(line traffic.Line, context traffic.Context, t *traffic.Traffic, accept uint) (LineResponse, error) {
 	switch accept {
 	case 0:
-		response := LineResponseDev{
+		response := LineResponseV2{
 			Line: LineV2{},
 		}
 		line, err := makeLineV2(line, context, t)
@@ -34,7 +34,7 @@ 	response, err := CreateSuccessLineV2(line, context, t)
 	if err != nil {
 		return LineV2{}, err
 	}
-	return response.(LineResponseDev).Line, nil
+	return response.(LineResponseV2).Line, nil
 
 	// TODO(cleaning) move from api/api.go
 }