diff --git a/BaseModels/OpenStreetMap/osm_api.py b/BaseModels/OpenStreetMap/osm_api.py index 1ec1819..eb1e603 100644 --- a/BaseModels/OpenStreetMap/osm_api.py +++ b/BaseModels/OpenStreetMap/osm_api.py @@ -103,7 +103,7 @@ def osm_get_cities_by_country(country_Dict): res_type = 'csv("name", "name:ru", "name:en", ::lon, ::lat)' data = f'area({area_id})->.searchArea;' \ - '(node[place~"city|town"](area.searchArea););' \ + '(node[place~"city$|town$"](area.searchArea););' \ 'out center;' res = osm_api_request(data, res_type) @@ -224,7 +224,7 @@ def osm_get_country_w_cities_n_airports(country_Dict, area_id): else: country_Dict['area_id'] = osm_get_area_id_by_params_dict({'country': country_Dict['name']}) - airports_Dict = osm_get_airports(country_Dict['area_id'], 'place~"city|town"') + airports_Dict = osm_get_airports(country_Dict['area_id'], 'place~"city$|town$"') if airports_Dict and 'error' in airports_Dict and airports_Dict['error'] == 'timeout': airports_Dict = osm_get_airports(country_Dict['area_id'], 'place="city"') diff --git a/ReferenceDataApp/admin.py b/ReferenceDataApp/admin.py index b052688..cfdc46c 100644 --- a/ReferenceDataApp/admin.py +++ b/ReferenceDataApp/admin.py @@ -4,13 +4,26 @@ from .models import * from modeltranslation.admin import TranslationAdmin class Admin_Country(Admin_Trans_BaseModel): - pass + list_display = [ + 'id', 'name', 'name_en', 'name_ru', + 'short_code', 'code', + 'enable', 'area_id', 'parsing_finished_DT', + 'order', 'modifiedDT', 'createDT'] admin.site.register(Country, Admin_Country) class Admin_City(Admin_Trans_BaseModel): - pass + list_display = [ + 'id', 'name', 'name_en', 'name_ru', + 'country', + 'enable', 'area_id', 'parsing_finished_DT', + 'order', 'modifiedDT', 'createDT'] admin.site.register(City, Admin_City) class Admin_Airport(Admin_Trans_BaseModel): - pass + list_display = [ + 'id', 'name', 'name_en', 'name_ru', + 'city', 'iata_code', 'icao_code', + 'international_name', + 'enable', 'area_id', 'parsing_finished_DT', + 'order', 'modifiedDT', 'createDT'] admin.site.register(Airport, Admin_Airport) \ No newline at end of file