Merge branch 'fronkdev' into 'master'

Added RW/HW to AddressDB Api search/find functions

See merge request fronk/thetool!72

application/AddressDB/AddressDB.php

@@ -27,6 +27,8 @@ class AddressDB {
     `Hausnummer`.`hausnummer` AS `hausnummer`,
     `Hausnummer`.`extref` AS `hausnummer_extref`,
     `Hausnummer`.`unit_count` AS `unit_count`,
+    `Hausnummer`.`rw` AS `rw`,
+    `Hausnummer`.`hw` AS `hw`,
     `Hausnummer`.`gps_lat` AS `gps_lat`,
     `Hausnummer`.`gps_long` AS `gps_long`,
     `Hausnummer`.`grund_nr` AS `grund_nr`,

application/Api/v1/AddressdbApicontroller.php

@@ -709,6 +709,8 @@ class AddressdbApicontroller extends mfBaseApicontroller {
               'street' => $data->strasse,
               'housenumber' => $housenumber,
               'lot_number' => $data->grund_nr,
+              'rw' => $data->rw,
+              'hw' => $data->hw,
               'building_unit_count' => 0,
               'gps_lat' => ($data->gps_lat) ? (float)$data->gps_lat : null,
               'gps_long' => ($data->gps_long) ? (float)$data->gps_long : null,
@@ -777,6 +779,8 @@ class AddressdbApicontroller extends mfBaseApicontroller {
               }
               $new_address['district'] = $ta['district'];
               $new_address['lot_number'] = $ta['lot_number'];
+              $new_address['rw'] = $ta['rw'];
+              $new_address['hw'] = $ta['hw'];
               $new_address['building_unit_count'] = $ta['building_unit_count'];
               $new_address['num'] = $u['num'];
               $new_address['block'] = $u['block'];

public/docs/preorder-api.yaml

@@ -799,6 +799,14 @@ components:
           type: string
           description: Grundstücksnummer
           example: 123/7
+        rw:
+          type: string
+          description: Rechtswert der Zugangskoordinate
+          example: "58876.54"
+        hw:
+          type: string
+          description: Hochwert der Zugangskoordinate
+          example: "262389.89"
         building_unit_count:
           type: int64
           description: Anzahl Wohneinheiten im Gebäude
@@ -907,6 +915,14 @@ components:
           type: string
           description: Grundstücksnummer
           example: 123/7
+        rw:
+          type: string
+          description: Rechtswert der Zugangskoordinate
+          example: "58876.54"
+        hw:
+          type: string
+          description: Hochwert der Zugangskoordinate
+          example: "262389.89"
         building_unit_count:
           type: int64
           description: Anzahl Wohneinheiten im Gebäude