From 778fba24515f2d770893f63f54b8ed0ed2679240 Mon Sep 17 00:00:00 2001 From: Al Date: Wed, 6 Apr 2016 22:59:46 -0400 Subject: [PATCH] [osm] Moving OSM boundaries to YAML files instead of JSON for consistency --- resources/boundaries/osm/ae.json | 6 ------ resources/boundaries/osm/ae.yaml | 5 +++++ resources/boundaries/osm/ar.json | 11 ----------- resources/boundaries/osm/ar.yaml | 10 ++++++++++ resources/boundaries/osm/at.json | 10 ---------- resources/boundaries/osm/at.yaml | 9 +++++++++ resources/boundaries/osm/au.json | 12 ------------ resources/boundaries/osm/au.yaml | 11 +++++++++++ resources/boundaries/osm/az.json | 6 ------ resources/boundaries/osm/az.yaml | 5 +++++ resources/boundaries/osm/ba.json | 10 ---------- resources/boundaries/osm/ba.yaml | 9 +++++++++ resources/boundaries/osm/bd.json | 11 ----------- resources/boundaries/osm/bd.yaml | 10 ++++++++++ resources/boundaries/osm/be.json | 9 --------- resources/boundaries/osm/be.yaml | 8 ++++++++ resources/boundaries/osm/bg.json | 10 ---------- resources/boundaries/osm/bg.yaml | 9 +++++++++ resources/boundaries/osm/bm.json | 7 ------- resources/boundaries/osm/bm.yaml | 6 ++++++ resources/boundaries/osm/bo.json | 13 ------------- resources/boundaries/osm/bo.yaml | 12 ++++++++++++ resources/boundaries/osm/br.json | 13 ------------- resources/boundaries/osm/br.yaml | 12 ++++++++++++ resources/boundaries/osm/by.json | 9 --------- resources/boundaries/osm/by.yaml | 8 ++++++++ resources/boundaries/osm/ca.json | 11 ----------- resources/boundaries/osm/ca.yaml | 10 ++++++++++ resources/boundaries/osm/ch.json | 11 ----------- resources/boundaries/osm/ch.yaml | 10 ++++++++++ resources/boundaries/osm/cl.json | 8 -------- resources/boundaries/osm/cl.yaml | 7 +++++++ resources/boundaries/osm/cn.json | 10 ---------- resources/boundaries/osm/cn.yaml | 9 +++++++++ resources/boundaries/osm/co.json | 12 ------------ resources/boundaries/osm/co.yaml | 11 +++++++++++ resources/boundaries/osm/cr.json | 9 --------- resources/boundaries/osm/cr.yaml | 8 ++++++++ resources/boundaries/osm/cu.json | 9 --------- resources/boundaries/osm/cu.yaml | 8 ++++++++ resources/boundaries/osm/cw.json | 5 ----- resources/boundaries/osm/cw.yaml | 4 ++++ resources/boundaries/osm/cz.json | 10 ---------- resources/boundaries/osm/cz.yaml | 9 +++++++++ resources/boundaries/osm/de.json | 12 ------------ resources/boundaries/osm/de.yaml | 11 +++++++++++ resources/boundaries/osm/dk.json | 10 ---------- resources/boundaries/osm/dk.yaml | 9 +++++++++ resources/boundaries/osm/dz.json | 8 -------- resources/boundaries/osm/dz.yaml | 7 +++++++ resources/boundaries/osm/ec.json | 10 ---------- resources/boundaries/osm/ec.yaml | 9 +++++++++ resources/boundaries/osm/ee.json | 9 --------- resources/boundaries/osm/ee.yaml | 8 ++++++++ resources/boundaries/osm/es.json | 11 ----------- resources/boundaries/osm/es.yaml | 10 ++++++++++ resources/boundaries/osm/fi.json | 11 ----------- resources/boundaries/osm/fi.yaml | 10 ++++++++++ resources/boundaries/osm/fo.json | 7 ------- resources/boundaries/osm/fo.yaml | 6 ++++++ resources/boundaries/osm/fr.json | 11 ----------- resources/boundaries/osm/fr.yaml | 10 ++++++++++ resources/boundaries/osm/gb.json | 13 ------------- resources/boundaries/osm/gb.yaml | 11 +++++++++++ resources/boundaries/osm/ge.json | 9 --------- resources/boundaries/osm/ge.yaml | 8 ++++++++ resources/boundaries/osm/gr.json | 13 ------------- resources/boundaries/osm/gr.yaml | 12 ++++++++++++ resources/boundaries/osm/hk.json | 8 -------- resources/boundaries/osm/hk.yaml | 7 +++++++ resources/boundaries/osm/hr.json | 10 ---------- resources/boundaries/osm/hr.yaml | 9 +++++++++ resources/boundaries/osm/ht.json | 9 --------- resources/boundaries/osm/ht.yaml | 8 ++++++++ resources/boundaries/osm/hu.json | 11 ----------- resources/boundaries/osm/hu.yaml | 10 ++++++++++ resources/boundaries/osm/id.json | 11 ----------- resources/boundaries/osm/id.yaml | 10 ++++++++++ resources/boundaries/osm/ie.json | 9 --------- resources/boundaries/osm/ie.yaml | 8 ++++++++ resources/boundaries/osm/il.json | 8 -------- resources/boundaries/osm/il.yaml | 7 +++++++ resources/boundaries/osm/im.json | 7 ------- resources/boundaries/osm/im.yaml | 6 ++++++ resources/boundaries/osm/in.json | 12 ------------ resources/boundaries/osm/in.yaml | 11 +++++++++++ resources/boundaries/osm/is.json | 8 -------- resources/boundaries/osm/is.yaml | 7 +++++++ resources/boundaries/osm/it.json | 9 --------- resources/boundaries/osm/it.yaml | 8 ++++++++ resources/boundaries/osm/jm.json | 7 ------- resources/boundaries/osm/jm.yaml | 6 ++++++ resources/boundaries/osm/jp.json | 13 ------------- resources/boundaries/osm/jp.yaml | 12 ++++++++++++ resources/boundaries/osm/kr.json | 10 ---------- resources/boundaries/osm/kr.yaml | 9 +++++++++ resources/boundaries/osm/li.json | 7 ------- resources/boundaries/osm/li.yaml | 6 ++++++ resources/boundaries/osm/lk.json | 8 -------- resources/boundaries/osm/lk.yaml | 7 +++++++ resources/boundaries/osm/lt.json | 10 ---------- resources/boundaries/osm/lt.yaml | 9 +++++++++ resources/boundaries/osm/lu.json | 10 ---------- resources/boundaries/osm/lu.yaml | 9 +++++++++ resources/boundaries/osm/lv.json | 11 ----------- resources/boundaries/osm/lv.yaml | 10 ++++++++++ resources/boundaries/osm/md.json | 11 ----------- resources/boundaries/osm/md.yaml | 10 ++++++++++ resources/boundaries/osm/me.json | 7 ------- resources/boundaries/osm/me.yaml | 6 ++++++ resources/boundaries/osm/mk.json | 11 ----------- resources/boundaries/osm/mk.yaml | 10 ++++++++++ resources/boundaries/osm/mx.json | 10 ---------- resources/boundaries/osm/mx.yaml | 9 +++++++++ resources/boundaries/osm/my.json | 11 ----------- resources/boundaries/osm/my.yaml | 10 ++++++++++ resources/boundaries/osm/nc.json | 10 ---------- resources/boundaries/osm/nc.yaml | 9 +++++++++ resources/boundaries/osm/nl.json | 13 ------------- resources/boundaries/osm/nl.yaml | 12 ++++++++++++ resources/boundaries/osm/no.json | 8 -------- resources/boundaries/osm/no.yaml | 7 +++++++ resources/boundaries/osm/np.json | 11 ----------- resources/boundaries/osm/np.yaml | 10 ++++++++++ resources/boundaries/osm/nz.json | 9 --------- resources/boundaries/osm/nz.yaml | 8 ++++++++ resources/boundaries/osm/pe.json | 9 --------- resources/boundaries/osm/pe.yaml | 8 ++++++++ resources/boundaries/osm/ph.json | 13 ------------- resources/boundaries/osm/ph.yaml | 12 ++++++++++++ resources/boundaries/osm/pk.json | 6 ------ resources/boundaries/osm/pk.yaml | 5 +++++ resources/boundaries/osm/pl.json | 12 ------------ resources/boundaries/osm/pl.yaml | 11 +++++++++++ resources/boundaries/osm/pr.json | 8 -------- resources/boundaries/osm/pr.yaml | 7 +++++++ resources/boundaries/osm/pt.json | 12 ------------ resources/boundaries/osm/pt.yaml | 11 +++++++++++ resources/boundaries/osm/re.json | 9 --------- resources/boundaries/osm/re.yaml | 8 ++++++++ resources/boundaries/osm/ro.json | 7 ------- resources/boundaries/osm/ro.yaml | 6 ++++++ resources/boundaries/osm/rs.json | 9 --------- resources/boundaries/osm/rs.yaml | 8 ++++++++ resources/boundaries/osm/ru.json | 12 ------------ resources/boundaries/osm/ru.yaml | 11 +++++++++++ resources/boundaries/osm/sa.json | 6 ------ resources/boundaries/osm/sa.yaml | 5 +++++ resources/boundaries/osm/se.json | 10 ---------- resources/boundaries/osm/se.yaml | 9 +++++++++ resources/boundaries/osm/sg.json | 6 ------ resources/boundaries/osm/sg.yaml | 5 +++++ resources/boundaries/osm/si.json | 10 ---------- resources/boundaries/osm/si.yaml | 9 +++++++++ resources/boundaries/osm/sk.json | 9 --------- resources/boundaries/osm/sk.yaml | 8 ++++++++ resources/boundaries/osm/th.json | 9 --------- resources/boundaries/osm/th.yaml | 8 ++++++++ resources/boundaries/osm/tj.json | 8 -------- resources/boundaries/osm/tj.yaml | 7 +++++++ resources/boundaries/osm/tn.json | 8 -------- resources/boundaries/osm/tn.yaml | 7 +++++++ resources/boundaries/osm/tr.json | 8 -------- resources/boundaries/osm/tr.yaml | 7 +++++++ resources/boundaries/osm/tw.json | 12 ------------ resources/boundaries/osm/tw.yaml | 11 +++++++++++ resources/boundaries/osm/tz.json | 9 --------- resources/boundaries/osm/tz.yaml | 8 ++++++++ resources/boundaries/osm/ua.json | 10 ---------- resources/boundaries/osm/ua.yaml | 9 +++++++++ resources/boundaries/osm/ug.json | 10 ---------- resources/boundaries/osm/ug.yaml | 9 +++++++++ resources/boundaries/osm/us.json | 12 ------------ resources/boundaries/osm/us.yaml | 11 +++++++++++ resources/boundaries/osm/uy.json | 10 ---------- resources/boundaries/osm/uy.yaml | 9 +++++++++ resources/boundaries/osm/uz.json | 8 -------- resources/boundaries/osm/uz.yaml | 7 +++++++ resources/boundaries/osm/ve.json | 10 ---------- resources/boundaries/osm/ve.yaml | 9 +++++++++ resources/boundaries/osm/vn.json | 8 -------- resources/boundaries/osm/vn.yaml | 7 +++++++ resources/boundaries/osm/za.json | 9 --------- resources/boundaries/osm/za.yaml | 8 ++++++++ resources/boundaries/osm/zw.json | 6 ------ resources/boundaries/osm/zw.yaml | 5 +++++ scripts/geodata/osm/extract.py | 10 +++++----- 187 files changed, 801 insertions(+), 895 deletions(-) delete mode 100644 resources/boundaries/osm/ae.json create mode 100644 resources/boundaries/osm/ae.yaml delete mode 100644 resources/boundaries/osm/ar.json create mode 100644 resources/boundaries/osm/ar.yaml delete mode 100644 resources/boundaries/osm/at.json create mode 100644 resources/boundaries/osm/at.yaml delete mode 100644 resources/boundaries/osm/au.json create mode 100644 resources/boundaries/osm/au.yaml delete mode 100644 resources/boundaries/osm/az.json create mode 100644 resources/boundaries/osm/az.yaml delete mode 100644 resources/boundaries/osm/ba.json create mode 100644 resources/boundaries/osm/ba.yaml delete mode 100644 resources/boundaries/osm/bd.json create mode 100644 resources/boundaries/osm/bd.yaml delete mode 100644 resources/boundaries/osm/be.json create mode 100644 resources/boundaries/osm/be.yaml delete mode 100644 resources/boundaries/osm/bg.json create mode 100644 resources/boundaries/osm/bg.yaml delete mode 100644 resources/boundaries/osm/bm.json create mode 100644 resources/boundaries/osm/bm.yaml delete mode 100644 resources/boundaries/osm/bo.json create mode 100644 resources/boundaries/osm/bo.yaml delete mode 100644 resources/boundaries/osm/br.json create mode 100644 resources/boundaries/osm/br.yaml delete mode 100644 resources/boundaries/osm/by.json create mode 100644 resources/boundaries/osm/by.yaml delete mode 100644 resources/boundaries/osm/ca.json create mode 100644 resources/boundaries/osm/ca.yaml delete mode 100644 resources/boundaries/osm/ch.json create mode 100644 resources/boundaries/osm/ch.yaml delete mode 100644 resources/boundaries/osm/cl.json create mode 100644 resources/boundaries/osm/cl.yaml delete mode 100644 resources/boundaries/osm/cn.json create mode 100644 resources/boundaries/osm/cn.yaml delete mode 100644 resources/boundaries/osm/co.json create mode 100644 resources/boundaries/osm/co.yaml delete mode 100644 resources/boundaries/osm/cr.json create mode 100644 resources/boundaries/osm/cr.yaml delete mode 100644 resources/boundaries/osm/cu.json create mode 100644 resources/boundaries/osm/cu.yaml delete mode 100644 resources/boundaries/osm/cw.json create mode 100644 resources/boundaries/osm/cw.yaml delete mode 100644 resources/boundaries/osm/cz.json create mode 100644 resources/boundaries/osm/cz.yaml delete mode 100644 resources/boundaries/osm/de.json create mode 100644 resources/boundaries/osm/de.yaml delete mode 100644 resources/boundaries/osm/dk.json create mode 100644 resources/boundaries/osm/dk.yaml delete mode 100644 resources/boundaries/osm/dz.json create mode 100644 resources/boundaries/osm/dz.yaml delete mode 100644 resources/boundaries/osm/ec.json create mode 100644 resources/boundaries/osm/ec.yaml delete mode 100644 resources/boundaries/osm/ee.json create mode 100644 resources/boundaries/osm/ee.yaml delete mode 100644 resources/boundaries/osm/es.json create mode 100644 resources/boundaries/osm/es.yaml delete mode 100644 resources/boundaries/osm/fi.json create mode 100644 resources/boundaries/osm/fi.yaml delete mode 100644 resources/boundaries/osm/fo.json create mode 100644 resources/boundaries/osm/fo.yaml delete mode 100644 resources/boundaries/osm/fr.json create mode 100644 resources/boundaries/osm/fr.yaml delete mode 100644 resources/boundaries/osm/gb.json create mode 100644 resources/boundaries/osm/gb.yaml delete mode 100644 resources/boundaries/osm/ge.json create mode 100644 resources/boundaries/osm/ge.yaml delete mode 100644 resources/boundaries/osm/gr.json create mode 100644 resources/boundaries/osm/gr.yaml delete mode 100644 resources/boundaries/osm/hk.json create mode 100644 resources/boundaries/osm/hk.yaml delete mode 100644 resources/boundaries/osm/hr.json create mode 100644 resources/boundaries/osm/hr.yaml delete mode 100644 resources/boundaries/osm/ht.json create mode 100644 resources/boundaries/osm/ht.yaml delete mode 100644 resources/boundaries/osm/hu.json create mode 100644 resources/boundaries/osm/hu.yaml delete mode 100644 resources/boundaries/osm/id.json create mode 100644 resources/boundaries/osm/id.yaml delete mode 100644 resources/boundaries/osm/ie.json create mode 100644 resources/boundaries/osm/ie.yaml delete mode 100644 resources/boundaries/osm/il.json create mode 100644 resources/boundaries/osm/il.yaml delete mode 100644 resources/boundaries/osm/im.json create mode 100644 resources/boundaries/osm/im.yaml delete mode 100644 resources/boundaries/osm/in.json create mode 100644 resources/boundaries/osm/in.yaml delete mode 100644 resources/boundaries/osm/is.json create mode 100644 resources/boundaries/osm/is.yaml delete mode 100644 resources/boundaries/osm/it.json create mode 100644 resources/boundaries/osm/it.yaml delete mode 100644 resources/boundaries/osm/jm.json create mode 100644 resources/boundaries/osm/jm.yaml delete mode 100644 resources/boundaries/osm/jp.json create mode 100644 resources/boundaries/osm/jp.yaml delete mode 100644 resources/boundaries/osm/kr.json create mode 100644 resources/boundaries/osm/kr.yaml delete mode 100644 resources/boundaries/osm/li.json create mode 100644 resources/boundaries/osm/li.yaml delete mode 100644 resources/boundaries/osm/lk.json create mode 100644 resources/boundaries/osm/lk.yaml delete mode 100644 resources/boundaries/osm/lt.json create mode 100644 resources/boundaries/osm/lt.yaml delete mode 100644 resources/boundaries/osm/lu.json create mode 100644 resources/boundaries/osm/lu.yaml delete mode 100644 resources/boundaries/osm/lv.json create mode 100644 resources/boundaries/osm/lv.yaml delete mode 100644 resources/boundaries/osm/md.json create mode 100644 resources/boundaries/osm/md.yaml delete mode 100644 resources/boundaries/osm/me.json create mode 100644 resources/boundaries/osm/me.yaml delete mode 100644 resources/boundaries/osm/mk.json create mode 100644 resources/boundaries/osm/mk.yaml delete mode 100644 resources/boundaries/osm/mx.json create mode 100644 resources/boundaries/osm/mx.yaml delete mode 100644 resources/boundaries/osm/my.json create mode 100644 resources/boundaries/osm/my.yaml delete mode 100644 resources/boundaries/osm/nc.json create mode 100644 resources/boundaries/osm/nc.yaml delete mode 100644 resources/boundaries/osm/nl.json create mode 100644 resources/boundaries/osm/nl.yaml delete mode 100644 resources/boundaries/osm/no.json create mode 100644 resources/boundaries/osm/no.yaml delete mode 100644 resources/boundaries/osm/np.json create mode 100644 resources/boundaries/osm/np.yaml delete mode 100644 resources/boundaries/osm/nz.json create mode 100644 resources/boundaries/osm/nz.yaml delete mode 100644 resources/boundaries/osm/pe.json create mode 100644 resources/boundaries/osm/pe.yaml delete mode 100644 resources/boundaries/osm/ph.json create mode 100644 resources/boundaries/osm/ph.yaml delete mode 100644 resources/boundaries/osm/pk.json create mode 100644 resources/boundaries/osm/pk.yaml delete mode 100644 resources/boundaries/osm/pl.json create mode 100644 resources/boundaries/osm/pl.yaml delete mode 100644 resources/boundaries/osm/pr.json create mode 100644 resources/boundaries/osm/pr.yaml delete mode 100644 resources/boundaries/osm/pt.json create mode 100644 resources/boundaries/osm/pt.yaml delete mode 100644 resources/boundaries/osm/re.json create mode 100644 resources/boundaries/osm/re.yaml delete mode 100644 resources/boundaries/osm/ro.json create mode 100644 resources/boundaries/osm/ro.yaml delete mode 100644 resources/boundaries/osm/rs.json create mode 100644 resources/boundaries/osm/rs.yaml delete mode 100644 resources/boundaries/osm/ru.json create mode 100644 resources/boundaries/osm/ru.yaml delete mode 100644 resources/boundaries/osm/sa.json create mode 100644 resources/boundaries/osm/sa.yaml delete mode 100644 resources/boundaries/osm/se.json create mode 100644 resources/boundaries/osm/se.yaml delete mode 100644 resources/boundaries/osm/sg.json create mode 100644 resources/boundaries/osm/sg.yaml delete mode 100644 resources/boundaries/osm/si.json create mode 100644 resources/boundaries/osm/si.yaml delete mode 100644 resources/boundaries/osm/sk.json create mode 100644 resources/boundaries/osm/sk.yaml delete mode 100644 resources/boundaries/osm/th.json create mode 100644 resources/boundaries/osm/th.yaml delete mode 100644 resources/boundaries/osm/tj.json create mode 100644 resources/boundaries/osm/tj.yaml delete mode 100644 resources/boundaries/osm/tn.json create mode 100644 resources/boundaries/osm/tn.yaml delete mode 100644 resources/boundaries/osm/tr.json create mode 100644 resources/boundaries/osm/tr.yaml delete mode 100644 resources/boundaries/osm/tw.json create mode 100644 resources/boundaries/osm/tw.yaml delete mode 100644 resources/boundaries/osm/tz.json create mode 100644 resources/boundaries/osm/tz.yaml delete mode 100644 resources/boundaries/osm/ua.json create mode 100644 resources/boundaries/osm/ua.yaml delete mode 100644 resources/boundaries/osm/ug.json create mode 100644 resources/boundaries/osm/ug.yaml delete mode 100644 resources/boundaries/osm/us.json create mode 100644 resources/boundaries/osm/us.yaml delete mode 100644 resources/boundaries/osm/uy.json create mode 100644 resources/boundaries/osm/uy.yaml delete mode 100644 resources/boundaries/osm/uz.json create mode 100644 resources/boundaries/osm/uz.yaml delete mode 100644 resources/boundaries/osm/ve.json create mode 100644 resources/boundaries/osm/ve.yaml delete mode 100644 resources/boundaries/osm/vn.json create mode 100644 resources/boundaries/osm/vn.yaml delete mode 100644 resources/boundaries/osm/za.json create mode 100644 resources/boundaries/osm/za.yaml delete mode 100644 resources/boundaries/osm/zw.json create mode 100644 resources/boundaries/osm/zw.yaml diff --git a/resources/boundaries/osm/ae.json b/resources/boundaries/osm/ae.json deleted file mode 100644 index b1b9de39..00000000 --- a/resources/boundaries/osm/ae.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/ae.yaml b/resources/boundaries/osm/ae.yaml new file mode 100644 index 00000000..86c25419 --- /dev/null +++ b/resources/boundaries/osm/ae.yaml @@ -0,0 +1,5 @@ +--- + admin_level: + "2": "country" + "4": "state" + diff --git a/resources/boundaries/osm/ar.json b/resources/boundaries/osm/ar.json deleted file mode 100644 index 9e1ab70e..00000000 --- a/resources/boundaries/osm/ar.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "5": "state_district", - "6": "state_district", - "7": "city", - "8": "city", - "9": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/ar.yaml b/resources/boundaries/osm/ar.yaml new file mode 100644 index 00000000..de5ca963 --- /dev/null +++ b/resources/boundaries/osm/ar.yaml @@ -0,0 +1,10 @@ +--- + admin_level: + "2": "country" + "4": "state" + "5": "state_district" + "6": "state_district" + "7": "city" + "8": "city" + "9": "suburb" + diff --git a/resources/boundaries/osm/at.json b/resources/boundaries/osm/at.json deleted file mode 100644 index 59939a34..00000000 --- a/resources/boundaries/osm/at.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "6": "state_district", - "8": "city", - "9": "city_district", - "10": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/at.yaml b/resources/boundaries/osm/at.yaml new file mode 100644 index 00000000..b1c64fe6 --- /dev/null +++ b/resources/boundaries/osm/at.yaml @@ -0,0 +1,9 @@ +--- + admin_level: + "2": "country" + "4": "state" + "6": "state_district" + "8": "city" + "9": "city_district" + "10": "suburb" + diff --git a/resources/boundaries/osm/au.json b/resources/boundaries/osm/au.json deleted file mode 100644 index 9065bd85..00000000 --- a/resources/boundaries/osm/au.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "5": "state_district", - "6": "state_district", - "7": "state_district", - "8": "postcode", - "9": "suburb", - "10": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/au.yaml b/resources/boundaries/osm/au.yaml new file mode 100644 index 00000000..091d8069 --- /dev/null +++ b/resources/boundaries/osm/au.yaml @@ -0,0 +1,11 @@ +--- + admin_level: + "2": "country" + "4": "state" + "5": "state_district" + "6": "state_district" + "7": "state_district" + "8": "postcode" + "9": "suburb" + "10": "suburb" + diff --git a/resources/boundaries/osm/az.json b/resources/boundaries/osm/az.json deleted file mode 100644 index b1b9de39..00000000 --- a/resources/boundaries/osm/az.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/az.yaml b/resources/boundaries/osm/az.yaml new file mode 100644 index 00000000..86c25419 --- /dev/null +++ b/resources/boundaries/osm/az.yaml @@ -0,0 +1,5 @@ +--- + admin_level: + "2": "country" + "4": "state" + diff --git a/resources/boundaries/osm/ba.json b/resources/boundaries/osm/ba.json deleted file mode 100644 index 6ec40667..00000000 --- a/resources/boundaries/osm/ba.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "admin_level": { - "2": "country", - "5": "state", - "6": "city", - "7": "city", - "8": "city", - "9": "city_district" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/ba.yaml b/resources/boundaries/osm/ba.yaml new file mode 100644 index 00000000..188db454 --- /dev/null +++ b/resources/boundaries/osm/ba.yaml @@ -0,0 +1,9 @@ +--- + admin_level: + "2": "country" + "5": "state" + "6": "city" + "7": "city" + "8": "city" + "9": "city_district" + diff --git a/resources/boundaries/osm/bd.json b/resources/boundaries/osm/bd.json deleted file mode 100644 index 878b6e9f..00000000 --- a/resources/boundaries/osm/bd.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "admin_level": { - "2": "country", - "3": "state", - "5": "state_district", - "6": "state_district", - "7": "city", - "8": "city", - "9": "city" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/bd.yaml b/resources/boundaries/osm/bd.yaml new file mode 100644 index 00000000..3154f1be --- /dev/null +++ b/resources/boundaries/osm/bd.yaml @@ -0,0 +1,10 @@ +--- + admin_level: + "2": "country" + "3": "state" + "5": "state_district" + "6": "state_district" + "7": "city" + "8": "city" + "9": "city" + diff --git a/resources/boundaries/osm/be.json b/resources/boundaries/osm/be.json deleted file mode 100644 index c5a44b6d..00000000 --- a/resources/boundaries/osm/be.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "6": "state_district", - "7": "state_district", - "8": "city" - } -} diff --git a/resources/boundaries/osm/be.yaml b/resources/boundaries/osm/be.yaml new file mode 100644 index 00000000..9923e171 --- /dev/null +++ b/resources/boundaries/osm/be.yaml @@ -0,0 +1,8 @@ +--- + admin_level: + "2": "country" + "4": "state" + "6": "state_district" + "7": "state_district" + "8": "city" + diff --git a/resources/boundaries/osm/bg.json b/resources/boundaries/osm/bg.json deleted file mode 100644 index f5a60dc7..00000000 --- a/resources/boundaries/osm/bg.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "admin_level": { - "2": "country", - "6": "state", - "7": "city", - "8": "city", - "9": "city_district", - "10": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/bg.yaml b/resources/boundaries/osm/bg.yaml new file mode 100644 index 00000000..73060b86 --- /dev/null +++ b/resources/boundaries/osm/bg.yaml @@ -0,0 +1,9 @@ +--- + admin_level: + "2": "country" + "6": "state" + "7": "city" + "8": "city" + "9": "city_district" + "10": "suburb" + diff --git a/resources/boundaries/osm/bm.json b/resources/boundaries/osm/bm.json deleted file mode 100644 index 0f0d3da4..00000000 --- a/resources/boundaries/osm/bm.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "admin_level": { - "2": "country", - "6": "state", - "8": "city" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/bm.yaml b/resources/boundaries/osm/bm.yaml new file mode 100644 index 00000000..756808a3 --- /dev/null +++ b/resources/boundaries/osm/bm.yaml @@ -0,0 +1,6 @@ +--- + admin_level: + "2": "country" + "6": "state" + "8": "city" + diff --git a/resources/boundaries/osm/bo.json b/resources/boundaries/osm/bo.json deleted file mode 100644 index 1a05417a..00000000 --- a/resources/boundaries/osm/bo.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "5": "state_district", - "6": "state_district", - "7": "state_district", - "8": "city", - "9": "city_district", - "10": "city_district", - "11": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/bo.yaml b/resources/boundaries/osm/bo.yaml new file mode 100644 index 00000000..45247d16 --- /dev/null +++ b/resources/boundaries/osm/bo.yaml @@ -0,0 +1,12 @@ +--- + admin_level: + "2": "country" + "4": "state" + "5": "state_district" + "6": "state_district" + "7": "state_district" + "8": "city" + "9": "city_district" + "10": "city_district" + "11": "suburb" + diff --git a/resources/boundaries/osm/br.json b/resources/boundaries/osm/br.json deleted file mode 100644 index d7002e46..00000000 --- a/resources/boundaries/osm/br.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "admin_level": { - "2": "country", - "3": "state", - "4": "state", - "5": "state_district", - "6": "state_district", - "7": "state_district", - "8": "city", - "9": "city_district", - "10": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/br.yaml b/resources/boundaries/osm/br.yaml new file mode 100644 index 00000000..793a8158 --- /dev/null +++ b/resources/boundaries/osm/br.yaml @@ -0,0 +1,12 @@ +--- + admin_level: + "2": "country" + "3": "state" + "4": "state" + "5": "state_district" + "6": "state_district" + "7": "state_district" + "8": "city" + "9": "city_district" + "10": "suburb" + diff --git a/resources/boundaries/osm/by.json b/resources/boundaries/osm/by.json deleted file mode 100644 index b91fbbe4..00000000 --- a/resources/boundaries/osm/by.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "6": "state_district", - "8": "city", - "9": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/by.yaml b/resources/boundaries/osm/by.yaml new file mode 100644 index 00000000..427cc0e7 --- /dev/null +++ b/resources/boundaries/osm/by.yaml @@ -0,0 +1,8 @@ +--- + admin_level: + "2": "country" + "4": "state" + "6": "state_district" + "8": "city" + "9": "suburb" + diff --git a/resources/boundaries/osm/ca.json b/resources/boundaries/osm/ca.json deleted file mode 100644 index 76451bf9..00000000 --- a/resources/boundaries/osm/ca.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "5": "state_district", - "6": "state_district", - "8": "city", - "9": "city_district", - "10": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/ca.yaml b/resources/boundaries/osm/ca.yaml new file mode 100644 index 00000000..22935c95 --- /dev/null +++ b/resources/boundaries/osm/ca.yaml @@ -0,0 +1,10 @@ +--- + admin_level: + "2": "country" + "4": "state" + "5": "state_district" + "6": "state_district" + "8": "city" + "9": "city_district" + "10": "suburb" + diff --git a/resources/boundaries/osm/ch.json b/resources/boundaries/osm/ch.json deleted file mode 100644 index 46e39d0c..00000000 --- a/resources/boundaries/osm/ch.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "5": "state_district", - "6": "state_district", - "7": "state_district", - "8": "city", - "10": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/ch.yaml b/resources/boundaries/osm/ch.yaml new file mode 100644 index 00000000..1dee364f --- /dev/null +++ b/resources/boundaries/osm/ch.yaml @@ -0,0 +1,10 @@ +--- + admin_level: + "2": "country" + "4": "state" + "5": "state_district" + "6": "state_district" + "7": "state_district" + "8": "city" + "10": "suburb" + diff --git a/resources/boundaries/osm/cl.json b/resources/boundaries/osm/cl.json deleted file mode 100644 index 34b92c40..00000000 --- a/resources/boundaries/osm/cl.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "6": "state_district", - "8": "city" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/cl.yaml b/resources/boundaries/osm/cl.yaml new file mode 100644 index 00000000..43174afb --- /dev/null +++ b/resources/boundaries/osm/cl.yaml @@ -0,0 +1,7 @@ +--- + admin_level: + "2": "country" + "4": "state" + "6": "state_district" + "8": "city" + diff --git a/resources/boundaries/osm/cn.json b/resources/boundaries/osm/cn.json deleted file mode 100644 index 68d58c4b..00000000 --- a/resources/boundaries/osm/cn.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "5": "state_district", - "6": "state_district", - "8": "city", - "10": "city" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/cn.yaml b/resources/boundaries/osm/cn.yaml new file mode 100644 index 00000000..021535fd --- /dev/null +++ b/resources/boundaries/osm/cn.yaml @@ -0,0 +1,9 @@ +--- + admin_level: + "2": "country" + "4": "state" + "5": "state_district" + "6": "state_district" + "8": "city" + "10": "city" + diff --git a/resources/boundaries/osm/co.json b/resources/boundaries/osm/co.json deleted file mode 100644 index 69de1fe5..00000000 --- a/resources/boundaries/osm/co.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "admin_level": { - "2": "country", - "3": "state", - "4": "state", - "5": "state_district", - "6": "state_district", - "7": "city", - "8": "city", - "9": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/co.yaml b/resources/boundaries/osm/co.yaml new file mode 100644 index 00000000..48444c63 --- /dev/null +++ b/resources/boundaries/osm/co.yaml @@ -0,0 +1,11 @@ +--- + admin_level: + "2": "country" + "3": "state" + "4": "state" + "5": "state_district" + "6": "state_district" + "7": "city" + "8": "city" + "9": "suburb" + diff --git a/resources/boundaries/osm/cr.json b/resources/boundaries/osm/cr.json deleted file mode 100644 index 5b1abcab..00000000 --- a/resources/boundaries/osm/cr.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "6": "state_district", - "8": "city", - "10": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/cr.yaml b/resources/boundaries/osm/cr.yaml new file mode 100644 index 00000000..15df2d5f --- /dev/null +++ b/resources/boundaries/osm/cr.yaml @@ -0,0 +1,8 @@ +--- + admin_level: + "2": "country" + "4": "state" + "6": "state_district" + "8": "city" + "10": "suburb" + diff --git a/resources/boundaries/osm/cu.json b/resources/boundaries/osm/cu.json deleted file mode 100644 index 5b1abcab..00000000 --- a/resources/boundaries/osm/cu.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "6": "state_district", - "8": "city", - "10": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/cu.yaml b/resources/boundaries/osm/cu.yaml new file mode 100644 index 00000000..15df2d5f --- /dev/null +++ b/resources/boundaries/osm/cu.yaml @@ -0,0 +1,8 @@ +--- + admin_level: + "2": "country" + "4": "state" + "6": "state_district" + "8": "city" + "10": "suburb" + diff --git a/resources/boundaries/osm/cw.json b/resources/boundaries/osm/cw.json deleted file mode 100644 index a3575551..00000000 --- a/resources/boundaries/osm/cw.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "admin_level": { - "3": "country" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/cw.yaml b/resources/boundaries/osm/cw.yaml new file mode 100644 index 00000000..28237c09 --- /dev/null +++ b/resources/boundaries/osm/cw.yaml @@ -0,0 +1,4 @@ +--- + admin_level: + "3": "country" + diff --git a/resources/boundaries/osm/cz.json b/resources/boundaries/osm/cz.json deleted file mode 100644 index 7f22d5f1..00000000 --- a/resources/boundaries/osm/cz.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "6": "state_district", - "7": "state_district", - "8": "city", - "10": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/cz.yaml b/resources/boundaries/osm/cz.yaml new file mode 100644 index 00000000..db8eb03b --- /dev/null +++ b/resources/boundaries/osm/cz.yaml @@ -0,0 +1,9 @@ +--- + admin_level: + "2": "country" + "4": "state" + "6": "state_district" + "7": "state_district" + "8": "city" + "10": "suburb" + diff --git a/resources/boundaries/osm/de.json b/resources/boundaries/osm/de.json deleted file mode 100644 index 6e92dece..00000000 --- a/resources/boundaries/osm/de.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "5": "state_district", - "6": "state_district", - "7": "state_district", - "8": "city", - "9": "city_district", - "10": "city_district" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/de.yaml b/resources/boundaries/osm/de.yaml new file mode 100644 index 00000000..44f39f63 --- /dev/null +++ b/resources/boundaries/osm/de.yaml @@ -0,0 +1,11 @@ +--- + admin_level: + "2": "country" + "4": "state" + "5": "state_district" + "6": "state_district" + "7": "state_district" + "8": "city" + "9": "city_district" + "10": "city_district" + diff --git a/resources/boundaries/osm/dk.json b/resources/boundaries/osm/dk.json deleted file mode 100644 index c2df2a38..00000000 --- a/resources/boundaries/osm/dk.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "7": "city", - "8": "city", - "9": "suburb", - "10": "city" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/dk.yaml b/resources/boundaries/osm/dk.yaml new file mode 100644 index 00000000..c761d607 --- /dev/null +++ b/resources/boundaries/osm/dk.yaml @@ -0,0 +1,9 @@ +--- + admin_level: + "2": "country" + "4": "state" + "7": "city" + "8": "city" + "9": "suburb" + "10": "city" + diff --git a/resources/boundaries/osm/dz.json b/resources/boundaries/osm/dz.json deleted file mode 100644 index 7870fcd5..00000000 --- a/resources/boundaries/osm/dz.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "6": "state_district", - "7": "city" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/dz.yaml b/resources/boundaries/osm/dz.yaml new file mode 100644 index 00000000..18dad522 --- /dev/null +++ b/resources/boundaries/osm/dz.yaml @@ -0,0 +1,7 @@ +--- + admin_level: + "2": "country" + "4": "state" + "6": "state_district" + "7": "city" + diff --git a/resources/boundaries/osm/ec.json b/resources/boundaries/osm/ec.json deleted file mode 100644 index 00b39637..00000000 --- a/resources/boundaries/osm/ec.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "6": "state_district", - "7": "city", - "8": "city", - "9": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/ec.yaml b/resources/boundaries/osm/ec.yaml new file mode 100644 index 00000000..6f64bb04 --- /dev/null +++ b/resources/boundaries/osm/ec.yaml @@ -0,0 +1,9 @@ +--- + admin_level: + "2": "country" + "4": "state" + "6": "state_district" + "7": "city" + "8": "city" + "9": "suburb" + diff --git a/resources/boundaries/osm/ee.json b/resources/boundaries/osm/ee.json deleted file mode 100644 index a1e1739a..00000000 --- a/resources/boundaries/osm/ee.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "admin_level": { - "2": "country", - "6": "state_district", - "8": "city", - "9": "city", - "10": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/ee.yaml b/resources/boundaries/osm/ee.yaml new file mode 100644 index 00000000..55a4ad25 --- /dev/null +++ b/resources/boundaries/osm/ee.yaml @@ -0,0 +1,8 @@ +--- + admin_level: + "2": "country" + "6": "state_district" + "8": "city" + "9": "city" + "10": "suburb" + diff --git a/resources/boundaries/osm/es.json b/resources/boundaries/osm/es.json deleted file mode 100644 index 168a38b1..00000000 --- a/resources/boundaries/osm/es.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "6": "state", - "7": "state_district", - "8": "city", - "9": "city_district", - "10": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/es.yaml b/resources/boundaries/osm/es.yaml new file mode 100644 index 00000000..978e55e7 --- /dev/null +++ b/resources/boundaries/osm/es.yaml @@ -0,0 +1,10 @@ +--- + admin_level: + "2": "country" + "4": "state" + "6": "state" + "7": "state_district" + "8": "city" + "9": "city_district" + "10": "suburb" + diff --git a/resources/boundaries/osm/fi.json b/resources/boundaries/osm/fi.json deleted file mode 100644 index 9c100eec..00000000 --- a/resources/boundaries/osm/fi.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "6": "state_district", - "7": "state_district", - "8": "city", - "9": "city", - "10": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/fi.yaml b/resources/boundaries/osm/fi.yaml new file mode 100644 index 00000000..5674c2e9 --- /dev/null +++ b/resources/boundaries/osm/fi.yaml @@ -0,0 +1,10 @@ +--- + admin_level: + "2": "country" + "4": "state" + "6": "state_district" + "7": "state_district" + "8": "city" + "9": "city" + "10": "suburb" + diff --git a/resources/boundaries/osm/fo.json b/resources/boundaries/osm/fo.json deleted file mode 100644 index 7c600672..00000000 --- a/resources/boundaries/osm/fo.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "8": "city" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/fo.yaml b/resources/boundaries/osm/fo.yaml new file mode 100644 index 00000000..7ea251f9 --- /dev/null +++ b/resources/boundaries/osm/fo.yaml @@ -0,0 +1,6 @@ +--- + admin_level: + "2": "country" + "4": "state" + "8": "city" + diff --git a/resources/boundaries/osm/fr.json b/resources/boundaries/osm/fr.json deleted file mode 100644 index cc1ed1a3..00000000 --- a/resources/boundaries/osm/fr.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "6": "state_district", - "7": "state_district", - "8": "city", - "9": "city_district", - "10": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/fr.yaml b/resources/boundaries/osm/fr.yaml new file mode 100644 index 00000000..2e67542a --- /dev/null +++ b/resources/boundaries/osm/fr.yaml @@ -0,0 +1,10 @@ +--- + admin_level: + "2": "country" + "4": "state" + "6": "state_district" + "7": "state_district" + "8": "city" + "9": "city_district" + "10": "suburb" + diff --git a/resources/boundaries/osm/gb.json b/resources/boundaries/osm/gb.json deleted file mode 100644 index 8ba4cd82..00000000 --- a/resources/boundaries/osm/gb.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "5": "state_district", - "6": "city", - "8": "city_district", - "10": "suburb" - }, - "designation": { - "non_metropolitan_county": "state_district" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/gb.yaml b/resources/boundaries/osm/gb.yaml new file mode 100644 index 00000000..90928360 --- /dev/null +++ b/resources/boundaries/osm/gb.yaml @@ -0,0 +1,11 @@ +--- + admin_level: + "2": "country" + "4": "state" + "5": "state_district" + "6": "city" + "8": "city_district" + "10": "suburb" + designation: + non_metropolitan_county: "state_district" + diff --git a/resources/boundaries/osm/ge.json b/resources/boundaries/osm/ge.json deleted file mode 100644 index b0a7c089..00000000 --- a/resources/boundaries/osm/ge.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "6": "state_district", - "8": "city", - "9": "city_district" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/ge.yaml b/resources/boundaries/osm/ge.yaml new file mode 100644 index 00000000..4bc537cb --- /dev/null +++ b/resources/boundaries/osm/ge.yaml @@ -0,0 +1,8 @@ +--- + admin_level: + "2": "country" + "4": "state" + "6": "state_district" + "8": "city" + "9": "city_district" + diff --git a/resources/boundaries/osm/gr.json b/resources/boundaries/osm/gr.json deleted file mode 100644 index d7002e46..00000000 --- a/resources/boundaries/osm/gr.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "admin_level": { - "2": "country", - "3": "state", - "4": "state", - "5": "state_district", - "6": "state_district", - "7": "state_district", - "8": "city", - "9": "city_district", - "10": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/gr.yaml b/resources/boundaries/osm/gr.yaml new file mode 100644 index 00000000..793a8158 --- /dev/null +++ b/resources/boundaries/osm/gr.yaml @@ -0,0 +1,12 @@ +--- + admin_level: + "2": "country" + "3": "state" + "4": "state" + "5": "state_district" + "6": "state_district" + "7": "state_district" + "8": "city" + "9": "city_district" + "10": "suburb" + diff --git a/resources/boundaries/osm/hk.json b/resources/boundaries/osm/hk.json deleted file mode 100644 index ad7ebc5b..00000000 --- a/resources/boundaries/osm/hk.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "admin_level": { - "3": "country", - "5": "state", - "6": "state_district", - "8": "city" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/hk.yaml b/resources/boundaries/osm/hk.yaml new file mode 100644 index 00000000..1cd762f8 --- /dev/null +++ b/resources/boundaries/osm/hk.yaml @@ -0,0 +1,7 @@ +--- + admin_level: + "3": "country" + "5": "state" + "6": "state_district" + "8": "city" + diff --git a/resources/boundaries/osm/hr.json b/resources/boundaries/osm/hr.json deleted file mode 100644 index ec59df32..00000000 --- a/resources/boundaries/osm/hr.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "admin_level": { - "2": "country", - "6": "state_district", - "7": "city", - "8": "city", - "9": "suburb", - "10": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/hr.yaml b/resources/boundaries/osm/hr.yaml new file mode 100644 index 00000000..5c46a287 --- /dev/null +++ b/resources/boundaries/osm/hr.yaml @@ -0,0 +1,9 @@ +--- + admin_level: + "2": "country" + "6": "state_district" + "7": "city" + "8": "city" + "9": "suburb" + "10": "suburb" + diff --git a/resources/boundaries/osm/ht.json b/resources/boundaries/osm/ht.json deleted file mode 100644 index e63979da..00000000 --- a/resources/boundaries/osm/ht.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "5": "state_district", - "8": "city", - "10": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/ht.yaml b/resources/boundaries/osm/ht.yaml new file mode 100644 index 00000000..9f0f2b1d --- /dev/null +++ b/resources/boundaries/osm/ht.yaml @@ -0,0 +1,8 @@ +--- + admin_level: + "2": "country" + "4": "state" + "5": "state_district" + "8": "city" + "10": "suburb" + diff --git a/resources/boundaries/osm/hu.json b/resources/boundaries/osm/hu.json deleted file mode 100644 index 7db49106..00000000 --- a/resources/boundaries/osm/hu.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "5": "state_district", - "6": "state_district", - "7": "state_district", - "8": "city", - "9": "city_district" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/hu.yaml b/resources/boundaries/osm/hu.yaml new file mode 100644 index 00000000..27d7aac2 --- /dev/null +++ b/resources/boundaries/osm/hu.yaml @@ -0,0 +1,10 @@ +--- + admin_level: + "2": "country" + "4": "state" + "5": "state_district" + "6": "state_district" + "7": "state_district" + "8": "city" + "9": "city_district" + diff --git a/resources/boundaries/osm/id.json b/resources/boundaries/osm/id.json deleted file mode 100644 index fd36a494..00000000 --- a/resources/boundaries/osm/id.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "5": "city", - "6": "city_district", - "7": "city", - "8": "city_district", - "9": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/id.yaml b/resources/boundaries/osm/id.yaml new file mode 100644 index 00000000..2379bee8 --- /dev/null +++ b/resources/boundaries/osm/id.yaml @@ -0,0 +1,10 @@ +--- + admin_level: + "2": "country" + "4": "state" + "5": "city" + "6": "city_district" + "7": "city" + "8": "city_district" + "9": "suburb" + diff --git a/resources/boundaries/osm/ie.json b/resources/boundaries/osm/ie.json deleted file mode 100644 index 379b31f7..00000000 --- a/resources/boundaries/osm/ie.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "admin_level": { - "2": "country", - "5": "state", - "6": "state_district", - "7": "city_district", - "10": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/ie.yaml b/resources/boundaries/osm/ie.yaml new file mode 100644 index 00000000..2eb5e15f --- /dev/null +++ b/resources/boundaries/osm/ie.yaml @@ -0,0 +1,8 @@ +--- + admin_level: + "2": "country" + "5": "state" + "6": "state_district" + "7": "city_district" + "10": "suburb" + diff --git a/resources/boundaries/osm/il.json b/resources/boundaries/osm/il.json deleted file mode 100644 index 1802f80e..00000000 --- a/resources/boundaries/osm/il.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "8": "city", - "10": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/il.yaml b/resources/boundaries/osm/il.yaml new file mode 100644 index 00000000..ca606c44 --- /dev/null +++ b/resources/boundaries/osm/il.yaml @@ -0,0 +1,7 @@ +--- + admin_level: + "2": "country" + "4": "state" + "8": "city" + "10": "suburb" + diff --git a/resources/boundaries/osm/im.json b/resources/boundaries/osm/im.json deleted file mode 100644 index 0f0d3da4..00000000 --- a/resources/boundaries/osm/im.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "admin_level": { - "2": "country", - "6": "state", - "8": "city" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/im.yaml b/resources/boundaries/osm/im.yaml new file mode 100644 index 00000000..756808a3 --- /dev/null +++ b/resources/boundaries/osm/im.yaml @@ -0,0 +1,6 @@ +--- + admin_level: + "2": "country" + "6": "state" + "8": "city" + diff --git a/resources/boundaries/osm/in.json b/resources/boundaries/osm/in.json deleted file mode 100644 index 8c2701e2..00000000 --- a/resources/boundaries/osm/in.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "5": "state_district", - "6": "state_district", - "7": "city", - "8": "city", - "9": "city_district", - "10": "city_district" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/in.yaml b/resources/boundaries/osm/in.yaml new file mode 100644 index 00000000..9e493750 --- /dev/null +++ b/resources/boundaries/osm/in.yaml @@ -0,0 +1,11 @@ +--- + admin_level: + "2": "country" + "4": "state" + "5": "state_district" + "6": "state_district" + "7": "city" + "8": "city" + "9": "city_district" + "10": "city_district" + diff --git a/resources/boundaries/osm/is.json b/resources/boundaries/osm/is.json deleted file mode 100644 index fc412b01..00000000 --- a/resources/boundaries/osm/is.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "admin_level": { - "2": "country", - "5": "state", - "6": "city", - "10": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/is.yaml b/resources/boundaries/osm/is.yaml new file mode 100644 index 00000000..2abbb85c --- /dev/null +++ b/resources/boundaries/osm/is.yaml @@ -0,0 +1,7 @@ +--- + admin_level: + "2": "country" + "5": "state" + "6": "city" + "10": "suburb" + diff --git a/resources/boundaries/osm/it.json b/resources/boundaries/osm/it.json deleted file mode 100644 index c29530ff..00000000 --- a/resources/boundaries/osm/it.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "6": "state_district", - "8": "city", - "10": "city_district" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/it.yaml b/resources/boundaries/osm/it.yaml new file mode 100644 index 00000000..3b6c3650 --- /dev/null +++ b/resources/boundaries/osm/it.yaml @@ -0,0 +1,8 @@ +--- + admin_level: + "2": "country" + "4": "state" + "6": "state_district" + "8": "city" + "10": "city_district" + diff --git a/resources/boundaries/osm/jm.json b/resources/boundaries/osm/jm.json deleted file mode 100644 index 0f0d3da4..00000000 --- a/resources/boundaries/osm/jm.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "admin_level": { - "2": "country", - "6": "state", - "8": "city" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/jm.yaml b/resources/boundaries/osm/jm.yaml new file mode 100644 index 00000000..756808a3 --- /dev/null +++ b/resources/boundaries/osm/jm.yaml @@ -0,0 +1,6 @@ +--- + admin_level: + "2": "country" + "6": "state" + "8": "city" + diff --git a/resources/boundaries/osm/jp.json b/resources/boundaries/osm/jp.json deleted file mode 100644 index 63a51c85..00000000 --- a/resources/boundaries/osm/jp.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "admin_level": { - "2": "country", - "3": "state", - "4": "state", - "5": "state_district", - "6": "state_district", - "7": "city", - "8": "suburb", - "9": "suburb", - "10": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/jp.yaml b/resources/boundaries/osm/jp.yaml new file mode 100644 index 00000000..4f37f401 --- /dev/null +++ b/resources/boundaries/osm/jp.yaml @@ -0,0 +1,12 @@ +--- + admin_level: + "2": "country" + "3": "state" + "4": "state" + "5": "state_district" + "6": "state_district" + "7": "city" + "8": "suburb" + "9": "suburb" + "10": "suburb" + diff --git a/resources/boundaries/osm/kr.json b/resources/boundaries/osm/kr.json deleted file mode 100644 index 85f98355..00000000 --- a/resources/boundaries/osm/kr.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "6": "state_district", - "7": "city", - "8": "city", - "10": "city" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/kr.yaml b/resources/boundaries/osm/kr.yaml new file mode 100644 index 00000000..65af3fff --- /dev/null +++ b/resources/boundaries/osm/kr.yaml @@ -0,0 +1,9 @@ +--- + admin_level: + "2": "country" + "4": "state" + "6": "state_district" + "7": "city" + "8": "city" + "10": "city" + diff --git a/resources/boundaries/osm/li.json b/resources/boundaries/osm/li.json deleted file mode 100644 index 0f0d3da4..00000000 --- a/resources/boundaries/osm/li.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "admin_level": { - "2": "country", - "6": "state", - "8": "city" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/li.yaml b/resources/boundaries/osm/li.yaml new file mode 100644 index 00000000..756808a3 --- /dev/null +++ b/resources/boundaries/osm/li.yaml @@ -0,0 +1,6 @@ +--- + admin_level: + "2": "country" + "6": "state" + "8": "city" + diff --git a/resources/boundaries/osm/lk.json b/resources/boundaries/osm/lk.json deleted file mode 100644 index 499811c4..00000000 --- a/resources/boundaries/osm/lk.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "5": "state_district", - "8": "city" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/lk.yaml b/resources/boundaries/osm/lk.yaml new file mode 100644 index 00000000..8c49c8e3 --- /dev/null +++ b/resources/boundaries/osm/lk.yaml @@ -0,0 +1,7 @@ +--- + admin_level: + "2": "country" + "4": "state" + "5": "state_district" + "8": "city" + diff --git a/resources/boundaries/osm/lt.json b/resources/boundaries/osm/lt.json deleted file mode 100644 index 57bc9bab..00000000 --- a/resources/boundaries/osm/lt.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "5": "state_district", - "6": "city_district", - "8": "city", - "10": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/lt.yaml b/resources/boundaries/osm/lt.yaml new file mode 100644 index 00000000..efd7076b --- /dev/null +++ b/resources/boundaries/osm/lt.yaml @@ -0,0 +1,9 @@ +--- + admin_level: + "2": "country" + "4": "state" + "5": "state_district" + "6": "city_district" + "8": "city" + "10": "suburb" + diff --git a/resources/boundaries/osm/lu.json b/resources/boundaries/osm/lu.json deleted file mode 100644 index 82769827..00000000 --- a/resources/boundaries/osm/lu.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "5": "state_district", - "6": "state_district", - "8": "city", - "9": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/lu.yaml b/resources/boundaries/osm/lu.yaml new file mode 100644 index 00000000..7b089905 --- /dev/null +++ b/resources/boundaries/osm/lu.yaml @@ -0,0 +1,9 @@ +--- + admin_level: + "2": "country" + "4": "state" + "5": "state_district" + "6": "state_district" + "8": "city" + "9": "suburb" + diff --git a/resources/boundaries/osm/lv.json b/resources/boundaries/osm/lv.json deleted file mode 100644 index 1f265b6c..00000000 --- a/resources/boundaries/osm/lv.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "6": "state_district", - "7": "city", - "8": "city", - "9": "city", - "10": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/lv.yaml b/resources/boundaries/osm/lv.yaml new file mode 100644 index 00000000..d528fb20 --- /dev/null +++ b/resources/boundaries/osm/lv.yaml @@ -0,0 +1,10 @@ +--- + admin_level: + "2": "country" + "4": "state" + "6": "state_district" + "7": "city" + "8": "city" + "9": "city" + "10": "suburb" + diff --git a/resources/boundaries/osm/md.json b/resources/boundaries/osm/md.json deleted file mode 100644 index 9c100eec..00000000 --- a/resources/boundaries/osm/md.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "6": "state_district", - "7": "state_district", - "8": "city", - "9": "city", - "10": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/md.yaml b/resources/boundaries/osm/md.yaml new file mode 100644 index 00000000..5674c2e9 --- /dev/null +++ b/resources/boundaries/osm/md.yaml @@ -0,0 +1,10 @@ +--- + admin_level: + "2": "country" + "4": "state" + "6": "state_district" + "7": "state_district" + "8": "city" + "9": "city" + "10": "suburb" + diff --git a/resources/boundaries/osm/me.json b/resources/boundaries/osm/me.json deleted file mode 100644 index 0f0d3da4..00000000 --- a/resources/boundaries/osm/me.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "admin_level": { - "2": "country", - "6": "state", - "8": "city" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/me.yaml b/resources/boundaries/osm/me.yaml new file mode 100644 index 00000000..756808a3 --- /dev/null +++ b/resources/boundaries/osm/me.yaml @@ -0,0 +1,6 @@ +--- + admin_level: + "2": "country" + "6": "state" + "8": "city" + diff --git a/resources/boundaries/osm/mk.json b/resources/boundaries/osm/mk.json deleted file mode 100644 index d561fa8f..00000000 --- a/resources/boundaries/osm/mk.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "6": "city", - "7": "city", - "8": "city", - "9": "suburb", - "10": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/mk.yaml b/resources/boundaries/osm/mk.yaml new file mode 100644 index 00000000..40cd9f35 --- /dev/null +++ b/resources/boundaries/osm/mk.yaml @@ -0,0 +1,10 @@ +--- + admin_level: + "2": "country" + "4": "state" + "6": "city" + "7": "city" + "8": "city" + "9": "suburb" + "10": "suburb" + diff --git a/resources/boundaries/osm/mx.json b/resources/boundaries/osm/mx.json deleted file mode 100644 index b36070c7..00000000 --- a/resources/boundaries/osm/mx.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "6": "state_district", - "8": "city", - "9": "city_district", - "10": "city_district" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/mx.yaml b/resources/boundaries/osm/mx.yaml new file mode 100644 index 00000000..cf5e349e --- /dev/null +++ b/resources/boundaries/osm/mx.yaml @@ -0,0 +1,9 @@ +--- + admin_level: + "2": "country" + "4": "state" + "6": "state_district" + "8": "city" + "9": "city_district" + "10": "city_district" + diff --git a/resources/boundaries/osm/my.json b/resources/boundaries/osm/my.json deleted file mode 100644 index 35f43e99..00000000 --- a/resources/boundaries/osm/my.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "5": "state_district", - "6": "state_district", - "7": "state_district", - "8": "state_district", - "10": "city" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/my.yaml b/resources/boundaries/osm/my.yaml new file mode 100644 index 00000000..df288ee4 --- /dev/null +++ b/resources/boundaries/osm/my.yaml @@ -0,0 +1,10 @@ +--- + admin_level: + "2": "country" + "4": "state" + "5": "state_district" + "6": "state_district" + "7": "state_district" + "8": "state_district" + "10": "city" + diff --git a/resources/boundaries/osm/nc.json b/resources/boundaries/osm/nc.json deleted file mode 100644 index b735616e..00000000 --- a/resources/boundaries/osm/nc.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "admin_level": { - "3": "country", - "6": "state", - "7": "state", - "8": "city", - "9": "city_district", - "10": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/nc.yaml b/resources/boundaries/osm/nc.yaml new file mode 100644 index 00000000..3dd73b5b --- /dev/null +++ b/resources/boundaries/osm/nc.yaml @@ -0,0 +1,9 @@ +--- + admin_level: + "3": "country" + "6": "state" + "7": "state" + "8": "city" + "9": "city_district" + "10": "suburb" + diff --git a/resources/boundaries/osm/nl.json b/resources/boundaries/osm/nl.json deleted file mode 100644 index df53e1da..00000000 --- a/resources/boundaries/osm/nl.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "admin_level": { - "2": "country", - "3": "country", - "4": "state", - "6": "state_district", - "7": "city", - "8": "city", - "9": "city_district", - "10": "suburb", - "11": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/nl.yaml b/resources/boundaries/osm/nl.yaml new file mode 100644 index 00000000..7e3f7af1 --- /dev/null +++ b/resources/boundaries/osm/nl.yaml @@ -0,0 +1,12 @@ +--- + admin_level: + "2": "country" + "3": "country" + "4": "state" + "6": "state_district" + "7": "city" + "8": "city" + "9": "city_district" + "10": "suburb" + "11": "suburb" + diff --git a/resources/boundaries/osm/no.json b/resources/boundaries/osm/no.json deleted file mode 100644 index c834a8e9..00000000 --- a/resources/boundaries/osm/no.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "7": "city", - "9": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/no.yaml b/resources/boundaries/osm/no.yaml new file mode 100644 index 00000000..275ce0ab --- /dev/null +++ b/resources/boundaries/osm/no.yaml @@ -0,0 +1,7 @@ +--- + admin_level: + "2": "country" + "4": "state" + "7": "city" + "9": "suburb" + diff --git a/resources/boundaries/osm/np.json b/resources/boundaries/osm/np.json deleted file mode 100644 index 76451bf9..00000000 --- a/resources/boundaries/osm/np.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "5": "state_district", - "6": "state_district", - "8": "city", - "9": "city_district", - "10": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/np.yaml b/resources/boundaries/osm/np.yaml new file mode 100644 index 00000000..22935c95 --- /dev/null +++ b/resources/boundaries/osm/np.yaml @@ -0,0 +1,10 @@ +--- + admin_level: + "2": "country" + "4": "state" + "5": "state_district" + "6": "state_district" + "8": "city" + "9": "city_district" + "10": "suburb" + diff --git a/resources/boundaries/osm/nz.json b/resources/boundaries/osm/nz.json deleted file mode 100644 index 22fda383..00000000 --- a/resources/boundaries/osm/nz.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "6": "state_district", - "7": "city_district", - "8": "city_district" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/nz.yaml b/resources/boundaries/osm/nz.yaml new file mode 100644 index 00000000..4a99c31e --- /dev/null +++ b/resources/boundaries/osm/nz.yaml @@ -0,0 +1,8 @@ +--- + admin_level: + "2": "country" + "4": "state" + "6": "state_district" + "7": "city_district" + "8": "city_district" + diff --git a/resources/boundaries/osm/pe.json b/resources/boundaries/osm/pe.json deleted file mode 100644 index 5b1abcab..00000000 --- a/resources/boundaries/osm/pe.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "6": "state_district", - "8": "city", - "10": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/pe.yaml b/resources/boundaries/osm/pe.yaml new file mode 100644 index 00000000..15df2d5f --- /dev/null +++ b/resources/boundaries/osm/pe.yaml @@ -0,0 +1,8 @@ +--- + admin_level: + "2": "country" + "4": "state" + "6": "state_district" + "8": "city" + "10": "suburb" + diff --git a/resources/boundaries/osm/ph.json b/resources/boundaries/osm/ph.json deleted file mode 100644 index 75987eb7..00000000 --- a/resources/boundaries/osm/ph.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "admin_level": { - "2": "country", - "3": "state", - "4": "state", - "5": "state_district", - "6": "city", - "7": "city_district", - "8": "city_district", - "9": "city_district", - "10": "city_district" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/ph.yaml b/resources/boundaries/osm/ph.yaml new file mode 100644 index 00000000..514b6b4d --- /dev/null +++ b/resources/boundaries/osm/ph.yaml @@ -0,0 +1,12 @@ +--- + admin_level: + "2": "country" + "3": "state" + "4": "state" + "5": "state_district" + "6": "city" + "7": "city_district" + "8": "city_district" + "9": "city_district" + "10": "city_district" + diff --git a/resources/boundaries/osm/pk.json b/resources/boundaries/osm/pk.json deleted file mode 100644 index b1b9de39..00000000 --- a/resources/boundaries/osm/pk.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/pk.yaml b/resources/boundaries/osm/pk.yaml new file mode 100644 index 00000000..86c25419 --- /dev/null +++ b/resources/boundaries/osm/pk.yaml @@ -0,0 +1,5 @@ +--- + admin_level: + "2": "country" + "4": "state" + diff --git a/resources/boundaries/osm/pl.json b/resources/boundaries/osm/pl.json deleted file mode 100644 index 9271059f..00000000 --- a/resources/boundaries/osm/pl.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "6": "state_district", - "7": "state_district", - "8": "city", - "9": "city_district", - "10": "city", - "11": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/pl.yaml b/resources/boundaries/osm/pl.yaml new file mode 100644 index 00000000..b915c643 --- /dev/null +++ b/resources/boundaries/osm/pl.yaml @@ -0,0 +1,11 @@ +--- + admin_level: + "2": "country" + "4": "state" + "6": "state_district" + "7": "state_district" + "8": "city" + "9": "city_district" + "10": "city" + "11": "suburb" + diff --git a/resources/boundaries/osm/pr.json b/resources/boundaries/osm/pr.json deleted file mode 100644 index 0610653d..00000000 --- a/resources/boundaries/osm/pr.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "admin_level": { - "4": "country", - "6": "state_district", - "8": "city", - "10": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/pr.yaml b/resources/boundaries/osm/pr.yaml new file mode 100644 index 00000000..e806da3f --- /dev/null +++ b/resources/boundaries/osm/pr.yaml @@ -0,0 +1,7 @@ +--- + admin_level: + "4": "country" + "6": "state_district" + "8": "city" + "10": "suburb" + diff --git a/resources/boundaries/osm/pt.json b/resources/boundaries/osm/pt.json deleted file mode 100644 index ff49b85b..00000000 --- a/resources/boundaries/osm/pt.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "5": "state", - "6": "state_district", - "7": "city", - "8": "city", - "9": "city_district", - "10": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/pt.yaml b/resources/boundaries/osm/pt.yaml new file mode 100644 index 00000000..4f5a7bdb --- /dev/null +++ b/resources/boundaries/osm/pt.yaml @@ -0,0 +1,11 @@ +--- + admin_level: + "2": "country" + "4": "state" + "5": "state" + "6": "state_district" + "7": "city" + "8": "city" + "9": "city_district" + "10": "suburb" + diff --git a/resources/boundaries/osm/re.json b/resources/boundaries/osm/re.json deleted file mode 100644 index 580c0a43..00000000 --- a/resources/boundaries/osm/re.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "admin_level": { - "6": "country", - "7": "state", - "8": "city", - "9": "city_district", - "10": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/re.yaml b/resources/boundaries/osm/re.yaml new file mode 100644 index 00000000..0d22762a --- /dev/null +++ b/resources/boundaries/osm/re.yaml @@ -0,0 +1,8 @@ +--- + admin_level: + "6": "country" + "7": "state" + "8": "city" + "9": "city_district" + "10": "suburb" + diff --git a/resources/boundaries/osm/ro.json b/resources/boundaries/osm/ro.json deleted file mode 100644 index ef3a82d0..00000000 --- a/resources/boundaries/osm/ro.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "6": "city" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/ro.yaml b/resources/boundaries/osm/ro.yaml new file mode 100644 index 00000000..c4e55f16 --- /dev/null +++ b/resources/boundaries/osm/ro.yaml @@ -0,0 +1,6 @@ +--- + admin_level: + "2": "country" + "4": "state" + "6": "city" + diff --git a/resources/boundaries/osm/rs.json b/resources/boundaries/osm/rs.json deleted file mode 100644 index f3b965dc..00000000 --- a/resources/boundaries/osm/rs.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "6": "state_district", - "7": "state_district", - "8": "city" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/rs.yaml b/resources/boundaries/osm/rs.yaml new file mode 100644 index 00000000..9923e171 --- /dev/null +++ b/resources/boundaries/osm/rs.yaml @@ -0,0 +1,8 @@ +--- + admin_level: + "2": "country" + "4": "state" + "6": "state_district" + "7": "state_district" + "8": "city" + diff --git a/resources/boundaries/osm/ru.json b/resources/boundaries/osm/ru.json deleted file mode 100644 index 5f8ad654..00000000 --- a/resources/boundaries/osm/ru.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "admin_level": { - "2": "country", - "3": "state", - "4": "state_district", - "5": "city_district", - "6": "city_district", - "8": "city", - "9": "city_district", - "10": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/ru.yaml b/resources/boundaries/osm/ru.yaml new file mode 100644 index 00000000..59838668 --- /dev/null +++ b/resources/boundaries/osm/ru.yaml @@ -0,0 +1,11 @@ +--- + admin_level: + "2": "country" + "3": "state" + "4": "state_district" + "5": "city_district" + "6": "city_district" + "8": "city" + "9": "city_district" + "10": "suburb" + diff --git a/resources/boundaries/osm/sa.json b/resources/boundaries/osm/sa.json deleted file mode 100644 index b1b9de39..00000000 --- a/resources/boundaries/osm/sa.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/sa.yaml b/resources/boundaries/osm/sa.yaml new file mode 100644 index 00000000..86c25419 --- /dev/null +++ b/resources/boundaries/osm/sa.yaml @@ -0,0 +1,5 @@ +--- + admin_level: + "2": "country" + "4": "state" + diff --git a/resources/boundaries/osm/se.json b/resources/boundaries/osm/se.json deleted file mode 100644 index fae0563a..00000000 --- a/resources/boundaries/osm/se.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "admin_level": { - "2": "country", - "3": "state", - "4": "state_district", - "7": "city", - "8": "city_district", - "9": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/se.yaml b/resources/boundaries/osm/se.yaml new file mode 100644 index 00000000..6c1138fb --- /dev/null +++ b/resources/boundaries/osm/se.yaml @@ -0,0 +1,9 @@ +--- + admin_level: + "2": "country" + "3": "state" + "4": "state_district" + "7": "city" + "8": "city_district" + "9": "suburb" + diff --git a/resources/boundaries/osm/sg.json b/resources/boundaries/osm/sg.json deleted file mode 100644 index 0b425281..00000000 --- a/resources/boundaries/osm/sg.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "admin_level": { - "2": "country", - "6": "state" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/sg.yaml b/resources/boundaries/osm/sg.yaml new file mode 100644 index 00000000..ccb8a85f --- /dev/null +++ b/resources/boundaries/osm/sg.yaml @@ -0,0 +1,5 @@ +--- + admin_level: + "2": "country" + "6": "state" + diff --git a/resources/boundaries/osm/si.json b/resources/boundaries/osm/si.json deleted file mode 100644 index 1d489e48..00000000 --- a/resources/boundaries/osm/si.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "5": "state", - "7": "state_district", - "8": "city", - "10": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/si.yaml b/resources/boundaries/osm/si.yaml new file mode 100644 index 00000000..1a907605 --- /dev/null +++ b/resources/boundaries/osm/si.yaml @@ -0,0 +1,9 @@ +--- + admin_level: + "2": "country" + "4": "state" + "5": "state" + "7": "state_district" + "8": "city" + "10": "suburb" + diff --git a/resources/boundaries/osm/sk.json b/resources/boundaries/osm/sk.json deleted file mode 100644 index a98f86ae..00000000 --- a/resources/boundaries/osm/sk.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "6": "state_district", - "8": "state_district", - "9": "city" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/sk.yaml b/resources/boundaries/osm/sk.yaml new file mode 100644 index 00000000..823cb86d --- /dev/null +++ b/resources/boundaries/osm/sk.yaml @@ -0,0 +1,8 @@ +--- + admin_level: + "2": "country" + "4": "state" + "6": "state_district" + "8": "state_district" + "9": "city" + diff --git a/resources/boundaries/osm/th.json b/resources/boundaries/osm/th.json deleted file mode 100644 index 59e921f0..00000000 --- a/resources/boundaries/osm/th.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "6": "state_district", - "8": "city_district", - "10": "city" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/th.yaml b/resources/boundaries/osm/th.yaml new file mode 100644 index 00000000..e2a62f45 --- /dev/null +++ b/resources/boundaries/osm/th.yaml @@ -0,0 +1,8 @@ +--- + admin_level: + "2": "country" + "4": "state" + "6": "state_district" + "8": "city_district" + "10": "city" + diff --git a/resources/boundaries/osm/tj.json b/resources/boundaries/osm/tj.json deleted file mode 100644 index 34b92c40..00000000 --- a/resources/boundaries/osm/tj.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "6": "state_district", - "8": "city" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/tj.yaml b/resources/boundaries/osm/tj.yaml new file mode 100644 index 00000000..43174afb --- /dev/null +++ b/resources/boundaries/osm/tj.yaml @@ -0,0 +1,7 @@ +--- + admin_level: + "2": "country" + "4": "state" + "6": "state_district" + "8": "city" + diff --git a/resources/boundaries/osm/tn.json b/resources/boundaries/osm/tn.json deleted file mode 100644 index 3ab505c4..00000000 --- a/resources/boundaries/osm/tn.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "5": "city", - "6": "city_district" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/tn.yaml b/resources/boundaries/osm/tn.yaml new file mode 100644 index 00000000..6f8b4571 --- /dev/null +++ b/resources/boundaries/osm/tn.yaml @@ -0,0 +1,7 @@ +--- + admin_level: + "2": "country" + "4": "state" + "5": "city" + "6": "city_district" + diff --git a/resources/boundaries/osm/tr.json b/resources/boundaries/osm/tr.json deleted file mode 100644 index ffba0287..00000000 --- a/resources/boundaries/osm/tr.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "admin_level": { - "2": "country", - "3": "state", - "4": "state", - "6": "state_district" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/tr.yaml b/resources/boundaries/osm/tr.yaml new file mode 100644 index 00000000..2d7605fc --- /dev/null +++ b/resources/boundaries/osm/tr.yaml @@ -0,0 +1,7 @@ +--- + admin_level: + "2": "country" + "3": "state" + "4": "state" + "6": "state_district" + diff --git a/resources/boundaries/osm/tw.json b/resources/boundaries/osm/tw.json deleted file mode 100644 index ef06c213..00000000 --- a/resources/boundaries/osm/tw.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "5": "state_district", - "6": "state_district", - "7": "state_district", - "8": "city", - "9": "city", - "10": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/tw.yaml b/resources/boundaries/osm/tw.yaml new file mode 100644 index 00000000..d56aa2c7 --- /dev/null +++ b/resources/boundaries/osm/tw.yaml @@ -0,0 +1,11 @@ +--- + admin_level: + "2": "country" + "4": "state" + "5": "state_district" + "6": "state_district" + "7": "state_district" + "8": "city" + "9": "city" + "10": "suburb" + diff --git a/resources/boundaries/osm/tz.json b/resources/boundaries/osm/tz.json deleted file mode 100644 index 50e2bf03..00000000 --- a/resources/boundaries/osm/tz.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "5": "state_district", - "7": "state_district", - "9": "city" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/tz.yaml b/resources/boundaries/osm/tz.yaml new file mode 100644 index 00000000..9fbd4269 --- /dev/null +++ b/resources/boundaries/osm/tz.yaml @@ -0,0 +1,8 @@ +--- + admin_level: + "2": "country" + "4": "state" + "5": "state_district" + "7": "state_district" + "9": "city" + diff --git a/resources/boundaries/osm/ua.json b/resources/boundaries/osm/ua.json deleted file mode 100644 index 848ddb7c..00000000 --- a/resources/boundaries/osm/ua.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "6": "state_district", - "7": "city_district", - "8": "city_district", - "9": "city" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/ua.yaml b/resources/boundaries/osm/ua.yaml new file mode 100644 index 00000000..300bcef4 --- /dev/null +++ b/resources/boundaries/osm/ua.yaml @@ -0,0 +1,9 @@ +--- + admin_level: + "2": "country" + "4": "state" + "6": "state_district" + "7": "city_district" + "8": "city_district" + "9": "city" + diff --git a/resources/boundaries/osm/ug.json b/resources/boundaries/osm/ug.json deleted file mode 100644 index df22bd67..00000000 --- a/resources/boundaries/osm/ug.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "6": "state_district", - "8": "state_district", - "9": "city", - "10": "city_district" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/ug.yaml b/resources/boundaries/osm/ug.yaml new file mode 100644 index 00000000..faf259fc --- /dev/null +++ b/resources/boundaries/osm/ug.yaml @@ -0,0 +1,9 @@ +--- + admin_level: + "2": "country" + "4": "state" + "6": "state_district" + "8": "state_district" + "9": "city" + "10": "city_district" + diff --git a/resources/boundaries/osm/us.json b/resources/boundaries/osm/us.json deleted file mode 100644 index 00477255..00000000 --- a/resources/boundaries/osm/us.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "5": "city", - "6": "state_district", - "7": "city", - "8": "city", - "9": "city_district", - "10": "suburb" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/us.yaml b/resources/boundaries/osm/us.yaml new file mode 100644 index 00000000..a2f4b011 --- /dev/null +++ b/resources/boundaries/osm/us.yaml @@ -0,0 +1,11 @@ +--- + admin_level: + "2": "country" + "4": "state" + "5": "city" + "6": "state_district" + "7": "city" + "8": "city" + "9": "city_district" + "10": "suburb" + diff --git a/resources/boundaries/osm/uy.json b/resources/boundaries/osm/uy.json deleted file mode 100644 index 752bfb5b..00000000 --- a/resources/boundaries/osm/uy.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "6": "state_district", - "7": "state_district", - "8": "city", - "9": "state_district" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/uy.yaml b/resources/boundaries/osm/uy.yaml new file mode 100644 index 00000000..633f6a46 --- /dev/null +++ b/resources/boundaries/osm/uy.yaml @@ -0,0 +1,9 @@ +--- + admin_level: + "2": "country" + "4": "state" + "6": "state_district" + "7": "state_district" + "8": "city" + "9": "state_district" + diff --git a/resources/boundaries/osm/uz.json b/resources/boundaries/osm/uz.json deleted file mode 100644 index 34b92c40..00000000 --- a/resources/boundaries/osm/uz.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "6": "state_district", - "8": "city" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/uz.yaml b/resources/boundaries/osm/uz.yaml new file mode 100644 index 00000000..43174afb --- /dev/null +++ b/resources/boundaries/osm/uz.yaml @@ -0,0 +1,7 @@ +--- + admin_level: + "2": "country" + "4": "state" + "6": "state_district" + "8": "city" + diff --git a/resources/boundaries/osm/ve.json b/resources/boundaries/osm/ve.json deleted file mode 100644 index ae7c6916..00000000 --- a/resources/boundaries/osm/ve.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "6": "state_district", - "7": "state_district", - "8": "city", - "9": "city_district" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/ve.yaml b/resources/boundaries/osm/ve.yaml new file mode 100644 index 00000000..e4d6c43c --- /dev/null +++ b/resources/boundaries/osm/ve.yaml @@ -0,0 +1,9 @@ +--- + admin_level: + "2": "country" + "4": "state" + "6": "state_district" + "7": "state_district" + "8": "city" + "9": "city_district" + diff --git a/resources/boundaries/osm/vn.json b/resources/boundaries/osm/vn.json deleted file mode 100644 index 34b92c40..00000000 --- a/resources/boundaries/osm/vn.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "6": "state_district", - "8": "city" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/vn.yaml b/resources/boundaries/osm/vn.yaml new file mode 100644 index 00000000..43174afb --- /dev/null +++ b/resources/boundaries/osm/vn.yaml @@ -0,0 +1,7 @@ +--- + admin_level: + "2": "country" + "4": "state" + "6": "state_district" + "8": "city" + diff --git a/resources/boundaries/osm/za.json b/resources/boundaries/osm/za.json deleted file mode 100644 index c29530ff..00000000 --- a/resources/boundaries/osm/za.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state", - "6": "state_district", - "8": "city", - "10": "city_district" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/za.yaml b/resources/boundaries/osm/za.yaml new file mode 100644 index 00000000..3b6c3650 --- /dev/null +++ b/resources/boundaries/osm/za.yaml @@ -0,0 +1,8 @@ +--- + admin_level: + "2": "country" + "4": "state" + "6": "state_district" + "8": "city" + "10": "city_district" + diff --git a/resources/boundaries/osm/zw.json b/resources/boundaries/osm/zw.json deleted file mode 100644 index b1b9de39..00000000 --- a/resources/boundaries/osm/zw.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "admin_level": { - "2": "country", - "4": "state" - } -} \ No newline at end of file diff --git a/resources/boundaries/osm/zw.yaml b/resources/boundaries/osm/zw.yaml new file mode 100644 index 00000000..86c25419 --- /dev/null +++ b/resources/boundaries/osm/zw.yaml @@ -0,0 +1,5 @@ +--- + admin_level: + "2": "country" + "4": "state" + diff --git a/scripts/geodata/osm/extract.py b/scripts/geodata/osm/extract.py index 257a05fa..67d66398 100644 --- a/scripts/geodata/osm/extract.py +++ b/scripts/geodata/osm/extract.py @@ -11,6 +11,7 @@ import re import sys import urllib import ujson as json +import yaml import HTMLParser from collections import OrderedDict @@ -157,16 +158,15 @@ class OSMAddressComponents(object): } } - def __init__(self): + def __init__(self, boundaries_dir=OSM_BOUNDARIES_DIR): self.config = {} - def configure(self, boundaries_dir=OSM_BOUNDARIES_DIR): for filename in os.listdir(boundaries_dir): - if not filename.endswith('.json'): + if not filename.endswith('.yaml'): continue - country_code = filename.rsplit('.json', 1)[0] - data = json.load(open(os.path.join(boundaries_dir, filename))) + country_code = filename.rsplit('.yaml', 1)[0] + data = yaml.load(open(os.path.join(boundaries_dir, filename))) for prop, values in data.iteritems(): for k, v in values.iteritems(): if v not in AddressFormatter.address_formatter_fields: