update documentation about {{center}} and {{geoCoords}}

3liz · Mar 16, 2015 · 9afe23f · 9afe23f
1 parent 3ed3d7e
commit 9afe23f
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/doc/main.fr.html b/doc/main.fr.html
@@ -54,7 +54,15 @@ <h3 id="overpass-turbo">Overpass Turbo</h3>
 			<br />
 			<strong>Attention</strong> avec quelques requêtes provenant d'Overpass Turbo :
 			<ul>
-				<li>quelques raccourcis ne sont pas disponibles aujourd'hui dans ce plugin. Nous supportons seulement {{geocodeArea:}}, {{nominatimArea:}} et {{bbox}}.</li>
+				<li>quelques raccourcis ne sont pas disponibles aujourd'hui dans ce plugin. Nous supportons seulement :
+					<ul>
+						<li>{{geocodeArea:}}</li>
+						<li>{{nominatimArea:}}></li>
+						<li>{{center}}</li>
+						<li>{{geocodeCoords:}}</li>
+						<li>{{bbox}}</li>
+					</ul>
+				</li>
 				<li>l'ordre dans le fichier résultat doit être comme-ci : node et way puis relation. Avec l'assistant par défaut d'Overpass Turbo, vous pouvez obtenir l'ordre inverse. Le parseur OGR ne peut pas lire l'ordre inverse. Vous devez modifier les "print" à la fin de la requête.</li>
 			</ul>
 			Par exemple, cette requête est correcte :

diff --git a/doc/main.html b/doc/main.html
@@ -54,7 +54,15 @@ <h3 id="overpass-turbo">Overpass Turbo</h3>
 			<br />
 			<strong>Be careful</strong> with some queries which come from Overpass Turbo :
 			<ul>
-				<li>some shortcuts are not available today in this plugin. We only support {{geocodeArea:}}, {{nominatimArea:}} and {{bbox}}.</li>
+				<li>some shortcuts are not available today in this plugin. We only support :
+					<ul>
+						<li>{{geocodeArea:}}</li>
+						<li>{{nominatimArea:}}></li>
+						<li>{{center}}</li>
+						<li>{{geocodeCoords:}}</li>
+						<li>{{bbox}}</li>
+					</ul>
+				</li>
 				<li>the order in the result have to be like this : node, then way and finally relation. With the default wizard of Overpass Turbo, you may get the reverse order. Our parser, OGR, can not work with this. You have to modify the print statement at the end.</li>
 			</ul>
 			For instance, this query is good :

diff --git a/ui/quick_query.py b/ui/quick_query.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'quick_query.ui'
 #
-# Created: Tue Feb 24 21:39:32 2015
+# Created: Wed Mar  4 18:58:19 2015
 #      by: PyQt4 UI code generator 4.10.4
 #
 # WARNING! All changes made in this file will be lost!
@@ -274,6 +274,7 @@ def retranslateUi(self, ui_quick_query):
         self.pushButton_mapFeatures.setText(_translate("ui_quick_query", "Help with key/value", None))
         self.label.setText(_translate("ui_quick_query", "Key", None))
         self.label_2.setText(_translate("ui_quick_query", "Value", None))
+        self.comboBox_in_around.setToolTip(_translate("ui_quick_query", "\"In\" will search the first multipolygon relation, however \"Around\" will get the first OSM node.", None))
         self.lineEdit_nominatim.setPlaceholderText(_translate("ui_quick_query", "A village, a town, ...", None))
         self.label_distance_point.setText(_translate("ui_quick_query", "m", None))
         self.label_13.setText(_translate("ui_quick_query", "Extent of the map canvas", None))

diff --git a/ui/quick_query.ui b/ui/quick_query.ui
@@ -124,7 +124,11 @@
          <item row="2" column="1">
           <layout class="QHBoxLayout" name="horizontalLayout_8">
            <item>
-            <widget class="QComboBox" name="comboBox_in_around"/>
+            <widget class="QComboBox" name="comboBox_in_around">
+             <property name="toolTip">
+              <string>&quot;In&quot; will search the first multipolygon relation, however &quot;Around&quot; will get the first OSM node.</string>
+             </property>
+            </widget>
            </item>
            <item>
             <widget class="QLineEdit" name="lineEdit_nominatim">