fix: set frame-topic in frame IDs properly to avoid ID clashes

Author: clezag

src/comp/flights.go

@@ -51,22 +51,22 @@ func GetFlights(ps []StFlights) ([]netex.CompositeFrame, error) {
 
 func compFlights(pd StFlightData) netex.CompositeFrame {
 	ret := DefaultCompositFrame()
-	ret.Id = CreateFrameId(netex.TypeCompositeFrameLineOffer, "FLIGHTS", "ita")
+	ret.Id = CreateFrameId(netex.TypeCompositeFrameLineOffer, "FLIGHTS")
 	ret.TypeOfFrameRef = MkTypeOfFrameRef(netex.EpipTypeLineOffer)
 
-	site := siteFrame()
+	site := siteFrame("FLIGHTS")
 	site.StopPlaces = &pd.StopPlaces
 	ret.Frames.Frames = append(ret.Frames.Frames, &site)
 
 	res := netex.ResourceFrame{}
-	res.Id = CreateFrameId(netex.TypeResourceFrameCommon, "ita")
+	res.Id = CreateFrameId(netex.TypeResourceFrameCommon, "FLIGHTS")
 	res.Version = "1"
 	res.TypeOfFrameRef = MkTypeOfFrameRef(netex.EpipTypeCommon)
 	res.Operators = &pd.Operators
 	ret.Frames.Frames = append(ret.Frames.Frames, &res)
 
 	ser := netex.ServiceFrame{}
-	ser.Id = CreateFrameId(netex.TypeServiceFrameNetwork, "ita")
+	ser.Id = CreateFrameId(netex.TypeServiceFrameNetwork, "FLIGHTS")
 	ser.Version = "1"
 	ser.TypeOfFrameRef = MkTypeOfFrameRef(netex.EpipTypeNetwork)
 	ser.JourneyPatterns = netex.JustSlice(pd.JourneyPatterns)
@@ -78,7 +78,7 @@ func compFlights(pd StFlightData) netex.CompositeFrame {
 	ret.Frames.Frames = append(ret.Frames.Frames, ser)
 
 	cal := netex.ServiceCalendarFrame{}
-	cal.Id = CreateFrameId(netex.TypeServiceCalendarFrameCalendar, "ita")
+	cal.Id = CreateFrameId(netex.TypeServiceCalendarFrameCalendar, "FLIGHTS")
 	cal.Version = "1"
 	cal.TypeOfFrameRef = MkTypeOfFrameRef(netex.EpipTypeCalendar)
 	cal.ServiceCalendar = append(cal.ServiceCalendar, pd.ServiceCalendars...)

src/comp/parking.go

@@ -20,16 +20,16 @@ type OdhEcharging struct {
 	}
 }
 
-func compFrame(pd StParkingData) netex.CompositeFrame {
+func compFrame(serviceName string, pd StParkingData) netex.CompositeFrame {
 	ret := DefaultCompositFrame()
-	ret.Id = CreateFrameId(netex.TypeCompositeFrameStopOffer, "PARKING", "ita")
+	ret.Id = CreateFrameId(netex.TypeCompositeFrameStopOffer, serviceName)
 	ret.TypeOfFrameRef = MkTypeOfFrameRef(netex.EpipTypeStopOffer)
 
-	site := siteFrame()
+	site := siteFrame(serviceName)
 	ret.Frames.Frames = append(ret.Frames.Frames, &site)
 
 	res := netex.ResourceFrame{}
-	res.Id = CreateFrameId(netex.TypeResourceFrameCommon, "ita")
+	res.Id = CreateFrameId(netex.TypeResourceFrameCommon, serviceName)
 	res.Version = "1"
 	res.TypeOfFrameRef = MkTypeOfFrameRef(netex.EpipTypeCommon)
 	ret.Frames.Frames = append(ret.Frames.Frames, &res)
@@ -63,15 +63,7 @@ func GetParking(ps []StParking) ([]netex.CompositeFrame, error) {
 		apd.Operators = append(apd.Operators, pd.Operators...)
 	}
 
-	ret = append(ret, compFrame(apd))
+	ret = append(ret, compFrame("PARKING", apd))
 
 	return ret, nil
 }
-
-func siteFrame() netex.SiteFrame {
-	var site netex.SiteFrame
-	site.Id = CreateFrameId(netex.TypeSiteFrameStop, "ita")
-	site.Version = "1"
-	site.TypeOfFrameRef = MkTypeOfFrameRef(netex.EpipTypeStop)
-	return site
-}

src/comp/sharing.go

@@ -102,7 +102,7 @@ func compSharing(serviceName string, ps []StSharing) (netex.CompositeFrame, erro
 	}
 
 	comp := DefaultCompositFrame()
-	comp.Id = CreateFrameId(netex.TypeCompositeFrameStopOffer, "SHARING", serviceName)
+	comp.Id = CreateFrameId(netex.TypeCompositeFrameStopOffer, serviceName)
 	comp.TypeOfFrameRef = MkTypeOfFrameRef(netex.EpipTypeStopOffer)
 	comp.Frames.Frames = append(comp.Frames.Frames, mob, res, site)
 

src/comp/util.go

@@ -43,3 +43,11 @@ func DefaultCompositFrame() netex.CompositeFrame {
 	c.FrameDefaults.DefaultCodespaceRef.Ref = "ita"
 	return c
 }
+
+func siteFrame(serviceName string) netex.SiteFrame {
+	var site netex.SiteFrame
+	site.Id = CreateFrameId(netex.TypeSiteFrameStop, serviceName)
+	site.Version = "1"
+	site.TypeOfFrameRef = MkTypeOfFrameRef(netex.EpipTypeStop)
+	return site
+}