diff --git a/dags/poi/business/district_bus.py b/dags/poi/business/district_bus.py index 20dfef1..e5d8fc9 100644 --- a/dags/poi/business/district_bus.py +++ b/dags/poi/business/district_bus.py @@ -46,6 +46,7 @@ def sync_new(distance=3000): continue seaweed_df['lng'] = seaweed_df['lng'] / 10 ** 10 seaweed_df['lat'] = seaweed_df['lat'] / 10 ** 10 + seaweed_df['city_display'] = city_display seaweed_df = process_dataframe_multithread(seaweed_df, deal3, 30) #seaweed_df['bus'] = seaweed_df.apply(lambda x: deal(city_item['city'], x['lng'], x['lat'], distance), axis=1) @@ -82,6 +83,7 @@ def sync1(): continue seaweed_df['lng'] = seaweed_df['lng'] / 10 ** 10 seaweed_df['lat'] = seaweed_df['lat'] / 10 ** 10 + seaweed_df['city_display'] = city_display seaweed_df = process_dataframe_multithread(seaweed_df, deal, 30) #seaweed_df['bus'] = seaweed_df.apply(lambda x: deal(city_item['city'], x['lng'], x['lat']), axis=1) diff --git a/dags/poi/business/district_facilities.py b/dags/poi/business/district_facilities.py index 4f89573..f53d0c3 100644 --- a/dags/poi/business/district_facilities.py +++ b/dags/poi/business/district_facilities.py @@ -27,9 +27,9 @@ if type is not None: elif type == 'supermarket': supermarket.do() else: - bank.do() - bus.do() hospital.do() school.do() subway.do() supermarket.do() + bus.do() + bank.do() diff --git a/dags/poi/business/district_hospital.py b/dags/poi/business/district_hospital.py index 5346de6..a610336 100644 --- a/dags/poi/business/district_hospital.py +++ b/dags/poi/business/district_hospital.py @@ -49,6 +49,7 @@ def sync_new(distance=3000): continue seaweed_df['lng'] = seaweed_df['lng'] / 10 ** 10 seaweed_df['lat'] = seaweed_df['lat'] / 10 ** 10 + seaweed_df['city_display'] = city_display seaweed_df = process_dataframe_multithread(seaweed_df, deal3, 30) #seaweed_df['hospital'] = seaweed_df.apply(lambda x: deal(city_item['city'], x['lng'], x['lat'], distance), axis=1) @@ -87,6 +88,7 @@ def sync1(): continue seaweed_df['lng'] = seaweed_df['lng'] / 10 ** 10 seaweed_df['lat'] = seaweed_df['lat'] / 10 ** 10 + seaweed_df['city_display'] = city_display seaweed_df = process_dataframe_multithread(seaweed_df, deal, 30) #seaweed_df['hospital'] = seaweed_df.apply(lambda x: deal(city_item['city'], x['lng'], x['lat']), axis=1) diff --git a/dags/poi/business/district_school.py b/dags/poi/business/district_school.py index d9ffde1..db37394 100644 --- a/dags/poi/business/district_school.py +++ b/dags/poi/business/district_school.py @@ -44,6 +44,7 @@ def sync_new(distance=3000): continue seaweed_df['lng'] = seaweed_df['lng'] / 10 ** 10 seaweed_df['lat'] = seaweed_df['lat'] / 10 ** 10 + seaweed_df['city_display'] = city_display seaweed_df = process_dataframe_multithread(seaweed_df, deal3, 30) #seaweed_df['school'] = seaweed_df.apply(lambda x: deal(city_item['city'], x['lng'], x['lat'], distance), axis=1) @@ -76,6 +77,7 @@ def sync1(): continue seaweed_df['lng'] = seaweed_df['lng'] / 10 ** 10 seaweed_df['lat'] = seaweed_df['lat'] / 10 ** 10 + seaweed_df['city_display'] = city_display seaweed_df = process_dataframe_multithread(seaweed_df, deal, 30) #seaweed_df['school'] = seaweed_df.apply(lambda x: deal(city_item['city'], x['lng'], x['lat']), axis=1) diff --git a/dags/poi/business/district_subway.py b/dags/poi/business/district_subway.py index cc9fbf1..f8d332e 100644 --- a/dags/poi/business/district_subway.py +++ b/dags/poi/business/district_subway.py @@ -44,6 +44,7 @@ def sync_new(distance=3000): continue seaweed_df['lng'] = seaweed_df['lng'] / 10 ** 10 seaweed_df['lat'] = seaweed_df['lat'] / 10 ** 10 + seaweed_df['city_display'] = city_display seaweed_df = process_dataframe_multithread(seaweed_df, deal3, 30) #seaweed_df['subway'] = seaweed_df.apply(lambda x: deal(city_item['city'], x['lng'], x['lat'], distance), axis=1) @@ -77,6 +78,7 @@ def sync1(): continue seaweed_df['lng'] = seaweed_df['lng'] / 10 ** 10 seaweed_df['lat'] = seaweed_df['lat'] / 10 ** 10 + seaweed_df['city_display'] = city_display seaweed_df = process_dataframe_multithread(seaweed_df, deal, 30) #seaweed_df['subway'] = seaweed_df.apply(lambda x: deal(city_item['city'], x['lng'], x['lat']), axis=1) diff --git a/dags/poi/business/district_supermarket.py b/dags/poi/business/district_supermarket.py index 947d71b..17d7001 100644 --- a/dags/poi/business/district_supermarket.py +++ b/dags/poi/business/district_supermarket.py @@ -45,6 +45,7 @@ def sync_new(): continue seaweed_df['lng'] = seaweed_df['lng'] / 10 ** 10 seaweed_df['lat'] = seaweed_df['lat'] / 10 ** 10 + seaweed_df['city_display'] = city_display seaweed_df = process_dataframe_multithread(seaweed_df, deal3, 30) #seaweed_df['supermarket'] = seaweed_df.apply(lambda x: deal(city_item['city'], x['lng'], x['lat']), axis=1) @@ -78,6 +79,7 @@ def sync1(): continue seaweed_df['lng'] = seaweed_df['lng'] / 10 ** 10 seaweed_df['lat'] = seaweed_df['lat'] / 10 ** 10 + seaweed_df['city_display'] = city_display seaweed_df = process_dataframe_multithread(seaweed_df, deal, 30) #seaweed_df['supermarket'] = seaweed_df.apply(lambda x: deal(city_item['city'], x['lng'], x['lat']), axis=1)