Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 20 additions & 2 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,6 +62,12 @@ You can search addresses using either the `find` method for a single address or
The following optional attributes can be requested to be included in the response:

- `coordinates`: Includes latitude and longitude of the address.
- `district`: Includes the official and name of the district that the address belongs to.
- `function`: Includes the function of the address (e.g. residential, commercial, healthcare, etc.).
- `location_status`: Includes the location status of the address (e.g. active, in development, etc.).
- `property_status`: Includes the property status of the address (e.g. in use, under construction, etc.).
- `surface_area`: Includes the surface area of the property in square meters.
- `construction_year`: Includes the construction year of the property.

#### Single Address

Expand All@@ -80,7 +86,9 @@ $address = $client->find(
postcode: '1118BN',
number: 800,
addition: null,
attributes: ['coordinates'],
attributes: [
AddressAttributesEnum::COORDINATES,
],
);
```

Expand All@@ -98,7 +106,16 @@ Address {
coordinates: Coordinates {
latitude: 52.30528553688755,
longitude: 4.750645160863609
}
},
district: District {
official: "Schiphol",
name: "Schiphol"
},
function: "kantoorfunctie",
location_status: "verblijfsobject in gebruik",
property_status: "pand in gebruik",
surface_area: 10398.0,
construction_year: 2019
}
```

Expand DownExpand Up@@ -140,6 +157,7 @@ AddressCollection {
province: "Noord-Holland",
country: "Nederland",
coordinates: Coordinates { ... }
...
},
Address {
postcode: "1015CN",
Expand Down
6 changes: 6 additions & 0 deletions src/DTO/Address.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,5 +14,11 @@ public function __construct(
public readonly string $province,
public readonly string $country,
public readonly ?Coordinates $coordinates,
public readonly ?District $district,
public readonly ?string $function,
public readonly ?string $location_status,
public readonly ?string $property_status,
public readonly ?float $surface_area,
public readonly ?int $construction_year,
) {}
}
11 changes: 11 additions & 0 deletions src/DTO/District.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
<?php

namespace Label84\NederlandPostcode\DTO;

class District
{
public function __construct(
public readonly string $official,
public readonly string $name,
) {}
}
6 changes: 6 additions & 0 deletions src/Enums/AddressAttributesEnum.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,4 +5,10 @@
enum AddressAttributesEnum: string
{
case COORDINATES = 'coordinates';
case DISTRICT = 'district';
case FUNCTION = 'function';
case LOCATION_STATUS = 'location_status';
case PROPERTY_STATUS = 'property_status';
case SURFACE_AREA = 'surface_area';
case CONSTRUCTION_YEAR = 'construction_year';
}
65 changes: 31 additions & 34 deletions src/Factories/AddressCollectionFactory.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,48 +2,45 @@

namespace Label84\NederlandPostcode\Factories;

use Label84\NederlandPostcode\DTO\Address;
use Label84\NederlandPostcode\DTO\AddressCollection;
use Label84\NederlandPostcode\DTO\Coordinates;

