.hgignore → .gitignore

@@ -1,13 +1,9 @@
-syntax: glob
 *.orig
 *.rej
 *~
+*.DS_Store
 *.o
 *.swp
 *.log
 
 temp/lizmap/www/*
-
-
-syntax: regexp
-(^|/)\.DS_Store$

lib/jelix/VERSION

@@ -1 +1 @@
-1.4.1
+1.4.1

lib/jelix/db/jDbPDOConnection.class.php

@@ -268,9 +268,10 @@ public function quote2 ($text, $checknull=true, $binary=false) {
      */
     public function tools () {
         if (!$this->_tools) {
-            $this->_tools = jApp::loadPlugin($this->dbms, 'db', '.dbtools.php', $this->dbms.'DbTools', $this);
+            $dbms = ($this->dbms === 'sqlite') ? 'sqlite3' : $this->dbms;
+            $this->_tools = jApp::loadPlugin($dbms, 'db', '.dbtools.php', $dbms.'DbTools', $this);
             if (is_null($this->_tools))
-                throw new jException('jelix~db.error.driver.notfound', $this->dbms);
+                throw new jException('jelix~db.error.driver.notfound', $dbms);
         }
 
         return $this->_tools;

lib/jelix/plugins/db/sqlite3/sqlite3.dbconnection.php

@@ -66,9 +66,23 @@ protected function _connect (){
         if (preg_match('/^(app|lib|var)\:/', $db))
             $path = str_replace(array('app:','lib:','var:'), array(jApp::appPath(), LIB_PATH, jApp::varPath()), $db);
         else
-            $path = jApp::varPath('db/sqlite3/'.$db);
+            $path = $db;
+
+        $return = new SQLite3($path);
+
+        // Load extensions if needed
+        if (isset($this->profile['extensions']) ) {
+            $list = preg_split('/ *, */',$this->profile['extensions']);
+            foreach($list as $ext){
+                try { 
+                    $return->loadExtension($ext); 
+                } catch(Exception $e) {
+                    throw new Exception('jDbPDOConnection: error while loading sqlite extension '.$ext);
+                }
+            }        
+        }
 
-        return new SQLite3($path);
+        return $return;
     }
 
     protected function _disconnect (){

lizmap/install/qgis/data/vector/VilleMTP_MTP_Quartiers_2011_4326.prj

@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]

lizmap/install/qgis/data/vector/VilleMTP_MTP_Quartiers_2011_4326.qpj

@@ -0,0 +1 @@
+GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]

lizmap/install/qgis/data/vector/districts.qml

