Changeset 881

Timestamp:

02/09/09 14:43:57 (18 months ago)

Author:

artem

Message:

+ sqlite-input-plugin.patch (kunitoki)
+ wkb-sqlite.patch (kunitoki)
+ very preliminary spatial index support (idx_<tablename>_<geometry_field>)

Location:

trunk

Files:

• SConstruct (modified) (3 diffs)
• include/mapnik/wkb.hpp (modified) (1 diff)
• plugins/input/sqlite (added)
• plugins/input/sqlite/Makefile.am (added)
• plugins/input/sqlite/SConscript (added)
• plugins/input/sqlite/sqlite_datasource.cpp (added)
• plugins/input/sqlite/sqlite_datasource.hpp (added)
• plugins/input/sqlite/sqlite_featureset.cpp (added)
• plugins/input/sqlite/sqlite_featureset.hpp (added)
• plugins/input/sqlite/sqlite_types.hpp (added)
• src/wkb.cpp (modified) (3 diffs)

trunk/SConstruct

@@ -82 +82 @@
             'ogr':     {'default':False,'path':'OGR','inc':'ogrsf_frmts.h','lib':'gdal','cxx':True},
             'occi':    {'default':False,'path':'OCCI','inc':'occi.h','lib':'ociei','cxx':True},
+            'sqlite':  {'default':False,'path':'SQLITE','inc':'sqlite3.h','lib':'sqlite3','cxx':False},
             
             # plugins without external dependencies
@@ -152 +153 @@
 opts.Add(PathVariable('OCCI_INCLUDES', 'Search path for OCCI include files', '/usr/lib/oracle/10.2.0.3/client/include/', PathVariable.PathAccept))
 opts.Add(PathVariable('OCCI_LIBS', 'Search path for OCCI library files', '/usr/lib/oracle/10.2.0.3/client/'+ LIBDIR_SCHEMA, PathVariable.PathAccept))
+opts.Add(PathVariable('SQLITE_INCLUDES', 'Search path for SQLITE include files', '/usr/include/', PathVariable.PathAccept))
+opts.Add(PathVariable('SQLITE_LIBS', 'Search path for SQLITE library files', '/usr/' + LIBDIR_SCHEMA, PathVariable.PathAccept))
 
 # Other variables
@@ -609 +612 @@
             env.Append(CXXFLAGS = gcc_cxx_flags + '-O0 -fno-inline %s' % debug_flags)
         else:
-            env.Append(CXXFLAGS = gcc_cxx_flags + '-O%s -finline-functions -Wno-inline %s' % (env['OPTIMIZATION'],ndebug_flags))
+            env.Append(CXXFLAGS = gcc_cxx_flags + '-fast -finline-functions -Wno-inline %s' % (ndebug_flags))
     
     

trunk/include/mapnik/wkb.hpp

@@ -34 +34 @@
     {
     public:
-       static void from_wkb(Feature & feature,const char* wkb, unsigned size, bool multiple_geometries = false);
+
+       static void from_wkb (Feature & feature,
+                             const char* wkb,
+                             unsigned size,
+                             bool multiple_geometries = false,
+                             bool sqlite_format = false);
     private:
        geometry_utils();

trunk/src/wkb.cpp

@@ -42 +42 @@
          wkbByteOrder byteOrder_;
          bool needSwap_;
+         bool sqliteFormat_;
+
       public:
         
@@ -54 +56 @@
          };
         
-         wkb_reader(const char* wkb,unsigned size)
+         wkb_reader(const char* wkb,unsigned size,bool sqliteFormat = false)
             : wkb_(wkb),
               size_(size),
               pos_(0),
-              byteOrder_((wkbByteOrder)wkb_[0])
-         {
-            ++pos_;
-            
+              sqliteFormat_(sqliteFormat)
+         {
+            if (sqliteFormat)
+            {
+              byteOrder_ = (wkbByteOrder) wkb_[1];
+              pos_ = 39;
+            }
+            else
+            {
+              byteOrder_ = (wkbByteOrder) wkb_[0];
+              ++pos_;
+            }
+
 #ifndef WORDS_BIGENDIAN
             needSwap_=byteOrder_?wkbXDR:wkbNDR;
@@ -341 +352 @@
    };
    
-   void geometry_utils::from_wkb(Feature & feature,const char* wkb, unsigned size, bool multiple_geometries) 
+   void geometry_utils::from_wkb(Feature & feature,const char* wkb, unsigned size, bool multiple_geometries, bool sqlite_format) 
    {
-      wkb_reader reader(wkb,size);
+      wkb_reader reader(wkb,size,sqlite_format);
       if (multiple_geometries)
          return reader.read_multi(feature);