From 8ffdf7faed6ade952d8e223dc37be22f41ef22e8 Mon Sep 17 00:00:00 2001 From: J Date: Tue, 17 Sep 2019 13:48:50 +0200 Subject: [PATCH] Adds smaller coordinates regions to avoid lots of sea --- src/coordinates/andalusia_north.json | 15 + ...h_peninsulae.json => andalusia_south.json} | 8 +- src/coordinates/central_peninsulae.json | 8 +- src/coordinates/hierro_island.json | 15 + src/coordinates/las_palmas_island.json | 15 + src/coordinates/murcia.json | 15 + src/coordinates/north_peninsulae_1.json | 15 + src/coordinates/north_peninsulae_2.json | 15 + src/coordinates/palma_island.json | 15 + src/coordinates/portugal_border.json | 15 + src/coordinates/spain_polygon.json | 353 ++++++++++++++++++ src/coordinates/valencia.json | 15 + src/librecatastro/catastro_scrapper.py | 2 - 13 files changed, 496 insertions(+), 10 deletions(-) create mode 100644 src/coordinates/andalusia_north.json rename src/coordinates/{north_peninsulae.json => andalusia_south.json} (51%) create mode 100644 src/coordinates/hierro_island.json create mode 100644 src/coordinates/las_palmas_island.json create mode 100644 src/coordinates/murcia.json create mode 100644 src/coordinates/north_peninsulae_1.json create mode 100644 src/coordinates/north_peninsulae_2.json create mode 100644 src/coordinates/palma_island.json create mode 100644 src/coordinates/portugal_border.json create mode 100644 src/coordinates/spain_polygon.json create mode 100644 src/coordinates/valencia.json diff --git a/src/coordinates/andalusia_north.json b/src/coordinates/andalusia_north.json new file mode 100644 index 0000000..f567ea8 --- /dev/null +++ b/src/coordinates/andalusia_north.json @@ -0,0 +1,15 @@ +{ + "geo_bounding_box": { + "ignore_unmapped": true, + "location": { + "bottom_right": { + "lat": 36.686041276581925, + "lon": -2.0214843750000004 + }, + "top_left": { + "lat": 38.324420427006544, + "lon": -7.514648437500001 + } + } + } +} \ No newline at end of file diff --git a/src/coordinates/north_peninsulae.json b/src/coordinates/andalusia_south.json similarity index 51% rename from src/coordinates/north_peninsulae.json rename to src/coordinates/andalusia_south.json index 95d6876..a3ae5b8 100644 --- a/src/coordinates/north_peninsulae.json +++ b/src/coordinates/andalusia_south.json @@ -3,12 +3,12 @@ "ignore_unmapped": true, "location": { "bottom_right": { - "lat": 41.013065787006300, - "lon": 3.669433593750000 + "lat": 35.995785386420344, + "lon": -2.0434570312500004 }, "top_left": { - "lat": 43.755225053069280, - "lon": -9.316406250000002 + "lat": 37.37015718405753, + "lon": -6.833496093750001 } } } diff --git a/src/coordinates/central_peninsulae.json b/src/coordinates/central_peninsulae.json index db69bb2..fd2b663 100644 --- a/src/coordinates/central_peninsulae.json +++ b/src/coordinates/central_peninsulae.json @@ -3,12 +3,12 @@ "ignore_unmapped": true, "location": { "bottom_right": { - "lat": 35.995785386420344, - "lon": 1.098632812500000 + "lat": 37.57941251343841, + "lon": -0.9008789062500001 }, "top_left": { - "lat": 41.162113939396920, - "lon": -7.602539062500001 + "lat": 41.983994270935625, + "lon": -6.218261718750001 } } } diff --git a/src/coordinates/hierro_island.json b/src/coordinates/hierro_island.json new file mode 100644 index 0000000..d215e0f --- /dev/null +++ b/src/coordinates/hierro_island.json @@ -0,0 +1,15 @@ +{ + "geo_bounding_box": { + "ignore_unmapped": true, + "location": { + "bottom_right": { + "lat": 27.638523614271946, + "lon": -17.880249023437504 + }, + "top_left": { + "lat": 27.847576211806295, + "lon": -18.157653808593754 + } + } + } +} \ No newline at end of file diff --git a/src/coordinates/las_palmas_island.json b/src/coordinates/las_palmas_island.json new file mode 100644 index 0000000..9fb16f7 --- /dev/null +++ b/src/coordinates/las_palmas_island.json @@ -0,0 +1,15 @@ +{ + "geo_bounding_box": { + "ignore_unmapped": true, + "location": { + "bottom_right": { + "lat": 27.72486719795934, + "lon": -15.353393554687502 + }, + "top_left": { + "lat": 28.173717624327864, + "lon": -15.839538574218752 + } + } + } +} \ No newline at end of file diff --git a/src/coordinates/murcia.json b/src/coordinates/murcia.json new file mode 100644 index 0000000..e567f90 --- /dev/null +++ b/src/coordinates/murcia.json @@ -0,0 +1,15 @@ +{ + "geo_bounding_box": { + "ignore_unmapped": true, + "location": { + "bottom_right": { + "lat": 37.56199695314352, + "lon": -0.81298828125 + }, + "top_left": { + "lat": 38.87392853923632, + "lon": -2.0214843750000004 + } + } + } +} \ No newline at end of file diff --git a/src/coordinates/north_peninsulae_1.json b/src/coordinates/north_peninsulae_1.json new file mode 100644 index 0000000..3964cd6 --- /dev/null +++ b/src/coordinates/north_peninsulae_1.json @@ -0,0 +1,15 @@ +{ + "geo_bounding_box": { + "ignore_unmapped": true, + "location": { + "bottom_right": { + "lat": 42.081916678306335, + "lon": -1.7358398437500002 + }, + "top_left": { + "lat": 43.27720532212024, + "lon": -8.679199218750002 + } + } + } +} \ No newline at end of file diff --git a/src/coordinates/north_peninsulae_2.json b/src/coordinates/north_peninsulae_2.json new file mode 100644 index 0000000..437796d --- /dev/null +++ b/src/coordinates/north_peninsulae_2.json @@ -0,0 +1,15 @@ +{ + "geo_bounding_box": { + "ignore_unmapped": true, + "location": { + "bottom_right": { + "lat": 41.705728515237524, + "lon": 3.1201171875 + }, + "top_left": { + "lat": 42.45588764197166, + "lon": -2.7685546875000004 + } + } + } +} \ No newline at end of file diff --git a/src/coordinates/palma_island.json b/src/coordinates/palma_island.json new file mode 100644 index 0000000..d70fd8c --- /dev/null +++ b/src/coordinates/palma_island.json @@ -0,0 +1,15 @@ +{ + "geo_bounding_box": { + "ignore_unmapped": true, + "location": { + "bottom_right": { + "lat": 39.257778150283364, + "lon": 3.4881591796875004 + }, + "top_left": { + "lat": 39.96870074491696, + "lon": 2.3098754882812504 + } + } + } +} \ No newline at end of file diff --git a/src/coordinates/portugal_border.json b/src/coordinates/portugal_border.json new file mode 100644 index 0000000..4badd94 --- /dev/null +++ b/src/coordinates/portugal_border.json @@ -0,0 +1,15 @@ +{ + "geo_bounding_box": { + "ignore_unmapped": true, + "location": { + "bottom_right": { + "lat": 37.17782559332976, + "lon": -6.04248046875 + }, + "top_left": { + "lat": 42.27730877423709, + "lon": -8.811035156250002 + } + } + } +} \ No newline at end of file diff --git a/src/coordinates/spain_polygon.json b/src/coordinates/spain_polygon.json new file mode 100644 index 0000000..3e23e96 --- /dev/null +++ b/src/coordinates/spain_polygon.json @@ -0,0 +1,353 @@ +{ + "geo_polygon": { + "ignore_unmapped": true, + "location": { + "points": [ + { + "lat": 43.32517767999296, + "lon": -1.8457031250000002 + }, + { + "lat": 43.27720532212024, + "lon": -2.3730468750000004 + }, + { + "lat": 43.45291889355465, + "lon": -2.79052734375 + }, + { + "lat": 43.35713822211053, + "lon": -3.1420898437500004 + }, + { + "lat": 43.48481212891603, + "lon": -3.5595703125 + }, + { + "lat": 43.40504748787035, + "lon": -4.416503906250001 + }, + { + "lat": 43.67581809328341, + "lon": -5.844726562500001 + }, + { + "lat": 43.54854811091288, + "lon": -7.229003906250001 + }, + { + "lat": 43.723474896114794, + "lon": -7.536621093750001 + }, + { + "lat": 43.723474896114794, + "lon": -7.998046875000001 + }, + { + "lat": 43.51668853502909, + "lon": -8.283691406250002 + }, + { + "lat": 43.29320031385285, + "lon": -8.964843750000002 + }, + { + "lat": 42.97250158602597, + "lon": -9.250488281250002 + }, + { + "lat": 42.52069952914966, + "lon": -9.008789062500002 + }, + { + "lat": 42.439674178149446, + "lon": -8.811035156250002 + }, + { + "lat": 42.22851735620852, + "lon": -8.854980468750002 + }, + { + "lat": 41.95131994679697, + "lon": -8.854980468750002 + }, + { + "lat": 42.13082130188811, + "lon": -8.239746093750002 + }, + { + "lat": 41.83682786072714, + "lon": -8.129882812500002 + }, + { + "lat": 41.85319643776675, + "lon": -7.448730468750001 + }, + { + "lat": 41.95131994679697, + "lon": -7.185058593750001 + }, + { + "lat": 41.983994270935625, + "lon": -6.5478515625 + }, + { + "lat": 41.68932225997044, + "lon": -6.5478515625 + }, + { + "lat": 41.57436130598913, + "lon": -6.218261718750001 + }, + { + "lat": 40.9964840143779, + "lon": -6.921386718750001 + }, + { + "lat": 40.245991504199026, + "lon": -6.767578125000001 + }, + { + "lat": 40.17887331434698, + "lon": -7.031250000000001 + }, + { + "lat": 39.977120098439634, + "lon": -6.877441406250001 + }, + { + "lat": 39.7240885773337, + "lon": -7.031250000000001 + }, + { + "lat": 39.690280594818034, + "lon": -7.536621093750001 + }, + { + "lat": 39.11301365149975, + "lon": -7.163085937500001 + }, + { + "lat": 39.06184913429154, + "lon": -6.96533203125 + }, + { + "lat": 38.839707613545144, + "lon": -7.097167968750001 + }, + { + "lat": 38.46219172306828, + "lon": -7.338867187500001 + }, + { + "lat": 38.18638677411551, + "lon": -7.009277343750001 + }, + { + "lat": 37.96152331396614, + "lon": -7.294921875000001 + }, + { + "lat": 37.54457732085584, + "lon": -7.514648437500001 + }, + { + "lat": 37.19533058280065, + "lon": -7.426757812500001 + }, + { + "lat": 37.21283151445594, + "lon": -6.943359375000001 + }, + { + "lat": 36.86204269508728, + "lon": -6.306152343750001 + }, + { + "lat": 36.56260003738548, + "lon": -6.372070312500001 + }, + { + "lat": 35.995785386420344, + "lon": -5.493164062500001 + }, + { + "lat": 36.421282443649496, + "lon": -5.141601562500001 + }, + { + "lat": 36.56260003738548, + "lon": -4.658203125000001 + }, + { + "lat": 36.73888412439431, + "lon": -4.394531250000001 + }, + { + "lat": 36.79169061907076, + "lon": -3.7792968750000004 + }, + { + "lat": 36.73888412439431, + "lon": -3.4716796875000004 + }, + { + "lat": 36.73888412439431, + "lon": -3.0102539062500004 + }, + { + "lat": 36.721273880045004, + "lon": -2.6147460937500004 + }, + { + "lat": 36.84446074079564, + "lon": -2.4609375000000004 + }, + { + "lat": 36.77409249464195, + "lon": -2.0874023437500004 + }, + { + "lat": 37.19533058280065, + "lon": -1.7578125000000002 + }, + { + "lat": 37.42252593456307, + "lon": -1.6259765625 + }, + { + "lat": 37.57941251343841, + "lon": -1.2744140625000002 + }, + { + "lat": 37.64903402157866, + "lon": -0.6591796875000001 + }, + { + "lat": 38.06539235133249, + "lon": -0.6811523437500001 + }, + { + "lat": 38.23818011979866, + "lon": -0.5493164062500001 + }, + { + "lat": 38.496593518947584, + "lon": -0.43945312500000006 + }, + { + "lat": 38.75408327579141, + "lon": 0.19775390625000003 + }, + { + "lat": 38.993572058209466, + "lon": -0.10986328125000001 + }, + { + "lat": 39.487084981687495, + "lon": -0.28564453125000006 + }, + { + "lat": 39.90973623453719, + "lon": -0.0439453125 + }, + { + "lat": 40.56389453066509, + "lon": 0.5712890625000001 + }, + { + "lat": 40.697299008636755, + "lon": 0.8349609375000001 + }, + { + "lat": 40.79717741518769, + "lon": 0.7470703125000001 + }, + { + "lat": 41.07935114946899, + "lon": 1.0546875000000002 + }, + { + "lat": 41.22824901518532, + "lon": 1.6699218750000002 + }, + { + "lat": 41.29431726315258, + "lon": 2.0214843750000004 + }, + { + "lat": 41.52502957323801, + "lon": 2.4169921875000004 + }, + { + "lat": 41.705728515237524, + "lon": 2.8564453125000004 + }, + { + "lat": 41.918628865183045, + "lon": 3.2080078125000004 + }, + { + "lat": 42.147114459221015, + "lon": 3.1420898437500004 + }, + { + "lat": 42.27730877423709, + "lon": 3.27392578125 + }, + { + "lat": 42.48830197960227, + "lon": 3.1420898437500004 + }, + { + "lat": 42.35854391749705, + "lon": 2.65869140625 + }, + { + "lat": 42.42345651793833, + "lon": 2.2851562500000004 + }, + { + "lat": 42.439674178149446, + "lon": 2.0214843750000004 + }, + { + "lat": 42.68243539838623, + "lon": 1.56005859375 + }, + { + "lat": 42.87596410238256, + "lon": 0.6811523437500001 + }, + { + "lat": 42.73087427928485, + "lon": 0.6372070312500001 + }, + { + "lat": 42.73087427928485, + "lon": 0.15380859375000003 + }, + { + "lat": 42.84375132629023, + "lon": -0.37353515625000006 + }, + { + "lat": 42.779275360241904, + "lon": -0.6152343750000001 + }, + { + "lat": 42.924251753870685, + "lon": -0.7910156250000001 + }, + { + "lat": 43.08493742707595, + "lon": -1.2963867187500002 + }, + { + "lat": 43.229195113965005, + "lon": -1.3623046875000002 + } + ] + } + } +} \ No newline at end of file diff --git a/src/coordinates/valencia.json b/src/coordinates/valencia.json new file mode 100644 index 0000000..b9d8da7 --- /dev/null +++ b/src/coordinates/valencia.json @@ -0,0 +1,15 @@ +{ + "geo_bounding_box": { + "ignore_unmapped": true, + "location": { + "bottom_right": { + "lat": 37.57941251343841, + "lon": 0.21972656250000003 + }, + "top_left": { + "lat": 41.32732632036624, + "lon": -1.2304687500000002 + } + } + } +} \ No newline at end of file diff --git a/src/librecatastro/catastro_scrapper.py b/src/librecatastro/catastro_scrapper.py index 0a8c8a6..7d03972 100644 --- a/src/librecatastro/catastro_scrapper.py +++ b/src/librecatastro/catastro_scrapper.py @@ -40,9 +40,7 @@ class CadastroScrapper: def scrap_all(filename=''): for r, d, files in os.walk(config['coordinates_path']): for file in files: - print(file, filename) if '.json' in file and ((filename != '' and file == filename) or filename == ''): - print(file) f = open(os.path.join(config['coordinates_path'], file), "r") content = f.read() try: