More generic fix

Author: optionsome

gtfsrthttp2mqtt.py

@@ -118,7 +118,7 @@ def doGTFSRTPolling(self):
                 full_topic = '{0}/{1}///{2}/{3}/{4}/{5}/{6}/{7}/{8}/{9}/{10}/{11}/{12}/{13}/{14}/{15}/'.format(
                     self.baseMqttTopic, self.feedName, mode, route_id, direction_id,
                     trip_headsign, trip_id, stop_id, start_time, vehicle_id, geohash_head, geohash_firstdeg,
-                    geohash_seconddeg, geohash_thirddeg, short_name, color)
+                    geohash_seconddeg, geohash_thirddeg, short_name, color).replace("+","").replace("#", "")
 
                 sernmesg = nfeedmsg.SerializeToString()
                 self.client.publish(full_topic, sernmesg)

utils.py

@@ -27,7 +27,7 @@ def parse_short_name(feed, trip_id, route_id, otp_data):
         feed_scoped_id = "OULU:" + trip_id
         if feed_scoped_id not in otp_data:
             return ""
-        return otp_data[feed_scoped_id]["route"]["shortName"].replace("+","")
+        return otp_data[feed_scoped_id]["route"]["shortName"]
 
     feed_scoped_id = feed + ":" + route_id
     if feed_scoped_id not in otp_data: