Adress Search - Add Google and IGN (france) API

3liz · Feb 25, 2014 · 0fb4ba4 · 0fb4ba4
1 parent 0f33d81
commit 0fb4ba4
Show file tree

Hide file tree

Showing 9 changed files with 494 additions and 450 deletions.
diff --git a/i18n/lizmap_en.qm b/i18n/lizmap_en.qm
diff --git a/i18n/lizmap_en.ts b/i18n/lizmap_en.ts
diff --git a/i18n/lizmap_fr.qm b/i18n/lizmap_fr.qm
diff --git a/i18n/lizmap_fr.ts b/i18n/lizmap_fr.ts
diff --git a/i18n/lizmap_it.qm b/i18n/lizmap_it.qm
diff --git a/i18n/lizmap_it.ts b/i18n/lizmap_it.ts
diff --git a/lizmap.py b/lizmap.py
@@ -254,7 +254,7 @@ def __init__(self, iface):
             },
             'externalSearch' : {
                 'widget': self.dlg.ui.liExternalSearch,
-                'wType': 'list', 'type': 'string', 'default': '', 'list':['', 'nominatim']
+                'wType': 'list', 'type': 'string', 'default': '', 'list':['', 'nominatim', 'google', 'ign']
             },
             'zoomHistory' : {
                 'widget': self.dlg.ui.cbActivateZoomHistory,

diff --git a/ui_lizmap.py b/ui_lizmap.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'ui_lizmap.ui'
 #
-# Created: Thu Feb 20 16:20:49 2014
+# Created: Tue Feb 25 18:24:58 2014
 #      by: PyQt4 UI code generator 4.10
 #
 # WARNING! All changes made in this file will be lost!
@@ -63,7 +63,7 @@ def setupUi(self, lizmap):
         self.scrollArea.setWidgetResizable(True)
         self.scrollArea.setObjectName(_fromUtf8("scrollArea"))
         self.scrollAreaWidgetContents = QtGui.QWidget()
-        self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(-151, -190, 535, 604))
+        self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 535, 604))
         self.scrollAreaWidgetContents.setObjectName(_fromUtf8("scrollAreaWidgetContents"))
         self.gridLayout_20 = QtGui.QGridLayout(self.scrollAreaWidgetContents)
         self.gridLayout_20.setObjectName(_fromUtf8("gridLayout_20"))
@@ -261,6 +261,8 @@ def setupUi(self, lizmap):
         self.liExternalSearch.addItem(_fromUtf8(""))
         self.liExternalSearch.setItemText(0, _fromUtf8(""))
         self.liExternalSearch.addItem(_fromUtf8(""))
+        self.liExternalSearch.addItem(_fromUtf8(""))
+        self.liExternalSearch.addItem(_fromUtf8(""))
         self.horizontalLayout_14.addWidget(self.liExternalSearch)
         spacerItem4 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
         self.horizontalLayout_14.addItem(spacerItem4)
@@ -881,7 +883,7 @@ def setupUi(self, lizmap):
         self.scrollArea_4.setWidgetResizable(True)
         self.scrollArea_4.setObjectName(_fromUtf8("scrollArea_4"))
         self.scrollAreaWidgetContents_4 = QtGui.QWidget()
-        self.scrollAreaWidgetContents_4.setGeometry(QtCore.QRect(0, 0, 662, 466))
+        self.scrollAreaWidgetContents_4.setGeometry(QtCore.QRect(0, 0, 361, 435))
         self.scrollAreaWidgetContents_4.setObjectName(_fromUtf8("scrollAreaWidgetContents_4"))
         self.verticalLayout_5 = QtGui.QVBoxLayout(self.scrollAreaWidgetContents_4)
         self.verticalLayout_5.setObjectName(_fromUtf8("verticalLayout_5"))
@@ -1219,6 +1221,8 @@ def retranslateUi(self, lizmap):
         self.cbActivateGeolocation.setText(_translate("lizmap", "map.tool.geolocation", None))
         self.label_19.setText(_translate("lizmap", "map.tool.externalSearch.label", None))
         self.liExternalSearch.setItemText(1, _translate("lizmap", "nominatim", None))
+        self.liExternalSearch.setItemText(2, _translate("lizmap", "google", None))
+        self.liExternalSearch.setItemText(3, _translate("lizmap", "ign", None))
         self.gb_Scales.setTitle(_translate("lizmap", "map.scales.label", None))
         self.label_13.setText(_translate("lizmap", "map.minScale.label", None))
         self.label_14.setText(_translate("lizmap", "map.maxScale.label", None))

diff --git a/ui_lizmap.ui b/ui_lizmap.ui
@@ -89,8 +89,8 @@
             <widget class="QWidget" name="scrollAreaWidgetContents">
              <property name="geometry">
               <rect>
-               <x>-151</x>
-               <y>-190</y>
+               <x>0</x>
+               <y>0</y>
                <width>535</width>
                <height>604</height>
               </rect>
@@ -518,6 +518,16 @@
                     <string>nominatim</string>
                    </property>
                   </item>
+                  <item>
+                   <property name="text">
+                    <string>google</string>
+                   </property>
+                  </item>
+                  <item>
+                   <property name="text">
+                    <string>ign</string>
+                   </property>
+                  </item>
                  </widget>
                 </item>
                 <item>