lib/mapper.php

@@ -126,12 +126,12 @@
        return $bestOffset;
    }
    
    public function mapUsingOffset($offset) {
    public function mapUsingOffset($offset, $mapper) {
        $result = [];
        foreach($this->gtfsrtTrips as $gtfsTripId => $gtfsTrip) {
            $ttssTripId = $gtfsTripId + $offset;
            if(isset($this->ttssTrips[$ttssTripId])) {
                $data = numToTypeB($gtfsTrip['id']);
                $data = $mapper($gtfsTrip['id']);
                $num = $gtfsTrip['num'];
                if(!is_array($data) || !isset($data['num'])) {
                    $data = [

 parse.php

@@ -9,10 +9,20 @@
    'bus' => [
        'gtfsrt' => 'ftp://ztp.krakow.pl/VehiclePositions_A.pb',
        'gtfsrt_file' => 'VehiclePositions_A.pb',
        'ttss' => 'http://91.223.13.70/internetservice/geoserviceDispatcher/services/vehicleinfo/vehicles',
        'ttss' => 'http://ttss.mpk.krakow.pl/internetservice/geoserviceDispatcher/services/vehicleinfo/vehicles',
        'ttss_file' => 'vehicles_A.json',
        'database' => 'mapping_A.sqlite3',
        'result' => 'mapping_A.json',
        'mapper' => 'numToTypeB',
    ],
    'tram' => [
        'gtfsrt' => 'ftp://ztp.krakow.pl/VehiclePositions.pb',
        'gtfsrt_file' => 'VehiclePositions_T.pb',
        'ttss' => 'http://www.ttss.krakow.pl/internetservice/geoserviceDispatcher/services/vehicleinfo/vehicles',
        'ttss_file' => 'vehicles_T.json',
        'database' => 'mapping_T.sqlite3',
        'result' => 'mapping_T.json',
        'mapper' => 'numToTypeT',
    ],
];

@@ -39,13 +49,13 @@
        
        $mapper->loadTTSS($source['ttss_file']);
        $timeDifference = time() - $mapper->getTTSSDate();
        if(abs($timeDifference) > 60) {
        if(abs($timeDifference) > 120) {
            throw new Exception('TTSS timestamp difference ('.$timeDifference.'s) is too high, aborting!');
        }
        
        $mapper->loadGTFSRT($source['gtfsrt_file']);
        $timeDifference = time() - $mapper->getGTFSRTDate();
        if(abs($timeDifference) > 60) {
        if(abs($timeDifference) > 120) {
            throw new Exception('GTFSRT timestamp difference ('.$timeDifference.'s) is too high, aborting!');
        }
        
@@ -58,7 +68,7 @@
        }
        
        $logger->info('Got offset '.$offset.', creating mapping...');
        $mapping = $mapper->mapUsingOffset($offset);
        $mapping = $mapper->mapUsingOffset($offset, $source['mapper']);
        
        $logger->info('Checking the data for correctness...');
        $weight = count($mapping);