Browse Source

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

tags/1.3
Etienne Trimaille 4 years ago
parent
commit
9afe23f630
4 changed files with 25 additions and 4 deletions
  1. 9
    1
      doc/main.fr.html
  2. 9
    1
      doc/main.html
  3. 2
    1
      ui/quick_query.py
  4. 5
    1
      ui/quick_query.ui

+ 9
- 1
doc/main.fr.html View File

@@ -54,7 +54,15 @@
54 54
 			<br />
55 55
 			<strong>Attention</strong> avec quelques requêtes provenant d'Overpass Turbo :
56 56
 			<ul>
57
-				<li>quelques raccourcis ne sont pas disponibles aujourd'hui dans ce plugin. Nous supportons seulement {{geocodeArea:}}, {{nominatimArea:}} et {{bbox}}.</li>
57
+				<li>quelques raccourcis ne sont pas disponibles aujourd'hui dans ce plugin. Nous supportons seulement :
58
+					<ul>
59
+						<li>{{geocodeArea:}}</li>
60
+						<li>{{nominatimArea:}}></li>
61
+						<li>{{center}}</li>
62
+						<li>{{geocodeCoords:}}</li>
63
+						<li>{{bbox}}</li>
64
+					</ul>
65
+				</li>
58 66
 				<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>
59 67
 			</ul>
60 68
 			Par exemple, cette requête est correcte :

+ 9
- 1
doc/main.html View File

@@ -54,7 +54,15 @@
54 54
 			<br />
55 55
 			<strong>Be careful</strong> with some queries which come from Overpass Turbo :
56 56
 			<ul>
57
-				<li>some shortcuts are not available today in this plugin. We only support {{geocodeArea:}}, {{nominatimArea:}} and {{bbox}}.</li>
57
+				<li>some shortcuts are not available today in this plugin. We only support :
58
+					<ul>
59
+						<li>{{geocodeArea:}}</li>
60
+						<li>{{nominatimArea:}}></li>
61
+						<li>{{center}}</li>
62
+						<li>{{geocodeCoords:}}</li>
63
+						<li>{{bbox}}</li>
64
+					</ul>
65
+				</li>
58 66
 				<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>
59 67
 			</ul>
60 68
 			For instance, this query is good :

+ 2
- 1
ui/quick_query.py View File

@@ -2,7 +2,7 @@
2 2
 
3 3
 # Form implementation generated from reading ui file 'quick_query.ui'
4 4
 #
5
-# Created: Tue Feb 24 21:39:32 2015
5
+# Created: Wed Mar  4 18:58:19 2015
6 6
 #      by: PyQt4 UI code generator 4.10.4
7 7
 #
8 8
 # WARNING! All changes made in this file will be lost!
@@ -274,6 +274,7 @@ class Ui_ui_quick_query(object):
274 274
         self.pushButton_mapFeatures.setText(_translate("ui_quick_query", "Help with key/value", None))
275 275
         self.label.setText(_translate("ui_quick_query", "Key", None))
276 276
         self.label_2.setText(_translate("ui_quick_query", "Value", None))
277
+        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))
277 278
         self.lineEdit_nominatim.setPlaceholderText(_translate("ui_quick_query", "A village, a town, ...", None))
278 279
         self.label_distance_point.setText(_translate("ui_quick_query", "m", None))
279 280
         self.label_13.setText(_translate("ui_quick_query", "Extent of the map canvas", None))

+ 5
- 1
ui/quick_query.ui View File

@@ -124,7 +124,11 @@
124 124
          <item row="2" column="1">
125 125
           <layout class="QHBoxLayout" name="horizontalLayout_8">
126 126
            <item>
127
-            <widget class="QComboBox" name="comboBox_in_around"/>
127
+            <widget class="QComboBox" name="comboBox_in_around">
128
+             <property name="toolTip">
129
+              <string>&quot;In&quot; will search the first multipolygon relation, however &quot;Around&quot; will get the first OSM node.</string>
130
+             </property>
131
+            </widget>
128 132
            </item>
129 133
            <item>
130 134
             <widget class="QLineEdit" name="lineEdit_nominatim">

Loading…
Cancel
Save