git-svn-id: https://svn.railml.org/railML2/branches/railML2.5-beta2@1260 997d4637-a740-4bf4-9a76-81fddc049f28

git-svn-id: https://svn.railml.org/railML2/branches/patternTrains@1259 997d4637-a740-4bf4-9a76-81fddc049f28

Separated tOriginDestinationInfo into tOriginDestinationInfo (attributes only) and eOriginDestinationInfo (extending with child element). Using tOriginDestinationInfo for origin and destination in patternTrainPart.

git-svn-id: https://svn.railml.org/railML2/branches/patternTrains@1258 997d4637-a740-4bf4-9a76-81fddc049f28

git-svn-id: https://svn.railml.org/railML2/branches/patternTrains@1257 997d4637-a740-4bf4-9a76-81fddc049f28

Merged updates from branches introduction.of.new.organizationalUnit.categoryManager (including changes from category.organizationalUnit) into railML2.5-beta2 (key+keyref on @organizationalUnitRef + cleanup)

git-svn-id: https://svn.railml.org/railML2/branches/railML2.5-beta2@1256 997d4637-a740-4bf4-9a76-81fddc049f28

git-svn-id: https://svn.railml.org/railML2/branches/railML2.5-beta2@1255 997d4637-a740-4bf4-9a76-81fddc049f28

git-svn-id: https://svn.railml.org/railML2/branches/metadata.projects@1254 997d4637-a740-4bf4-9a76-81fddc049f28

deprecating <locallyControlledArea>, because it has been replaced by <controller/localOperationArea>

git-svn-id: https://svn.railml.org/railML2/branches/railML2.5-beta2@1253 997d4637-a740-4bf4-9a76-81fddc049f28

git-svn-id: https://svn.railml.org/railML2/branches/metadata.projects@1252 997d4637-a740-4bf4-9a76-81fddc049f28

introducing <localOperationArea> and <workZone> referenced by controller;
see #393

git-svn-id: https://svn.railml.org/railML2/branches/railML2.5-beta2@1251 997d4637-a740-4bf4-9a76-81fddc049f28

git-svn-id: https://svn.railml.org/railML2/branches/railML2.5-beta2@1250 997d4637-a740-4bf4-9a76-81fddc049f28

git-svn-id: https://svn.railml.org/railML2/branches/railML2.5-beta2@1249 997d4637-a740-4bf4-9a76-81fddc049f28

insert "states" in <vehicle> and <formation> using the already defined "tStates" resp. "tState" from infrastructure, solution for #478

git-svn-id: https://svn.railml.org/railML2/branches/railML2.5-beta2@1248 997d4637-a740-4bf4-9a76-81fddc049f28

Merge branch 'category.organizationalUnit' into introduction.of.new.organizationalUnit.categoryManager

git-svn-id: https://svn.railml.org/railML2/branches/introduction.of.new.organizationalUnit.categoryManager@1245 997d4637-a740-4bf4-9a76-81fddc049f28

git-svn-id: https://svn.railml.org/railML2/branches/introduction.of.new.organizationalUnit.categoryManager@1244 997d4637-a740-4bf4-9a76-81fddc049f28

git-svn-id: https://svn.railml.org/railML2/branches/railML2.5-beta2@1243 997d4637-a740-4bf4-9a76-81fddc049f28

Moved eTrackPropPassengerInfo from infrastructure.xsd to infrastructureTypes.xsd to solve dependency error from tPlatformEdge. Also renamed to tPropPassengerInfo, as the type is being used by both track and platformEdge.

git-svn-id: https://svn.railml.org/railML2/branches/railML2.5-beta2@1242 997d4637-a740-4bf4-9a76-81fddc049f28

Merged branch metadata.projects into railML2.5-beta2, closing issues #390, #405, #406, #407, #409, #410, #411 and #412. Community discussion needed for proposed attributes regulationStage and planningStage in issue #408.

git-svn-id: https://svn.railml.org/railML2/branches/railML2.5-beta2@1241 997d4637-a740-4bf4-9a76-81fddc049f28

Removing attributes regulationStage and planningStage from standard until a standardised enumeration can be found

