From bernhard.herzog at intevation.de Thu Jul 14 13:15:14 2011 From: bernhard.herzog at intevation.de (Bernhard Herzog) Date: Thu, 14 Jul 2011 13:15:14 +0200 Subject: [Thuban-commits] r2891 - trunk/thuban/Thuban/UI In-Reply-To: <20110714104534.6A3C0866E0D1@pyrosoma.intevation.org> References: <20110714104534.6A3C0866E0D1@pyrosoma.intevation.org> Message-ID: <201107141315.14651.bernhard.herzog@intevation.de> On 14.07.2011, scm-commit at wald.intevation.org wrote: > Author: bricks > Date: 2011-07-14 12:45:33 +0200 (Thu, 14 Jul 2011) > New Revision: 2891 8...9 > --- trunk/thuban/Thuban/UI/viewport.py 2009-09-27 20:38:23 UTC (rev 2890) > +++ trunk/thuban/Thuban/UI/viewport.py 2011-07-14 10:45:33 UTC (rev 2891) > @@ -377,7 +377,12 @@ > if scale is None: > scale = self.scale > > - llx, lly, urx, ury = bbox = self.map.ProjectedBoundingBox() > + bbox = self.map.ProjectedBoundingBox() > + if not bbox: > + #There are no layers so we have nothing to scale > + return scale, scale > + else: > + llx, lly, urx, ury = bbox This is better written as if not bbox: #There are no layers so we have nothing to scale return scale, scale llx, lly, urx, ury = bbox The rest of the method after the if-statement only makes sense if there is a bbox, so you'd either need to put the entire rest of the method into the else-clause or simply omit the else as above because the early return if there's no bbox essentially turns everything after the if statement into an else clause anyway. Bernhard -- Bernhard Herzog | ++49-541-335 08 30 | http://www.intevation.de/ Intevation GmbH, Neuer Graben 17, 49074 Osnabr?ck | AG Osnabr?ck, HR B 18998 Gesch?ftsf?hrer: Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wagner From bjoern.ricks at intevation.de Fri Jul 15 09:30:38 2011 From: bjoern.ricks at intevation.de (Bjoern Ricks) Date: Fri, 15 Jul 2011 09:30:38 +0200 Subject: Joined release of shapelib and pyshapelib Message-ID: <201107150930.43028.bjoern.ricks@intevation.de> Hallo Fank, we are currently thinking about and planning a 1.0 release for pyshapelib (after three years of inactivity and unreleased code). Bram pointed out that a shapelib 1.3.0 beta exists but also no release since one year. Therefore we thought about a joined release of shapelib 1.3.0 and pyshapelib 1.0. What do you think? Regards Bj?rn -- Bjoern Ricks | ++49-541-335083-167 | http://www.intevation.de/ Intevation GmbH, Neuer Graben 17, 49074 Osnabr?ck | AG Osnabr?ck, HR B 18998 Gesch?ftsf?hrer: Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wagner -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 198 bytes Desc: This is a digitally signed message part. Url : http://www.intevation.de/pipermail/thuban-devel/attachments/20110715/cd873848/attachment.bin From bjoern.ricks at intevation.de Thu Jul 14 13:30:08 2011 From: bjoern.ricks at intevation.de (Bjoern Ricks) Date: Thu, 14 Jul 2011 13:30:08 +0200 Subject: [Thuban-commits] r2891 - trunk/thuban/Thuban/UI In-Reply-To: <201107141315.14651.bernhard.herzog@intevation.de> References: <20110714104534.6A3C0866E0D1@pyrosoma.intevation.org> <201107141315.14651.bernhard.herzog@intevation.de> Message-ID: <201107141330.13967.bjoern.ricks@intevation.de> On Thursday 14 July 2011 13:15:14 Bernhard Herzog wrote: > This is better written as > > ? ? ? ?if not bbox: > ? ? ? ? ? ?#There are no layers so we have nothing to scale > ? ? ? ? ? ?return scale, scale > > ? ? ? ?llx, lly, urx, ury = bbox > > The rest of the method after the if-statement only makes sense if there is > a bbox, so you'd either need to put the entire rest of the method into the > else-clause or simply omit the else as above because the early return if > there's no bbox essentially turns everything after the if statement into an > else clause anyway. > > ? Bernhard Of course else doesn't make sense here. Just removed it and did another commit. Thanks! Bj?rn -- Bjoern Ricks | ++49-541-335083-167 | http://www.intevation.de/ Intevation GmbH, Neuer Graben 17, 49074 Osnabr?ck | AG Osnabr?ck, HR B 18998 Gesch?ftsf?hrer: Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wagner -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 198 bytes Desc: This is a digitally signed message part. Url : http://www.intevation.de/pipermail/thuban-devel/attachments/20110714/6b4daed4/attachment.bin From bjoern.ricks at intevation.de Fri Jul 15 10:42:44 2011 From: bjoern.ricks at intevation.de (Bjoern Ricks) Date: Fri, 15 Jul 2011 10:42:44 +0200 Subject: pyshapelib repository and new release In-Reply-To: <45a143715cbc0fa45c320b99baefea7b.squirrel@webmail.bramz.net> References: <201107141556.10096.bjoern.ricks@intevation.de> <201107150858.41816.bjoern.ricks@intevation.de> <45a143715cbc0fa45c320b99baefea7b.squirrel@webmail.bramz.net> Message-ID: <201107151042.48850.bjoern.ricks@intevation.de> On Friday 15 July 2011 10:23:39 Bram de Greve wrote: > The pyshapelib code has already been transfered to its new repository > (it's mostly been Karl-Heinz Ruskowski who went through the pain of of > svndump and svnload =) ?I don't think there has been any changes since > then. ?What needs to be done is to structure the new repository in a > standard trunk/tags/branches scheme. ?The only issue is: what to do with > the shapelib code that's mirrored in there? > > trunk/pyshapelib/ > trunk/shapelib/ > > or > > trunk/ > trunk/shapelib/ > > or > > trunk/ > shapelib/ > > I prefer having the immediately in the trunk, but I > don't know what's usually done at intevation. ?What's thuban like? > > Bram Oh sorry I already did change the structure of the pyshapelib svn without discussing it first to get a cleaner svn:externals line in thuban. It's now trunk/pyshapelib and trunk/shapelib. Maybe shapelib should be moved or use a tag for a released version. Not sure about that. Bj?rn -- Bjoern Ricks | ++49-541-335083-167 | http://www.intevation.de/ Intevation GmbH, Neuer Graben 17, 49074 Osnabr?ck | AG Osnabr?ck, HR B 18998 Gesch?ftsf?hrer: Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wagner -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 198 bytes Desc: This is a digitally signed message part. Url : http://www.intevation.de/pipermail/thuban-devel/attachments/20110715/9c3b4275/attachment.bin From bram.degreve at gmail.com Fri Jul 15 11:35:59 2011 From: bram.degreve at gmail.com (Bram de Greve) Date: Fri, 15 Jul 2011 11:35:59 +0200 Subject: pyshapelib repository and new release In-Reply-To: <201107151042.48850.bjoern.ricks@intevation.de> References: <201107141556.10096.bjoern.ricks@intevation.de> <201107150858.41816.bjoern.ricks@intevation.de> <45a143715cbc0fa45c320b99baefea7b.squirrel@webmail.bramz.net> <201107151042.48850.bjoern.ricks@intevation.de> Message-ID: [sending from gmail, so it gets to the list] Bjorn, Ah, I didn't notice yet. That's alright for me (trunk/pyshapelib and trunk/shapelib). svn:externals is a good idea too! It's good you're pushing things forward! I've been inactive for too long, and pyshapelib desperately needs a new release. So all kudos to you for that! Bram On 15 July 2011 10:42, Bjoern Ricks wrote: > > > Bram > Oh sorry I already did change the structure of the pyshapelib svn without > discussing it first to get a cleaner svn:externals line in thuban. It's now > trunk/pyshapelib and trunk/shapelib. Maybe shapelib should be moved or use > a > tag for a released version. Not sure about that. > > Bj?rn > -- > Bjoern Ricks | ++49-541-335083-167 | http://www.intevation.de/ > Intevation GmbH, Neuer Graben 17, 49074 Osnabr?ck | AG Osnabr?ck, HR B > 18998 > Gesch?ftsf?hrer: Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wagner > > _______________________________________________ > Thuban-devel mailing list > Thuban-devel at intevation.de > https://www.intevation.de/mailman/listinfo/thuban-devel > > -- hi, i'm a signature viruz, plz set me as your signature and help me spread :) -------------- next part -------------- An HTML attachment was scrubbed... URL: http://www.intevation.de/pipermail/thuban-devel/attachments/20110715/1188b579/attachment.html From bjoern.ricks at intevation.de Fri Jul 15 15:17:07 2011 From: bjoern.ricks at intevation.de (Bjoern Ricks) Date: Fri, 15 Jul 2011 15:17:07 +0200 Subject: Failling testcases Message-ID: <201107151517.12021.bjoern.ricks@intevation.de> Hi, today I did fix the thuban unit test to be able to run again. Currently (without postgis and gdal tests) only two of them are failing. ====================================================================== FAIL: Extensions.ogr.test.test_OGRShapestore.TestOGRTable.test_Column ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/bricks/source/greater/thuban/test/../Extensions/ogr/test/test_OGRShapestore.py", line 200, in test_Column self.assertEquals(self.table.Column(0).type, FIELDTYPE_INT) AssertionError: 'double' != 'int' ====================================================================== FAIL: Extensions.ogr.test.test_OGRShapestore.TestOGRTable.test_Columns ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/bricks/source/greater/thuban/test/../Extensions/ogr/test/test_OGRShapestore.py", line 194, in test_Columns self.assertEquals(self.table.Columns()[0].type, FIELDTYPE_INT) AssertionError: 'double' != 'int' Because I don't have enough knowledge about the orgshapes I am not able to fix them at the moment. Any hints? Bj?rn -- Bjoern Ricks | ++49-541-335083-167 | http://www.intevation.de/ Intevation GmbH, Neuer Graben 17, 49074 Osnabr?ck | AG Osnabr?ck, HR B 18998 Gesch?ftsf?hrer: Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wagner -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 198 bytes Desc: This is a digitally signed message part. Url : http://www.intevation.de/pipermail/thuban-devel/attachments/20110715/e11fdb19/attachment.bin From bernhard at intevation.de Mon Jul 18 09:48:07 2011 From: bernhard at intevation.de (Bernhard Reiter) Date: Mon, 18 Jul 2011 09:48:07 +0200 Subject: Failling testcases In-Reply-To: <201107151517.12021.bjoern.ricks@intevation.de> References: <201107151517.12021.bjoern.ricks@intevation.de> Message-ID: <201107180948.07624.bernhard@intevation.de> Am Freitag, 15. Juli 2011 15:17:07 schrieb Bjoern Ricks: > today I did fix the thuban unit test to be able to run again. Currently > (without postgis and gdal tests) only two of them are failing. > FAIL: Extensions.ogr.test.test_OGRShapestore.TestOGRTable.test_Column > ? ? self.assertEquals(self.table.Column(0).type, FIELDTYPE_INT) > AssertionError: 'double' != 'int' Its fine, from https://wald.intevation.org/plugins/scmsvn/viewcvs.php/trunk/thuban/Releasenotes.txt?rev=2832&root=thuban&view=auto Notable issues: - Extension OGR: - Two tests fail (probably because of an ogr/shapelib problem.) https://wald.intevation.org/tracker/index.php?func=detail&aid=91 The failure looks harmless. As the ogr layer support is beta it did not block the release. -- Managing Director + Owner: www.Intevation.net <- A Free Software Company Kolabsys.com: Board Member FSFE.org: Founding GA Member Intevation GmbH, Osnabr?ck, DE; Amtsgericht Osnabr?ck, HRB 18998 Gesch?ftsf?hrer Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wagner -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 198 bytes Desc: This is a digitally signed message part. Url : http://www.intevation.de/pipermail/thuban-devel/attachments/20110718/34c04e73/attachment.bin From dpinte at dipole-consulting.com Mon Jul 18 09:43:43 2011 From: dpinte at dipole-consulting.com (Didrik Pinte) Date: Mon, 18 Jul 2011 09:43:43 +0200 Subject: Failling testcases In-Reply-To: <201107151517.12021.bjoern.ricks@intevation.de> References: <201107151517.12021.bjoern.ricks@intevation.de> Message-ID: <1FB08ACD-D6C3-4971-B1BB-112AD85EA38B@dipole-consulting.com> On 15 Jul 2011, at 15:17, Bjoern Ricks wrote: > Hi, > > today I did fix the thuban unit test to be able to run again. Currently > (without postgis and gdal tests) only two of them are failing. > > ====================================================================== > FAIL: Extensions.ogr.test.test_OGRShapestore.TestOGRTable.test_Column > ---------------------------------------------------------------------- > Traceback (most recent call last): > > File "/home/bricks/source/greater/thuban/test/../Extensions/ogr/test/test_OGRShapestore.py", > line 200, in test_Column > self.assertEquals(self.table.Column(0).type, FIELDTYPE_INT) > AssertionError: 'double' != 'int' > > ====================================================================== > FAIL: Extensions.ogr.test.test_OGRShapestore.TestOGRTable.test_Columns > ---------------------------------------------------------------------- > Traceback (most recent call last): > > File "/home/bricks/source/greater/thuban/test/../Extensions/ogr/test/test_OGRShapestore.py", > line 194, in test_Columns > self.assertEquals(self.table.Columns()[0].type, FIELDTYPE_INT) > AssertionError: 'double' != 'int' > > Because I don't have enough knowledge about the orgshapes I am not able to fix > them at the moment. Any hints? The answer is there : http://wald.intevation.org/tracker/index.php?func=detail&aid=91&group_id=6&atid=105 -- Didrik