diff --git a/application/Api/v1/AddressdbApicontroller.php b/application/Api/v1/AddressdbApicontroller.php index a0fd5353a..9cec22a8c 100644 --- a/application/Api/v1/AddressdbApicontroller.php +++ b/application/Api/v1/AddressdbApicontroller.php @@ -350,7 +350,7 @@ class AddressdbApicontroller extends mfBaseApicontroller { $address_key = $data->hausnummer_id."-".$data->zusatz; } //$sort_key = $data->plz." ".$data->gemeinde." ".$data->ortschaft." ".$data->strasse." ".$data->hausnummer." ".$data->zusatz; - $sort_key = $data->plz." ".$data->gemeinde." ".$data->strasse." ".$data->hausnummer." ".$data->zusatz; + $sort_key = $data->plz." ".$data->gemeinde." ".$data->ortschaft." ".$data->strasse." ".$data->hausnummer." ".$data->zusatz; if(!array_key_exists($address_key, $tmp_addresses)) { // get allowed preorderTypes @@ -410,9 +410,10 @@ class AddressdbApicontroller extends mfBaseApicontroller { 'zusatz' => $data->zusatz, ]; $tmp_addresses[$address_key]['building_unit_count']++; - + //if($data->hausnummer_oaid == "AT-8940-30400d5c") var_dump($data); } - + //exit; + //var_dump($tmp_addresses);exit; // sort found addresses by count of found keywords // if there is an int we don't want to show more than one street $sorted_addresses = []; @@ -422,7 +423,7 @@ class AddressdbApicontroller extends mfBaseApicontroller { $count_parts = 0; $uniq_parts_count = 0; $uniq_parts_found = []; - /*if($temp_add['oaid'] == "AT-8951-1592d361") { + /*if($temp_add['oaid'] == "AT-8940-30400d5c") { var_dump($temp_add); }*/ foreach($search_parts as $p) { @@ -451,8 +452,14 @@ class AddressdbApicontroller extends mfBaseApicontroller { } unset($temp_add['sort_key']); - //echo $address['text']." $p $count
\n"; + //echo "$p $count
\n"; if($includes_int && (($count + 1) - count($search_parts) ) < 1) { + + /*if($temp_add['oaid'] == "AT-8940-30400d5c") { + echo $temp_add['sort_key']." - count $count; count(search_parts) ".count($search_parts); + //echo "blah";exit; + exit; + }*/ continue; } @@ -463,7 +470,7 @@ class AddressdbApicontroller extends mfBaseApicontroller { } //var_dump($count);exit; //var_dump($uniq_parts_count, $uniq_parts_found);exit; - if($uniq_parts_count == count($uniq_parts_found)) { + if($uniq_parts_count <= count($uniq_parts_found)) { if(!array_key_exists($count, $sorted_addresses)) { $sorted_addresses[$count] = []; } diff --git a/scripts/addressdb/liezen/03-create_thetool_preorder_campaigns.php b/scripts/addressdb/liezen/03-create_thetool_preorder_campaigns.php index 5aafd8a8b..324becd76 100644 --- a/scripts/addressdb/liezen/03-create_thetool_preorder_campaigns.php +++ b/scripts/addressdb/liezen/03-create_thetool_preorder_campaigns.php @@ -41,7 +41,7 @@ foreach(NetworkModel::search(['name%' => 'RML Liezen%']) as $network) { 'from' => 1673305200 , 'to' => 1988150399, 'required_preorder_fields' => json_encode(["contact_type"]), - 'district_is_city' => 0, + 'district_is_city' => 1, 'exist_is_error' => 1, 'require_connectiontype' => 1, 'allow_unit_update' => 1,