From 6e6948de1866375410f7795ccd6bd0acf92f333f Mon Sep 17 00:00:00 2001 From: ashokdahal Date: Mon, 24 Aug 2020 14:03:13 +0200 Subject: [PATCH] test test --- ... Management Module Sample-checkpoint.ipynb | 105 ------------------ RiskChanges/Exposure/__init__.pyc | Bin 537 -> 0 bytes RiskChanges/__init__.pyc | Bin 167 -> 0 bytes ...iskChanges-1.7.zip => RiskChanges-1.8.zip} | Bin 2135 -> 2135 bytes setup.py | 4 +- 5 files changed, 2 insertions(+), 107 deletions(-) delete mode 100644 .ipynb_checkpoints/Data Management Module Sample-checkpoint.ipynb delete mode 100644 RiskChanges/Exposure/__init__.pyc delete mode 100644 RiskChanges/__init__.pyc rename dist/{RiskChanges-1.7.zip => RiskChanges-1.8.zip} (58%) diff --git a/.ipynb_checkpoints/Data Management Module Sample-checkpoint.ipynb b/.ipynb_checkpoints/Data Management Module Sample-checkpoint.ipynb deleted file mode 100644 index b4c1503..0000000 --- a/.ipynb_checkpoints/Data Management Module Sample-checkpoint.ipynb +++ /dev/null @@ -1,105 +0,0 @@ -{ - "cells": [ - { - "cell_type": "code", - "execution_count": 1, - "metadata": {}, - "outputs": [], - "source": [ - "Samle of the data management modulle" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [ - "from RiskChanges import DataManage" - ] - }, - { - "cell_type": "code", - "execution_count": 3, - "metadata": {}, - "outputs": [], - "source": [ - "DataManage.loadshp(shpInput=\"D:\\SDSS\\Sample data\\Split_one\\Flood_Class.shp\",\n", - " connstr='postgresql://postgres:puntu@localhost:5432/postgres',lyrName='Tekson',schema='tekson')\n", - "\n" - ] - }, - { - "cell_type": "code", - "execution_count": 4, - "metadata": {}, - "outputs": [ - { - "ename": "DataError", - "evalue": "(psycopg2.errors.InvalidParameterValue) Geometry type (Point) does not match column type (MultiPolygon)\n\n[SQL: INSERT INTO tekson.\"Tekson_WFS\" (id, kunta, grd_id, id_nro, vaesto, miehet, naiset, ika_0_14, ika_15_64, ika_65_, xkoord, ykoord, geom) VALUES (%(id)s, %(kunta)s, %(grd_id)s, %(id_nro)s, %(vaesto)s, %(miehet)s, %(naiset)s, %(ika_0_14)s, %(ika_15_64)s, %(ika_65_)s, %(xkoord)s, %(ykoord)s, ST_GeomFromEWKT(%(geom)s))]\n[parameters: ({'id': 'vaki2005_1km_kp.6121', 'kunta': '078', 'grd_id': '1kmN6638E0272', 'id_nro': 25863, 'vaesto': 137, 'miehet': 63, 'naiset': 74, 'ika_0_14': 11, 'ika_15_64': 90, 'ika_65_': 36, 'xkoord': 272500, 'ykoord': 6638500, 'geom': 'SRID=3067;POINT (272500 6638500)'}, {'id': 'vaki2005_1km_kp.6122', 'kunta': '078', 'grd_id': '1kmN6638E0273', 'id_nro': 25864, 'vaesto': 474, 'miehet': 229, 'naiset': 245, 'ika_0_14': 61, 'ika_15_64': 314, 'ika_65_': 99, 'xkoord': 273500, 'ykoord': 6638500, 'geom': 'SRID=3067;POINT (273500 6638500)'}, {'id': 'vaki2005_1km_kp.6401', 'kunta': '078', 'grd_id': '1kmN6639E0275', 'id_nro': 26541, 'vaesto': 463, 'miehet': 233, 'naiset': 230, 'ika_0_14': 71, 'ika_15_64': 312, 'ika_65_': 80, 'xkoord': 275500, 'ykoord': 6639500, 'geom': 'SRID=3067;POINT (275500 6639500)'}, {'id': 'vaki2005_1km_kp.6589', 'kunta': '445', 'grd_id': '1kmN6640E0184', 'id_nro': 27125, 'vaesto': 28, 'miehet': 16, 'naiset': 12, 'ika_0_14': 5, 'ika_15_64': 16, 'ika_65_': 7, 'xkoord': 184500, 'ykoord': 6640500, 'geom': 'SRID=3067;POINT (184500 6640500)'}, {'id': 'vaki2005_1km_kp.6680', 'kunta': '078', 'grd_id': '1kmN6640E0275', 'id_nro': 27216, 'vaesto': 273, 'miehet': 143, 'naiset': 130, 'ika_0_14': 48, 'ika_15_64': 165, 'ika_65_': 60, 'xkoord': 275500, 'ykoord': 6640500, 'geom': 'SRID=3067;POINT (275500 6640500)'}, {'id': 'vaki2005_1km_kp.6693', 'kunta': '078', 'grd_id': '1kmN6640E0288', 'id_nro': 27229, 'vaesto': 2, 'miehet': -1, 'naiset': -1, 'ika_0_14': -1, 'ika_15_64': -1, 'ika_65_': -1, 'xkoord': 288500, 'ykoord': 6640500, 'geom': 'SRID=3067;POINT (288500 6640500)'}, {'id': 'vaki2005_1km_kp.6983', 'kunta': '710', 'grd_id': '1kmN6641E0295', 'id_nro': 27911, 'vaesto': 2, 'miehet': -1, 'naiset': -1, 'ika_0_14': -1, 'ika_15_64': -1, 'ika_65_': -1, 'xkoord': 295500, 'ykoord': 6641500, 'geom': 'SRID=3067;POINT (295500 6641500)'}, {'id': 'vaki2005_1km_kp.7539', 'kunta': '078', 'grd_id': '1kmN6643E0277', 'id_nro': 29243, 'vaesto': 2, 'miehet': -1, 'naiset': -1, 'ika_0_14': -1, 'ika_15_64': -1, 'ika_65_': -1, 'xkoord': 277500, 'ykoord': 6643500, 'geom': 'SRID=3067;POINT (277500 6643500)'} ... displaying 10 of 102091 total bound parameter sets ... {'id': 'vaki2005_1km_kp.392462', 'kunta': '890', 'grd_id': '1kmN7753E0500', 'id_nro': 778716, 'vaesto': 153, 'miehet': 77, 'naiset': 76, 'ika_0_14': 24, 'ika_15_64': 119, 'ika_65_': 10, 'xkoord': 500500, 'ykoord': 7753500, 'geom': 'SRID=3067;POINT (500500 7753500)'}, {'id': 'vaki2005_1km_kp.393281', 'kunta': '890', 'grd_id': '1kmN7774E0523', 'id_nro': 792914, 'vaesto': 1, 'miehet': -1, 'naiset': -1, 'ika_0_14': -1, 'ika_15_64': -1, 'ika_65_': -1, 'xkoord': 523500, 'ykoord': 7774500, 'geom': 'SRID=3067;POINT (523500 7774500)'})]\n(Background on this error at: http://sqlalche.me/e/13/9h9h)", - "output_type": "error", - "traceback": [ - "\u001b[1;31m---------------------------------------------------------------------------\u001b[0m", - "\u001b[1;31mInvalidParameterValue\u001b[0m Traceback (most recent call last)", - "\u001b[1;32m~\\.conda\\envs\\SDSS\\lib\\site-packages\\sqlalchemy\\engine\\base.py\u001b[0m in \u001b[0;36m_execute_context\u001b[1;34m(self, dialect, constructor, statement, parameters, *args)\u001b[0m\n\u001b[0;32m 1257\u001b[0m self.dialect.do_executemany(\n\u001b[1;32m-> 1258\u001b[1;33m \u001b[0mcursor\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mstatement\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mparameters\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mcontext\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m\u001b[0;32m 1259\u001b[0m )\n", - "\u001b[1;32m~\\.conda\\envs\\SDSS\\lib\\site-packages\\sqlalchemy\\dialects\\postgresql\\psycopg2.py\u001b[0m in \u001b[0;36mdo_executemany\u001b[1;34m(self, cursor, statement, parameters, context)\u001b[0m\n\u001b[0;32m 872\u001b[0m \u001b[1;32mif\u001b[0m \u001b[0mself\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mexecutemany_mode\u001b[0m \u001b[1;32mis\u001b[0m \u001b[0mEXECUTEMANY_DEFAULT\u001b[0m\u001b[1;33m:\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[1;32m--> 873\u001b[1;33m \u001b[0mcursor\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mexecutemany\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mstatement\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mparameters\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m\u001b[0;32m 874\u001b[0m \u001b[1;32mreturn\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n", - "\u001b[1;31mInvalidParameterValue\u001b[0m: Geometry type (Point) does not match column type (MultiPolygon)\n", - "\nThe above exception was the direct cause of the following exception:\n", - "\u001b[1;31mDataError\u001b[0m Traceback (most recent call last)", - "\u001b[1;32m\u001b[0m in \u001b[0;36m\u001b[1;34m\u001b[0m\n\u001b[1;32m----> 1\u001b[1;33m \u001b[0mDataManage\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mLoadWFS\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mwfsURL\u001b[0m\u001b[1;33m=\u001b[0m\u001b[1;34m\"http://geo.stat.fi/geoserver/vaestoruutu/wfs\"\u001b[0m\u001b[1;33m,\u001b[0m\u001b[0mlayer_name\u001b[0m\u001b[1;33m=\u001b[0m\u001b[1;34m'vaestoruutu:vaki2005_1km_kp'\u001b[0m\u001b[1;33m,\u001b[0m\u001b[0mconnstr\u001b[0m\u001b[1;33m=\u001b[0m\u001b[1;34m'postgresql://postgres:puntu@localhost:5432/postgres'\u001b[0m\u001b[1;33m,\u001b[0m\u001b[0mlyrName\u001b[0m\u001b[1;33m=\u001b[0m\u001b[1;34m'Tekson_WFS'\u001b[0m\u001b[1;33m,\u001b[0m\u001b[0mschema\u001b[0m\u001b[1;33m=\u001b[0m\u001b[1;34m'tekson'\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m", - "\u001b[1;32mD:\\SDSS\\New Development\\Risk Changes Library\\RiskChanges\\RiskChanges\\DataManage\\load_WFS.py\u001b[0m in \u001b[0;36mLoadWFS\u001b[1;34m(wfsURL, layer_name, connstr, lyrName, schema)\u001b[0m\n\u001b[0;32m 63\u001b[0m \u001b[1;31m# For the geom column, we will use GeoAlchemy's type 'Geometry'\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m 64\u001b[0m geodataframe.to_sql(lyrName, engine, schema='tekson',if_exists='append', index=False, \n\u001b[1;32m---> 65\u001b[1;33m dtype={'geom': Geometry(geom_type, srid= epsg)}) \n\u001b[0m\u001b[0;32m 66\u001b[0m \u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m 67\u001b[0m \u001b[1;33m\u001b[0m\u001b[0m\n", - "\u001b[1;32m~\\.conda\\envs\\SDSS\\lib\\site-packages\\pandas\\core\\generic.py\u001b[0m in \u001b[0;36mto_sql\u001b[1;34m(self, name, con, schema, if_exists, index, index_label, chunksize, dtype, method)\u001b[0m\n\u001b[0;32m 2661\u001b[0m \u001b[0mchunksize\u001b[0m\u001b[1;33m=\u001b[0m\u001b[0mchunksize\u001b[0m\u001b[1;33m,\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m 2662\u001b[0m \u001b[0mdtype\u001b[0m\u001b[1;33m=\u001b[0m\u001b[0mdtype\u001b[0m\u001b[1;33m,\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[1;32m-> 2663\u001b[1;33m \u001b[0mmethod\u001b[0m\u001b[1;33m=\u001b[0m\u001b[0mmethod\u001b[0m\u001b[1;33m,\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m\u001b[0;32m 2664\u001b[0m )\n\u001b[0;32m 2665\u001b[0m \u001b[1;33m\u001b[0m\u001b[0m\n", - "\u001b[1;32m~\\.conda\\envs\\SDSS\\lib\\site-packages\\pandas\\io\\sql.py\u001b[0m in \u001b[0;36mto_sql\u001b[1;34m(frame, name, con, schema, if_exists, index, index_label, chunksize, dtype, method)\u001b[0m\n\u001b[0;32m 519\u001b[0m \u001b[0mchunksize\u001b[0m\u001b[1;33m=\u001b[0m\u001b[0mchunksize\u001b[0m\u001b[1;33m,\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m 520\u001b[0m \u001b[0mdtype\u001b[0m\u001b[1;33m=\u001b[0m\u001b[0mdtype\u001b[0m\u001b[1;33m,\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[1;32m--> 521\u001b[1;33m \u001b[0mmethod\u001b[0m\u001b[1;33m=\u001b[0m\u001b[0mmethod\u001b[0m\u001b[1;33m,\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m\u001b[0;32m 522\u001b[0m )\n\u001b[0;32m 523\u001b[0m \u001b[1;33m\u001b[0m\u001b[0m\n", - "\u001b[1;32m~\\.conda\\envs\\SDSS\\lib\\site-packages\\pandas\\io\\sql.py\u001b[0m in \u001b[0;36mto_sql\u001b[1;34m(self, frame, name, if_exists, index, index_label, schema, chunksize, dtype, method)\u001b[0m\n\u001b[0;32m 1315\u001b[0m )\n\u001b[0;32m 1316\u001b[0m \u001b[0mtable\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mcreate\u001b[0m\u001b[1;33m(\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[1;32m-> 1317\u001b[1;33m \u001b[0mtable\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0minsert\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mchunksize\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mmethod\u001b[0m\u001b[1;33m=\u001b[0m\u001b[0mmethod\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m\u001b[0;32m 1318\u001b[0m \u001b[1;32mif\u001b[0m \u001b[1;32mnot\u001b[0m \u001b[0mname\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0misdigit\u001b[0m\u001b[1;33m(\u001b[0m\u001b[1;33m)\u001b[0m \u001b[1;32mand\u001b[0m \u001b[1;32mnot\u001b[0m \u001b[0mname\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mislower\u001b[0m\u001b[1;33m(\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m:\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m 1319\u001b[0m \u001b[1;31m# check for potentially case sensitivity issues (GH7815)\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n", - "\u001b[1;32m~\\.conda\\envs\\SDSS\\lib\\site-packages\\pandas\\io\\sql.py\u001b[0m in \u001b[0;36minsert\u001b[1;34m(self, chunksize, method)\u001b[0m\n\u001b[0;32m 753\u001b[0m \u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m 754\u001b[0m \u001b[0mchunk_iter\u001b[0m \u001b[1;33m=\u001b[0m \u001b[0mzip\u001b[0m\u001b[1;33m(\u001b[0m\u001b[1;33m*\u001b[0m\u001b[1;33m[\u001b[0m\u001b[0marr\u001b[0m\u001b[1;33m[\u001b[0m\u001b[0mstart_i\u001b[0m\u001b[1;33m:\u001b[0m\u001b[0mend_i\u001b[0m\u001b[1;33m]\u001b[0m \u001b[1;32mfor\u001b[0m \u001b[0marr\u001b[0m \u001b[1;32min\u001b[0m \u001b[0mdata_list\u001b[0m\u001b[1;33m]\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[1;32m--> 755\u001b[1;33m \u001b[0mexec_insert\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mconn\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mkeys\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mchunk_iter\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m\u001b[0;32m 756\u001b[0m \u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m 757\u001b[0m def _query_iterator(\n", - "\u001b[1;32m~\\.conda\\envs\\SDSS\\lib\\site-packages\\pandas\\io\\sql.py\u001b[0m in \u001b[0;36m_execute_insert\u001b[1;34m(self, conn, keys, data_iter)\u001b[0m\n\u001b[0;32m 667\u001b[0m \"\"\"\n\u001b[0;32m 668\u001b[0m \u001b[0mdata\u001b[0m \u001b[1;33m=\u001b[0m \u001b[1;33m[\u001b[0m\u001b[0mdict\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mzip\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mkeys\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mrow\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m)\u001b[0m \u001b[1;32mfor\u001b[0m \u001b[0mrow\u001b[0m \u001b[1;32min\u001b[0m \u001b[0mdata_iter\u001b[0m\u001b[1;33m]\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[1;32m--> 669\u001b[1;33m \u001b[0mconn\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mexecute\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mself\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mtable\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0minsert\u001b[0m\u001b[1;33m(\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mdata\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m\u001b[0;32m 670\u001b[0m \u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m 671\u001b[0m \u001b[1;32mdef\u001b[0m \u001b[0m_execute_insert_multi\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mself\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mconn\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mkeys\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mdata_iter\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m:\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n", - "\u001b[1;32m~\\.conda\\envs\\SDSS\\lib\\site-packages\\sqlalchemy\\engine\\base.py\u001b[0m in \u001b[0;36mexecute\u001b[1;34m(self, object_, *multiparams, **params)\u001b[0m\n\u001b[0;32m 1012\u001b[0m )\n\u001b[0;32m 1013\u001b[0m \u001b[1;32melse\u001b[0m\u001b[1;33m:\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[1;32m-> 1014\u001b[1;33m \u001b[1;32mreturn\u001b[0m \u001b[0mmeth\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mself\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mmultiparams\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mparams\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m\u001b[0;32m 1015\u001b[0m \u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m 1016\u001b[0m \u001b[1;32mdef\u001b[0m \u001b[0m_execute_function\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mself\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mfunc\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mmultiparams\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mparams\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m:\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n", - "\u001b[1;32m~\\.conda\\envs\\SDSS\\lib\\site-packages\\sqlalchemy\\sql\\elements.py\u001b[0m in \u001b[0;36m_execute_on_connection\u001b[1;34m(self, connection, multiparams, params)\u001b[0m\n\u001b[0;32m 296\u001b[0m \u001b[1;32mdef\u001b[0m \u001b[0m_execute_on_connection\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mself\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mconnection\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mmultiparams\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mparams\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m:\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m 297\u001b[0m \u001b[1;32mif\u001b[0m \u001b[0mself\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0msupports_execution\u001b[0m\u001b[1;33m:\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[1;32m--> 298\u001b[1;33m \u001b[1;32mreturn\u001b[0m \u001b[0mconnection\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0m_execute_clauseelement\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mself\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mmultiparams\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mparams\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m\u001b[0;32m 299\u001b[0m \u001b[1;32melse\u001b[0m\u001b[1;33m:\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m 300\u001b[0m \u001b[1;32mraise\u001b[0m \u001b[0mexc\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mObjectNotExecutableError\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mself\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n", - "\u001b[1;32m~\\.conda\\envs\\SDSS\\lib\\site-packages\\sqlalchemy\\engine\\base.py\u001b[0m in \u001b[0;36m_execute_clauseelement\u001b[1;34m(self, elem, multiparams, params)\u001b[0m\n\u001b[0;32m 1131\u001b[0m \u001b[0mdistilled_params\u001b[0m\u001b[1;33m,\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m 1132\u001b[0m \u001b[0mcompiled_sql\u001b[0m\u001b[1;33m,\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[1;32m-> 1133\u001b[1;33m \u001b[0mdistilled_params\u001b[0m\u001b[1;33m,\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m\u001b[0;32m 1134\u001b[0m )\n\u001b[0;32m 1135\u001b[0m \u001b[1;32mif\u001b[0m \u001b[0mself\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0m_has_events\u001b[0m \u001b[1;32mor\u001b[0m \u001b[0mself\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mengine\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0m_has_events\u001b[0m\u001b[1;33m:\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n", - "\u001b[1;32m~\\.conda\\envs\\SDSS\\lib\\site-packages\\sqlalchemy\\engine\\base.py\u001b[0m in \u001b[0;36m_execute_context\u001b[1;34m(self, dialect, constructor, statement, parameters, *args)\u001b[0m\n\u001b[0;32m 1316\u001b[0m \u001b[1;32mexcept\u001b[0m \u001b[0mBaseException\u001b[0m \u001b[1;32mas\u001b[0m \u001b[0me\u001b[0m\u001b[1;33m:\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m 1317\u001b[0m self._handle_dbapi_exception(\n\u001b[1;32m-> 1318\u001b[1;33m \u001b[0me\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mstatement\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mparameters\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mcursor\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mcontext\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m\u001b[0;32m 1319\u001b[0m )\n\u001b[0;32m 1320\u001b[0m \u001b[1;33m\u001b[0m\u001b[0m\n", - "\u001b[1;32m~\\.conda\\envs\\SDSS\\lib\\site-packages\\sqlalchemy\\engine\\base.py\u001b[0m in \u001b[0;36m_handle_dbapi_exception\u001b[1;34m(self, e, statement, parameters, cursor, context)\u001b[0m\n\u001b[0;32m 1510\u001b[0m \u001b[1;32melif\u001b[0m \u001b[0mshould_wrap\u001b[0m\u001b[1;33m:\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m 1511\u001b[0m util.raise_(\n\u001b[1;32m-> 1512\u001b[1;33m \u001b[0msqlalchemy_exception\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mwith_traceback\u001b[0m\u001b[1;33m=\u001b[0m\u001b[0mexc_info\u001b[0m\u001b[1;33m[\u001b[0m\u001b[1;36m2\u001b[0m\u001b[1;33m]\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mfrom_\u001b[0m\u001b[1;33m=\u001b[0m\u001b[0me\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m\u001b[0;32m 1513\u001b[0m )\n\u001b[0;32m 1514\u001b[0m \u001b[1;32melse\u001b[0m\u001b[1;33m:\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n", - "\u001b[1;32m~\\.conda\\envs\\SDSS\\lib\\site-packages\\sqlalchemy\\util\\compat.py\u001b[0m in \u001b[0;36mraise_\u001b[1;34m(***failed resolving arguments***)\u001b[0m\n\u001b[0;32m 176\u001b[0m \u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m 177\u001b[0m \u001b[1;32mtry\u001b[0m\u001b[1;33m:\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[1;32m--> 178\u001b[1;33m \u001b[1;32mraise\u001b[0m \u001b[0mexception\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m\u001b[0;32m 179\u001b[0m \u001b[1;32mfinally\u001b[0m\u001b[1;33m:\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m 180\u001b[0m \u001b[1;31m# credit to\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n", - "\u001b[1;32m~\\.conda\\envs\\SDSS\\lib\\site-packages\\sqlalchemy\\engine\\base.py\u001b[0m in \u001b[0;36m_execute_context\u001b[1;34m(self, dialect, constructor, statement, parameters, *args)\u001b[0m\n\u001b[0;32m 1256\u001b[0m \u001b[1;32mif\u001b[0m \u001b[1;32mnot\u001b[0m \u001b[0mevt_handled\u001b[0m\u001b[1;33m:\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m 1257\u001b[0m self.dialect.do_executemany(\n\u001b[1;32m-> 1258\u001b[1;33m \u001b[0mcursor\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mstatement\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mparameters\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mcontext\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m\u001b[0;32m 1259\u001b[0m )\n\u001b[0;32m 1260\u001b[0m \u001b[1;32melif\u001b[0m \u001b[1;32mnot\u001b[0m \u001b[0mparameters\u001b[0m \u001b[1;32mand\u001b[0m \u001b[0mcontext\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mno_parameters\u001b[0m\u001b[1;33m:\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n", - "\u001b[1;32m~\\.conda\\envs\\SDSS\\lib\\site-packages\\sqlalchemy\\dialects\\postgresql\\psycopg2.py\u001b[0m in \u001b[0;36mdo_executemany\u001b[1;34m(self, cursor, statement, parameters, context)\u001b[0m\n\u001b[0;32m 871\u001b[0m \u001b[1;32mdef\u001b[0m \u001b[0mdo_executemany\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mself\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mcursor\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mstatement\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mparameters\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mcontext\u001b[0m\u001b[1;33m=\u001b[0m\u001b[1;32mNone\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m:\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m 872\u001b[0m \u001b[1;32mif\u001b[0m \u001b[0mself\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mexecutemany_mode\u001b[0m \u001b[1;32mis\u001b[0m \u001b[0mEXECUTEMANY_DEFAULT\u001b[0m\u001b[1;33m:\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[1;32m--> 873\u001b[1;33m \u001b[0mcursor\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mexecutemany\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mstatement\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mparameters\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m\u001b[0;32m 874\u001b[0m \u001b[1;32mreturn\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m 875\u001b[0m \u001b[1;33m\u001b[0m\u001b[0m\n", - "\u001b[1;31mDataError\u001b[0m: (psycopg2.errors.InvalidParameterValue) Geometry type (Point) does not match column type (MultiPolygon)\n\n[SQL: INSERT INTO tekson.\"Tekson_WFS\" (id, kunta, grd_id, id_nro, vaesto, miehet, naiset, ika_0_14, ika_15_64, ika_65_, xkoord, ykoord, geom) VALUES (%(id)s, %(kunta)s, %(grd_id)s, %(id_nro)s, %(vaesto)s, %(miehet)s, %(naiset)s, %(ika_0_14)s, %(ika_15_64)s, %(ika_65_)s, %(xkoord)s, %(ykoord)s, ST_GeomFromEWKT(%(geom)s))]\n[parameters: ({'id': 'vaki2005_1km_kp.6121', 'kunta': '078', 'grd_id': '1kmN6638E0272', 'id_nro': 25863, 'vaesto': 137, 'miehet': 63, 'naiset': 74, 'ika_0_14': 11, 'ika_15_64': 90, 'ika_65_': 36, 'xkoord': 272500, 'ykoord': 6638500, 'geom': 'SRID=3067;POINT (272500 6638500)'}, {'id': 'vaki2005_1km_kp.6122', 'kunta': '078', 'grd_id': '1kmN6638E0273', 'id_nro': 25864, 'vaesto': 474, 'miehet': 229, 'naiset': 245, 'ika_0_14': 61, 'ika_15_64': 314, 'ika_65_': 99, 'xkoord': 273500, 'ykoord': 6638500, 'geom': 'SRID=3067;POINT (273500 6638500)'}, {'id': 'vaki2005_1km_kp.6401', 'kunta': '078', 'grd_id': '1kmN6639E0275', 'id_nro': 26541, 'vaesto': 463, 'miehet': 233, 'naiset': 230, 'ika_0_14': 71, 'ika_15_64': 312, 'ika_65_': 80, 'xkoord': 275500, 'ykoord': 6639500, 'geom': 'SRID=3067;POINT (275500 6639500)'}, {'id': 'vaki2005_1km_kp.6589', 'kunta': '445', 'grd_id': '1kmN6640E0184', 'id_nro': 27125, 'vaesto': 28, 'miehet': 16, 'naiset': 12, 'ika_0_14': 5, 'ika_15_64': 16, 'ika_65_': 7, 'xkoord': 184500, 'ykoord': 6640500, 'geom': 'SRID=3067;POINT (184500 6640500)'}, {'id': 'vaki2005_1km_kp.6680', 'kunta': '078', 'grd_id': '1kmN6640E0275', 'id_nro': 27216, 'vaesto': 273, 'miehet': 143, 'naiset': 130, 'ika_0_14': 48, 'ika_15_64': 165, 'ika_65_': 60, 'xkoord': 275500, 'ykoord': 6640500, 'geom': 'SRID=3067;POINT (275500 6640500)'}, {'id': 'vaki2005_1km_kp.6693', 'kunta': '078', 'grd_id': '1kmN6640E0288', 'id_nro': 27229, 'vaesto': 2, 'miehet': -1, 'naiset': -1, 'ika_0_14': -1, 'ika_15_64': -1, 'ika_65_': -1, 'xkoord': 288500, 'ykoord': 6640500, 'geom': 'SRID=3067;POINT (288500 6640500)'}, {'id': 'vaki2005_1km_kp.6983', 'kunta': '710', 'grd_id': '1kmN6641E0295', 'id_nro': 27911, 'vaesto': 2, 'miehet': -1, 'naiset': -1, 'ika_0_14': -1, 'ika_15_64': -1, 'ika_65_': -1, 'xkoord': 295500, 'ykoord': 6641500, 'geom': 'SRID=3067;POINT (295500 6641500)'}, {'id': 'vaki2005_1km_kp.7539', 'kunta': '078', 'grd_id': '1kmN6643E0277', 'id_nro': 29243, 'vaesto': 2, 'miehet': -1, 'naiset': -1, 'ika_0_14': -1, 'ika_15_64': -1, 'ika_65_': -1, 'xkoord': 277500, 'ykoord': 6643500, 'geom': 'SRID=3067;POINT (277500 6643500)'} ... displaying 10 of 102091 total bound parameter sets ... {'id': 'vaki2005_1km_kp.392462', 'kunta': '890', 'grd_id': '1kmN7753E0500', 'id_nro': 778716, 'vaesto': 153, 'miehet': 77, 'naiset': 76, 'ika_0_14': 24, 'ika_15_64': 119, 'ika_65_': 10, 'xkoord': 500500, 'ykoord': 7753500, 'geom': 'SRID=3067;POINT (500500 7753500)'}, {'id': 'vaki2005_1km_kp.393281', 'kunta': '890', 'grd_id': '1kmN7774E0523', 'id_nro': 792914, 'vaesto': 1, 'miehet': -1, 'naiset': -1, 'ika_0_14': -1, 'ika_15_64': -1, 'ika_65_': -1, 'xkoord': 523500, 'ykoord': 7774500, 'geom': 'SRID=3067;POINT (523500 7774500)'})]\n(Background on this error at: http://sqlalche.me/e/13/9h9h)" - ] - } - ], - "source": [ - "DataManage.LoadWFS(wfsURL=\"http://geo.stat.fi/geoserver/vaestoruutu/wfs\",layer_name='vaestoruutu:vaki2005_1km_kp',connstr='postgresql://postgres:puntu@localhost:5432/postgres',lyrName='Tekson_WFS',schema='tekson')" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [ - "x, y = 174100, 444100\n", - "bbox = (x-500, y-500, x+500, y+500)\n", - "DataManage.loadWCS(folder=\"D:/\",out_name='ashok_WCS',WCS_URL='http://geodata.nationaalgeoregister.nl/ahn2/wcs?service=WCS',Version='1.0.0',layerName='ahn2_05m_ruw',bbox=bbox,srid=28992)" - ] - } - ], - "metadata": { - "kernelspec": { - "display_name": "Python 3", - "language": "python", - "name": "python3" - }, - "language_info": { - "codemirror_mode": { - "name": "ipython", - "version": 3 - }, - "file_extension": ".py", - "mimetype": "text/x-python", - "name": "python", - "nbconvert_exporter": "python", - "pygments_lexer": "ipython3", - "version": "3.7.7" - } - }, - "nbformat": 4, - "nbformat_minor": 4 -} diff --git a/RiskChanges/Exposure/__init__.pyc b/RiskChanges/Exposure/__init__.pyc deleted file mode 100644 index c4c81ec747a23295955dbeca5690cc7560bf94db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 537 zcmah`T}#6-6utde-3EUA0;%}Yr~UvDQPzPEvWNCTER_=5OoK^UnpExnwm)FrtevvK zFdrv5Cx@GR6X*MQx_-XM3mBS>>n%bVBt=?2!b%#vx&KdE}5kByLex^C#znXqN||=CrYtpw+IZ^ z0Yc2w`|OR#SE|DKS6!*Lp@LA}ih*&8oSm+037H2zWB<7{37Qi&INV3-k&qr-t6nlXmB+<)2Wm@Pu8pL3QccV3y6FnHrganoHR< zm;wqW&u7yU0NKUJB*Fl5_2j#3dO#IC?2;TXCr#F6*8mEIvAe>}PfklmXyagjIb`xK Ou*%2mu0Zvg9C`o_YfJ?I delta 276 zcmcaEa9w~Wz?+#xgaHK9QYP{!@R{qQh*&8onCk~+7H2zWB<7{37Q*?p_KXuaCyxR^uE$^AW@YOVUcwN}SxN+lZMn?0=u}qC%A*e5oK$eZgIr4ZWQw?aounKcQaX3A<{8>e98B88&}rYGej#E@jhT zQcIaUpG{8yWEUfo2m{R3lkc+W0afs@OLD-RG+CEj11J>6?g}?QIV~Nbje`N^kjcBi ODj&1E0@Z7B=m7xBhD)RX diff --git a/setup.py b/setup.py index d51400e..7023df3 100644 --- a/setup.py +++ b/setup.py @@ -2,13 +2,13 @@ setup( name = 'RiskChanges', # How you named your package folder (MyLib) packages = ['RiskChanges'], # Chose the same as "name" - version = '1.7', # Start with a small number and increase it with every change you make + version = '1.8', # Start with a small number and increase it with every change you make license='cc-by-4.0', # Chose a license from here: https://help.github.com/articles/licensing-a-repository description = 'Library for computation of Loss and risk for Changing Natural Hazards', # Give a short description about your library author = 'Ashok Dahal ', # Type in your name author_email = 'ashokdahal.geo@gmail.com', # Type in your E-Mail url = 'https://github.com/ashokdahal', # Provide either the link to your github or to your website - download_url = 'https://github.com/ashokdahal/RiskChanges/archive/0.7.tar.gz', # I explain this later on + download_url = 'https://github.com/ashokdahal/RiskChanges/archive/0.8.tar.gz', # I explain this later on keywords = ['Risk', 'Natural Hazard', 'Loss'], # Keywords that define your package best install_requires=[ # I get to this in a second 'gdal',