From b993e9a163cc6fccd389424c982ceca194918c90 Mon Sep 17 00:00:00 2001 From: Al Date: Sat, 6 Aug 2016 21:17:14 -0400 Subject: [PATCH] [fix] add Japanese-language variant if metro station is added --- scripts/geodata/osm/formatter.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/geodata/osm/formatter.py b/scripts/geodata/osm/formatter.py index a38d211e..b7642e9d 100644 --- a/scripts/geodata/osm/formatter.py +++ b/scripts/geodata/osm/formatter.py @@ -351,7 +351,7 @@ class OSMAddressFormatter(object): like apartment numbers. ''' if self.metro_stations_index is None: - return + return False nearest_metro = self.metro_stations_index.nearest_point(latitude, longitude) if nearest_metro: props, lat, lon, distance = nearest_metro @@ -365,6 +365,9 @@ class OSMAddressFormatter(object): if name: address_components[AddressFormatter.METRO_STATION] = name + return True + + return False def venue_names(self, props, languages): ''' @@ -728,7 +731,8 @@ class OSMAddressFormatter(object): # Only including nearest metro station in Japan if country == JAPAN: if random.random() < float(nested_get(self.config, ('countries', 'jp', 'add_metro_probability'), default=0.0)): - self.add_metro_station(revised_tags, latitude, longitude, japanese_variant, default_language=JAPANESE) + if self.add_metro_station(revised_tags, latitude, longitude, japanese_variant, default_language=JAPANESE): + language = japanese_variant num_floors = None num_basements = None