ok, i'll prepare a new maintenance release now.. ede
On 03.03.2019 22:13, Rahkonen Jukka (MML) wrote: > Hi, > > Reading layers with Add datastore layer from geopackage and Spatialite with > r6144 was successful. Thanks, Nico. > > -Jukka- > > -----Alkuperäinen viesti----- > Lähettäjä: edgar.sol...@web.de <edgar.sol...@web.de> > Lähetetty: lauantai 2. maaliskuuta 2019 12.53 > Vastaanottaja: Rahkonen Jukka (MML) <jukka.rahko...@maanmittauslaitos.fi> > Aihe: Re: [JPP-Devel] SVN: [6144] core/trunk/src/com/vividsolutions/jump > > Jukka, > > could you double check it please? i guess now would be a good time for the > maintenance release then.. ede > > On 28.02.2019 11:25, jump-pilot-svn--- via Jump-pilot-devel wrote: >> Revision: 6144 >> http://sourceforge.net/p/jump-pilot/code/6144 >> Author: elnico >> Date: 2019-02-28 10:25:42 +0000 (Thu, 28 Feb 2019) >> Log Message: >> ----------- >> Corrected bug preventing some Spatialite tables to be loaded. >> Removed system.out.println debug part >> >> Modified Paths: >> -------------- >> >> core/trunk/src/com/vividsolutions/jump/datastore/spatialite/SpatialiteDSMetadata.java >> >> core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/A >> ddDatastoreLayerPanel.java >> >> Modified: >> core/trunk/src/com/vividsolutions/jump/datastore/spatialite/Spatialite >> DSMetadata.java >> =================================================================== >> --- >> core/trunk/src/com/vividsolutions/jump/datastore/spatialite/SpatialiteDSMetadata.java >> 2019-02-25 14:11:38 UTC (rev 6143) >> +++ >> core/trunk/src/com/vividsolutions/jump/datastore/spatialite/SpatialiteDSMetadata.java >> 2019-02-28 10:25:42 UTC (rev 6144) >> @@ -1,6 +1,7 @@ >> package com.vividsolutions.jump.datastore.spatialite; >> >> import com.vividsolutions.jump.datastore.DataStoreConnection; >> +import com.vividsolutions.jump.datastore.DataStoreLayer; >> import com.vividsolutions.jump.datastore.GeometryColumn; >> import com.vividsolutions.jump.datastore.SQLUtil; >> import com.vividsolutions.jump.datastore.spatialdatabases.*; >> @@ -289,17 +290,17 @@ >> // tries to load spatialite, assuming it is available on the system's >> path >> Statement stmt = null; >> try { >> - stmt = conn.getJdbcConnection().createStatement(); >> - stmt.executeUpdate("SELECT load_extension('mod_spatialite')"); >> - // ex is thrown if extension cannot be loaded >> - this.spatialiteLoaded = true; >> - ResultSet rs = stmt.executeQuery("select spatialite_version()"); >> - rs.next(); >> - this.setSpatialiteVersion(rs.getString(1)); >> - >> - JUMPWorkbench.getInstance().getFrame().log( >> - "SpatialDatabasesPlugin: Spatialite extension loaded for this >> connexion, version: " >> - + this.getSpatialiteVersion(), this.getClass()); >> +// stmt = conn.getJdbcConnection().createStatement(); >> +// stmt.executeUpdate("SELECT load_extension('mod_spatialite')"); >> +// // ex is thrown if extension cannot be loaded >> +// this.spatialiteLoaded = true; >> +// ResultSet rs = stmt.executeQuery("select spatialite_version()"); >> +// rs.next(); >> +// this.setSpatialiteVersion(rs.getString(1)); >> +// >> +// JUMPWorkbench.getInstance().getFrame().log( >> +// "SpatialDatabasesPlugin: Spatialite extension loaded for this >> connexion, version: " >> +// + this.getSpatialiteVersion(), this.getClass()); >> } catch (Exception e) { >> JUMPWorkbench.getInstance().getFrame().log( >> "SpatialDatabasesPlugin: CANNOT load Spatialite Extention >> (mod_spatialite), reason:" >> @@ -306,7 +307,7 @@ >> + e.getMessage(), this.getClass()); >> } finally { >> try { >> - stmt.close(); >> +// stmt.close(); >> } catch (Throwable th) { >> // TODO: log >> th.printStackTrace(); >> @@ -418,7 +419,7 @@ >> /** >> * builds the map of geometric columns database type: WKB, WKT, >> SPATIALITE to >> * be able to build custom queries for extent and geo type retrieval. The >> - * geometry_format column of the metadata will be queries to find geometry >> + * geometry_format column of the metadata will be queried to find >> + geometry >> * type (column only detected in the FDO_LAYOUT format). For other layout, >> * will default to SPATIALITE type >> */ >> @@ -498,6 +499,15 @@ >> public GeometryColumn getGeometryColumn(String datasetName, String >> geoCol) { >> List<GeometryColumn> l = this.geometryColumnListMap.get(datasetName); >> if (l == null) { >> + // 2018-02-28: also look into dataStoreLayers to find geo column, now >> this container is used to >> + // speedup DB tables discovery >> + if (this.dataStoreLayers != null) { >> + for (DataStoreLayer dsl : this.dataStoreLayers) { >> + if (datasetName.equals(dsl.getFullName()) && >> geoCol.equals(dsl.getGeoCol().getName())) { >> + return dsl.getGeoCol(); >> + } >> + } >> + } >> return null; >> } >> >> >> Modified: >> core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/A >> ddDatastoreLayerPanel.java >> =================================================================== >> --- >> core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/AddDatastoreLayerPanel.java >> 2019-02-25 14:11:38 UTC (rev 6143) >> +++ >> core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/AddDatastoreLayerPanel.java >> 2019-02-28 10:25:42 UTC (rev 6144) >> @@ -292,7 +292,6 @@ >> // DataStoreLayer list is retrieved when getDatasetNames is called >> // TODO: propagate to DataStoreMetadata interface >> if (md instanceof SpatialDatabasesDSMetadata && >> ((SpatialDatabasesDSMetadata)md).getDataStoreLayers() != null) { >> - System.out.println("adding datastorelayer directly !"); >> for (DataStoreLayer layer : >> ((SpatialDatabasesDSMetadata)md).getDataStoreLayers()) { >> ArrayList<DataStoreLayer> newEntry = new ArrayList<>(); >> newEntry.add(layer); >> >> >> >> _______________________________________________ >> Jump-pilot-devel mailing list >> Jump-pilot-devel@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel >> > _______________________________________________ Jump-pilot-devel mailing list Jump-pilot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
