diff --git a/data-full.json b/data-full.json
index 76ea51e..1f39b43 100644
--- a/data-full.json
+++ b/data-full.json
@@ -2,7 +2,7 @@
   "version": 0.6,
   "generator": "Overpass API 0.7.62.1 084b4234",
   "osm3s": {
-    "timestamp_osm_base": "2024-04-19T01:21:45Z",
+    "timestamp_osm_base": "2024-04-20T01:20:41Z",
     "copyright": "The data included in this document is from www.openstreetmap.org. The data is made available under ODbL."
   },
   "elements": [
@@ -111,6 +111,24 @@
     "source": "PGS;US NGA Pub. 112. 2010-11-10."
   }
 },
+{
+  "type": "node",
+  "id": 20958978,
+  "lat": -33.8535605,
+  "lon": 151.2081472,
+  "tags": {
+    "seamark:information": "top corner of shed",
+    "seamark:light:character": "Oc",
+    "seamark:light:colour": "red",
+    "seamark:light:height": "12",
+    "seamark:light:period": "3",
+    "seamark:light:range": "3",
+    "seamark:light:reference": "K 2686",
+    "seamark:light:sequence": "2+(1)",
+    "seamark:type": "light_minor",
+    "source": "US NGA Pub. 111. 2024-04-19."
+  }
+},
 {
   "type": "node",
   "id": 21270143,
@@ -698,6 +716,28 @@
     "seamark:vertical_length": "14.3"
   }
 },
+{
+  "type": "node",
+  "id": 46500819,
+  "lat": -33.8121422,
+  "lon": 151.2463495,
+  "tags": {
+    "man_made": "lighthouse",
+    "name": "Rosherville (Parriwi Head)",
+    "seamark:beacon_special_purpose:colour": "white",
+    "seamark:beacon_special_purpose:shape": "tower",
+    "seamark:light:character": "Fl",
+    "seamark:light:colour": "green",
+    "seamark:light:height": "43",
+    "seamark:light:period": "3",
+    "seamark:light:range": "12",
+    "seamark:light:reference": "K 2638.10",
+    "seamark:light:sequence": "1+(2)",
+    "seamark:name": "Rosherville",
+    "seamark:type": "light_major",
+    "source": "US NGA Pub. 111. 2024-04-19."
+  }
+},
 {
   "type": "node",
   "id": 48944273,
@@ -2886,6 +2926,52 @@
     "wikipedia": "es:Faro de Cabo de Berbería"
   }
 },
+{
+  "type": "node",
+  "id": 281356861,
+  "lat": -33.8177323,
+  "lon": 151.2615567,
+  "tags": {
+    "check_date": "2023-07-01",
+    "man_made": "lighthouse",
+    "name": "Grotto Point Lighthouse",
+    "seamark:beacon_special_purpose:colour": "white",
+    "seamark:beacon_special_purpose:shape": "tower",
+    "seamark:light:1:character": "Oc",
+    "seamark:light:1:colour": "green",
+    "seamark:light:1:group": "4",
+    "seamark:light:1:height": "19",
+    "seamark:light:1:period": "15",
+    "seamark:light:1:range": "9",
+    "seamark:light:1:sector_end": "288",
+    "seamark:light:1:sector_start": "276",
+    "seamark:light:1:sequence": "1+(1)+1+(1)+1+(1)+8+(1)",
+    "seamark:light:2:character": "Oc",
+    "seamark:light:2:colour": "white",
+    "seamark:light:2:group": "4",
+    "seamark:light:2:height": "19",
+    "seamark:light:2:period": "15",
+    "seamark:light:2:range": "12",
+    "seamark:light:2:sector_end": "306",
+    "seamark:light:2:sector_start": "288",
+    "seamark:light:2:sequence": "1+(1)+1+(1)+1+(1)+8+(1)",
+    "seamark:light:3:character": "Oc",
+    "seamark:light:3:colour": "red",
+    "seamark:light:3:group": "4",
+    "seamark:light:3:height": "19",
+    "seamark:light:3:period": "15",
+    "seamark:light:3:range": "9",
+    "seamark:light:3:sector_end": "312",
+    "seamark:light:3:sector_start": "306",
+    "seamark:light:3:sequence": "1+(1)+1+(1)+1+(1)+8+(1)",
+    "seamark:light:reference": "K 2638",
+    "seamark:name": "Grotto Point",
+    "seamark:type": "light_major",
+    "source": "US NGA Pub. 111. 2024-04-19.",
+    "wikidata": "Q5610807",
+    "wikipedia": "en:Grotto Point Light"
+  }
+},
 {
   "type": "node",
   "id": 281596262,
@@ -40988,6 +41074,34 @@
     "wikidata": "Q55155449"
   }
 },
