Commit 516fc858 authored by Thomas Graichen's avatar Thomas Graichen

Update ZHV scheme xml and generated classes

- also refactor class names
parent 16a5f80d
<component name="ProjectRunConfigurationManager"> <component name="ProjectRunConfigurationManager">
<configuration default="false" name="ZHV_Converter" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true"> <configuration default="false" name="ZhvConverter" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true">
<module name="ZHV-Tools" /> <module name="ZHV-Tools" />
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" /> <option name="PARENT_ENVS" value="true" />
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<option name="ADD_CONTENT_ROOTS" value="true" /> <option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" /> <option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" /> <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/zhv_parser/ZHV_Converter.py" /> <option name="SCRIPT_NAME" value="$PROJECT_DIR$/zhv_parser/ZhvConverter.py" />
<option name="PARAMETERS" value="../data/examples_zhv/example_multiple_stations.xml" /> <option name="PARAMETERS" value="../data/examples_zhv/example_multiple_stations.xml" />
<option name="SHOW_COMMAND_LINE" value="false" /> <option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" /> <option name="EMULATE_TERMINAL" value="false" />
......
...@@ -2,89 +2,41 @@ ...@@ -2,89 +2,41 @@
<GetResponseType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://zhv.xml.wvi/"> <GetResponseType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://zhv.xml.wvi/">
<Items> <Items>
<StopPlace> <StopPlace>
<Name> <Name>
<Name>Chemnitz, TU Campus</Name> <Name>Chemnitz, TU Campus</Name>
</Name> </Name>
<Location> <Location>
<Latitude>50.813726</Latitude> <Latitude>50.813726</Latitude>
<Longitude>12.930835</Longitude> <Longitude>12.930835</Longitude>
</Location> </Location>
<Condition> <Condition>
<ConditionKind>Served</ConditionKind> <ConditionKind>Served</ConditionKind>
</Condition> </Condition>
<State> <State>
<StateKind>InOrder</StateKind> <StateKind>InOrder</StateKind>
</State> </State>
<DHID>de:14511:30220</DHID> <DHID>de:14511:30220</DHID>
<Authority> <Authority>
<AuthorityId>13</AuthorityId> <AuthorityId>13</AuthorityId>
<Label>VVO</Label> <Label>VVO</Label>
</Authority> </Authority>
<Municipality> <Municipality>
<MunicipalityCode>14511000</MunicipalityCode> <MunicipalityCode>14511000</MunicipalityCode>
<Label>Chemnitz</Label> <Label>Chemnitz</Label>
</Municipality> </Municipality>
<District> <District>
<DistrictCode /> <DistrictCode />
<Name /> <Name />
</District> </District>
<AreaQuay> <AreaQuay>
<Items> <Items>
<Area> <Area>
<Name>
<Name>Tram</Name>
</Name>
<Location>
<Latitude>50.813726</Latitude>
<Longitude>12.930871</Longitude>
</Location>
<Condition>
<ConditionKind>Served</ConditionKind>
</Condition>
<State>
<StateKind>InOrder</StateKind>
</State>
<DHID>de:14511:30220:1</DHID>
<Quays>
<Quay>
<Name>
<Name>ChemnitzBahn Süd 2A</Name>
</Name>
<Location>
<Latitude>50.813465</Latitude>
<Longitude>12.931051</Longitude>
</Location>
<Condition>
<ConditionKind>Served</ConditionKind>
</Condition>
<State>
<StateKind>InOrder</StateKind>
</State>
<DHID>de:14511:30220:1:2A</DHID>
</Quay>
<Quay>
<Name>
<Name>Tram Süd 2B</Name>
</Name>
<Location>
<Latitude>50.813709</Latitude>
<Longitude>12.930808</Longitude>
</Location>
<Condition>
<ConditionKind>Served</ConditionKind>
</Condition>
<State>
<StateKind>InOrder</StateKind>
</State>
<DHID>de:14511:30220:1:2B</DHID>
</Quay>
<Quay>
<Name> <Name>
<Name>ChemnitzBahn Nord 3A</Name> <Name>Tram</Name>
</Name> </Name>
<Location> <Location>
<Latitude>50.813925</Latitude> <Latitude>50.813726</Latitude>
<Longitude>12.930719</Longitude> <Longitude>12.930871</Longitude>
</Location> </Location>
<Condition> <Condition>
<ConditionKind>Served</ConditionKind> <ConditionKind>Served</ConditionKind>
...@@ -92,15 +44,97 @@ ...@@ -92,15 +44,97 @@
<State> <State>
<StateKind>InOrder</StateKind> <StateKind>InOrder</StateKind>
</State> </State>
<DHID>de:14511:30220:1:3A</DHID> <DHID>de:14511:30220:1</DHID>
</Quay> <Quays>
<Quay> <Quay>
<Name>
<Name>ChemnitzBahn Süd 2A</Name>
</Name>
<Location>
<Latitude>50.813465</Latitude>
<Longitude>12.931051</Longitude>
</Location>
<Condition>
<ConditionKind>Served</ConditionKind>
</Condition>
<State>
<StateKind>InOrder</StateKind>
</State>
<DHID>de:14511:30220:1:2A</DHID>
</Quay>
<Quay>
<Name>
<Name>Tram Süd 2B</Name>
</Name>
<Location>
<Latitude>50.813709</Latitude>
<Longitude>12.930808</Longitude>
</Location>
<Condition>
<ConditionKind>Served</ConditionKind>
</Condition>
<State>
<StateKind>InOrder</StateKind>
</State>
<DHID>de:14511:30220:1:2B</DHID>
</Quay>
<Quay>
<Name>
<Name>ChemnitzBahn Nord 3A</Name>
</Name>
<Location>
<Latitude>50.813925</Latitude>
<Longitude>12.930719</Longitude>
</Location>
<Condition>
<ConditionKind>Served</ConditionKind>
</Condition>
<State>
<StateKind>InOrder</StateKind>
</State>
<DHID>de:14511:30220:1:3A</DHID>
</Quay>
<Quay>
<Name>
<Name>Tram Nord 3B</Name>
</Name>
<Location>
<Latitude>50.813658</Latitude>
<Longitude>12.930979</Longitude>
</Location>
<Condition>
<ConditionKind>Served</ConditionKind>
</Condition>
<State>
<StateKind>InOrder</StateKind>
</State>
<DHID>de:14511:30220:1:3B</DHID>
</Quay>
<Quay>
<Name>
<Name>Zugang Fußgänger</Name>
</Name>
<Location>
<Latitude>50.81409</Latitude>
<Longitude>12.930521</Longitude>
</Location>
<Condition>
<ConditionKind>Unserved</ConditionKind>
</Condition>
<State>
<StateKind>OutOfOrder</StateKind>
</State>
<DHID>de:14511:30220:1:F</DHID>
</Quay>
</Quays>
</Area>
<Area>
<Name> <Name>
<Name>Tram Nord 3B</Name> <Name>Bus</Name>
</Name> </Name>
<Location> <Location>
<Latitude>50.813658</Latitude> <Latitude>50.813817</Latitude>
<Longitude>12.930979</Longitude> <Longitude>12.930772</Longitude>
</Location> </Location>
<Condition> <Condition>
<ConditionKind>Served</ConditionKind> <ConditionKind>Served</ConditionKind>
...@@ -108,49 +142,81 @@ ...@@ -108,49 +142,81 @@
<State> <State>
<StateKind>InOrder</StateKind> <StateKind>InOrder</StateKind>
</State> </State>
<DHID>de:14511:30220:1:3B</DHID> <DHID>de:14511:30220:2</DHID>
</Quay> <Quays>
<Quay> <Quay>
<Name> <Name>
<Name>Zugang Fußgänger</Name> <Name>Bus Süd 1</Name>
</Name> </Name>
<Location> <Location>
<Latitude>50.81409</Latitude> <Latitude>50.813721</Latitude>
<Longitude>12.930521</Longitude> <Longitude>12.930683</Longitude>
</Location> </Location>
<Condition> <Condition>
<ConditionKind>Unserved</ConditionKind> <ConditionKind>Served</ConditionKind>
</Condition> </Condition>
<State> <State>
<StateKind>OutOfOrder</StateKind> <StateKind>InOrder</StateKind>
</State> </State>
<DHID>de:14511:30220:1:F</DHID> <DHID>de:14511:30220:2:1</DHID>
</Quay> </Quay>
</Quays> <Quay>
</Area> <Name>
<Area> <Name>Bus Nord 4</Name>
<Name> </Name>
<Name>Bus</Name> <Location>
</Name> <Latitude>50.813936</Latitude>
<Location> <Longitude>12.930844</Longitude>
<Latitude>50.813817</Latitude> </Location>
<Longitude>12.930772</Longitude> <Condition>
</Location> <ConditionKind>Served</ConditionKind>
<Condition> </Condition>
<ConditionKind>Served</ConditionKind> <State>
</Condition> <StateKind>InOrder</StateKind>
<State> </State>
<StateKind>InOrder</StateKind> <DHID>de:14511:30220:2:4</DHID>
</State> </Quay>
<DHID>de:14511:30220:2</DHID> </Quays>
<Quays> </Area>
<Quay> </Items>
</AreaQuay>
</StopPlace>
<StopPlace>
<Name>
<Name>Chemnitz, Rosenbergstr</Name>
</Name>
<Location>
<Latitude>50.817779</Latitude>
<Longitude>12.929326</Longitude>
</Location>
<Condition>
<ConditionKind>Served</ConditionKind>
</Condition>
<State>
<StateKind>InOrder</StateKind>
</State>
<DHID>de:14511:30222</DHID>
<Authority>
<AuthorityId>13</AuthorityId>
<Label>VVO</Label>
</Authority>
<Municipality>
<MunicipalityCode>14511000</MunicipalityCode>
<Label>Chemnitz</Label>
</Municipality>
<District>
<DistrictCode />
<Name />
</District>
<AreaQuay>
<Items>
<Area>
<Name> <Name>
<Name>Bus Süd 1</Name> <Name>Tram</Name>
</Name> </Name>
<Location> <Location>
<Latitude>50.813721</Latitude> <Latitude>50.817802</Latitude>
<Longitude>12.930683</Longitude> <Longitude>12.929335</Longitude>
</Location> </Location>
<Condition> <Condition>
<ConditionKind>Served</ConditionKind> <ConditionKind>Served</ConditionKind>
...@@ -158,15 +224,97 @@ ...@@ -158,15 +224,97 @@
<State> <State>
<StateKind>InOrder</StateKind> <StateKind>InOrder</StateKind>
</State> </State>
<DHID>de:14511:30220:2:1</DHID> <DHID>de:14511:30222:1</DHID>
</Quay> <Quays>
<Quay> <Quay>
<Name>
<Name>ChemnitzBahnn Nord</Name>
</Name>
<Location>
<Latitude>50.818023</Latitude>
<Longitude>12.929236</Longitude>
</Location>
<Condition>
<ConditionKind>Served</ConditionKind>
</Condition>
<State>
<StateKind>InOrder</StateKind>
</State>
<DHID>de:14511:30222:1:CN</DHID>
</Quay>
<Quay>
<Name>
<Name>ChemnitzBahn Süd</Name>
</Name>
<Location>
<Latitude>50.817506</Latitude>
<Longitude>12.92938</Longitude>
</Location>
<Condition>
<ConditionKind>Served</ConditionKind>
</Condition>
<State>
<StateKind>InOrder</StateKind>
</State>
<DHID>de:14511:30222:1:CS</DHID>
</Quay>
<Quay>
<Name>
<Name>Zugang Fußgänger</Name>
</Name>
<Location>
<Latitude>50.818301</Latitude>
<Longitude>12.929039</Longitude>
</Location>
<Condition>
<ConditionKind>Unserved</ConditionKind>
</Condition>
<State>
<StateKind>OutOfOrder</StateKind>
</State>
<DHID>de:14511:30222:1:F</DHID>
</Quay>
<Quay>
<Name>
<Name>Tram Nord</Name>
</Name>
<Location>
<Latitude>50.817751</Latitude>
<Longitude>12.929416</Longitude>
</Location>
<Condition>
<ConditionKind>Served</ConditionKind>
</Condition>
<State>
<StateKind>InOrder</StateKind>
</State>
<DHID>de:14511:30222:1:TN</DHID>
</Quay>
<Quay>
<Name>
<Name>Tram Süd</Name>
</Name>
<Location>
<Latitude>50.817824</Latitude>
<Longitude>12.92929</Longitude>
</Location>
<Condition>
<ConditionKind>Served</ConditionKind>
</Condition>
<State>
<StateKind>InOrder</StateKind>
</State>
<DHID>de:14511:30222:1:TS</DHID>
</Quay>
</Quays>
</Area>
<Area>
<Name> <Name>
<Name>Bus Nord 4</Name> <Name>Bus</Name>
</Name> </Name>
<Location> <Location>
<Latitude>50.813936</Latitude> <Latitude>50.817802</Latitude>
<Longitude>12.930844</Longitude> <Longitude>12.929299</Longitude>
</Location> </Location>
<Condition> <Condition>
<ConditionKind>Served</ConditionKind> <ConditionKind>Served</ConditionKind>
...@@ -174,273 +322,125 @@ ...@@ -174,273 +322,125 @@
<State> <State>
<StateKind>InOrder</StateKind> <StateKind>InOrder</StateKind>
</State> </State>
<DHID>de:14511:30220:2:4</DHID> <DHID>de:14511:30222:2</DHID>
</Quay> <Quays>
</Quays> <Quay>
</Area> <Name>
</Items> <Name>Bus Nord</Name>
</AreaQuay> </Name>
</StopPlace> <Location>
<StopPlace> <Latitude>50.81804</Latitude>
<Name> <Longitude>12.92938</Longitude>
<Name>Chemnitz, Rosenbergstr</Name> </Location>
</Name> <Condition>
<Location> <ConditionKind>Served</ConditionKind>
<Latitude>50.817779</Latitude> </Condition>
<Longitude>12.929326</Longitude> <State>
</Location> <StateKind>InOrder</StateKind>
<Condition> </State>
<ConditionKind>Served</ConditionKind> <DHID>de:14511:30222:2:BN</DHID>
</Condition> </Quay>
<State> <Quay>
<StateKind>InOrder</StateKind> <Name>
</State> <Name>Bus Süd</Name>
<DHID>de:14511:30222</DHID> </Name>
<Authority> <Location>
<AuthorityId>13</AuthorityId> <Latitude>50.817569</Latitude>
<Label>VVO</Label> <Longitude>12.929209</Longitude>
</Authority> </Location>
<Municipality> <Condition>
<MunicipalityCode>14511000</MunicipalityCode> <ConditionKind>Served</ConditionKind>
<Label>Chemnitz</Label> </Condition>
</Municipality> <State>
<District> <StateKind>InOrder</StateKind>
<DistrictCode /> </State>
<Name /> <DHID>de:14511:30222:2:BS</DHID>
</District> </Quay>
<AreaQuay> </Quays>
<Items> </Area>
<Area> </Items>
<Name> </AreaQuay>
<Name>Tram</Name> </StopPlace>
</Name> <StopPlace>
<Location>
<Latitude>50.817802</Latitude>
<Longitude>12.929335</Longitude>
</Location>
<Condition>
<ConditionKind>Served</ConditionKind>
</Condition>
<State>
<StateKind>InOrder</StateKind>
</State>
<DHID>de:14511:30222:1</DHID>
<Quays>
<Quay>
<Name>
<Name>ChemnitzBahnn Nord</Name>
</Name>
<Location>
<Latitude>50.818023</Latitude>
<Longitude>12.929236</Longitude>
</Location>
<Condition>
<ConditionKind>Served</ConditionKind>
</Condition>
<State>
<StateKind>InOrder</StateKind>
</State>
<DHID>de:14511:30222:1:CN</DHID>
</Quay>
<Quay>
<Name>
<Name>ChemnitzBahn Süd</Name>
</Name>
<Location>
<Latitude>50.817506</Latitude>
<Longitude>12.92938</Longitude>
</Location>
<Condition>
<ConditionKind>Served</ConditionKind>
</Condition>
<State>
<StateKind>InOrder</StateKind>
</State>
<DHID>de:14511:30222:1:CS</DHID>
</Quay>
<Quay>
<Name>
<Name>Zugang Fußgänger</Name>
</Name>
<Location>
<Latitude>50.818301</Latitude>
<Longitude>12.929039</Longitude>
</Location>
<Condition>
<ConditionKind>Unserved</ConditionKind>
</Condition>
<State>
<StateKind>OutOfOrder</StateKind>
</State>
<DHID>de:14511:30222:1:F</DHID>
</Quay>
<Quay>
<Name>
<Name>Tram Nord</Name>
</Name>
<Location>
<Latitude>50.817751</Latitude>
<Longitude>12.929416</Longitude>
</Location>
<Condition>
<ConditionKind>Served</ConditionKind>
</Condition>
<State>
<StateKind>InOrder</StateKind>
</State>
<DHID>de:14511:30222:1:TN</DHID>
</Quay>
<Quay>
<Name>
<Name>Tram Süd</Name>
</Name>
<Location>
<Latitude>50.817824</Latitude>
<Longitude>12.92929</Longitude>
</Location>