Moved interpreter code into a function and ran flake8 (except for E501)

This commit is contained in:
Suwako Moriya 2018-11-11 09:39:34 +01:00
parent 6d215e2305
commit e709259a8f
2 changed files with 24 additions and 18 deletions

View File

@ -14,7 +14,7 @@ import re
api = "https://master.apis.dev.openstreetmap.org/" # Testing, it should be replaced by https://api.openstreetmap.org/ when the program is finished
def runfetch(url):
def runfetch(url='https://www.legifrance.gouv.fr/eli/arrete/2018/10/12/PRMD1824595A/jo/texte'):
session = requests.Session()
req1 = session.get(url) # Get the source code
text = req1.text.split('\n')
@ -27,15 +27,15 @@ def runfetch(url):
# dicformat:{id,commune,site,departement,zone,ministere,aerozone}
return diclist
def dms2dd(dms):
coordslst = re.search("(\d{1,3})° (\d{2})' (\d{2},?\d{0,2})(?:\"|”|\'\')", dms).groups()
dd = float(coordslst[0].replace(",", ".")) + float(coordslst[1].replace(",", "."))/60 + float(coordslst[2].replace(",", "."))/3600
return dd
if __name__ == '__main__':
diclist = runfetch('https://www.legifrance.gouv.fr/eli/arrete/2018/10/12/PRMD1824595A/jo/texte') # Fetch all the data from a french article
url = 'https://www.legifrance.gouv.fr/eli/arrete/2018/10/12/PRMD1824595A/jo/texte'
def fetch(url='https://www.legifrance.gouv.fr/eli/arrete/2018/10/12/PRMD1824595A/jo/texte'):
diclist = runfetch(url=url)
for index, zone in enumerate(diclist):
for element in zone:
diclist[index][element] = re.sub("<br.{0,2}>", "\n", diclist[index][element]) # Replace <br>, <br /> and <br/> by \n
@ -83,8 +83,12 @@ if __name__ == '__main__':
# Atolls
elif area["zone"].strip() == "atolls et eaux territoriales incluses":
area["zone"] = [("cercle", "35KM", "138.9022", "21.82917"), ("cercle", "27KM", "138.7425", "22.23528A")]
return diclist
if __name__ == '__main__':
diclist = fetch() # Fetch all the data from a french article
# Print the dict (keep this code in the end of the file)
print("===== Dict =====")

View File

@ -5,6 +5,7 @@
import requests
from bs4 import BeautifulSoup
def runfetch():
site = requests.get("https://www.legifrance.gouv.fr/eli/arrete/2018/10/12/PRMD1824595A/jo/texte").text
soup = BeautifulSoup(site, "html.parser")
@ -16,5 +17,6 @@ def runfetch():
tds[-1].append(td.text)
print(trs)
if __name__ == "__main__":
runfetch()