Skip to content

Add base_address field to AIS output and precursor database tables #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mbjackson-capp wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add base_address field to AIS output and precursor database tables #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df1aca7
add base address to AddressJsonSerializer output take numero uno
mbjackson-capp Aug 28, 2025
f40d9b6
fully add a base_address class attribute to Address and AddressSummar…
mbjackson-capp Aug 28, 2025
1f0cf3c
make sure base_address is carried into precursor tables
mbjackson-capp Aug 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ais/api/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,7 @@ def model_to_data(self, address):
('match_type', match_type if match_type else None),
('properties', OrderedDict([
('street_address', address.street_address),
('base_address', address.base_address),
('address_low', address.address_low),
('address_low_suffix', address.address_low_suffix),
('address_low_frac', address.address_low_frac),
Expand Down
4 changes: 3 additions & 1 deletion ais/engine/scripts/load_dor_condos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ def main():
# Read DOR Parcel rows from engine db
print("Reading parcels...")
dor_parcel_read_stmt = '''
select parcel_id, street_address, address_low, address_low_suffix, address_low_frac, address_high, street_predir,
select parcel_id, street_address,
base_address,
address_low, address_low_suffix, address_low_frac, address_high, street_predir,
street_name, street_suffix, street_postdir, street_full from {dor_parcel_table}
'''.format(dor_parcel_table='dor_parcel')
engine_dor_parcel_rows = etl.fromdb(pg_db, dor_parcel_read_stmt)
Expand Down
1 change: 1 addition & 0 deletions ais/engine/scripts/load_ng911_address_points.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ def main():
'unit_num': comps['address_unit']['unit_num'] or '',
'unit_type': comps['address_unit']['unit_type'] or '',
'street_address': street_address,
'base_address': comps['base_address'],
}
address_points.append(address_point)

Expand Down
1 change: 1 addition & 0 deletions ais/engine/scripts/load_opa_properties.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ def main():
'unit_num': comps['address_unit']['unit_num'] or '',
'unit_type': comps['address_unit']['unit_type'] or '',
'street_address': street_address,
'base_address': comps['base_address']
}
props.append(prop)

Expand Down
13 changes: 9 additions & 4 deletions ais/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ class PwdParcel(db.Model):
id = db.Column(db.Integer, primary_key=True)
parcel_id = db.Column(db.Integer, index=True)
street_address = db.Column(db.Text)
base_address = db.Column(db.Text)
address_low = db.Column(db.Integer)
address_low_suffix = db.Column(db.Text)
address_low_frac = db.Column(db.Text)
Expand All @@ -143,6 +144,7 @@ class DorParcel(db.Model):
id = db.Column(db.Integer, primary_key=True)
parcel_id = db.Column(db.Text, index=True)
street_address = db.Column(db.Text)
base_address = db.Column(db.Text)
address_low = db.Column(db.Integer)
address_low_suffix = db.Column(db.Text)
address_low_frac = db.Column(db.Text)
Expand All @@ -167,6 +169,7 @@ class DorCondominium(db.Model):
id = db.Column(db.Integer, primary_key=True)
parcel_id = db.Column(db.Text, index=True)
street_address = db.Column(db.Text)
base_address = db.Column(db.Text)
address_low = db.Column(db.Integer)
address_low_suffix = db.Column(db.Text)
address_low_frac = db.Column(db.Text)
Expand All @@ -188,6 +191,7 @@ class OpaProperty(db.Model):
id = db.Column(db.Integer, primary_key=True)
account_num = db.Column(db.Text, index=True)
street_address = db.Column(db.Text)
base_address = db.Column(db.Text)
address_low = db.Column(db.Integer)
address_low_suffix = db.Column(db.Text)
address_low_frac = db.Column(db.Text)
Expand All @@ -211,6 +215,7 @@ class OpaProperty(db.Model):
class NG911AddressPoint(db.Model):
id = db.Column(db.Integer, primary_key=True)
street_address = db.Column(db.Text)
base_address = db.Column(db.Text)
address_low = db.Column(db.Integer)
address_low_suffix = db.Column(db.Text)
address_low_frac = db.Column(db.Text)
Expand All @@ -233,6 +238,7 @@ class NG911AddressPoint(db.Model):
#############

ADDRESS_FIELDS = [
'base_address',
'address_low',
'address_low_suffix',
'address_low_frac',
Expand Down Expand Up @@ -278,6 +284,7 @@ class Address(db.Model):

id = db.Column(db.Integer, primary_key=True)
street_address = db.Column(db.Text)
base_address = db.Column(db.Text)
address_low = db.Column(db.Integer)
address_low_suffix = db.Column(db.Text)
address_low_frac = db.Column(db.Text)
Expand Down Expand Up @@ -354,6 +361,7 @@ def __init__(self, *args, **kwargs):
raise ValueError('Invalid range address')

kwargs = {
'base_address': c['base_address'],
'address_low': c['address']['low_num'],
'address_low_suffix': c['address']['addr_suffix'], # passyunk change
'address_low_frac': c['address']['fractional'], # passyunk change
Expand Down Expand Up @@ -460,10 +468,6 @@ def address_full_num(self):
num += '-' + str(address_high)[-2:]
return num

@property
def base_address(self):
return ' '.join([self.address_full, self.street_full])

@property
def base_address_no_suffix(self):
return '{} {}'.format(self.address_full_num, self.street_full)
Expand Down Expand Up @@ -1196,6 +1200,7 @@ class AddressSummary(db.Model):

id = db.Column(db.Integer, primary_key=True)
street_address = db.Column(db.Text, unique=True)
base_address = db.Column(db.Text)
address_low = db.Column(db.Integer)
address_low_suffix = db.Column(db.Text)
address_low_frac = db.Column(db.Text)
Expand Down