class AddressCollectionFactory
{
/**
* @param array{data: array<array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* municipality: string,
* province: string,
* country: string,
* coordinates?: array{
* latitude: float,
* longitude: float,
* },
* }>} $response
* @param array{
* data: array<array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* municipality: string,
* province: string,
* country: string,
* coordinates?: array{
* latitude: float,
* longitude: float,
* },
* details?: array{
* district?: array{
* official: string,
* name: string,
* },
* function?: string,
* location_status?: string,
* property_status?: string,
* surface_area?: float,
* construction_year?: int,
* }
* }>
* } $response
*/
public static function make(array $response): AddressCollection
{
$addresses = array_map(function (array $attributes) {
return new Address(
postcode: $attributes['postcode'],
number: $attributes['number'],
addition: $attributes['addition'] ?? null,
street: $attributes['street'],
city: $attributes['city'],
municipality: $attributes['municipality'],
province: $attributes['province'],
country: $attributes['country'],
coordinates: isset($attributes['coordinates']) ? new Coordinates(
latitude: $attributes['coordinates']['latitude'],
longitude: $attributes['coordinates']['longitude'],
) : null,
);
}, $response['data']);

$addresses = array_values($addresses);
$addresses = array_map(
fn(array $attributes) => AddressFactory::make($attributes),
$response['data'],
);

return new AddressCollection($addresses);
}
Expand Down
64 changes: 64 additions & 0 deletions src/Factories/AddressFactory.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
<?php

namespace Label84\NederlandPostcode\Factories;

use Label84\NederlandPostcode\DTO\Address;
use Label84\NederlandPostcode\DTO\Coordinates;
use Label84\NederlandPostcode\DTO\District;

class AddressFactory
{
/**
* @param array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* municipality: string,
* province: string,
* country: string,
* coordinates?: array{
* latitude: float,
* longitude: float,
* },
* details?: array{
* district?: array{
* official: string,
* name: string,
* },
* function?: string,
* location_status?: string,
* property_status?: string,
* surface_area?: float,
* construction_year?: int,
* }
* } $attributes
*/
public static function make(array $attributes): Address
{
return new Address(
postcode: $attributes['postcode'],
number: $attributes['number'],
addition: $attributes['addition'] ?? null,
street: $attributes['street'],
city: $attributes['city'],
municipality: $attributes['municipality'],
province: $attributes['province'],
country: $attributes['country'],
coordinates: isset($attributes['coordinates']) ? new Coordinates(
latitude: $attributes['coordinates']['latitude'],
longitude: $attributes['coordinates']['longitude'],
) : null,
district: isset($attributes['details']['district']) ? new District(
official: $attributes['details']['district']['official'],
name: $attributes['details']['district']['name'],
) : null,
function: $attributes['details']['function'] ?? null,
location_status: $attributes['details']['location_status'] ?? null,
property_status: $attributes['details']['property_status'] ?? null,
surface_area: $attributes['details']['surface_area'] ?? null,
construction_year: $attributes['details']['construction_year'] ?? null,
);
}
}
75 changes: 31 additions & 44 deletions src/Factories/EnergyLabelCollectionFactory.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,59 +2,46 @@

namespace Label84\NederlandPostcode\Factories;

use DateTime;
use Label84\NederlandPostcode\DTO\EnergyLabel;
use Label84\NederlandPostcode\DTO\EnergyLabelCollection;

class EnergyLabelCollectionFactory
{
/**
* @param array{data: array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* energy_labels: array<array{
* inspection_date: string,
* valid_until_date: string,
* construction_type: string,
* building_type: string|null,
* energy_label: string,
* max_energy_demand: float,
* max_fossil_energy_demand: float,
* min_renewable_share: float,
* }>,
* }} $response
* @param array{
* data: array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* energy_labels: array<array{
* inspection_date: string,
* valid_until_date: string,
* construction_type: string,
* building_type: string|null,
* energy_label: string,
* max_energy_demand: float,
* max_fossil_energy_demand: float,
* min_renewable_share: float,
* }>
* }
* } $response
*/
public static function make(array $response): EnergyLabelCollection
{
$postcode = $response['data']['postcode'];
$number = $response['data']['number'];
$addition = $response['data']['addition'] ?? null;
$street = $response['data']['street'];
$city = $response['data']['city'];
$shared = [
'postcode' => $response['data']['postcode'],
'number' => $response['data']['number'],
'addition' => $response['data']['addition'] ?? null,
'street' => $response['data']['street'],
'city' => $response['data']['city'],
];

$energyLabels = array_map(function (array $attributes) use ($postcode, $number, $addition, $street, $city) {
return new EnergyLabel(
postcode: $postcode,
number: $number,
addition: $addition,
street: $street,
city: $city,
inspectionDate: new DateTime($attributes['inspection_date']),
validUntilDate: new DateTime($attributes['valid_until_date']),
constructionType: $attributes['construction_type'],
buildingType: $attributes['building_type'],
energyLabel: $attributes['energy_label'],
maxEnergyDemand: $attributes['max_energy_demand'],
maxFossilEnergyDemand: $attributes['max_fossil_energy_demand'],
minRenewableShare: $attributes['min_renewable_share'],
);
}, $response['data']['energy_labels']);
$energyLabels = array_map(
fn(array $attributes) => EnergyLabelFactory::make(array_merge($shared, $attributes)),
$response['data']['energy_labels'],
);

$energyLabels = array_values($energyLabels);

return new EnergyLabelCollection($energyLabels);
return new EnergyLabelCollection(array_values($energyLabels));
}
}
45 changes: 45 additions & 0 deletions src/Factories/EnergyLabelFactory.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
<?php

namespace Label84\NederlandPostcode\Factories;

use DateTime;
use Label84\NederlandPostcode\DTO\EnergyLabel;

class EnergyLabelFactory
{
/**
* @param array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* inspection_date: string,
* valid_until_date: string,
* construction_type: string,
* building_type: string|null,
* energy_label: string,
* max_energy_demand: float,
* max_fossil_energy_demand: float,
* min_renewable_share: float,
* } $attributes
*/
public static function make(array $attributes): EnergyLabel
{
return new EnergyLabel(
postcode: $attributes['postcode'],
number: $attributes['number'],
addition: $attributes['addition'] ?? null,
street: $attributes['street'],
city: $attributes['city'],
inspectionDate: new DateTime($attributes['inspection_date']),
validUntilDate: new DateTime($attributes['valid_until_date']),
constructionType: $attributes['construction_type'],
buildingType: $attributes['building_type'],
energyLabel: $attributes['energy_label'],
maxEnergyDemand: $attributes['max_energy_demand'],
maxFossilEnergyDemand: $attributes['max_fossil_energy_demand'],
minRenewableShare: $attributes['min_renewable_share'],
);
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 20 additions & 2 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,6 +62,12 @@ You can search addresses using either the `find` method for a single address or
The following optional attributes can be requested to be included in the response:

- `coordinates`: Includes latitude and longitude of the address.
- `district`: Includes the official and name of the district that the address belongs to.
- `function`: Includes the function of the address (e.g. residential, commercial, healthcare, etc.).
- `location_status`: Includes the location status of the address (e.g. active, in development, etc.).
- `property_status`: Includes the property status of the address (e.g. in use, under construction, etc.).
- `surface_area`: Includes the surface area of the property in square meters.
- `construction_year`: Includes the construction year of the property.

#### Single Address

Expand All@@ -80,7 +86,9 @@ $address = $client->find(
postcode: '1118BN',
number: 800,
addition: null,
attributes: ['coordinates'],
attributes: [
AddressAttributesEnum::COORDINATES,
],
);
```

Expand All@@ -98,7 +106,16 @@ Address {
coordinates: Coordinates {
latitude: 52.30528553688755,
longitude: 4.750645160863609
}
},
district: District {
official: "Schiphol",
name: "Schiphol"
},
function: "kantoorfunctie",
location_status: "verblijfsobject in gebruik",
property_status: "pand in gebruik",
surface_area: 10398.0,
construction_year: 2019
}
```

Expand DownExpand Up@@ -140,6 +157,7 @@ AddressCollection {
province: "Noord-Holland",
country: "Nederland",
coordinates: Coordinates { ... }
...
},
Address {
postcode: "1015CN",
Expand Down
6 changes: 6 additions & 0 deletions src/DTO/Address.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,5 +14,11 @@ public function __construct(
public readonly string $province,
public readonly string $country,
public readonly ?Coordinates $coordinates,
public readonly ?District $district,
public readonly ?string $function,
public readonly ?string $location_status,
public readonly ?string $property_status,
public readonly ?float $surface_area,
public readonly ?int $construction_year,
) {}
}
11 changes: 11 additions & 0 deletions src/DTO/District.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
<?php

namespace Label84\NederlandPostcode\DTO;

class District
{
public function __construct(
public readonly string $official,
public readonly string $name,
) {}
}
6 changes: 6 additions & 0 deletions src/Enums/AddressAttributesEnum.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,4 +5,10 @@
enum AddressAttributesEnum: string
{
case COORDINATES = 'coordinates';
case DISTRICT = 'district';
case FUNCTION = 'function';
case LOCATION_STATUS = 'location_status';
case PROPERTY_STATUS = 'property_status';
case SURFACE_AREA = 'surface_area';
case CONSTRUCTION_YEAR = 'construction_year';
}
65 changes: 31 additions & 34 deletions src/Factories/AddressCollectionFactory.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,48 +2,45 @@

namespace Label84\NederlandPostcode\Factories;

use Label84\NederlandPostcode\DTO\Address;
use Label84\NederlandPostcode\DTO\AddressCollection;
use Label84\NederlandPostcode\DTO\Coordinates;

class AddressCollectionFactory
{
/**
* @param array{data: array<array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* municipality: string,
* province: string,
* country: string,
* coordinates?: array{
* latitude: float,
* longitude: float,
* },
* }>} $response
* @param array{
* data: array<array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* municipality: string,
* province: string,
* country: string,
* coordinates?: array{
* latitude: float,
* longitude: float,
* },
* details?: array{
* district?: array{
* official: string,
* name: string,
* },
* function?: string,
* location_status?: string,
* property_status?: string,
* surface_area?: float,
* construction_year?: int,
* }
* }>
* } $response
*/
public static function make(array $response): AddressCollection
{
$addresses = array_map(function (array $attributes) {
return new Address(
postcode: $attributes['postcode'],
number: $attributes['number'],
addition: $attributes['addition'] ?? null,
street: $attributes['street'],
city: $attributes['city'],
municipality: $attributes['municipality'],
province: $attributes['province'],
country: $attributes['country'],
coordinates: isset($attributes['coordinates']) ? new Coordinates(
latitude: $attributes['coordinates']['latitude'],
longitude: $attributes['coordinates']['longitude'],
) : null,
);
}, $response['data']);

$addresses = array_values($addresses);
$addresses = array_map(
fn(array $attributes) => AddressFactory::make($attributes),
$response['data'],
);

return new AddressCollection($addresses);
}
Expand Down
64 changes: 64 additions & 0 deletions src/Factories/AddressFactory.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
<?php

namespace Label84\NederlandPostcode\Factories;

use Label84\NederlandPostcode\DTO\Address;
use Label84\NederlandPostcode\DTO\Coordinates;
use Label84\NederlandPostcode\DTO\District;

class AddressFactory
{
/**
* @param array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* municipality: string,
* province: string,
* country: string,
* coordinates?: array{
* latitude: float,
* longitude: float,
* },
* details?: array{
* district?: array{
* official: string,
* name: string,
* },
* function?: string,
* location_status?: string,
* property_status?: string,
* surface_area?: float,
* construction_year?: int,
* }
* } $attributes
*/
public static function make(array $attributes): Address
{
return new Address(
postcode: $attributes['postcode'],
number: $attributes['number'],
addition: $attributes['addition'] ?? null,
street: $attributes['street'],
city: $attributes['city'],
municipality: $attributes['municipality'],
province: $attributes['province'],
country: $attributes['country'],
coordinates: isset($attributes['coordinates']) ? new Coordinates(
latitude: $attributes['coordinates']['latitude'],
longitude: $attributes['coordinates']['longitude'],
) : null,
district: isset($attributes['details']['district']) ? new District(
official: $attributes['details']['district']['official'],
name: $attributes['details']['district']['name'],
) : null,
function: $attributes['details']['function'] ?? null,
location_status: $attributes['details']['location_status'] ?? null,
property_status: $attributes['details']['property_status'] ?? null,
surface_area: $attributes['details']['surface_area'] ?? null,
construction_year: $attributes['details']['construction_year'] ?? null,
);
}
}
75 changes: 31 additions & 44 deletions src/Factories/EnergyLabelCollectionFactory.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,59 +2,46 @@

namespace Label84\NederlandPostcode\Factories;

use DateTime;
use Label84\NederlandPostcode\DTO\EnergyLabel;
use Label84\NederlandPostcode\DTO\EnergyLabelCollection;

class EnergyLabelCollectionFactory
{
/**
* @param array{data: array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* energy_labels: array<array{
* inspection_date: string,
* valid_until_date: string,
* construction_type: string,
* building_type: string|null,
* energy_label: string,
* max_energy_demand: float,
* max_fossil_energy_demand: float,
* min_renewable_share: float,
* }>,
* }} $response
* @param array{
* data: array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* energy_labels: array<array{
* inspection_date: string,
* valid_until_date: string,
* construction_type: string,
* building_type: string|null,
* energy_label: string,
* max_energy_demand: float,
* max_fossil_energy_demand: float,
* min_renewable_share: float,
* }>
* }
* } $response
*/
public static function make(array $response): EnergyLabelCollection
{
$postcode = $response['data']['postcode'];
$number = $response['data']['number'];
$addition = $response['data']['addition'] ?? null;
$street = $response['data']['street'];
$city = $response['data']['city'];
$shared = [
'postcode' => $response['data']['postcode'],
'number' => $response['data']['number'],
'addition' => $response['data']['addition'] ?? null,
'street' => $response['data']['street'],
'city' => $response['data']['city'],
];

$energyLabels = array_map(function (array $attributes) use ($postcode, $number, $addition, $street, $city) {
return new EnergyLabel(
postcode: $postcode,
number: $number,
addition: $addition,
street: $street,
city: $city,
inspectionDate: new DateTime($attributes['inspection_date']),
validUntilDate: new DateTime($attributes['valid_until_date']),
constructionType: $attributes['construction_type'],
buildingType: $attributes['building_type'],
energyLabel: $attributes['energy_label'],
maxEnergyDemand: $attributes['max_energy_demand'],
maxFossilEnergyDemand: $attributes['max_fossil_energy_demand'],
minRenewableShare: $attributes['min_renewable_share'],
);
}, $response['data']['energy_labels']);
$energyLabels = array_map(
fn(array $attributes) => EnergyLabelFactory::make(array_merge($shared, $attributes)),
$response['data']['energy_labels'],
);

$energyLabels = array_values($energyLabels);

return new EnergyLabelCollection($energyLabels);
return new EnergyLabelCollection(array_values($energyLabels));
}
}
45 changes: 45 additions & 0 deletions src/Factories/EnergyLabelFactory.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
<?php

namespace Label84\NederlandPostcode\Factories;

use DateTime;
use Label84\NederlandPostcode\DTO\EnergyLabel;

class EnergyLabelFactory
{
/**
* @param array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* inspection_date: string,
* valid_until_date: string,
* construction_type: string,
* building_type: string|null,
* energy_label: string,
* max_energy_demand: float,
* max_fossil_energy_demand: float,
* min_renewable_share: float,
* } $attributes
*/
public static function make(array $attributes): EnergyLabel
{
return new EnergyLabel(
postcode: $attributes['postcode'],
number: $attributes['number'],
addition: $attributes['addition'] ?? null,
street: $attributes['street'],
city: $attributes['city'],
inspectionDate: new DateTime($attributes['inspection_date']),
validUntilDate: new DateTime($attributes['valid_until_date']),
constructionType: $attributes['construction_type'],
buildingType: $attributes['building_type'],
energyLabel: $attributes['energy_label'],
maxEnergyDemand: $attributes['max_energy_demand'],
maxFossilEnergyDemand: $attributes['max_fossil_energy_demand'],
minRenewableShare: $attributes['min_renewable_share'],
);
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 20 additions & 2 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,6 +62,12 @@ You can search addresses using either the `find` method for a single address or
The following optional attributes can be requested to be included in the response:

- `coordinates`: Includes latitude and longitude of the address.
- `district`: Includes the official and name of the district that the address belongs to.
- `function`: Includes the function of the address (e.g. residential, commercial, healthcare, etc.).
- `location_status`: Includes the location status of the address (e.g. active, in development, etc.).
- `property_status`: Includes the property status of the address (e.g. in use, under construction, etc.).
- `surface_area`: Includes the surface area of the property in square meters.
- `construction_year`: Includes the construction year of the property.

#### Single Address

Expand All@@ -80,7 +86,9 @@ $address = $client->find(
postcode: '1118BN',
number: 800,
addition: null,
attributes: ['coordinates'],
attributes: [
AddressAttributesEnum::COORDINATES,
],
);
```

Expand All@@ -98,7 +106,16 @@ Address {
coordinates: Coordinates {
latitude: 52.30528553688755,
longitude: 4.750645160863609
}
},
district: District {
official: "Schiphol",
name: "Schiphol"
},
function: "kantoorfunctie",
location_status: "verblijfsobject in gebruik",
property_status: "pand in gebruik",
surface_area: 10398.0,
construction_year: 2019
}
```

Expand DownExpand Up@@ -140,6 +157,7 @@ AddressCollection {
province: "Noord-Holland",
country: "Nederland",
coordinates: Coordinates { ... }
...
},
Address {
postcode: "1015CN",
Expand Down
6 changes: 6 additions & 0 deletions src/DTO/Address.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,5 +14,11 @@ public function __construct(
public readonly string $province,
public readonly string $country,
public readonly ?Coordinates $coordinates,
public readonly ?District $district,
public readonly ?string $function,
public readonly ?string $location_status,
public readonly ?string $property_status,
public readonly ?float $surface_area,
public readonly ?int $construction_year,
) {}
}
11 changes: 11 additions & 0 deletions src/DTO/District.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
<?php

namespace Label84\NederlandPostcode\DTO;

class District
{
public function __construct(
public readonly string $official,
public readonly string $name,
) {}
}
6 changes: 6 additions & 0 deletions src/Enums/AddressAttributesEnum.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,4 +5,10 @@
enum AddressAttributesEnum: string
{
case COORDINATES = 'coordinates';
case DISTRICT = 'district';
case FUNCTION = 'function';
case LOCATION_STATUS = 'location_status';
case PROPERTY_STATUS = 'property_status';
case SURFACE_AREA = 'surface_area';
case CONSTRUCTION_YEAR = 'construction_year';
}
65 changes: 31 additions & 34 deletions src/Factories/AddressCollectionFactory.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,48 +2,45 @@

namespace Label84\NederlandPostcode\Factories;

use Label84\NederlandPostcode\DTO\Address;
use Label84\NederlandPostcode\DTO\AddressCollection;
use Label84\NederlandPostcode\DTO\Coordinates;

class AddressCollectionFactory
{
/**
* @param array{data: array<array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* municipality: string,
* province: string,
* country: string,
* coordinates?: array{
* latitude: float,
* longitude: float,
* },
* }>} $response
* @param array{
* data: array<array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* municipality: string,
* province: string,
* country: string,
* coordinates?: array{
* latitude: float,
* longitude: float,
* },
* details?: array{
* district?: array{
* official: string,
* name: string,
* },
* function?: string,
* location_status?: string,
* property_status?: string,
* surface_area?: float,
* construction_year?: int,
* }
* }>
* } $response
*/
public static function make(array $response): AddressCollection
{
$addresses = array_map(function (array $attributes) {
return new Address(
postcode: $attributes['postcode'],
number: $attributes['number'],
addition: $attributes['addition'] ?? null,
street: $attributes['street'],
city: $attributes['city'],
municipality: $attributes['municipality'],
province: $attributes['province'],
country: $attributes['country'],
coordinates: isset($attributes['coordinates']) ? new Coordinates(
latitude: $attributes['coordinates']['latitude'],
longitude: $attributes['coordinates']['longitude'],
) : null,
);
}, $response['data']);

$addresses = array_values($addresses);
$addresses = array_map(
fn(array $attributes) => AddressFactory::make($attributes),
$response['data'],
);

return new AddressCollection($addresses);
}
Expand Down
64 changes: 64 additions & 0 deletions src/Factories/AddressFactory.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
<?php

namespace Label84\NederlandPostcode\Factories;

use Label84\NederlandPostcode\DTO\Address;
use Label84\NederlandPostcode\DTO\Coordinates;
use Label84\NederlandPostcode\DTO\District;

class AddressFactory
{
/**
* @param array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* municipality: string,
* province: string,
* country: string,
* coordinates?: array{
* latitude: float,
* longitude: float,
* },
* details?: array{
* district?: array{
* official: string,
* name: string,
* },
* function?: string,
* location_status?: string,
* property_status?: string,
* surface_area?: float,
* construction_year?: int,
* }
* } $attributes
*/
public static function make(array $attributes): Address
{
return new Address(
postcode: $attributes['postcode'],
number: $attributes['number'],
addition: $attributes['addition'] ?? null,
street: $attributes['street'],
city: $attributes['city'],
municipality: $attributes['municipality'],
province: $attributes['province'],
country: $attributes['country'],
coordinates: isset($attributes['coordinates']) ? new Coordinates(
latitude: $attributes['coordinates']['latitude'],
longitude: $attributes['coordinates']['longitude'],
) : null,
district: isset($attributes['details']['district']) ? new District(
official: $attributes['details']['district']['official'],
name: $attributes['details']['district']['name'],
) : null,
function: $attributes['details']['function'] ?? null,
location_status: $attributes['details']['location_status'] ?? null,
property_status: $attributes['details']['property_status'] ?? null,
surface_area: $attributes['details']['surface_area'] ?? null,
construction_year: $attributes['details']['construction_year'] ?? null,
);
}
}
75 changes: 31 additions & 44 deletions src/Factories/EnergyLabelCollectionFactory.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,59 +2,46 @@

namespace Label84\NederlandPostcode\Factories;

use DateTime;
use Label84\NederlandPostcode\DTO\EnergyLabel;
use Label84\NederlandPostcode\DTO\EnergyLabelCollection;

class EnergyLabelCollectionFactory
{
/**
* @param array{data: array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* energy_labels: array<array{
* inspection_date: string,
* valid_until_date: string,
* construction_type: string,
* building_type: string|null,
* energy_label: string,
* max_energy_demand: float,
* max_fossil_energy_demand: float,
* min_renewable_share: float,
* }>,
* }} $response
* @param array{
* data: array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* energy_labels: array<array{
* inspection_date: string,
* valid_until_date: string,
* construction_type: string,
* building_type: string|null,
* energy_label: string,
* max_energy_demand: float,
* max_fossil_energy_demand: float,
* min_renewable_share: float,
* }>
* }
* } $response
*/
public static function make(array $response): EnergyLabelCollection
{
$postcode = $response['data']['postcode'];
$number = $response['data']['number'];
$addition = $response['data']['addition'] ?? null;
$street = $response['data']['street'];
$city = $response['data']['city'];
$shared = [
'postcode' => $response['data']['postcode'],
'number' => $response['data']['number'],
'addition' => $response['data']['addition'] ?? null,
'street' => $response['data']['street'],
'city' => $response['data']['city'],
];

$energyLabels = array_map(function (array $attributes) use ($postcode, $number, $addition, $street, $city) {
return new EnergyLabel(
postcode: $postcode,
number: $number,
addition: $addition,
street: $street,
city: $city,
inspectionDate: new DateTime($attributes['inspection_date']),
validUntilDate: new DateTime($attributes['valid_until_date']),
constructionType: $attributes['construction_type'],
buildingType: $attributes['building_type'],
energyLabel: $attributes['energy_label'],
maxEnergyDemand: $attributes['max_energy_demand'],
maxFossilEnergyDemand: $attributes['max_fossil_energy_demand'],
minRenewableShare: $attributes['min_renewable_share'],
);
}, $response['data']['energy_labels']);
$energyLabels = array_map(
fn(array $attributes) => EnergyLabelFactory::make(array_merge($shared, $attributes)),
$response['data']['energy_labels'],
);

$energyLabels = array_values($energyLabels);

return new EnergyLabelCollection($energyLabels);
return new EnergyLabelCollection(array_values($energyLabels));
}
}
45 changes: 45 additions & 0 deletions src/Factories/EnergyLabelFactory.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
<?php

namespace Label84\NederlandPostcode\Factories;

use DateTime;
use Label84\NederlandPostcode\DTO\EnergyLabel;

class EnergyLabelFactory
{
/**
* @param array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* inspection_date: string,
* valid_until_date: string,
* construction_type: string,
* building_type: string|null,
* energy_label: string,
* max_energy_demand: float,
* max_fossil_energy_demand: float,
* min_renewable_share: float,
* } $attributes
*/
public static function make(array $attributes): EnergyLabel
{
return new EnergyLabel(
postcode: $attributes['postcode'],
number: $attributes['number'],
addition: $attributes['addition'] ?? null,
street: $attributes['street'],
city: $attributes['city'],
inspectionDate: new DateTime($attributes['inspection_date']),
validUntilDate: new DateTime($attributes['valid_until_date']),
constructionType: $attributes['construction_type'],
buildingType: $attributes['building_type'],
energyLabel: $attributes['energy_label'],
maxEnergyDemand: $attributes['max_energy_demand'],
maxFossilEnergyDemand: $attributes['max_fossil_energy_demand'],
minRenewableShare: $attributes['min_renewable_share'],
);
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 20 additions & 2 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,6 +62,12 @@ You can search addresses using either the `find` method for a single address or
The following optional attributes can be requested to be included in the response:

- `coordinates`: Includes latitude and longitude of the address.
- `district`: Includes the official and name of the district that the address belongs to.
- `function`: Includes the function of the address (e.g. residential, commercial, healthcare, etc.).
- `location_status`: Includes the location status of the address (e.g. active, in development, etc.).
- `property_status`: Includes the property status of the address (e.g. in use, under construction, etc.).
- `surface_area`: Includes the surface area of the property in square meters.
- `construction_year`: Includes the construction year of the property.

#### Single Address

Expand All@@ -80,7 +86,9 @@ $address = $client->find(
postcode: '1118BN',
number: 800,
addition: null,
attributes: ['coordinates'],
attributes: [
AddressAttributesEnum::COORDINATES,
],
);
```

Expand All@@ -98,7 +106,16 @@ Address {
coordinates: Coordinates {
latitude: 52.30528553688755,
longitude: 4.750645160863609
}
},
district: District {
official: "Schiphol",
name: "Schiphol"
},
function: "kantoorfunctie",
location_status: "verblijfsobject in gebruik",
property_status: "pand in gebruik",
surface_area: 10398.0,
construction_year: 2019
}
```

Expand DownExpand Up@@ -140,6 +157,7 @@ AddressCollection {
province: "Noord-Holland",
country: "Nederland",
coordinates: Coordinates { ... }
...
},
Address {
postcode: "1015CN",
Expand Down
6 changes: 6 additions & 0 deletions src/DTO/Address.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,5 +14,11 @@ public function __construct(
public readonly string $province,
public readonly string $country,
public readonly ?Coordinates $coordinates,
public readonly ?District $district,
public readonly ?string $function,
public readonly ?string $location_status,
public readonly ?string $property_status,
public readonly ?float $surface_area,
public readonly ?int $construction_year,
) {}
}
11 changes: 11 additions & 0 deletions src/DTO/District.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
<?php

namespace Label84\NederlandPostcode\DTO;

class District
{
public function __construct(
public readonly string $official,
public readonly string $name,
) {}
}
6 changes: 6 additions & 0 deletions src/Enums/AddressAttributesEnum.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,4 +5,10 @@
enum AddressAttributesEnum: string
{
case COORDINATES = 'coordinates';
case DISTRICT = 'district';
case FUNCTION = 'function';
case LOCATION_STATUS = 'location_status';
case PROPERTY_STATUS = 'property_status';
case SURFACE_AREA = 'surface_area';
case CONSTRUCTION_YEAR = 'construction_year';
}
65 changes: 31 additions & 34 deletions src/Factories/AddressCollectionFactory.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,48 +2,45 @@

namespace Label84\NederlandPostcode\Factories;

use Label84\NederlandPostcode\DTO\Address;
use Label84\NederlandPostcode\DTO\AddressCollection;
use Label84\NederlandPostcode\DTO\Coordinates;

class AddressCollectionFactory
{
/**
* @param array{data: array<array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* municipality: string,
* province: string,
* country: string,
* coordinates?: array{
* latitude: float,
* longitude: float,
* },
* }>} $response
* @param array{
* data: array<array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* municipality: string,
* province: string,
* country: string,
* coordinates?: array{
* latitude: float,
* longitude: float,
* },
* details?: array{
* district?: array{
* official: string,
* name: string,
* },
* function?: string,
* location_status?: string,
* property_status?: string,
* surface_area?: float,
* construction_year?: int,
* }
* }>
* } $response
*/
public static function make(array $response): AddressCollection
{
$addresses = array_map(function (array $attributes) {
return new Address(
postcode: $attributes['postcode'],
number: $attributes['number'],
addition: $attributes['addition'] ?? null,
street: $attributes['street'],
city: $attributes['city'],
municipality: $attributes['municipality'],
province: $attributes['province'],
country: $attributes['country'],
coordinates: isset($attributes['coordinates']) ? new Coordinates(
latitude: $attributes['coordinates']['latitude'],
longitude: $attributes['coordinates']['longitude'],
) : null,
);
}, $response['data']);

$addresses = array_values($addresses);
$addresses = array_map(
fn(array $attributes) => AddressFactory::make($attributes),
$response['data'],
);

return new AddressCollection($addresses);
}
Expand Down
64 changes: 64 additions & 0 deletions src/Factories/AddressFactory.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
<?php

namespace Label84\NederlandPostcode\Factories;

use Label84\NederlandPostcode\DTO\Address;
use Label84\NederlandPostcode\DTO\Coordinates;
use Label84\NederlandPostcode\DTO\District;

class AddressFactory
{
/**
* @param array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* municipality: string,
* province: string,
* country: string,
* coordinates?: array{
* latitude: float,
* longitude: float,
* },
* details?: array{
* district?: array{
* official: string,
* name: string,
* },
* function?: string,
* location_status?: string,
* property_status?: string,
* surface_area?: float,
* construction_year?: int,
* }
* } $attributes
*/
public static function make(array $attributes): Address
{
return new Address(
postcode: $attributes['postcode'],
number: $attributes['number'],
addition: $attributes['addition'] ?? null,
street: $attributes['street'],
city: $attributes['city'],
municipality: $attributes['municipality'],
province: $attributes['province'],
country: $attributes['country'],
coordinates: isset($attributes['coordinates']) ? new Coordinates(
latitude: $attributes['coordinates']['latitude'],
longitude: $attributes['coordinates']['longitude'],
) : null,
district: isset($attributes['details']['district']) ? new District(
official: $attributes['details']['district']['official'],
name: $attributes['details']['district']['name'],
) : null,
function: $attributes['details']['function'] ?? null,
location_status: $attributes['details']['location_status'] ?? null,
property_status: $attributes['details']['property_status'] ?? null,
surface_area: $attributes['details']['surface_area'] ?? null,
construction_year: $attributes['details']['construction_year'] ?? null,
);
}
}
75 changes: 31 additions & 44 deletions src/Factories/EnergyLabelCollectionFactory.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,59 +2,46 @@

namespace Label84\NederlandPostcode\Factories;

use DateTime;
use Label84\NederlandPostcode\DTO\EnergyLabel;
use Label84\NederlandPostcode\DTO\EnergyLabelCollection;

class EnergyLabelCollectionFactory
{
/**
* @param array{data: array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* energy_labels: array<array{
* inspection_date: string,
* valid_until_date: string,
* construction_type: string,
* building_type: string|null,
* energy_label: string,
* max_energy_demand: float,
* max_fossil_energy_demand: float,
* min_renewable_share: float,
* }>,
* }} $response
* @param array{
* data: array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* energy_labels: array<array{
* inspection_date: string,
* valid_until_date: string,
* construction_type: string,
* building_type: string|null,
* energy_label: string,
* max_energy_demand: float,
* max_fossil_energy_demand: float,
* min_renewable_share: float,
* }>
* }
* } $response
*/
public static function make(array $response): EnergyLabelCollection
{
$postcode = $response['data']['postcode'];
$number = $response['data']['number'];
$addition = $response['data']['addition'] ?? null;
$street = $response['data']['street'];
$city = $response['data']['city'];
$shared = [
'postcode' => $response['data']['postcode'],
'number' => $response['data']['number'],
'addition' => $response['data']['addition'] ?? null,
'street' => $response['data']['street'],
'city' => $response['data']['city'],
];

$energyLabels = array_map(function (array $attributes) use ($postcode, $number, $addition, $street, $city) {
return new EnergyLabel(
postcode: $postcode,
number: $number,
addition: $addition,
street: $street,
city: $city,
inspectionDate: new DateTime($attributes['inspection_date']),
validUntilDate: new DateTime($attributes['valid_until_date']),
constructionType: $attributes['construction_type'],
buildingType: $attributes['building_type'],
energyLabel: $attributes['energy_label'],
maxEnergyDemand: $attributes['max_energy_demand'],
maxFossilEnergyDemand: $attributes['max_fossil_energy_demand'],
minRenewableShare: $attributes['min_renewable_share'],
);
}, $response['data']['energy_labels']);
$energyLabels = array_map(
fn(array $attributes) => EnergyLabelFactory::make(array_merge($shared, $attributes)),
$response['data']['energy_labels'],
);

$energyLabels = array_values($energyLabels);

return new EnergyLabelCollection($energyLabels);
return new EnergyLabelCollection(array_values($energyLabels));
}
}
45 changes: 45 additions & 0 deletions src/Factories/EnergyLabelFactory.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
<?php

namespace Label84\NederlandPostcode\Factories;

use DateTime;
use Label84\NederlandPostcode\DTO\EnergyLabel;

class EnergyLabelFactory
{
/**
* @param array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* inspection_date: string,
* valid_until_date: string,
* construction_type: string,
* building_type: string|null,
* energy_label: string,
* max_energy_demand: float,
* max_fossil_energy_demand: float,
* min_renewable_share: float,
* } $attributes
*/
public static function make(array $attributes): EnergyLabel
{
return new EnergyLabel(
postcode: $attributes['postcode'],
number: $attributes['number'],
addition: $attributes['addition'] ?? null,
street: $attributes['street'],
city: $attributes['city'],
inspectionDate: new DateTime($attributes['inspection_date']),
validUntilDate: new DateTime($attributes['valid_until_date']),
constructionType: $attributes['construction_type'],
buildingType: $attributes['building_type'],
energyLabel: $attributes['energy_label'],
maxEnergyDemand: $attributes['max_energy_demand'],
maxFossilEnergyDemand: $attributes['max_fossil_energy_demand'],
minRenewableShare: $attributes['min_renewable_share'],
);
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 20 additions & 2 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,6 +62,12 @@ You can search addresses using either the `find` method for a single address or
The following optional attributes can be requested to be included in the response:

- `coordinates`: Includes latitude and longitude of the address.
- `district`: Includes the official and name of the district that the address belongs to.
- `function`: Includes the function of the address (e.g. residential, commercial, healthcare, etc.).
- `location_status`: Includes the location status of the address (e.g. active, in development, etc.).
- `property_status`: Includes the property status of the address (e.g. in use, under construction, etc.).
- `surface_area`: Includes the surface area of the property in square meters.
- `construction_year`: Includes the construction year of the property.

#### Single Address

Expand All@@ -80,7 +86,9 @@ $address = $client->find(
postcode: '1118BN',
number: 800,
addition: null,
attributes: ['coordinates'],
attributes: [
AddressAttributesEnum::COORDINATES,
],
);
```

Expand All@@ -98,7 +106,16 @@ Address {
coordinates: Coordinates {
latitude: 52.30528553688755,
longitude: 4.750645160863609
}
},
district: District {
official: "Schiphol",
name: "Schiphol"
},
function: "kantoorfunctie",
location_status: "verblijfsobject in gebruik",
property_status: "pand in gebruik",
surface_area: 10398.0,
construction_year: 2019
}
```

Expand DownExpand Up@@ -140,6 +157,7 @@ AddressCollection {
province: "Noord-Holland",
country: "Nederland",
coordinates: Coordinates { ... }
...
},
Address {
postcode: "1015CN",
Expand Down
6 changes: 6 additions & 0 deletions src/DTO/Address.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,5 +14,11 @@ public function __construct(
public readonly string $province,
public readonly string $country,
public readonly ?Coordinates $coordinates,
public readonly ?District $district,
public readonly ?string $function,
public readonly ?string $location_status,
public readonly ?string $property_status,
public readonly ?float $surface_area,
public readonly ?int $construction_year,
) {}
}
11 changes: 11 additions & 0 deletions src/DTO/District.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
<?php

namespace Label84\NederlandPostcode\DTO;

class District
{
public function __construct(
public readonly string $official,
public readonly string $name,
) {}
}
6 changes: 6 additions & 0 deletions src/Enums/AddressAttributesEnum.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,4 +5,10 @@
enum AddressAttributesEnum: string
{
case COORDINATES = 'coordinates';
case DISTRICT = 'district';
case FUNCTION = 'function';
case LOCATION_STATUS = 'location_status';
case PROPERTY_STATUS = 'property_status';
case SURFACE_AREA = 'surface_area';
case CONSTRUCTION_YEAR = 'construction_year';
}
65 changes: 31 additions & 34 deletions src/Factories/AddressCollectionFactory.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,48 +2,45 @@

namespace Label84\NederlandPostcode\Factories;

use Label84\NederlandPostcode\DTO\Address;
use Label84\NederlandPostcode\DTO\AddressCollection;
use Label84\NederlandPostcode\DTO\Coordinates;

class AddressCollectionFactory
{
/**
* @param array{data: array<array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* municipality: string,
* province: string,
* country: string,
* coordinates?: array{
* latitude: float,
* longitude: float,
* },
* }>} $response
* @param array{
* data: array<array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* municipality: string,
* province: string,
* country: string,
* coordinates?: array{
* latitude: float,
* longitude: float,
* },
* details?: array{
* district?: array{
* official: string,
* name: string,
* },
* function?: string,
* location_status?: string,
* property_status?: string,
* surface_area?: float,
* construction_year?: int,
* }
* }>
* } $response
*/
public static function make(array $response): AddressCollection
{
$addresses = array_map(function (array $attributes) {
return new Address(
postcode: $attributes['postcode'],
number: $attributes['number'],
addition: $attributes['addition'] ?? null,
street: $attributes['street'],
city: $attributes['city'],
municipality: $attributes['municipality'],
province: $attributes['province'],
country: $attributes['country'],
coordinates: isset($attributes['coordinates']) ? new Coordinates(
latitude: $attributes['coordinates']['latitude'],
longitude: $attributes['coordinates']['longitude'],
) : null,
);
}, $response['data']);

$addresses = array_values($addresses);
$addresses = array_map(
fn(array $attributes) => AddressFactory::make($attributes),
$response['data'],
);

return new AddressCollection($addresses);
}
Expand Down
64 changes: 64 additions & 0 deletions src/Factories/AddressFactory.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
<?php

namespace Label84\NederlandPostcode\Factories;

use Label84\NederlandPostcode\DTO\Address;
use Label84\NederlandPostcode\DTO\Coordinates;
use Label84\NederlandPostcode\DTO\District;

class AddressFactory
{
/**
* @param array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* municipality: string,
* province: string,
* country: string,
* coordinates?: array{
* latitude: float,
* longitude: float,
* },
* details?: array{
* district?: array{
* official: string,
* name: string,
* },
* function?: string,
* location_status?: string,
* property_status?: string,
* surface_area?: float,
* construction_year?: int,
* }
* } $attributes
*/
public static function make(array $attributes): Address
{
return new Address(
postcode: $attributes['postcode'],
number: $attributes['number'],
addition: $attributes['addition'] ?? null,
street: $attributes['street'],
city: $attributes['city'],
municipality: $attributes['municipality'],
province: $attributes['province'],
country: $attributes['country'],
coordinates: isset($attributes['coordinates']) ? new Coordinates(
latitude: $attributes['coordinates']['latitude'],
longitude: $attributes['coordinates']['longitude'],
) : null,
district: isset($attributes['details']['district']) ? new District(
official: $attributes['details']['district']['official'],
name: $attributes['details']['district']['name'],
) : null,
function: $attributes['details']['function'] ?? null,
location_status: $attributes['details']['location_status'] ?? null,
property_status: $attributes['details']['property_status'] ?? null,
surface_area: $attributes['details']['surface_area'] ?? null,
construction_year: $attributes['details']['construction_year'] ?? null,
);
}
}
75 changes: 31 additions & 44 deletions src/Factories/EnergyLabelCollectionFactory.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,59 +2,46 @@

namespace Label84\NederlandPostcode\Factories;

use DateTime;
use Label84\NederlandPostcode\DTO\EnergyLabel;
use Label84\NederlandPostcode\DTO\EnergyLabelCollection;

class EnergyLabelCollectionFactory
{
/**
* @param array{data: array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* energy_labels: array<array{
* inspection_date: string,
* valid_until_date: string,
* construction_type: string,
* building_type: string|null,
* energy_label: string,
* max_energy_demand: float,
* max_fossil_energy_demand: float,
* min_renewable_share: float,
* }>,
* }} $response
* @param array{
* data: array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* energy_labels: array<array{
* inspection_date: string,
* valid_until_date: string,
* construction_type: string,
* building_type: string|null,
* energy_label: string,
* max_energy_demand: float,
* max_fossil_energy_demand: float,
* min_renewable_share: float,
* }>
* }
* } $response
*/
public static function make(array $response): EnergyLabelCollection
{
$postcode = $response['data']['postcode'];
$number = $response['data']['number'];
$addition = $response['data']['addition'] ?? null;
$street = $response['data']['street'];
$city = $response['data']['city'];
$shared = [
'postcode' => $response['data']['postcode'],
'number' => $response['data']['number'],
'addition' => $response['data']['addition'] ?? null,
'street' => $response['data']['street'],
'city' => $response['data']['city'],
];

$energyLabels = array_map(function (array $attributes) use ($postcode, $number, $addition, $street, $city) {
return new EnergyLabel(
postcode: $postcode,
number: $number,
addition: $addition,
street: $street,
city: $city,
inspectionDate: new DateTime($attributes['inspection_date']),
validUntilDate: new DateTime($attributes['valid_until_date']),
constructionType: $attributes['construction_type'],
buildingType: $attributes['building_type'],
energyLabel: $attributes['energy_label'],
maxEnergyDemand: $attributes['max_energy_demand'],
maxFossilEnergyDemand: $attributes['max_fossil_energy_demand'],
minRenewableShare: $attributes['min_renewable_share'],
);
}, $response['data']['energy_labels']);
$energyLabels = array_map(
fn(array $attributes) => EnergyLabelFactory::make(array_merge($shared, $attributes)),
$response['data']['energy_labels'],
);

$energyLabels = array_values($energyLabels);

return new EnergyLabelCollection($energyLabels);
return new EnergyLabelCollection(array_values($energyLabels));
}
}
45 changes: 45 additions & 0 deletions src/Factories/EnergyLabelFactory.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
<?php

namespace Label84\NederlandPostcode\Factories;

use DateTime;
use Label84\NederlandPostcode\DTO\EnergyLabel;

class EnergyLabelFactory
{
/**
* @param array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* inspection_date: string,
* valid_until_date: string,
* construction_type: string,
* building_type: string|null,
* energy_label: string,
* max_energy_demand: float,
* max_fossil_energy_demand: float,
* min_renewable_share: float,
* } $attributes
*/
public static function make(array $attributes): EnergyLabel
{
return new EnergyLabel(
postcode: $attributes['postcode'],
number: $attributes['number'],
addition: $attributes['addition'] ?? null,
street: $attributes['street'],
city: $attributes['city'],
inspectionDate: new DateTime($attributes['inspection_date']),
validUntilDate: new DateTime($attributes['valid_until_date']),
constructionType: $attributes['construction_type'],
buildingType: $attributes['building_type'],
energyLabel: $attributes['energy_label'],
maxEnergyDemand: $attributes['max_energy_demand'],
maxFossilEnergyDemand: $attributes['max_fossil_energy_demand'],
minRenewableShare: $attributes['min_renewable_share'],
);
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 20 additions & 2 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,6 +62,12 @@ You can search addresses using either the `find` method for a single address or
The following optional attributes can be requested to be included in the response:

- `coordinates`: Includes latitude and longitude of the address.
- `district`: Includes the official and name of the district that the address belongs to.
- `function`: Includes the function of the address (e.g. residential, commercial, healthcare, etc.).
- `location_status`: Includes the location status of the address (e.g. active, in development, etc.).
- `property_status`: Includes the property status of the address (e.g. in use, under construction, etc.).
- `surface_area`: Includes the surface area of the property in square meters.
- `construction_year`: Includes the construction year of the property.

#### Single Address

Expand All@@ -80,7 +86,9 @@ $address = $client->find(
postcode: '1118BN',
number: 800,
addition: null,
attributes: ['coordinates'],
attributes: [
AddressAttributesEnum::COORDINATES,
],
);
```

Expand All@@ -98,7 +106,16 @@ Address {
coordinates: Coordinates {
latitude: 52.30528553688755,
longitude: 4.750645160863609
}
},
district: District {
official: "Schiphol",
name: "Schiphol"
},
function: "kantoorfunctie",
location_status: "verblijfsobject in gebruik",
property_status: "pand in gebruik",
surface_area: 10398.0,
construction_year: 2019
}
```

Expand DownExpand Up@@ -140,6 +157,7 @@ AddressCollection {
province: "Noord-Holland",
country: "Nederland",
coordinates: Coordinates { ... }
...
},
Address {
postcode: "1015CN",
Expand Down
6 changes: 6 additions & 0 deletions src/DTO/Address.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,5 +14,11 @@ public function __construct(
public readonly string $province,
public readonly string $country,
public readonly ?Coordinates $coordinates,
public readonly ?District $district,
public readonly ?string $function,
public readonly ?string $location_status,
public readonly ?string $property_status,
public readonly ?float $surface_area,
public readonly ?int $construction_year,
) {}
}
11 changes: 11 additions & 0 deletions src/DTO/District.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
<?php

namespace Label84\NederlandPostcode\DTO;

class District
{
public function __construct(
public readonly string $official,
public readonly string $name,
) {}
}
6 changes: 6 additions & 0 deletions src/Enums/AddressAttributesEnum.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,4 +5,10 @@
enum AddressAttributesEnum: string
{
case COORDINATES = 'coordinates';
case DISTRICT = 'district';
case FUNCTION = 'function';
case LOCATION_STATUS = 'location_status';
case PROPERTY_STATUS = 'property_status';
case SURFACE_AREA = 'surface_area';
case CONSTRUCTION_YEAR = 'construction_year';
}
65 changes: 31 additions & 34 deletions src/Factories/AddressCollectionFactory.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,48 +2,45 @@

namespace Label84\NederlandPostcode\Factories;

use Label84\NederlandPostcode\DTO\Address;
use Label84\NederlandPostcode\DTO\AddressCollection;
use Label84\NederlandPostcode\DTO\Coordinates;

class AddressCollectionFactory
{
/**
* @param array{data: array<array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* municipality: string,
* province: string,
* country: string,
* coordinates?: array{
* latitude: float,
* longitude: float,
* },
* }>} $response
* @param array{
* data: array<array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* municipality: string,
* province: string,
* country: string,
* coordinates?: array{
* latitude: float,
* longitude: float,
* },
* details?: array{
* district?: array{
* official: string,
* name: string,
* },
* function?: string,
* location_status?: string,
* property_status?: string,
* surface_area?: float,
* construction_year?: int,
* }
* }>
* } $response
*/
public static function make(array $response): AddressCollection
{
$addresses = array_map(function (array $attributes) {
return new Address(
postcode: $attributes['postcode'],
number: $attributes['number'],
addition: $attributes['addition'] ?? null,
street: $attributes['street'],
city: $attributes['city'],
municipality: $attributes['municipality'],
province: $attributes['province'],
country: $attributes['country'],
coordinates: isset($attributes['coordinates']) ? new Coordinates(
latitude: $attributes['coordinates']['latitude'],
longitude: $attributes['coordinates']['longitude'],
) : null,
);
}, $response['data']);

$addresses = array_values($addresses);
$addresses = array_map(
fn(array $attributes) => AddressFactory::make($attributes),
$response['data'],
);

return new AddressCollection($addresses);
}
Expand Down
64 changes: 64 additions & 0 deletions src/Factories/AddressFactory.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
<?php

namespace Label84\NederlandPostcode\Factories;

use Label84\NederlandPostcode\DTO\Address;
use Label84\NederlandPostcode\DTO\Coordinates;
use Label84\NederlandPostcode\DTO\District;

class AddressFactory
{
/**
* @param array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* municipality: string,
* province: string,
* country: string,
* coordinates?: array{
* latitude: float,
* longitude: float,
* },
* details?: array{
* district?: array{
* official: string,
* name: string,
* },
* function?: string,
* location_status?: string,
* property_status?: string,
* surface_area?: float,
* construction_year?: int,
* }
* } $attributes
*/
public static function make(array $attributes): Address
{
return new Address(
postcode: $attributes['postcode'],
number: $attributes['number'],
addition: $attributes['addition'] ?? null,
street: $attributes['street'],
city: $attributes['city'],
municipality: $attributes['municipality'],
province: $attributes['province'],
country: $attributes['country'],
coordinates: isset($attributes['coordinates']) ? new Coordinates(
latitude: $attributes['coordinates']['latitude'],
longitude: $attributes['coordinates']['longitude'],
) : null,
district: isset($attributes['details']['district']) ? new District(
official: $attributes['details']['district']['official'],
name: $attributes['details']['district']['name'],
) : null,
function: $attributes['details']['function'] ?? null,
location_status: $attributes['details']['location_status'] ?? null,
property_status: $attributes['details']['property_status'] ?? null,
surface_area: $attributes['details']['surface_area'] ?? null,
construction_year: $attributes['details']['construction_year'] ?? null,
);
}
}
75 changes: 31 additions & 44 deletions src/Factories/EnergyLabelCollectionFactory.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,59 +2,46 @@

namespace Label84\NederlandPostcode\Factories;

use DateTime;
use Label84\NederlandPostcode\DTO\EnergyLabel;
use Label84\NederlandPostcode\DTO\EnergyLabelCollection;

class EnergyLabelCollectionFactory
{
/**
* @param array{data: array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* energy_labels: array<array{
* inspection_date: string,
* valid_until_date: string,
* construction_type: string,
* building_type: string|null,
* energy_label: string,
* max_energy_demand: float,
* max_fossil_energy_demand: float,
* min_renewable_share: float,
* }>,
* }} $response
* @param array{
* data: array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* energy_labels: array<array{
* inspection_date: string,
* valid_until_date: string,
* construction_type: string,
* building_type: string|null,
* energy_label: string,
* max_energy_demand: float,
* max_fossil_energy_demand: float,
* min_renewable_share: float,
* }>
* }
* } $response
*/
public static function make(array $response): EnergyLabelCollection
{
$postcode = $response['data']['postcode'];
$number = $response['data']['number'];
$addition = $response['data']['addition'] ?? null;
$street = $response['data']['street'];
$city = $response['data']['city'];
$shared = [
'postcode' => $response['data']['postcode'],
'number' => $response['data']['number'],
'addition' => $response['data']['addition'] ?? null,
'street' => $response['data']['street'],
'city' => $response['data']['city'],
];

$energyLabels = array_map(function (array $attributes) use ($postcode, $number, $addition, $street, $city) {
return new EnergyLabel(
postcode: $postcode,
number: $number,
addition: $addition,
street: $street,
city: $city,
inspectionDate: new DateTime($attributes['inspection_date']),
validUntilDate: new DateTime($attributes['valid_until_date']),
constructionType: $attributes['construction_type'],
buildingType: $attributes['building_type'],
energyLabel: $attributes['energy_label'],
maxEnergyDemand: $attributes['max_energy_demand'],
maxFossilEnergyDemand: $attributes['max_fossil_energy_demand'],
minRenewableShare: $attributes['min_renewable_share'],
);
}, $response['data']['energy_labels']);
$energyLabels = array_map(
fn(array $attributes) => EnergyLabelFactory::make(array_merge($shared, $attributes)),
$response['data']['energy_labels'],
);

$energyLabels = array_values($energyLabels);

return new EnergyLabelCollection($energyLabels);
return new EnergyLabelCollection(array_values($energyLabels));
}
}
45 changes: 45 additions & 0 deletions src/Factories/EnergyLabelFactory.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
<?php

namespace Label84\NederlandPostcode\Factories;

use DateTime;
use Label84\NederlandPostcode\DTO\EnergyLabel;

class EnergyLabelFactory
{
/**
* @param array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* inspection_date: string,
* valid_until_date: string,
* construction_type: string,
* building_type: string|null,
* energy_label: string,
* max_energy_demand: float,
* max_fossil_energy_demand: float,
* min_renewable_share: float,
* } $attributes
*/
public static function make(array $attributes): EnergyLabel
{
return new EnergyLabel(
postcode: $attributes['postcode'],
number: $attributes['number'],
addition: $attributes['addition'] ?? null,
street: $attributes['street'],
city: $attributes['city'],
inspectionDate: new DateTime($attributes['inspection_date']),
validUntilDate: new DateTime($attributes['valid_until_date']),
constructionType: $attributes['construction_type'],
buildingType: $attributes['building_type'],
energyLabel: $attributes['energy_label'],
maxEnergyDemand: $attributes['max_energy_demand'],
maxFossilEnergyDemand: $attributes['max_fossil_energy_demand'],
minRenewableShare: $attributes['min_renewable_share'],
);
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 20 additions & 2 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,6 +62,12 @@ You can search addresses using either the `find` method for a single address or
The following optional attributes can be requested to be included in the response:

- `coordinates`: Includes latitude and longitude of the address.
- `district`: Includes the official and name of the district that the address belongs to.
- `function`: Includes the function of the address (e.g. residential, commercial, healthcare, etc.).
- `location_status`: Includes the location status of the address (e.g. active, in development, etc.).
- `property_status`: Includes the property status of the address (e.g. in use, under construction, etc.).
- `surface_area`: Includes the surface area of the property in square meters.
- `construction_year`: Includes the construction year of the property.

#### Single Address

Expand All@@ -80,7 +86,9 @@ $address = $client->find(
postcode: '1118BN',
number: 800,
addition: null,
attributes: ['coordinates'],
attributes: [
AddressAttributesEnum::COORDINATES,
],
);
```

Expand All@@ -98,7 +106,16 @@ Address {
coordinates: Coordinates {
latitude: 52.30528553688755,
longitude: 4.750645160863609
}
},
district: District {
official: "Schiphol",
name: "Schiphol"
},
function: "kantoorfunctie",
location_status: "verblijfsobject in gebruik",
property_status: "pand in gebruik",
surface_area: 10398.0,
construction_year: 2019
}
```

Expand DownExpand Up@@ -140,6 +157,7 @@ AddressCollection {
province: "Noord-Holland",
country: "Nederland",
coordinates: Coordinates { ... }
...
},
Address {
postcode: "1015CN",
Expand Down
6 changes: 6 additions & 0 deletions src/DTO/Address.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,5 +14,11 @@ public function __construct(
public readonly string $province,
public readonly string $country,
public readonly ?Coordinates $coordinates,
public readonly ?District $district,
public readonly ?string $function,
public readonly ?string $location_status,
public readonly ?string $property_status,
public readonly ?float $surface_area,
public readonly ?int $construction_year,
) {}
}
11 changes: 11 additions & 0 deletions src/DTO/District.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
<?php

namespace Label84\NederlandPostcode\DTO;

class District
{
public function __construct(
public readonly string $official,
public readonly string $name,
) {}
}
6 changes: 6 additions & 0 deletions src/Enums/AddressAttributesEnum.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,4 +5,10 @@
enum AddressAttributesEnum: string
{
case COORDINATES = 'coordinates';
case DISTRICT = 'district';
case FUNCTION = 'function';
case LOCATION_STATUS = 'location_status';
case PROPERTY_STATUS = 'property_status';
case SURFACE_AREA = 'surface_area';
case CONSTRUCTION_YEAR = 'construction_year';
}
65 changes: 31 additions & 34 deletions src/Factories/AddressCollectionFactory.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,48 +2,45 @@

namespace Label84\NederlandPostcode\Factories;

use Label84\NederlandPostcode\DTO\Address;
use Label84\NederlandPostcode\DTO\AddressCollection;
use Label84\NederlandPostcode\DTO\Coordinates;

class AddressCollectionFactory
{
/**
* @param array{data: array<array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* municipality: string,
* province: string,
* country: string,
* coordinates?: array{
* latitude: float,
* longitude: float,
* },
* }>} $response
* @param array{
* data: array<array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* municipality: string,
* province: string,
* country: string,
* coordinates?: array{
* latitude: float,
* longitude: float,
* },
* details?: array{
* district?: array{
* official: string,
* name: string,
* },
* function?: string,
* location_status?: string,
* property_status?: string,
* surface_area?: float,
* construction_year?: int,
* }
* }>
* } $response
*/
public static function make(array $response): AddressCollection
{
$addresses = array_map(function (array $attributes) {
return new Address(
postcode: $attributes['postcode'],
number: $attributes['number'],
addition: $attributes['addition'] ?? null,
street: $attributes['street'],
city: $attributes['city'],
municipality: $attributes['municipality'],
province: $attributes['province'],
country: $attributes['country'],
coordinates: isset($attributes['coordinates']) ? new Coordinates(
latitude: $attributes['coordinates']['latitude'],
longitude: $attributes['coordinates']['longitude'],
) : null,
);
}, $response['data']);

$addresses = array_values($addresses);
$addresses = array_map(
fn(array $attributes) => AddressFactory::make($attributes),
$response['data'],
);

return new AddressCollection($addresses);
}
Expand Down
64 changes: 64 additions & 0 deletions src/Factories/AddressFactory.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
<?php

namespace Label84\NederlandPostcode\Factories;

use Label84\NederlandPostcode\DTO\Address;
use Label84\NederlandPostcode\DTO\Coordinates;
use Label84\NederlandPostcode\DTO\District;

class AddressFactory
{
/**
* @param array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* municipality: string,
* province: string,
* country: string,
* coordinates?: array{
* latitude: float,
* longitude: float,
* },
* details?: array{
* district?: array{
* official: string,
* name: string,
* },
* function?: string,
* location_status?: string,
* property_status?: string,
* surface_area?: float,
* construction_year?: int,
* }
* } $attributes
*/
public static function make(array $attributes): Address
{
return new Address(
postcode: $attributes['postcode'],
number: $attributes['number'],
addition: $attributes['addition'] ?? null,
street: $attributes['street'],
city: $attributes['city'],
municipality: $attributes['municipality'],
province: $attributes['province'],
country: $attributes['country'],
coordinates: isset($attributes['coordinates']) ? new Coordinates(
latitude: $attributes['coordinates']['latitude'],
longitude: $attributes['coordinates']['longitude'],
) : null,
district: isset($attributes['details']['district']) ? new District(
official: $attributes['details']['district']['official'],
name: $attributes['details']['district']['name'],
) : null,
function: $attributes['details']['function'] ?? null,
location_status: $attributes['details']['location_status'] ?? null,
property_status: $attributes['details']['property_status'] ?? null,
surface_area: $attributes['details']['surface_area'] ?? null,
construction_year: $attributes['details']['construction_year'] ?? null,
);
}
}
75 changes: 31 additions & 44 deletions src/Factories/EnergyLabelCollectionFactory.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,59 +2,46 @@

namespace Label84\NederlandPostcode\Factories;

use DateTime;
use Label84\NederlandPostcode\DTO\EnergyLabel;
use Label84\NederlandPostcode\DTO\EnergyLabelCollection;

class EnergyLabelCollectionFactory
{
/**
* @param array{data: array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* energy_labels: array<array{
* inspection_date: string,
* valid_until_date: string,
* construction_type: string,
* building_type: string|null,
* energy_label: string,
* max_energy_demand: float,
* max_fossil_energy_demand: float,
* min_renewable_share: float,
* }>,
* }} $response
* @param array{
* data: array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* energy_labels: array<array{
* inspection_date: string,
* valid_until_date: string,
* construction_type: string,
* building_type: string|null,
* energy_label: string,
* max_energy_demand: float,
* max_fossil_energy_demand: float,
* min_renewable_share: float,
* }>
* }
* } $response
*/
public static function make(array $response): EnergyLabelCollection
{
$postcode = $response['data']['postcode'];
$number = $response['data']['number'];
$addition = $response['data']['addition'] ?? null;
$street = $response['data']['street'];
$city = $response['data']['city'];
$shared = [
'postcode' => $response['data']['postcode'],
'number' => $response['data']['number'],
'addition' => $response['data']['addition'] ?? null,
'street' => $response['data']['street'],
'city' => $response['data']['city'],
];

$energyLabels = array_map(function (array $attributes) use ($postcode, $number, $addition, $street, $city) {
return new EnergyLabel(
postcode: $postcode,
number: $number,
addition: $addition,
street: $street,
city: $city,
inspectionDate: new DateTime($attributes['inspection_date']),
validUntilDate: new DateTime($attributes['valid_until_date']),
constructionType: $attributes['construction_type'],
buildingType: $attributes['building_type'],
energyLabel: $attributes['energy_label'],
maxEnergyDemand: $attributes['max_energy_demand'],
maxFossilEnergyDemand: $attributes['max_fossil_energy_demand'],
minRenewableShare: $attributes['min_renewable_share'],
);
}, $response['data']['energy_labels']);
$energyLabels = array_map(
fn(array $attributes) => EnergyLabelFactory::make(array_merge($shared, $attributes)),
$response['data']['energy_labels'],
);

$energyLabels = array_values($energyLabels);

return new EnergyLabelCollection($energyLabels);
return new EnergyLabelCollection(array_values($energyLabels));
}
}
45 changes: 45 additions & 0 deletions src/Factories/EnergyLabelFactory.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
<?php

namespace Label84\NederlandPostcode\Factories;

use DateTime;
use Label84\NederlandPostcode\DTO\EnergyLabel;

class EnergyLabelFactory
{
/**
* @param array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* inspection_date: string,
* valid_until_date: string,
* construction_type: string,
* building_type: string|null,
* energy_label: string,
* max_energy_demand: float,
* max_fossil_energy_demand: float,
* min_renewable_share: float,
* } $attributes
*/
public static function make(array $attributes): EnergyLabel
{
return new EnergyLabel(
postcode: $attributes['postcode'],
number: $attributes['number'],
addition: $attributes['addition'] ?? null,
street: $attributes['street'],
city: $attributes['city'],
inspectionDate: new DateTime($attributes['inspection_date']),
validUntilDate: new DateTime($attributes['valid_until_date']),
constructionType: $attributes['construction_type'],
buildingType: $attributes['building_type'],
energyLabel: $attributes['energy_label'],
maxEnergyDemand: $attributes['max_energy_demand'],
maxFossilEnergyDemand: $attributes['max_fossil_energy_demand'],
minRenewableShare: $attributes['min_renewable_share'],
);
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 20 additions & 2 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,6 +62,12 @@ You can search addresses using either the `find` method for a single address or
The following optional attributes can be requested to be included in the response:

- `coordinates`: Includes latitude and longitude of the address.
- `district`: Includes the official and name of the district that the address belongs to.
- `function`: Includes the function of the address (e.g. residential, commercial, healthcare, etc.).
- `location_status`: Includes the location status of the address (e.g. active, in development, etc.).
- `property_status`: Includes the property status of the address (e.g. in use, under construction, etc.).
- `surface_area`: Includes the surface area of the property in square meters.
- `construction_year`: Includes the construction year of the property.

#### Single Address

Expand All@@ -80,7 +86,9 @@ $address = $client->find(
postcode: '1118BN',
number: 800,
addition: null,
attributes: ['coordinates'],
attributes: [
AddressAttributesEnum::COORDINATES,
],
);
```

Expand All@@ -98,7 +106,16 @@ Address {
coordinates: Coordinates {
latitude: 52.30528553688755,
longitude: 4.750645160863609
}
},
district: District {
official: "Schiphol",
name: "Schiphol"
},
function: "kantoorfunctie",
location_status: "verblijfsobject in gebruik",
property_status: "pand in gebruik",
surface_area: 10398.0,
construction_year: 2019
}
```

Expand DownExpand Up@@ -140,6 +157,7 @@ AddressCollection {
province: "Noord-Holland",
country: "Nederland",
coordinates: Coordinates { ... }
...
},
Address {
postcode: "1015CN",
Expand Down
6 changes: 6 additions & 0 deletions src/DTO/Address.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,5 +14,11 @@ public function __construct(
public readonly string $province,
public readonly string $country,
public readonly ?Coordinates $coordinates,
public readonly ?District $district,
public readonly ?string $function,
public readonly ?string $location_status,
public readonly ?string $property_status,
public readonly ?float $surface_area,
public readonly ?int $construction_year,
) {}
}
11 changes: 11 additions & 0 deletions src/DTO/District.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
<?php

namespace Label84\NederlandPostcode\DTO;

class District
{
public function __construct(
public readonly string $official,
public readonly string $name,
) {}
}
6 changes: 6 additions & 0 deletions src/Enums/AddressAttributesEnum.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,4 +5,10 @@
enum AddressAttributesEnum: string
{
case COORDINATES = 'coordinates';
case DISTRICT = 'district';
case FUNCTION = 'function';
case LOCATION_STATUS = 'location_status';
case PROPERTY_STATUS = 'property_status';
case SURFACE_AREA = 'surface_area';
case CONSTRUCTION_YEAR = 'construction_year';
}
65 changes: 31 additions & 34 deletions src/Factories/AddressCollectionFactory.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,48 +2,45 @@

namespace Label84\NederlandPostcode\Factories;

use Label84\NederlandPostcode\DTO\Address;
use Label84\NederlandPostcode\DTO\AddressCollection;
use Label84\NederlandPostcode\DTO\Coordinates;

class AddressCollectionFactory
{
/**
* @param array{data: array<array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* municipality: string,
* province: string,
* country: string,
* coordinates?: array{
* latitude: float,
* longitude: float,
* },
* }>} $response
* @param array{
* data: array<array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* municipality: string,
* province: string,
* country: string,
* coordinates?: array{
* latitude: float,
* longitude: float,
* },
* details?: array{
* district?: array{
* official: string,
* name: string,
* },
* function?: string,
* location_status?: string,
* property_status?: string,
* surface_area?: float,
* construction_year?: int,
* }
* }>
* } $response
*/
public static function make(array $response): AddressCollection
{
$addresses = array_map(function (array $attributes) {
return new Address(
postcode: $attributes['postcode'],
number: $attributes['number'],
addition: $attributes['addition'] ?? null,
street: $attributes['street'],
city: $attributes['city'],
municipality: $attributes['municipality'],
province: $attributes['province'],
country: $attributes['country'],
coordinates: isset($attributes['coordinates']) ? new Coordinates(
latitude: $attributes['coordinates']['latitude'],
longitude: $attributes['coordinates']['longitude'],
) : null,
);
}, $response['data']);

$addresses = array_values($addresses);
$addresses = array_map(
fn(array $attributes) => AddressFactory::make($attributes),
$response['data'],
);

return new AddressCollection($addresses);
}
Expand Down
64 changes: 64 additions & 0 deletions src/Factories/AddressFactory.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
<?php

namespace Label84\NederlandPostcode\Factories;

use Label84\NederlandPostcode\DTO\Address;
use Label84\NederlandPostcode\DTO\Coordinates;
use Label84\NederlandPostcode\DTO\District;

class AddressFactory
{
/**
* @param array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* municipality: string,
* province: string,
* country: string,
* coordinates?: array{
* latitude: float,
* longitude: float,
* },
* details?: array{
* district?: array{
* official: string,
* name: string,
* },
* function?: string,
* location_status?: string,
* property_status?: string,
* surface_area?: float,
* construction_year?: int,
* }
* } $attributes
*/
public static function make(array $attributes): Address
{
return new Address(
postcode: $attributes['postcode'],
number: $attributes['number'],
addition: $attributes['addition'] ?? null,
street: $attributes['street'],
city: $attributes['city'],
municipality: $attributes['municipality'],
province: $attributes['province'],
country: $attributes['country'],
coordinates: isset($attributes['coordinates']) ? new Coordinates(
latitude: $attributes['coordinates']['latitude'],
longitude: $attributes['coordinates']['longitude'],
) : null,
district: isset($attributes['details']['district']) ? new District(
official: $attributes['details']['district']['official'],
name: $attributes['details']['district']['name'],
) : null,
function: $attributes['details']['function'] ?? null,
location_status: $attributes['details']['location_status'] ?? null,
property_status: $attributes['details']['property_status'] ?? null,
surface_area: $attributes['details']['surface_area'] ?? null,
construction_year: $attributes['details']['construction_year'] ?? null,
);
}
}
75 changes: 31 additions & 44 deletions src/Factories/EnergyLabelCollectionFactory.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,59 +2,46 @@

namespace Label84\NederlandPostcode\Factories;

use DateTime;
use Label84\NederlandPostcode\DTO\EnergyLabel;
use Label84\NederlandPostcode\DTO\EnergyLabelCollection;

class EnergyLabelCollectionFactory
{
/**
* @param array{data: array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* energy_labels: array<array{
* inspection_date: string,
* valid_until_date: string,
* construction_type: string,
* building_type: string|null,
* energy_label: string,
* max_energy_demand: float,
* max_fossil_energy_demand: float,
* min_renewable_share: float,
* }>,
* }} $response
* @param array{
* data: array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* energy_labels: array<array{
* inspection_date: string,
* valid_until_date: string,
* construction_type: string,
* building_type: string|null,
* energy_label: string,
* max_energy_demand: float,
* max_fossil_energy_demand: float,
* min_renewable_share: float,
* }>
* }
* } $response
*/
public static function make(array $response): EnergyLabelCollection
{
$postcode = $response['data']['postcode'];
$number = $response['data']['number'];
$addition = $response['data']['addition'] ?? null;
$street = $response['data']['street'];
$city = $response['data']['city'];
$shared = [
'postcode' => $response['data']['postcode'],
'number' => $response['data']['number'],
'addition' => $response['data']['addition'] ?? null,
'street' => $response['data']['street'],
'city' => $response['data']['city'],
];

$energyLabels = array_map(function (array $attributes) use ($postcode, $number, $addition, $street, $city) {
return new EnergyLabel(
postcode: $postcode,
number: $number,
addition: $addition,
street: $street,
city: $city,
inspectionDate: new DateTime($attributes['inspection_date']),
validUntilDate: new DateTime($attributes['valid_until_date']),
constructionType: $attributes['construction_type'],
buildingType: $attributes['building_type'],
energyLabel: $attributes['energy_label'],
maxEnergyDemand: $attributes['max_energy_demand'],
maxFossilEnergyDemand: $attributes['max_fossil_energy_demand'],
minRenewableShare: $attributes['min_renewable_share'],
);
}, $response['data']['energy_labels']);
$energyLabels = array_map(
fn(array $attributes) => EnergyLabelFactory::make(array_merge($shared, $attributes)),
$response['data']['energy_labels'],
);

$energyLabels = array_values($energyLabels);

return new EnergyLabelCollection($energyLabels);
return new EnergyLabelCollection(array_values($energyLabels));
}
}
45 changes: 45 additions & 0 deletions src/Factories/EnergyLabelFactory.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
<?php

namespace Label84\NederlandPostcode\Factories;

use DateTime;
use Label84\NederlandPostcode\DTO\EnergyLabel;

class EnergyLabelFactory
{
/**
* @param array{
* postcode: string,
* number: int,
* addition?: string|null,
* street: string,
* city: string,
* inspection_date: string,
* valid_until_date: string,
* construction_type: string,
* building_type: string|null,
* energy_label: string,
* max_energy_demand: float,
* max_fossil_energy_demand: float,
* min_renewable_share: float,
* } $attributes
*/
public static function make(array $attributes): EnergyLabel
{
return new EnergyLabel(
postcode: $attributes['postcode'],
number: $attributes['number'],
addition: $attributes['addition'] ?? null,
street: $attributes['street'],
city: $attributes['city'],
inspectionDate: new DateTime($attributes['inspection_date']),
validUntilDate: new DateTime($attributes['valid_until_date']),
constructionType: $attributes['construction_type'],
buildingType: $attributes['building_type'],
energyLabel: $attributes['energy_label'],
maxEnergyDemand: $attributes['max_energy_demand'],
maxFossilEnergyDemand: $attributes['max_fossil_energy_demand'],
minRenewableShare: $attributes['min_renewable_share'],
);
}
}
Loading