diff --git a/app.py b/app.py index faf8b57..75ce491 100755 --- a/app.py +++ b/app.py @@ -2,7 +2,7 @@ # encoding: utf-8 """ """ -VERSION = "8.7" +VERSION = "8.7.5" INDEX = "./index" DATABASE = "./gml/gml.sqlite" @@ -341,9 +341,10 @@ def index(): wkt = "" url_map = "" if r['kind'].startswith("CRS"): - ref.ImportFromEPSG(int(short_code[0])) + ref_code = ref.ImportFromEPSG(int(short_code[0])) wkt = ref.ExportToWkt() - if wkt and r['bbox']: + # e.g. epsg::5225 has wkt with towgs84 but not function in /map and raise error in OGR => ref_code = 0 (withnout error) + if r['bbox'] and ref_code == 0: # a = ref.ImportFromWkt(r['wkt']) # if a == 0: url_map = "/" + r['code']+ "/map" @@ -1179,7 +1180,7 @@ def index(id, format): for b in bbox: mbbox.append(b) - ref.ImportFromEPSG(int(rcode)) + ref_code = ref.ImportFromEPSG(int(rcode)) wkt = ref.ExportToWkt() type_epsg = "EPSG" @@ -1233,7 +1234,8 @@ def index(id, format): wkt = ref.ExportToWkt().decode('utf-8') # One of the formats is a map (because /coordinates/ was redirect on /coordinates and then catch by ) - if format == "/map": + # epsg::5225 has wkt with towgs84 but not function in map and raise error in OGR => ref_code = 0 (withnout error) + if format == "/map" and ref_code == 0: if bbox: n, w, s, e = bbox center = (n-s)/2.0 + s, (e-w)/2.0 + w @@ -1242,6 +1244,10 @@ def index(id, format): else: center = 0,0 return template ('./templates/map', name=rname, code=rcode, url_coords=url_coords, center=center, bbox=mbbox) + else: + error = 404 + try_url= "" + return template('./templates/error', error=error, try_url=try_url, version=VERSION) ref.ImportFromWkt(wkt) ct = "text/plain" diff --git a/gml/gml.sqlite b/gml/gml.sqlite index 4b25ca2..410bec5 100644 Binary files a/gml/gml.sqlite and b/gml/gml.sqlite differ diff --git a/index/MAIN_9tn0zme7wve4krnh.seg b/index/MAIN_19v90bgc7m1kpi18.seg similarity index 99% rename from index/MAIN_9tn0zme7wve4krnh.seg rename to index/MAIN_19v90bgc7m1kpi18.seg index e16f552..f8d0f88 100644 Binary files a/index/MAIN_9tn0zme7wve4krnh.seg and b/index/MAIN_19v90bgc7m1kpi18.seg differ diff --git a/index/MAIN_2y5hqutv7giqi84o.seg b/index/MAIN_2y5hqutv7giqi84o.seg new file mode 100644 index 0000000..786cb11 Binary files /dev/null and b/index/MAIN_2y5hqutv7giqi84o.seg differ diff --git a/index/MAIN_i38ux14nje3x80vo.seg b/index/MAIN_40fb08qc2se5ry53.seg similarity index 98% rename from index/MAIN_i38ux14nje3x80vo.seg rename to index/MAIN_40fb08qc2se5ry53.seg index b7b5d83..ec6afac 100644 Binary files a/index/MAIN_i38ux14nje3x80vo.seg and b/index/MAIN_40fb08qc2se5ry53.seg differ diff --git a/index/MAIN_4s33s5o8onqbo7g8.seg b/index/MAIN_4s33s5o8onqbo7g8.seg new file mode 100644 index 0000000..89fb6b8 Binary files /dev/null and b/index/MAIN_4s33s5o8onqbo7g8.seg differ diff --git a/index/MAIN_71bu56v0ti7g1tpp.seg b/index/MAIN_7hn2q2qodjhlgtsv.seg similarity index 57% rename from index/MAIN_71bu56v0ti7g1tpp.seg rename to index/MAIN_7hn2q2qodjhlgtsv.seg index 5360f66..7554e32 100644 Binary files a/index/MAIN_71bu56v0ti7g1tpp.seg and b/index/MAIN_7hn2q2qodjhlgtsv.seg differ diff --git a/index/MAIN_aazw9ov66tc4s44k.seg b/index/MAIN_aazw9ov66tc4s44k.seg new file mode 100644 index 0000000..dc9cdd9 Binary files /dev/null and b/index/MAIN_aazw9ov66tc4s44k.seg differ diff --git a/index/MAIN_dygqpmojwqamo6w2.seg b/index/MAIN_dygqpmojwqamo6w2.seg new file mode 100644 index 0000000..f259b04 Binary files /dev/null and b/index/MAIN_dygqpmojwqamo6w2.seg differ diff --git a/index/MAIN_txe9yjqnhjh0njeg.seg b/index/MAIN_gs13a76tiwvus012.seg similarity index 99% rename from index/MAIN_txe9yjqnhjh0njeg.seg rename to index/MAIN_gs13a76tiwvus012.seg index 934f08b..5104e5d 100644 Binary files a/index/MAIN_txe9yjqnhjh0njeg.seg and b/index/MAIN_gs13a76tiwvus012.seg differ diff --git a/index/MAIN_gv945volpm0zwg02.seg b/index/MAIN_gv945volpm0zwg02.seg deleted file mode 100644 index 79d20ff..0000000 Binary files a/index/MAIN_gv945volpm0zwg02.seg and /dev/null differ diff --git a/index/MAIN_q39clwec8w1lrc6h.seg b/index/MAIN_jbof4qyeeb4biw6d.seg similarity index 75% rename from index/MAIN_q39clwec8w1lrc6h.seg rename to index/MAIN_jbof4qyeeb4biw6d.seg index 37ceb80..0785469 100644 Binary files a/index/MAIN_q39clwec8w1lrc6h.seg and b/index/MAIN_jbof4qyeeb4biw6d.seg differ diff --git a/index/MAIN_3pbytliwniarr1jz.seg b/index/MAIN_mpyvksnf0xhhuvlw.seg similarity index 97% rename from index/MAIN_3pbytliwniarr1jz.seg rename to index/MAIN_mpyvksnf0xhhuvlw.seg index a6d68d0..08978b9 100644 Binary files a/index/MAIN_3pbytliwniarr1jz.seg and b/index/MAIN_mpyvksnf0xhhuvlw.seg differ diff --git a/index/MAIN_pphfucijbuom6odq.seg b/index/MAIN_pphfucijbuom6odq.seg new file mode 100644 index 0000000..c2142f0 Binary files /dev/null and b/index/MAIN_pphfucijbuom6odq.seg differ diff --git a/index/MAIN_quasckkurj8qpmhj.seg b/index/MAIN_quasckkurj8qpmhj.seg new file mode 100644 index 0000000..c5dde60 Binary files /dev/null and b/index/MAIN_quasckkurj8qpmhj.seg differ diff --git a/index/MAIN_z71c9bxscj3vls8w.seg b/index/MAIN_rj0frxyk2jwt2h97.seg similarity index 52% rename from index/MAIN_z71c9bxscj3vls8w.seg rename to index/MAIN_rj0frxyk2jwt2h97.seg index 61b0868..ff52ab2 100644 Binary files a/index/MAIN_z71c9bxscj3vls8w.seg and b/index/MAIN_rj0frxyk2jwt2h97.seg differ diff --git a/index/MAIN_s6ro1w5a5fnny1er.seg b/index/MAIN_s6ro1w5a5fnny1er.seg deleted file mode 100644 index a958f66..0000000 Binary files a/index/MAIN_s6ro1w5a5fnny1er.seg and /dev/null differ diff --git a/index/MAIN_sfhlli0yqwbz3m5h.seg b/index/MAIN_sfhlli0yqwbz3m5h.seg deleted file mode 100644 index 505a3fe..0000000 Binary files a/index/MAIN_sfhlli0yqwbz3m5h.seg and /dev/null differ diff --git a/index/MAIN_z6eody7wz7njdc2c.seg b/index/MAIN_z6eody7wz7njdc2c.seg deleted file mode 100644 index 5bc5a7a..0000000 Binary files a/index/MAIN_z6eody7wz7njdc2c.seg and /dev/null differ diff --git a/index/MAIN_evshkbe83j3gvxou.seg b/index/MAIN_znhhx6n06zudfqrr.seg similarity index 71% rename from index/MAIN_evshkbe83j3gvxou.seg rename to index/MAIN_znhhx6n06zudfqrr.seg index a44209a..ebedf8b 100644 Binary files a/index/MAIN_evshkbe83j3gvxou.seg and b/index/MAIN_znhhx6n06zudfqrr.seg differ diff --git a/index/_MAIN_15155.toc b/index/_MAIN_15598.toc similarity index 73% rename from index/_MAIN_15155.toc rename to index/_MAIN_15598.toc index 2580827..15706ff 100644 Binary files a/index/_MAIN_15155.toc and b/index/_MAIN_15598.toc differ