решение задания 9 + 10

This commit is contained in:
2023-01-30 22:18:50 +07:00
parent 8ba717ddd5
commit cbc58e4b1d
3 changed files with 34 additions and 4 deletions
+3 -2
View File
@@ -11,5 +11,6 @@ def search_organization_pos(search_text: str) -> tuple:
toponym = response.json()["response"]["GeoObjectCollection"]["featureMember"][0]["GeoObject"] toponym = response.json()["response"]["GeoObjectCollection"]["featureMember"][0]["GeoObject"]
point = [float(i) for i in toponym["Point"]["pos"].split(" ")] point = [float(i) for i in toponym["Point"]["pos"].split(" ")]
toponym_longitude, toponym_lattitude = toponym["Point"]["pos"].split(" ") toponym_longitude, toponym_lattitude = toponym["Point"]["pos"].split(" ")
name = toponym["metaDataProperty"]["GeocoderMetaData"]["text"] name = toponym["metaDataProperty"]["GeocoderMetaData"]["Address"]["formatted"]
return "{0},{1}".format(point[0], point[1]), toponym_longitude, toponym_lattitude, name postal_code = toponym["metaDataProperty"]["GeocoderMetaData"]["Address"]["postal_code"]
return "{0},{1}".format(point[0], point[1]), toponym_longitude, toponym_lattitude, name, postal_code
+17 -1
View File
@@ -20,6 +20,8 @@ class Window(QMainWindow):
self.variant_map = "map" self.variant_map = "map"
self.org_point = "0.0,0.0" self.org_point = "0.0,0.0"
self.name_find_org = "" self.name_find_org = ""
self.postal_code = ""
self.hide_postal_code = False
self.update() self.update()
self.button_group = QButtonGroup(None) self.button_group = QButtonGroup(None)
self.button_group.addButton(self.map) self.button_group.addButton(self.map)
@@ -28,6 +30,7 @@ class Window(QMainWindow):
self.button_group.buttonClicked.connect(self.push_button) self.button_group.buttonClicked.connect(self.push_button)
self.find.clicked.connect(self.search_organization) self.find.clicked.connect(self.search_organization)
self.drop.clicked.connect(self.drop_find) self.drop.clicked.connect(self.drop_find)
self.checkBox.stateChanged.connect(self.hide_postal_code_move)
def keyPressEvent(self, event): def keyPressEvent(self, event):
try: try:
@@ -70,13 +73,26 @@ class Window(QMainWindow):
def search_organization(self): def search_organization(self):
# Москва, ул. Ак. Королева, 12 # Москва, ул. Ак. Королева, 12
text = self.plainTextEdit.toPlainText() text = self.plainTextEdit.toPlainText()
self.org_point, self.lon, self.lat, self.name_find_org = search_organization_pos(text) self.org_point, self.lon, self.lat, self.name_find_org, self.postal_code = search_organization_pos(text)
if self.hide_postal_code:
self.label_2.setText(self.name_find_org + " : " + self.postal_code)
else:
self.label_2.setText(self.name_find_org) self.label_2.setText(self.name_find_org)
self.update() self.update()
def drop_find(self): def drop_find(self):
self.org_point = "0.0,0.0" self.org_point = "0.0,0.0"
self.name_find_org = "" self.name_find_org = ""
self.postal_code = ""
self.label_2.setText(self.name_find_org)
self.update()
def hide_postal_code_move(self, checked):
if checked:
self.hide_postal_code = True
self.label_2.setText(self.name_find_org + " : " + self.postal_code)
else:
self.hide_postal_code = False
self.label_2.setText(self.name_find_org) self.label_2.setText(self.name_find_org)
self.update() self.update()
+13
View File
@@ -118,6 +118,19 @@
<string/> <string/>
</property> </property>
</widget> </widget>
<widget class="QCheckBox" name="checkBox">
<property name="geometry">
<rect>
<x>610</x>
<y>160</y>
<width>191</width>
<height>25</height>
</rect>
</property>
<property name="text">
<string>Почтовый индекс</string>
</property>
</widget>
</widget> </widget>
</widget> </widget>
<resources/> <resources/>