Mercurial > dive4elements > river
comparison backend/contrib/shpimporter/dgm.py @ 7352:c6825778de1f
Merged double-precision branch.
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Wed, 16 Oct 2013 13:03:13 +0200 |
| parents | bb5bd48b80f6 |
| children |
comparison
equal
deleted
inserted
replaced
| 7350:760ea7f08455 | 7352:c6825778de1f |
|---|---|
| 120 if isinstance(val, tuple): | 120 if isinstance(val, tuple): |
| 121 values.append(val[1](fields[namedict[val[0]]])) | 121 values.append(val[1](fields[namedict[val[0]]])) |
| 122 else: | 122 else: |
| 123 values.append(unicode.encode( | 123 values.append(unicode.encode( |
| 124 fields[namedict[val]], "UTF-8")) | 124 fields[namedict[val]], "UTF-8")) |
| 125 km_von = fields[namedict["km_von"]] | 125 km_von = min(float(fields[namedict["km_von"]]), |
| 126 km_bis = fields[namedict["km_bis"]] | 126 float(fields[namedict["km_bis"]])) |
| 127 km_bis = max(float(fields[namedict["km_von"]]), | |
| 128 float(fields[namedict["km_bis"]])) | |
| 127 year_from = None | 129 year_from = None |
| 128 year_to = None | 130 year_to = None |
| 129 try: | 131 try: |
| 130 year_from = datetime.datetime( | 132 year_from = datetime.datetime( |
| 131 int(fields[namedict["Jahr_von"]]), 1, 1) | 133 int(fields[namedict["Jahr_von"]]), 1, 1) |