+{
+  "type": "node",
+  "id": 1162539123,
+  "lat": -33.8539417,
+  "lon": 151.2851907,
+  "tags": {
+    "man_made": "lighthouse",
+    "name": "Macquarie Lighthouse",
+    "seamark:beacon_special_purpose:colour": "white",
+    "seamark:beacon_special_purpose:construction": "masonry",
+    "seamark:beacon_special_purpose:height": "25.9",
+    "seamark:beacon_special_purpose:shape": "tower",
+    "seamark:light:1:character": "Fl",
+    "seamark:light:1:colour": "white",
+    "seamark:light:1:group": "2",
+    "seamark:light:1:height": "105",
+    "seamark:light:1:period": "10",
+    "seamark:light:1:range": "22",
+    "seamark:light:1:sector_end": "359",
+    "seamark:light:1:sector_start": "204",
+    "seamark:light:1:sequence": "0.1+(1.9)+0.1+(7.9)",
+    "seamark:light:reference": "K 2632",
+    "seamark:name": "Macquarie",
+    "seamark:type": "light_major",
+    "source": "US NGA Pub. 111. 2024-04-19.",
+    "wikimedia_commons": "File:1_Macquarie_Lighthouse1.JPG"
+  }
+},
 {
   "type": "node",
   "id": 1163031158,
@@ -41824,6 +41938,7 @@
     "seamark:light:range": "5",
     "seamark:light:reference": "K 2644",
     "seamark:light:sequence": "2+(1)",
+    "seamark:name": "Western Channel Beacon",
     "seamark:type": "beacon_lateral",
     "source": "US NGA Pub. 111. 2010-09-02.",
     "wikidata": "Q7987710",
@@ -41843,17 +41958,36 @@
     "seamark:beacon_lateral:shape": "tower",
     "seamark:light:character": "Oc",
     "seamark:light:colour": "green",
-    "seamark:light:height": "9",
+    "seamark:light:height": "8",
     "seamark:light:period": "3",
     "seamark:light:range": "5",
     "seamark:light:reference": "K 2652",
     "seamark:light:sequence": "2+(1)",
+    "seamark:name": "Eastern Channel Beacon",
     "seamark:type": "beacon_lateral",
     "source": "US NGA Pub. 111. 2010-09-02.",
     "wikidata": "Q5330051",
     "wikimedia_commons": "File:East_Channel_Pile_Light.jpg"
   }
 },