@@ -0,0 +1,165 @@
+<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
+<qgis version="1.8.0-Lisboa" minimumScale="0" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0">
+  <transparencyLevelInt>255</transparencyLevelInt>
+  <renderer-v2 attr="LIBQUART" symbollevels="0" type="categorizedSymbol">
+    <categories>
+      <category symbol="0" value="CROIX D'ARGENT" label="CROIX D'ARGENT"/>
+      <category symbol="1" value="HOPITAUX-FACULTES" label="HOPITAUX-FACULTES"/>
+      <category symbol="2" value="LES CEVENNES" label="LES CEVENNES"/>
+      <category symbol="3" value="MONTPELLIER CENTRE" label="MONTPELLIER CENTRE"/>
+      <category symbol="4" value="MOSSON" label="MOSSON"/>
+      <category symbol="5" value="PORT MARIANNE" label="PORT MARIANNE"/>
+      <category symbol="6" value="PRES D'ARENE" label="PRES D'ARENE"/>
+      <category symbol="7" value="" label=""/>
+    </categories>
+    <symbols>
+      <symbol outputUnit="MM" alpha="0.4" type="fill" name="0">
+        <layer pass="0" class="SimpleFill" locked="0">
+          <prop k="color" v="166,206,227,102"/>
+          <prop k="color_border" v="0,0,0,102"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="style" v="solid"/>
+          <prop k="style_border" v="dash"/>
+          <prop k="width_border" v="0.5"/>
+        </layer>
+      </symbol>
+      <symbol outputUnit="MM" alpha="0.4" type="fill" name="1">
+        <layer pass="0" class="SimpleFill" locked="0">
+          <prop k="color" v="31,120,180,102"/>
+          <prop k="color_border" v="0,0,0,102"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="style" v="solid"/>
+          <prop k="style_border" v="dash"/>
+          <prop k="width_border" v="0.5"/>
+        </layer>
+      </symbol>
+      <symbol outputUnit="MM" alpha="0.4" type="fill" name="2">
+        <layer pass="0" class="SimpleFill" locked="0">
+          <prop k="color" v="178,223,138,102"/>
+          <prop k="color_border" v="0,0,0,102"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="style" v="solid"/>
+          <prop k="style_border" v="dash"/>
+          <prop k="width_border" v="0.5"/>
+        </layer>
+      </symbol>
+      <symbol outputUnit="MM" alpha="0.4" type="fill" name="3">
+        <layer pass="0" class="SimpleFill" locked="0">
+          <prop k="color" v="251,154,153,102"/>
+          <prop k="color_border" v="0,0,0,102"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="style" v="solid"/>
+          <prop k="style_border" v="dash"/>
+          <prop k="width_border" v="0.5"/>
+        </layer>
+      </symbol>
+      <symbol outputUnit="MM" alpha="0.4" type="fill" name="4">
+        <layer pass="0" class="SimpleFill" locked="0">
+          <prop k="color" v="227,26,28,102"/>
+          <prop k="color_border" v="0,0,0,102"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="style" v="solid"/>
+          <prop k="style_border" v="dash"/>
+          <prop k="width_border" v="0.5"/>
+        </layer>
+      </symbol>
+      <symbol outputUnit="MM" alpha="0.4" type="fill" name="5">
+        <layer pass="0" class="SimpleFill" locked="0">
+          <prop k="color" v="255,127,0,102"/>
+          <prop k="color_border" v="0,0,0,102"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="style" v="solid"/>
+          <prop k="style_border" v="dash"/>
+          <prop k="width_border" v="0.5"/>
+        </layer>
+      </symbol>
+      <symbol outputUnit="MM" alpha="0.4" type="fill" name="6">
+        <layer pass="0" class="SimpleFill" locked="0">
+          <prop k="color" v="202,178,214,102"/>
+          <prop k="color_border" v="0,0,0,102"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="style" v="solid"/>
+          <prop k="style_border" v="dash"/>
+          <prop k="width_border" v="0.5"/>
+        </layer>
+      </symbol>
+      <symbol outputUnit="MM" alpha="0.4" type="fill" name="7">
+        <layer pass="0" class="SimpleFill" locked="0">
+          <prop k="color" v="106,61,154,102"/>
+          <prop k="color_border" v="0,0,0,102"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="style" v="solid"/>
+          <prop k="style_border" v="dash"/>
+          <prop k="width_border" v="0.5"/>
+        </layer>
+      </symbol>
+    </symbols>
+    <source-symbol>
+      <symbol outputUnit="MM" alpha="0.4" type="fill" name="0">
+        <layer pass="0" class="SimpleFill" locked="0">
+          <prop k="color" v="190,151,107,102"/>
+          <prop k="color_border" v="0,0,0,102"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="style" v="solid"/>
+          <prop k="style_border" v="dash"/>
+          <prop k="width_border" v="0.5"/>
+        </layer>
+      </symbol>
+    </source-symbol>
+    <colorramp type="colorbrewer" name="[source]">
+      <prop k="colors" v="10"/>
+      <prop k="schemeName" v="Paired"/>
+    </colorramp>
+    <rotation field=""/>
+    <sizescale field=""/>
+  </renderer-v2>
+  <customproperties/>
+  <displayfield>QUARTIER</displayfield>
+  <label>0</label>
+  <labelattributes>
+    <label fieldname="" text="Étiquette"/>
+    <family fieldname="" name="Ubuntu"/>
+    <size fieldname="" units="pt" value="12"/>
+    <bold fieldname="" on="0"/>
+    <italic fieldname="" on="0"/>
+    <underline fieldname="" on="0"/>
+    <strikeout fieldname="" on="0"/>
+    <color fieldname="" red="0" blue="0" green="0"/>
+    <x fieldname=""/>
+    <y fieldname=""/>
+    <offset x="0" y="0" units="pt" yfieldname="" xfieldname=""/>
+    <angle fieldname="" value="0" auto="0"/>
+    <alignment fieldname="" value="center"/>
+    <buffercolor fieldname="" red="255" blue="255" green="255"/>
+    <buffersize fieldname="" units="pt" value="1"/>
+    <bufferenabled fieldname="" on=""/>
+    <multilineenabled fieldname="" on=""/>
+    <selectedonly on=""/>
+  </labelattributes>
+  <edittypes>
+    <edittype type="0" name="AREA"/>
+    <edittype type="0" name="COMMUNE"/>
+    <edittype type="0" name="LIBQUART"/>
+    <edittype type="0" name="LIBSQUART"/>
+    <edittype type="0" name="PERIMETER"/>
+    <edittype type="11" name="QUARTIER"/>
+    <edittype type="0" name="QUARTIER_"/>
+    <edittype type="0" name="QUARTIER_I"/>
+    <edittype type="11" name="QUARTMNO"/>
+    <edittype type="11" name="SQUARTMNO"/>
+    <edittype type="0" name="SYMBOL"/>
+    <edittype type="0" name="Shape_Area"/>
+    <edittype type="0" name="Shape_Leng"/>
+    <edittype type="0" name="photo"/>
+    <edittype type="0" name="url"/>
+  </edittypes>
+  <editform>.</editform>
+  <editforminit></editforminit>
+  <annotationform>.</annotationform>
+  <aliases>
+    <alias field="LIBQUART" index="2" name="Name"/>
+    <alias field="photo" index="4" name="Illustration"/>
+    <alias field="url" index="5" name="Website"/>
+  </aliases>
+  <attributeactions/>
+</qgis>