git-svn-id: https://svn.railml.org/railML2/branches/metadata.projects@1240 997d4637-a740-4bf4-9a76-81fddc049f28

Key-keyref constraint for organizationalUnitRef + cleanup between eCategory, tCategory and aCategory

git-svn-id: https://svn.railml.org/railML2/branches/category.organizationalUnit@1239 997d4637-a740-4bf4-9a76-81fddc049f28

git-svn-id: https://svn.railml.org/railML2/branches/railML2.5-beta2@1238 997d4637-a740-4bf4-9a76-81fddc049f28

adding <propPassengerInfo> container including mediaResources also for track and platformEdge as discussed in the forum, see #393, see #477

git-svn-id: https://svn.railml.org/railML2/branches/railML2.5-beta2@1236 997d4637-a740-4bf4-9a76-81fddc049f28

git-svn-id: https://svn.railml.org/railML2/branches/railML2.5-beta2@1235 997d4637-a740-4bf4-9a76-81fddc049f28

git-svn-id: https://svn.railml.org/railML2/branches/railML2.5-beta2@1234 997d4637-a740-4bf4-9a76-81fddc049f28

git-svn-id: https://svn.railml.org/railML2/branches/railML2.5-beta2@1233 997d4637-a740-4bf4-9a76-81fddc049f28

git-svn-id: https://svn.railml.org/railML2/branches/introduction.of.new.organizationalUnit.categoryManager@1232 997d4637-a740-4bf4-9a76-81fddc049f28

git-svn-id: https://svn.railml.org/railML2/branches/railML2.5-beta2@1231 997d4637-a740-4bf4-9a76-81fddc049f28

git-svn-id: https://svn.railml.org/railML2/branches/introduction.of.new.organizationalUnit.categoryManager@1230 997d4637-a740-4bf4-9a76-81fddc049f28

git-svn-id: https://svn.railml.org/railML2/branches/introduction.of.new.organizationalUnit.categoryManager@1229 997d4637-a740-4bf4-9a76-81fddc049f28

git-svn-id: https://svn.railml.org/railML2/branches/railML2.5-beta2@1228 997d4637-a740-4bf4-9a76-81fddc049f28

added categoryManager to metadata as requested by timetable community in order to allow for specification of a constraint regarding the organizational unit that is responsible for specifying a category

git-svn-id: https://svn.railml.org/railML2/branches/introduction.of.new.organizationalUnit.categoryManager@1227 997d4637-a740-4bf4-9a76-81fddc049f28

git-svn-id: https://svn.railml.org/railML2/branches/introduction.of.new.organizationalUnit.categoryManager@1226 997d4637-a740-4bf4-9a76-81fddc049f28

git-svn-id: https://svn.railml.org/railML2/branches/railML2.5-beta2@1225 997d4637-a740-4bf4-9a76-81fddc049f28

git-svn-id: https://svn.railml.org/railML2/branches/railML2.5-beta2@1224 997d4637-a740-4bf4-9a76-81fddc049f28

git-svn-id: https://svn.railml.org/railML2/branches/railML2.5-beta2@1223 997d4637-a740-4bf4-9a76-81fddc049f28

git-svn-id: https://svn.railml.org/railML2/branches/railML2.5-beta2@1222 997d4637-a740-4bf4-9a76-81fddc049f28

git-svn-id: https://svn.railml.org/railML2/branches/railML2.5-beta2@1221 997d4637-a740-4bf4-9a76-81fddc049f28

git-svn-id: https://svn.railml.org/railML2/branches/railML2.5-beta2@1220 997d4637-a740-4bf4-9a76-81fddc049f28

Renamed tArea and aArea from r1213 to tInfrastructureArea and aInfrastructureArea, as tArea already exists, making the schema invalid.

git-svn-id: https://svn.railml.org/railML2/branches/railML2.5-dev@1219 997d4637-a740-4bf4-9a76-81fddc049f28

git-svn-id: https://svn.railml.org/railML2/branches/railML2.5-beta2@1218 997d4637-a740-4bf4-9a76-81fddc049f28