+{
+  "type": "node",
+  "id": 1191079531,
+  "lat": -33.9985131,
+  "lon": 151.2062303,
+  "tags": {
+    "seamark:beacon_special_purpose:colour": "white",
+    "seamark:light:character": "Fl",
+    "seamark:light:colour": "yellow",
+    "seamark:light:period": "3",
+    "seamark:light:reference": "K 2625.50",
+    "seamark:light:sequence": "1+(2)",
+    "seamark:topmark:colour": "red",
+    "seamark:topmark:shape": "board",
+    "seamark:type": "beacon_special_purpose",
+    "source": "US NGA Pub. 111. 2024-04-19."
+  }
+},
 {
   "type": "node",
   "id": 1191080448,
@@ -43674,19 +43808,22 @@
   "lat": -36.7403150,
   "lon": 174.9347150,
   "tags": {
-    "height": "7",
     "ref:linz:hydrographic_id": "124804",
+    "seamark:beacon_lateral:category": "starboard",
+    "seamark:beacon_lateral:colour": "white",
+    "seamark:beacon_lateral:height": "2.1",
+    "seamark:beacon_lateral:shape": "post",
     "seamark:light:character": "Fl",
     "seamark:light:colour": "green",
     "seamark:light:group": "1",
-    "seamark:light:height": "7",
+    "seamark:light:height": "6",
     "seamark:light:period": "2",
     "seamark:light:range": "1",
-    "seamark:light:reference": "K 3834.3",
+    "seamark:light:reference": "K 3845.3",
     "seamark:light:sequence": "0.5+(1.5)",
     "seamark:name": "Motutapu Island",
-    "seamark:type": "light_minor",
-    "source": "US NGA Pub. 111. 2010-09-02.;LINZ;Mahurangi Harbour to Rangitoto Island Chart"
+    "seamark:type": "beacon_lateral",
+    "source": "US NGA Pub. 111. 2024-04-19.;LINZ;Mahurangi Harbour to Rangitoto Island Chart"
   }
 },
 {
@@ -43873,7 +44010,7 @@
     "seamark:beacon_lateral:category": "port",
     "seamark:beacon_lateral:colour": "red",
     "seamark:beacon_lateral:construction": "metal",
-    "seamark:beacon_lateral:height": "6",
+    "seamark:beacon_lateral:height": "6.1",
     "seamark:beacon_lateral:shape": "pile",
     "seamark:beacon_lateral:system": "iala-a",
     "seamark:information": "Channel marked by light beacons.",
@@ -43887,7 +44024,7 @@
     "seamark:topmark:colour": "red",
     "seamark:topmark:shape": "cylinder",
     "seamark:type": "beacon_lateral",
-    "source": "US NGA Pub. 111. 2010-09-02.;LINZ;Auckland Harbour East Chart"
+    "source": "US NGA Pub. 111. 2024-04-19.;LINZ;Auckland Harbour East Chart"
   }
 },
 {
@@ -43899,6 +44036,8 @@
     "height": "3",
     "ref:linz:hydrographic_id": "125332",
     "seamark:beacon_lateral:category": "starboard",
+    "seamark:beacon_lateral:colour": "white",
+    "seamark:beacon_lateral:construction": "concreted",
     "seamark:beacon_lateral:shape": "pile",
     "seamark:information": "Five F.W. on bulk cement jetty 0.2 mile S.",
     "seamark:light:character": "Fl",
@@ -43912,7 +44051,7 @@
     "seamark:topmark:colour": "green",
     "seamark:topmark:shape": "cone, point up",
     "seamark:type": "beacon_lateral",
-    "source": "US NGA Pub. 111. 2010-09-02.;LINZ;Auckland Harbour East Chart"
+    "source": "US NGA Pub. 111. 2024-04-19.;LINZ;Auckland Harbour East Chart"
   }
 },
 {
@@ -43937,9 +44076,9 @@
     "seamark:light:reference": "K 3819",
     "seamark:light:sequence": "(2)+4",
     "seamark:topmark:colour": "green",
-    "seamark:topmark:shape": "cone, point up",
+    "seamark:topmark:shape": "triangle, point up",
     "seamark:type": "beacon_special_purpose",
-    "source": "US NGA Pub. 111. 2010-09-02.;LINZ;Auckland Harbour East Chart"
+    "source": "US NGA Pub. 111. 2024-04-19.;LINZ;Auckland Harbour East Chart"
   }
 },
 {
@@ -351359,6 +351498,7 @@
     "seamark:light:colour": "green",
     "seamark:light:height": "8",
     "seamark:light:period": "3",
+    "seamark:light:range": "5",
     "seamark:light:reference": "K 2664",
     "seamark:light:sequence": "2+(1)",
     "seamark:name": "Robertsons Point",
@@ -360481,6 +360621,51 @@
     "seamark:type": "beacon_lateral"
   }
 },
+{
+  "type": "node",
+  "id": 3976662488,
+  "lat": -33.9982453,
+  "lon": 151.2381709,
+  "tags": {
+    "man_made": "lighthouse",
+    "name": "Endeavour Light",
+    "seamark:beacon:colour": "white",
+    "seamark:beacon:height": "4.0",
+    "seamark:beacon:shape": "tower",
+    "seamark:light:1:character": "Oc",
+    "seamark:light:1:colour": "red",
+    "seamark:light:1:height": "27",
+    "seamark:light:1:period": "3",
+    "seamark:light:1:range": "7",
+    "seamark:light:1:sector_end": "320",
+    "seamark:light:1:sector_start": "285",
+    "seamark:light:1:sequence": "2+(1)",
+    "seamark:light:2:character": "Oc",
+    "seamark:light:2:colour": "white",
+    "seamark:light:2:height": "27",
+    "seamark:light:2:period": "3",
+    "seamark:light:2:range": "7",
+    "seamark:light:2:sector_end": "103",
+    "seamark:light:2:sector_start": "320",
+    "seamark:light:2:sequence": "2+(1)",
+    "seamark:light:3:character": "Oc",
+    "seamark:light:3:colour": "red",
+    "seamark:light:3:height": "27",
+    "seamark:light:3:period": "3",
+    "seamark:light:3:range": "7",
+    "seamark:light:3:sector_end": "140",
+    "seamark:light:3:sector_start": "103",
+    "seamark:light:3:sequence": "2+(1)",
+    "seamark:light:4:character": "F",
+    "seamark:light:4:colour": "blue",
+    "seamark:light:4:sector_end": "114",
+    "seamark:light:4:sector_start": "260",
+    "seamark:light:reference": "K 2623",
+    "seamark:name": "Endeavour Light",
+    "seamark:type": "beacon",
+    "source": "US NGA Pub. 111. 2024-04-19."
+  }
+},
 {
   "type": "node",
   "id": 3978768955,
@@ -433237,9 +433422,10 @@
     "seamark:light:3:period": "3.7",
     "seamark:light:3:range": "24",
     "seamark:light:3:sequence": "0.2+(3.5)",
+    "seamark:light:reference": "K 4528",
+    "seamark:name": "Mount Pitt",
     "seamark:type": "light_major",
-    "source": "LINZ;Norfolk Island to Cape Egmont Chart;Chart NZ21",
-    "source:date": "2005-04-01"
+    "source": "LINZ;Norfolk Island to Cape Egmont Chart;Chart NZ21;US NGA Pub. 111. 2024-04-19."
   }
 },
 {
@@ -453988,7 +454174,6 @@
     "seamark:light:1:colour": "white",
     "seamark:light:1:height": "13",
     "seamark:light:1:period": "3",
-    "seamark:light:1:reference": "K 2695",
     "seamark:light:1:sequence": "2+(1)",
     "seamark:light:2:character": "F",
     "seamark:light:2:colour": "green",
@@ -454011,6 +454196,7 @@
     "seamark:light:4:range": "1.9",
     "seamark:light:4:sector_end": "285.69",
     "seamark:light:4:sector_start": "281.67",
+    "seamark:light:reference": "K 2695",
     "seamark:name": "Goat Island Port Entry Light",
     "seamark:type": "beacon_special_purpose",
     "source": "US NGA Pub. 111. 2024-04-13.",
@@ -454273,6 +454459,28 @@
     "seamark:type": "beacon_lateral"
   }
 },
