sysadminix/tripwithbonus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0.0.30

Browse Source 
osm admin
This commit is contained in:
SDE
2023-07-20 16:05:22 +03:00
parent ced379ab20
commit 3ae7b07eab
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BaseModels/OpenStreetMap/osm_api.py
View File

@@ -103,7 +103,7 @@ def osm_get_cities_by_country(country_Dict):
res_type = 'csv("name", "name:ru", "name:en", ::lon, ::lat)' res_type = 'csv("name", "name:ru", "name:en", ::lon, ::lat)'
data = f'area({area_id})->.searchArea;' \ data = f'area({area_id})->.searchArea;' \
'(node[place~"city|town"](area.searchArea););' \ '(node[place~"city$|town$"](area.searchArea););' \
'out center;' 'out center;'
res = osm_api_request(data, res_type) res = osm_api_request(data, res_type)
@@ -224,7 +224,7 @@ def osm_get_country_w_cities_n_airports(country_Dict, area_id):
else: else:
country_Dict['area_id'] = osm_get_area_id_by_params_dict({'country': country_Dict['name']}) 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': if airports_Dict and 'error' in airports_Dict and airports_Dict['error'] == 'timeout':
airports_Dict = osm_get_airports(country_Dict['area_id'], 'place="city"') airports_Dict = osm_get_airports(country_Dict['area_id'], 'place="city"')

19
ReferenceDataApp/admin.py
View File

@@ -4,13 +4,26 @@ from .models import *
from modeltranslation.admin import TranslationAdmin from modeltranslation.admin import TranslationAdmin
class Admin_Country(Admin_Trans_BaseModel): 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) admin.site.register(Country, Admin_Country)
class Admin_City(Admin_Trans_BaseModel): 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) admin.site.register(City, Admin_City)
class Admin_Airport(Admin_Trans_BaseModel): 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) admin.site.register(Airport, Admin_Airport)