| 1 |
|
2004-03-12 Bernhard Herzog <[email protected]> |
| 2 |
|
|
| 3 |
|
Support views in addition to normal tables in the postgis |
| 4 |
|
shapestore |
| 5 |
|
|
| 6 |
|
* Thuban/Model/postgisdb.py |
| 7 |
|
(PostGISShapeStore._fetch_table_information): Add a fallback for |
| 8 |
|
the case where the table name is not in the geometry_columns |
| 9 |
|
table. This is usually the case for views. Also, set |
| 10 |
|
self.shapestore here. |
| 11 |
|
(PostGISShapeStore.ShapeType): No need to query the database all |
| 12 |
|
the time. The shape type is now determined in |
| 13 |
|
_fetch_table_information |
| 14 |
|
|
| 15 |
|
* test/postgissupport.py (PostgreSQLServer.new_postgis_db) |
| 16 |
|
(PostgreSQLServer.get_static_data_db, PostGISDatabase.__init__): |
| 17 |
|
New parameter to specify views. |
| 18 |
|
(PostGISDatabase.has_data): Also compare the views. New views |
| 19 |
|
parameter |
| 20 |
|
(PostGISDatabase.initdb): Create the views. |
| 21 |
|
(PostgreSQLServer.get_default_static_data_db): Add the v_landmarks |
| 22 |
|
view |
| 23 |
|
|
| 24 |
|
* test/test_postgis_db.py |
| 25 |
|
(TestPostGISShapestorePointFromViews): New. Test a |
| 26 |
|
PostGISShapeStore with a view |
| 27 |
|
(TestPostGISShapestorePointOIDAsGIDColumn.setUp): Pass the name of |
| 28 |
|
the geometry_column explicitly to test whether that works |
| 29 |
|
|
| 30 |
|
2004-03-12 Bernhard Herzog <[email protected]> |
| 31 |
|
|
| 32 |
|
Final step for explicit id/geometry columns: Loading and saving |
| 33 |
|
|
| 34 |
|
* Resources/XML/thuban-1.1.dtd: New. Derived from thuban-1.0.dtd |
| 35 |
|
with the following changes: |
| 36 |
|
(dbshapesource): Two new attributes id_column and geometry_column |
| 37 |
|
|
| 38 |
|
* Thuban/Model/save.py (SessionSaver.write): Use the new dtd |
| 39 |
|
(SessionSaver.write_session): Use the new namespace |
| 40 |
|
(SessionSaver.write_data_containers): Write the new dbshapesource |
| 41 |
|
parameters |
| 42 |
|
|
| 43 |
|
* Thuban/Model/load.py (SessionLoader.__init__): New namespace for |
| 44 |
|
the new file format version |
| 45 |
|
(SessionLoader.start_dbshapesource): Handle the new db parameters |
| 46 |
|
|
| 47 |
|
* test/test_save.py: Update to the new dtd and namespace |
| 48 |
|
(SaveSessionTest.test_save_postgis): Update the NonConnectionStore |
| 49 |
|
mock object to provide a working IDColumn method. |
| 50 |
|
|
| 51 |
|
* test/test_load_1_0.py: New. Copy of the test_load.py before |
| 52 |
|
today's changes but with the round-trip tests removed. |
| 53 |
|
|
| 54 |
|
* test/test_load_0_9.py: Update doc-string. |
| 55 |
|
|
| 56 |
|
* test/test_load.py: Update all .thuban files to the new dtd and |
| 57 |
|
namespace. |
| 58 |
|
(TestPostGISLayer.file_contents): Add the new dbshapesource |
| 59 |
|
paramters |
| 60 |
|
|
| 61 |
|
2004-03-11 Bernhard Herzog <[email protected]> |
| 62 |
|
|
| 63 |
|
Next step for explicit id/geometry columns: User interaction |
| 64 |
|
|
| 65 |
|
* Thuban/UI/dbdialog.py (ChooseDBTableDialog.__init__): Rework how |
| 66 |
|
the dialog is constructed. Add combo boxes to select id and |
| 67 |
|
geometry column. Rename some instance variables. |
| 68 |
|
(ChooseDBTableDialog.GetTable): Return id and geometry column |
| 69 |
|
names |
| 70 |
|
(ChooseDBTableDialog.OnTableSelect): New. Event handler for |
| 71 |
|
selections in the table list |
| 72 |
|
|
| 73 |
|
* Thuban/UI/mainwindow.py (MainWindow.AddDBLayer): Use id_column |
| 74 |
|
and geometry_column |
| 75 |
|
|
| 76 |
|
* Thuban/Model/session.py (Session.OpenDBShapeStore): Add the new |
| 77 |
|
parameters for id_column and geometry column of PostGISShapeStore |
| 78 |
|
here as well. |
| 79 |
|
|
| 80 |
|
* Thuban/Model/postgisdb.py (type_map): Add ROWID psycog type. |
| 81 |
|
(_raw_type_map): New. Map raw PostgreSQL type ints to thuban types |
| 82 |
|
(PostGISConnection.GeometryTables): Use a better query to |
| 83 |
|
determine which relations in the database might be usable for |
| 84 |
|
shapestores. Now supports views as well but is more PostgreSQL |
| 85 |
|
specific |
| 86 |
|
(PostGISConnection.table_columns): New. Somewhat experimental |
| 87 |
|
method to let the db dialogs provide lists of columns to users so |
| 88 |
|
that they can select id and geometry columns. |
| 89 |
|
(PostGISTable.__init__): The default value of the id_column |
| 90 |
|
parameter is now None it still means "gid" effectively, though. |
| 91 |
|
(PostGISTable.IDColumn): New introspection method to return a |
| 92 |
|
column object for the id column |
| 93 |
|
(PostGISShapeStore.GeometryColumn): New introspection method to |
| 94 |
|
return a column object for the geometry column |
| 95 |
|
|
| 96 |
|
* test/test_postgis_db.py |
| 97 |
|
(TestPostGISConnection.test_gis_tables_non_empty): |
| 98 |
|
Removed. Subsumed by the new: |
| 99 |
|
(TestPostGISConnection.test_gis_tables_with_views_and_tables): |
| 100 |
|
New. Tes the GeometryTables and table_columns methods with actual |
| 101 |
|
tables and views. |
| 102 |
|
(PointTests.test_id_column, PointTests.test_geometry_column): |
| 103 |
|
New. tests for the new methods. |
| 104 |
|
(TestPostGISShapestorePoint.setUp) |
| 105 |
|
(TestPostGISShapestorePointSRID.setUp) |
| 106 |
|
(TestPostGISShapestorePointExplicitGIDColumn.setUp): Fill the |
| 107 |
|
instance variables needed by the new tests |
| 108 |
|
|
| 109 |
|
2004-03-11 Bernhard Herzog <[email protected]> |
| 110 |
|
|
| 111 |
|
* Thuban/UI/classgen.py (GenQuantilesPanel.GetList): The row |
| 112 |
|
numbers given to ReadValue are ordinals. |
| 113 |
|
|
| 114 |
|
2004-03-11 Bernhard Herzog <[email protected]> |
| 115 |
|
|
| 116 |
|
Elimiate the requirement for PostGIS tables to have a column |
| 117 |
|
called "gid". |
| 118 |
|
|
| 119 |
|
* Thuban/Model/postgisdb.py (PostGISTable.__init__): New parameter |
| 120 |
|
id_column to specify which column to use to identify rows. Also |
| 121 |
|
new instance variables id_column and quoted_id_column |
| 122 |
|
(PostGISTable.RowIdToOrdinal, PostGISTable.RowOrdinalToId) |
| 123 |
|
(PostGISTable.ReadRowAsDict, PostGISTable.ReadValue) |
| 124 |
|
(PostGISTable.SimpleQuery): Use the id column name provided to the |
| 125 |
|
constructor instead of "gid" |
| 126 |
|
(PostGISShapeStore.__init__): New parameter id_column analogously |
| 127 |
|
to PostGISTable.__init__. This parameter is simply passed through |
| 128 |
|
to the base class constructor |
| 129 |
|
(PostGISShapeStore._create_col_from_description): Fix typo in |
| 130 |
|
doc-string |
| 131 |
|
(PostGISShapeStore.Shape, PostGISShapeStore.AllShapes) |
| 132 |
|
(PostGISShapeStore.ShapesInRegion): Use the id column name |
| 133 |
|
provided to the constructor instead of "gid" |
| 134 |
|
|
| 135 |
|
* test/postgissupport.py |
| 136 |
|
(PostgreSQLServer.get_default_static_data_db): New static table |
| 137 |
|
landmarks_point_id with an id column != "gid. Update the comments |
| 138 |
|
a bit. |
| 139 |
|
(skip_if_addgeometrycolumn_does_not_use_quote_ident): Fix typo in |
| 140 |
|
doc- |
| 141 |
|
(upload_shapefile): New parameter gid_column to use a name other |
| 142 |
|
than "gid" for the column to store the shape ids |
| 143 |
|
|
| 144 |
|
* test/test_postgis_db.py (TableTests): New. Mixin-class |
| 145 |
|
containing all tests previously in TestPostGISTable. The actual |
| 146 |
|
tests are the same but the code is a bit more configurable to |
| 147 |
|
allow for different id columns etc. |
| 148 |
|
(TestPostGISTable): Derive from TableTests now for the actual |
| 149 |
|
tests. |
| 150 |
|
(TestPostGISTableExplicitGIDColumn): New. Like TestPostGISTable |
| 151 |
|
except that it the landmarks_point_id table to test the id_column |
| 152 |
|
parameter |
| 153 |
|
(PointTests): Extend the doc-string |
| 154 |
|
(TestPostGISShapestorePointExplicitGIDColumn) |
| 155 |
|
(TestPostGISShapestorePointOIDAsGIDColumn): New classes derived |
| 156 |
|
from PointTests to test the explicit id_column parameter. One |
| 157 |
|
tests with the name of the column holding the shape ids, the other |
| 158 |
|
uses PostgreSQL's OID column. For the latter a number of methods |
| 159 |
|
have to be overwritten to make them independent of the actual id |
| 160 |
|
values. |
| 161 |
|
|
| 162 |
|
2004-03-08 Silke Reimer <[email protected]> |
| 163 |
|
|
| 164 |
|
Update debian directory: |
| 165 |
|
|
| 166 |
|
* debian/changelog: Added new version. |
| 167 |
|
* deiban/rules: Updated management of patches (with cbds) |
| 168 |
|
* debian/control: Added cbds to dependencies |
| 169 |
|
* debian/patches/*: New. Adds better support for patches of thuban in |
| 170 |
|
debian |
| 171 |
|
* debian/menu: Syntax of menu changed slightly |
| 172 |
|
* debian/setup.py.patch: removed because it has been moved to |
| 173 |
|
debian/patechs/setup.py.patch |
| 174 |
|
|
| 175 |
|
|
| 176 |
|
2004-02-26 Bernhard Herzog <[email protected]> |
| 177 |
|
|
| 178 |
|
Create the Doc/technotes directory for text files with information |
| 179 |
|
for developers |
| 180 |
|
|
| 181 |
|
* Doc/technotes/README: New. README for the technotes |
| 182 |
|
|
| 183 |
|
* Doc/technotes/coding_guidelines.txt: New. Coding guidelines for |
| 184 |
|
Thuban |
| 185 |
|
|
| 186 |
|
* Doc/technotes/release_process.txt: New. Used to be |
| 187 |
|
HOWTO-Release. Now slightly adapted to technote formatting style. |
| 188 |
|
|
| 189 |
|
* HOWTO-Release: Removed. It's contents are now in |
| 190 |
|
Doc/technotes/release_process.txt |
| 191 |
|
|
| 192 |
|
2004-02-25 Bernhard Herzog <[email protected]> |
| 193 |
|
|
| 194 |
|
* libraries/thuban/wxproj.cpp (get_wx_version): New. Return the |
| 195 |
|
version of wxWindows the module was compiled with so we can check |
| 196 |
|
that against the wxPython version. |
| 197 |
|
|
| 198 |
|
* Thuban/version.py (thuban_branch, thuban_release): New variables |
| 199 |
|
controlling which and how Thuban versions are shown. See the |
| 200 |
|
comments for details. |
| 201 |
|
(verify_versions): Also check that the wx version that wxproj is |
| 202 |
|
compiled against matches that of the wxPython we use at runtime |
| 203 |
|
|
| 204 |
|
2004-02-20 Bernhard Herzog <[email protected]> |
| 205 |
|
|
| 206 |
|
* Extensions/wms/wms.py (epsg_code_to_projection): Use |
| 207 |
|
get_system_proj_file to read the epsg projections. The old way |
| 208 |
|
depended on the current directory being the top Thuban directory. |
| 209 |
|
|
| 210 |
|
2004-02-20 Bernhard Herzog <[email protected]> |
| 211 |
|
|
| 212 |
|
* Extensions/svgexport/test/test_svgmapwriter.py |
| 213 |
|
(TestVirtualDC.test_clippath): Remove a debug print |
| 214 |
|
|
| 215 |
|
2004-02-20 Bernhard Herzog <[email protected]> |
| 216 |
|
|
| 217 |
|
* Extensions/svgexport/__init__.py: New. Turn |
| 218 |
|
Extensions/svgexport into a package. |
| 219 |
|
|
| 220 |
|
* Extensions/svgexport/svgmapwriter.py: Reorder the imports and |
| 221 |
|
doc-string a bit. The doc-string must come first, otherwise it's |
| 222 |
|
not a doc-string. The __future__ import must be the first thing |
| 223 |
|
after the doc-string. Use only double quotes in doc-strings. |
| 224 |
|
Single quotes trip up emacs syntax highlighting if the text |
| 225 |
|
contains apostrophes. |
| 226 |
|
|
| 227 |
|
2004-02-20 Bernhard Herzog <[email protected]> |
| 228 |
|
|
| 229 |
|
* Extensions/svgexport/test/__init__.py, |
| 230 |
|
Extensions/svgexport/test/test_svgmapwriter.py: New. Initial test |
| 231 |
|
suite for svgexport |
| 232 |
|
|
| 233 |
|
* test/runtests.py (find_test_modules): New. Function with the |
| 234 |
|
module finding code from main. |
| 235 |
|
(main): Use find_test_modules to figure out the default test |
| 236 |
|
modules and take modules from Extensions.svgexport.test too. |
| 237 |
|
|
| 238 |
|
2004-02-19 Bernhard Herzog <[email protected]> |
| 239 |
|
|
| 240 |
|
* Thuban/UI/application.py (ThubanApplication.OnInit): Make sure |
| 241 |
|
the mainwindow has a reference to the map of the initial session. |
| 242 |
|
This fixes a bug introduced with the fix for RT#2245 |
| 243 |
|
|
| 244 |
|
2004-02-19 Bernhard Herzog <[email protected]> |
| 245 |
|
|
| 246 |
|
* Extensions/svgexport/svgsaver.py, |
| 247 |
|
Extensions/svgexport/svgmapwriter.py, |
| 248 |
|
Extensions/svgexport/maplegend.py: Added again. This time in the |
| 249 |
|
correct place. |
| 250 |
|
|
| 251 |
|
2004-02-17 Bernhard Herzog <[email protected]> |
| 252 |
|
|
| 253 |
|
Fix for RT#2245 |
| 254 |
|
|
| 255 |
|
* Thuban/UI/application.py (ThubanApplication.OnInit): Initialize |
| 256 |
|
instance variables before trying to create any windows. Creating |
| 257 |
|
windows can start an event loop if e.g. message boxes are popped |
| 258 |
|
up for some reason, and event handlers, especially EVT_UPDATE_UI |
| 259 |
|
may want to access things from the application. |
| 260 |
|
(ThubanApplication.maps_changed): The mainwindow may not have been |
| 261 |
|
created yet, so check whether it has been created before calling |
| 262 |
|
its methods |
| 263 |
|
|
| 264 |
|
* Thuban/UI/view.py (MapCanvas.OnIdle): Only try to redraw if we |
| 265 |
|
have a map |
| 266 |
|
|
| 267 |
|
2004-02-17 Bernhard Herzog <[email protected]> |
| 268 |
|
|
| 269 |
|
* test/test_svgmapwriter.py, Extensions/svgsaver.py, |
| 270 |
|
Extensions/svgmapwriter.py, Extensions/maplegend.py, |
| 271 |
|
extensions/svgexport/svgsaver.py, |
| 272 |
|
extensions/svgexport/svgmapwriter.py, |
| 273 |
|
extensions/svgexport/maplegend.py: Removed. These files were in |
| 274 |
|
the wrong places or didn't work at all. |
| 275 |
|
|
| 276 |
|
2004-02-16 Bernhard Herzog <[email protected]> |
| 277 |
|
|
| 278 |
|
* Thuban/UI/view.py (MapCanvas.Export): Remove accidentally added |
| 279 |
|
line |
| 280 |
|
|
| 281 |
|
2004-02-16 Bernhard Herzog <[email protected]> |
| 282 |
|
|
| 283 |
|
* Thuban/UI/view.py (MapCanvas.Export): Avoid UnboundLocalError. |
| 284 |
|
|
| 285 |
2004-02-15 Markus Rechtien <[email protected]> |
2004-02-15 Markus Rechtien <[email protected]> |
| 286 |
|
|
| 287 |
* Extensions/svgexport/svgmapwriter.py: New. Adds the capability |
* Extensions/svgexport/svgmapwriter.py: New. Adds the capability |
Parent Directory
| 
Revision Log
| 
Patch