+{
+  "type": "node",
+  "id": 10251795799,
+  "lat": -33.8015017,
+  "lon": 151.2842879,
+  "tags": {
+    "seamark:beacon_isolated_danger:colour": "black;red;black",
+    "seamark:beacon_isolated_danger:colour_pattern": "horizontal",
+    "seamark:beacon_isolated_danger:shape": "pole",
+    "seamark:light:character": "Fl",
+    "seamark:light:colour": "white",
+    "seamark:light:group": "2",
+    "seamark:light:period": "7",
+    "seamark:light:reference": "K 2641",
+    "seamark:light:sequence": "1+(1)+1+(4)",
+    "seamark:name": "004",
+    "seamark:topmark:colour": "black",
+    "seamark:topmark:shape": "2 spheres",
+    "seamark:type": "beacon_isolated_danger",
+    "source": "US NGA Pub. 111. 2024-04-19."
+  }
+},
 {
   "type": "node",
   "id": 10251808118,
@@ -454288,6 +454496,7 @@
     "seamark:light:colour": "green",
     "seamark:light:height": "6",
     "seamark:light:period": "3",
+    "seamark:light:range": "6",
     "seamark:light:reference": "K 2668",
     "seamark:light:sequence": "2+(1)",
     "seamark:type": "beacon_lateral",
@@ -465252,6 +465461,60 @@
     "source": "US NGA Pub. 111. 2024-04-13."
   }
 },
+{
+  "type": "node",
+  "id": 11830320998,
+  "lat": -33.8520314,
+  "lon": 151.2108271,
+  "tags": {
+    "seamark:information": "top of center span",
+    "seamark:light:category": "aero",
+    "seamark:light:character": "Oc",
+    "seamark:light:colour": "red",
+    "seamark:light:height": "138",
+    "seamark:light:period": "1.5",
+    "seamark:light:range": "25",
+    "seamark:light:reference": "K 2676.40",
+    "seamark:light:sequence": "1+(0.5)",
+    "seamark:type": "light_minor",
+    "source": "US NGA Pub. 111. 2024-04-19."
+  }
+},
+{
+  "type": "node",
+  "id": 11830425352,
+  "lat": -33.9991261,
+  "lon": 151.2038928,
+  "tags": {
+    "seamark:beacon_special_purpose:colour": "white",
+    "seamark:light:character": "Fl",
+    "seamark:light:colour": "yellow",
+    "seamark:light:period": "3",
+    "seamark:light:reference": "K 2625.51",
+    "seamark:light:sequence": "1+(2)",
+    "seamark:topmark:colour": "red",
+    "seamark:topmark:shape": "triangle, point up",
+    "seamark:type": "beacon_special_purpose",
+    "source": "US NGA Pub. 111. 2024-04-19."
+  }
+},
+{
+  "type": "node",
+  "id": 11830457376,
+  "lat": -33.9720066,
+  "lon": 151.2115109,
+  "tags": {
+    "seamark:light:character": "Fl",
+    "seamark:light:colour": "green",
+    "seamark:light:height": "7",
+    "seamark:light:period": "3",
+    "seamark:light:range": "4",
+    "seamark:light:reference": "K 2626.76",
+    "seamark:light:sequence": "1+(2)",
+    "seamark:type": "light_minor",
+    "source": "US NGA Pub. 111. 2024-04-19."
+  }
+},
 {
   "type": "way",
   "id": 27301930,
@@ -475693,6 +475956,40 @@
     "wikipedia": "it:Faro di Punta Palascia"
   }
 },
+{
+  "type": "way",
+  "id": 330361858,
+  "nodes": [
+    3373251364,
+    3373251366,
+    3373251369,
+    3373251367,
+    3373251364
+  ],
+  "tags": {
+    "building": "lighthouse",
+    "man_made": "lighthouse",
+    "name": "Cape Baily Lighthouse",
+    "seamark:beacon_special_purpose:colour": "white",
+    "seamark:beacon_special_purpose:construction": "concreted",
+    "seamark:beacon_special_purpose:height": "9.1",
+    "seamark:beacon_special_purpose:shape": "tower",
+    "seamark:light:character": "Fl",
+    "seamark:light:colour": "white",
+    "seamark:light:group": "4",
+    "seamark:light:height": "55",
+    "seamark:light:period": "16",
+    "seamark:light:range": "13",
+    "seamark:light:reference": "K 2622",
+    "seamark:light:sequence": "1+(2)+1+(2)+1+(2)+1+(6)",
+    "seamark:name": "Cape Baily",
+    "seamark:type": "beacon_special_purpose",
+    "source": "US NGA Pub. 111. 2024-04-19.",
+    "tourism": "attraction",
+    "website": "https://www.nationalparks.nsw.gov.au/things-to-do/historic-buildings-places/cape-baily-lighthouse",
+    "wikidata": "Q5034579"
+  }
+},
 {
   "type": "way",
   "id": 331279063,
@@ -477441,19 +477738,20 @@
     "historic": "building",
     "man_made": "lighthouse",
     "name": "Hornby Lighthouse",
-    "seamark:light:1:character": "LFl",
-    "seamark:light:1:colour": "white",
-    "seamark:light:1:height": "27",
-    "seamark:light:1:period": "5",
-    "seamark:light:1:range": "15",
-    "seamark:light:1:sector_end": "334",
-    "seamark:light:1:sector_start": "240",
-    "seamark:light:1:sequence": "2+(3)",
+    "seamark:beacon_special_purpose:colour": "white;red",
+    "seamark:beacon_special_purpose:colour_pattern": "horizontal",
+    "seamark:beacon_special_purpose:height": "9.1",
+    "seamark:beacon_special_purpose:shape": "tower",
+    "seamark:light:character": "LFl",
+    "seamark:light:colour": "white",
+    "seamark:light:height": "27",
+    "seamark:light:period": "5",
+    "seamark:light:range": "15",
     "seamark:light:reference": "K 2636",
+    "seamark:light:sequence": "2+(3)",
     "seamark:name": "Hornby",
     "seamark:type": "light_major",
-    "source": "US NGA Pub. 111. 2010-09-02.",
-    "tourism": "attraction",
+    "source": "US NGA Pub. 111. 2024-04-19.",
     "wikidata": "Q12060536",
     "wikipedia": "en:Hornby Lighthouse"
   }
@@ -488405,6 +488703,7 @@
     "seamark:light:range": "6",
     "seamark:light:reference": "K 2662",
     "seamark:light:sequence": "2+(1)",
+    "seamark:name": "20 / Bradleys Head",
     "seamark:type": "beacon_cardinal",
     "source": "US NGA Pub. 111. 2024-04-13.",
     "wikidata": "Q897057",
@@ -513201,6 +513500,30 @@
   "lat": -34.4196661,
   "lon": 150.9067652
 },
+{
+  "type": "node",
+  "id": 3373251364,
+  "lat": -34.0351121,
+  "lon": 151.2221955
+},
+{
+  "type": "node",
+  "id": 3373251366,
+  "lat": -34.0351328,
+  "lon": 151.2222236
+},
+{
+  "type": "node",
+  "id": 3373251367,
+  "lat": -34.0351388,
+  "lon": 151.2221669
+},
+{
+  "type": "node",
+  "id": 3373251369,
+  "lat": -34.0351595,
+  "lon": 151.2221950
+},
 {
   "type": "node",
   "id": 1903566739,