add legendary dawntrail nodes

This reverts commit 56b053fc7f.

CONTRIBUTING.MD

@@ -0,0 +1,141 @@
+# How to contribute
+
+All meaningful contributions are welcome. If you're not sure about something,
+open an issue or [join the discord server](https://discord.youhavetrouble.me/)
+to talk it out.
+
+## Reporting issues
+
+If you find a bug or unexpected behavior, open an issue. Include information about
+how to reproduce the issue, and any relevant error messages from your browser's
+console.
+
+## Pull requests
+PLEASE OPEN AN ISSUE OR DISCUSS ON DISCORD BEFORE MAKING A PULL REQUEST.
+
+Noone likes to waste time on a PR that won't be accepted, so please ask first!
+
+## Inputting data
+
+Entire project is data-driven and contributions can be made either via pull request or
+submitting a json file with the data formatted as described below. If anything's unclear,
+[ask on discord](https://discord.youhavetrouble.me/).
+
+### Items
+You can see the existing data [here](https://github.com/YouHaveTrouble/DiscipleOfLand/blob/master/public/data/items.json).
+Item data adheres to following json schema:
+```json
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "type": "object",
+  "patternProperties": {
+    "^[a-zA-Z0-9-]+$": {
+      "type": "object",
+      "properties": {
+        "name": { "type": "string" },
+        "level": { "type": "integer" },
+        "stars": { "type": "integer" },
+        "perception": { "type": "integer" }
+      },
+      "required": ["name", "level"]
+    }
+  },
+  "additionalProperties": false
+}
+
+```
+
+### Zones
+You can see the existing data [here](https://github.com/YouHaveTrouble/DiscipleOfLand/blob/master/public/data/zones.json).
+Zone data adheres to following json schema:
+```json
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "type": "object",
+  "patternProperties": {
+    "^[a-zA-Z0-9-]+$": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "object",
+          "properties": {
+            "en": { "type": "string" }
+          },
+          "required": ["en"]
+        },
+        "aetherytes": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "position": {
+                "type": "object",
+                "properties": {
+                  "x": { "type": "number" },
+                  "y": { "type": "number" }
+                },
+                "required": ["x", "y"]
+              },
+              "name": {
+                "type": "object",
+                "properties": {
+                  "en": { "type": "string" }
+                },
+                "required": ["en"]
+              }
+            },
+            "required": ["position", "name"]
+          }
+        }
+      },
+      "required": ["name", "aetherytes"]
+    }
+  },
+  "additionalProperties": false
+}
+```
+
+### Nodes
+You can see the existing data [here](https://github.com/YouHaveTrouble/DiscipleOfLand/blob/master/public/data/nodes.json).
+Node data adheres to following json schema:
+```json
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "type": "object",
+  "properties": {
+    "job": { 
+      "type": "string",
+      "enum": ["botanist", "miner"]
+    },
+    "type": { 
+      "type": "string",
+      "enum": ["unspoiled", "legendary"]
+    },
+    "position": {
+      "type": "object",
+      "properties": {
+        "zone": { "type": "string" },
+        "x": { "type": "number" },
+        "y": { "type": "number" }
+      },
+      "required": ["zone", "x", "y"]
+    },
+    "times": {
+      "type": "array",
+      "items": { "type": "string", "pattern": "^\\d{2}:\\d{2}-\\d{2}:\\d{2}$" },
+      "minItems": 2,
+      "maxItems": 2
+    },
+    "items": {
+      "type": "array",
+      "items": { "type": "string" }
+    }
+  },
+  "required": ["job", "type", "position", "times", "items"]
+}
+```
+`times` is an array of two strings representing the time the node is available in Eorzea time.
+First value is the time the node becomes available, second value is the time the node disappears.
+
+`items` elements are ids corresponding to the items in the items.json file.
+

README.md

@@ -14,7 +14,7 @@ This is currently still missing a lot of functionality and data.
 - [x] Filter and sorting section/popup
 - [x] Filtering based on job
 - [x] Filtering based on level
-- [ ] Filtering based on node type (legendary, ephemeral, etc.)
+- [x] Filtering based on node type (legendary, ephemeral, etc.)
 - [ ] Fully input level 80-100 nodes data
 
 ## Nice to have checklist

index.html

@@ -13,6 +13,11 @@
     <meta property="twitter:description" content="Track timed gathering nodes in Final Fantasy XIV.">
     <meta property="og-url" content="https://dol.yht.one">
     <meta property="twitter:url" content="https://dol.yht.one">
+    <script
+            async
+            src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-8262480617556085"
+            crossorigin="anonymous"
+    ></script>
 </head>
 <body>
 <noscript>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "discipleofland",
-  "version": "0.0.5",
+  "version": "0.1.2",
   "private": true,
   "type": "module",
   "scripts": {
@@ -20,7 +20,7 @@
     "@vue/eslint-config-typescript": "^12.0.0",
     "eslint": "^8.51.0",
     "eslint-plugin-vue": "^9.17.0",
-    "vite": "^5.3.3",
+    "vite": "^5.4.18",
     "vue-eslint-parser": "^9.3.2",
     "vite-plugin-eslint": "^1.8.1"
   },

public/data/aetherytes.json

@@ -1,173 +0,0 @@
-[
-  {
-    "position": {
-      "zone": "labyrinthos",
-      "x": 30.3,
-      "y": 11.9
-    },
-    "name": {
-      "en": "The Archeion"
-    }
-  },
-  {
-    "position": {
-      "zone": "labyrinthos",
-      "x": 21.6,
-      "y": 20.4
-    },
-    "name": {
-      "en": "Sharlayan Hamlet"
-    }
-  },
-  {
-    "position": {
-      "zone": "labyrinthos",
-      "x": 6.8,
-      "y": 27.5
-    },
-    "name": {
-      "en": "Aporia"
-    }
-  },
-  {
-    "position": {
-      "zone": "thavnair",
-      "x": 29.5,
-      "y": 16.5
-    },
-    "name": {
-      "en": "Palaka's Stand"
-    }
-  },
-  {
-    "position": {
-      "zone": "thavnair",
-      "x": 10.9,
-      "y": 22.2
-    },
-    "name": {
-      "en": "The Great Work"
-    }
-  },
-  {
-    "position": {
-      "zone": "thavnair",
-      "x": 25.3,
-      "y": 34.0
-    },
-    "name": {
-      "en": "Yedlihmad"
-    }
-  },
-  {
-    "position": {
-      "zone": "shaaloani",
-      "x": 15.6,
-      "y": 19.2
-    },
-    "name": {
-      "en": "Sheshenewezi Springs"
-    }
-  },
-  {
-    "position": {
-      "zone": "shaaloani",
-      "x": 29.0,
-      "y": 30.8
-    },
-    "name": {
-      "en": "Hhusatahwi"
-    }
-  },
-  {
-    "position": {
-      "zone": "shaaloani",
-      "x": 27.1,
-      "y": 10.1
-    },
-    "name": {
-      "en": "Mehwahhetsoan"
-    }
-  },
-  {
-    "position": {
-      "zone": "heritage-found",
-      "x": 17.0,
-      "y": 9.8
-    },
-    "name": {
-      "en": "The Outskirts"
-    }
-  },
-  {
-    "position": {
-      "zone": "heritage-found",
-      "x": 31.7,
-      "y": 25.7
-    },
-    "name": {
-      "en": "Yyasulani Station"
-    }
-  },
-  {
-    "position": {
-      "zone": "heritage-found",
-      "x": 17.0,
-      "y": 23.9
-    },
-    "name": {
-      "en": "Electrope Strike"
-    }
-  },
-  {
-    "position": {
-      "zone": "living-memory",
-      "x": 21.5,
-      "y": 37.3
-    },
-    "name": {
-      "en": "Leynode Mnemo"
-    }
-  },
-  {
-    "position": {
-      "zone": "living-memory",
-      "x": 34.7,
-      "y": 15.7
-    },
-    "name": {
-      "en": "Leynode Pyro"
-    }
-  },
-  {
-    "position": {
-      "zone": "living-memory",
-      "x": 16.4,
-      "y": 13.5
-    },
-    "name": {
-      "en": "Leynode Aero"
-    }
-  },
-  {
-    "position": {
-      "zone": "urquopacha",
-      "x": 30.5,
-      "y": 34.2
-    },
-    "name": {
-      "en": "Worlar's Echo"
-    }
-  },
-  {
-    "position": {
-      "zone": "urquopacha",
-      "x": 28.1,
-      "y": 13.1
-    },
-    "name": {
-      "en": "Wachunpelo"
-    }
-  }
-]
-

public/data/items.json

@@ -1,19 +1,73 @@
 {
-  "rarefied-iceberg-lettuce": {
-    "name": "Rarefied Iceberg Lettuce",
+
+  "rarefied-sykon": {
+    "name": "Rarefied Sykon",
+    "level": 87
+  },
+  "rarefied-elder-nutmeg": {
+    "name": "Rarefied Elder Nutmeg",
     "level": 90
   },
+  "rarefied-coconut": {
+    "name": "Rarefied Coconut",
+    "level": 85
+  },
+  "rarefied-palm-log": {
+    "name": "Rarefied Palm Log",
+    "level": 85
+  },
+  "rarefied-red-pine-log": {
+    "name": "Rarefied Red Pine Log",
+    "level": 83
+  },
   "rarefied-dark-rye": {
     "name": "Rarefied Dark Rye",
     "level": 89
   },
-  "rarefied-palm-log": {
-    "name": "Rarefied Palm Log",
+  "rarefied-iceberg-lettuce": {
+    "name": "Rarefied Iceberg Lettuce",
+    "level": 90,
+    "stars": 1
+  },
+  "rarefied-ar-cean-cotton-boll": {
+    "name": "Rarefied AR-Cean Cotton Boll",
+    "level": 90,
+    "stars": 1
+  },
+
+  "rarefied-sharlayan-rock-salt": {
+    "name": "Rarefied Sharlayan Rock Salt",
+    "level": 85
+  },
+  "rarefied-raw-ametrine": {
+    "name": "Rarefied Raw Ametrine",
     "level": 81
   },
-  "rarefied-coconut": {
-    "name": "Rarefied Coconut",
-    "level": 85
+  "rarefied-eblan-alumen": {
+    "name": "Rarefied Eblan Alumen",
+    "level": 90
+  },
+  "rarefied-phrygian-gold-ore": {
+    "name":"Rarefied Phrygian Gold Ore",
+    "level": 87
+  },
+  "rarefied-pewter-ore": {
+    "name": "Rarefied Pewter Ore",
+    "level": 90,
+    "stars": 1
+  },
+  "rarefied-bismuth-ore": {
+    "name": "Rarefied Bismuth Ore",
+    "level": 83
+  },
+  "rarefied-annite": {
+    "name": "Rarefied Annite",
+    "level": 90,
+    "stars": 1
+  },
+  "rarefied-blue-zircon": {
+    "name": "Rarefied Blue Zircon",
+    "level": 89
   },
   "rarefied-titanium-gold-ore": {
     "name": "Rarefied Titanium Gold Ore",
@@ -58,5 +112,93 @@
   "rarefied-mountain-flax": {
     "name": "Rarefied Mountain Flax",
     "level": 93
+  },
+  "rarefied-raw-dark-amber": {
+    "name": "Rarefied Raw Dark Amber",
+    "level": 93
+  },
+  "raw-spodumene": {
+    "name": "Raw Spodumene",
+    "level": 90,
+    "stars": 3,
+    "perception": 3850
+  },
+  "mempisang-log": {
+    "name": "Mempisang Log",
+    "level": 90,
+    "stars": 1,
+    "perception": 2990
+  },
+  "paldao-log": {
+    "name": "Paldao Log",
+    "level": 90,
+    "stars": 2,
+    "perception": 3600
+  },
+  "shaaloani-coffee": {
+    "name": "Shaaloani Coffee",
+    "level": 100,
+    "stars": 2,
+    "perception": 4740
+  },
+  "ipe-log": {
+    "name": "Ipe Log",
+    "level": 100,
+    "stars": 1,
+    "perception": 4480
+  },
+  "nopaliflower": {
+    "name": "Nopaliflower",
+    "level": 100,
+    "stars": 2,
+    "perception": 4480
+  },
+  "blackseed-cotton-boll": {
+    "name": "Blackseed Cotton Boll",
+    "level": 100,
+    "stars": 1,
+    "perception": 4480
+  },
+  "optical-fibergrass": {
+    "name": "Optical Fibergrass",
+    "level": 100,
+    "stars": 1,
+    "perception": 4480
+  },
+  "cordia-log": {
+    "name": "Cordia Log",
+    "level": 100,
+    "stars": 2,
+    "perception": 4740
+  },
+  "cordia-sap": {
+    "name": "Cordia Sap",
+    "level": 100,
+    "stars": 1,
+    "perception": 4960
+  },
+  "cochineal-pigment": {
+    "name": "Cochineal Pigment",
+    "level": 100,
+    "stars": 2,
+    "perception": 4740
+  },
+  "fulgurpine-log": {
+    "name": "Fulgurpine Log",
+    "level": 100,
+    "stars": 3,
+    "perception": 5090
+  },
+  "carnauba-leaf": {
+    "name": "Carnauba Leaf",
+    "level": 100,
+    "stars": 3,
+    "perception": 5090
+  },
+  "urqopacha-flax": {
+    "name": "Urqopacha Flax",
+    "level": 100,
+    "stars": 3,
+    "perception": 5090
   }
 }

public/data/nodes.json

@@ -33,6 +33,105 @@
       "rarefied-coconut"
     ]
   },
+  {
+    "job": "botanist",
+    "type": "unspoiled",
+    "position": {
+      "zone": "ultima-thule",
+      "x": 14.0,
+      "y": 28.0
+    },
+    "times": [
+      "08:00-10:00",
+      "20:00-22:00"
+    ],
+    "items": [
+      "rarefied-ar-cean-cotton-boll"
+    ]
+  },
+  {
+    "job": "miner",
+    "type": "unspoiled",
+    "position": {
+      "zone": "labyrinthos",
+      "x": 32.5,
+      "y": 21.2
+    },
+    "times": [
+      "12:00-14:00",
+      "00:00-02:00"
+    ],
+    "items": [
+      "rarefied-sharlayan-rock-salt",
+      "rarefied-raw-ametrine"
+    ]
+  },
+  {
+    "job": "miner",
+    "type": "unspoiled",
+    "position": {
+      "zone": "garlemald",
+      "x": 12.9,
+      "y": 21.8
+    },
+    "times": [
+      "14:00-16:00",
+      "02:00-04:00"
+    ],
+    "items": [
+      "rarefied-eblan-alumen",
+      "rarefied-phrygian-gold-ore"
+    ]
+  },
+  {
+    "job": "miner",
+    "type": "unspoiled",
+    "position": {
+      "zone": "thavnair",
+      "x": 32.0,
+      "y": 25.0
+    },
+    "times": [
+      "04:00-06:00",
+      "16:00-18:00"
+    ],
+    "items": [
+      "rarefied-pewter-ore"
+    ]
+  },
+  {
+    "job": "miner",
+    "type": "unspoiled",
+    "position": {
+      "zone": "mare-lamentorum",
+      "x": 16.0,
+      "y": 32.0
+    },
+    "times": [
+      "06:00-08:00",
+      "18:00-20:00"
+    ],
+    "items": [
+      "rarefied-bismuth-ore"
+    ]
+  },
+  {
+    "job": "miner",
+    "type": "unspoiled",
+    "position": {
+      "zone": "elpis",
+      "x": 8.0,
+      "y": 36.0
+    },
+    "times": [
+      "10:00-12:00",
+      "22:00-00:00"
+    ],
+    "items": [
+      "rarefied-annite",
+      "rarefied-blue-zircon"
+    ]
+  },
   {
     "job": "miner",
     "type": "unspoiled",
@@ -104,7 +203,7 @@
     "job": "botanist",
     "type": "unspoiled",
     "position": {
-      "zone": "yar-tel",
+      "zone": "yak-tel",
       "x": 36.9,
       "y": 34.8
     },
@@ -148,6 +247,247 @@
     "items": [
       "rarefied-mountain-flax"
     ]
+  },
+  {
+    "job": "miner",
+    "type": "unspoiled",
+    "position": {
+      "zone": "kozamauka",
+      "x": 6.9,
+      "y": 7.5
+    },
+    "times": [
+      "10:00-12:00",
+      "22:00-00:00"
+    ],
+    "items": [
+      "rarefied-raw-dark-amber"
+    ]
+  },
+  {
+    "job": "miner",
+    "type": "legendary",
+    "position": {
+      "zone": "elpis",
+      "x": 30.2,
+      "y": 18.2
+    },
+    "times": [
+      "08:00-10:00",
+      "20:00-22:00"
+    ],
+    "items": [
+      "raw-spodumene"
+    ]
+  },
+  {
+    "job": "botanist",
+    "type": "legendary",
+    "position": {
+      "zone": "elpis",
+      "x": 33.1,
+      "y": 14.7
+    },
+    "times": [
+      "06:00-08:00",
+      "18:00-20:00"
+    ],
+    "items": [
+      "mempisang-log"
+    ]
+  },
+  {
+    "job": "botanist",
+    "type": "legendary",
+    "position": {
+      "zone": "elpis",
+      "x": 9.8,
+      "y": 29.8
+    },
+    "times": [
+      "02:00-04:00",
+      "14:00-16:00"
+    ],
+    "items": [
+      "paldao-log"
+    ]
+  },
+  {
+    "job": "botanist",
+    "type": "legendary",
+    "position": {
+      "zone": "kozamauka",
+      "x": 7.0,
+      "y": 33.0
+    },
+    "times": [
+      "12:00-14:00",
+      "00:00-02:00"
+    ],
+    "items": [
+      "ipe-log"
+    ]
+  },
+  {
+    "job": "botanist",
+    "type": "legendary",
+    "position": {
+      "zone": "shaaloani",
+      "x": 10.0,
+      "y": 31.0
+    },
+    "times": [
+      "14:00-16:00",
+      "02:00-04:00"
+    ],
+    "items": [
+      "nopaliflower"
+    ]
+  },
+  {
+    "job": "botanist",
+    "type": "legendary",
+    "position": {
+      "zone": "yak-tel",
+      "x": 14.0,
+      "y": 28.0
+    },
+    "times": [
+      "20:00-22:00",
+      "08:00-10:00"
+    ],
+    "items": [
+      "blackseed-cotton-boll"
+    ]
+  },
+  {
+    "job": "botanist",
+    "type": "legendary",
+    "position": {
+      "zone": "living-memory",
+      "x": 28.0,
+      "y": 17.0
+    },
+    "times": [
+      "16:00-18:00",
+      "04:00-06:00"
+    ],
+    "items": [
+      "blackseed-cotton-boll",
+      "optical-fibergrass"
+    ]
+  },
+  {
+    "job": "botanist",
+    "type": "legendary",
+    "position": {
+      "zone": "yak-tel",
+      "x": 35.8,
+      "y": 22.3
+    },
+    "times": [
+      "00:00-02:00",
+      "12:00-14:00"
+    ],
+    "items": [
+      "cordia-log",
+      "cordia-sap"
+    ]
+  },
+  {
+    "job": "botanist",
+    "type": "legendary",
+    "position": {
+      "zone": "shaaloani",
+      "x": 35.0,
+      "y": 16.3
+    },
+    "times": [
+      "04:00-06:00",
+      "16:00-18:00"
+    ],
+    "items": [
+      "shaaloani-coffee"
+    ]
+  },
+  {
+    "job": "botanist",
+    "type": "legendary",
+    "position": {
+      "zone": "living-memory",
+      "x": 22.5,
+      "y": 12.5
+    },
+    "times": [
+      "10:00-12:00",
+      "22:00-00:00"
+    ],
+    "items": [
+      "cordia-sap"
+    ]
+  },
+  {
+    "job": "botanist",
+    "type": "legendary",
+    "position": {
+      "zone": "heritage-found",
+      "x": 34.2,
+      "y": 20.7
+    },
+    "times": [
+      "18:00-20:00",
+      "06:00-08:00"
+    ],
+    "items": [
+      "cochineal-pigment"
+    ]
+  },
+  {
+    "job": "botanist",
+    "type": "legendary",
+    "position": {
+      "zone": "living-memory",
+      "x": 8.0,
+      "y": 10.0
+    },
+    "times": [
+      "08:00-10:00",
+      "20:00-22:00"
+    ],
+    "items": [
+      "fulgurpine-log"
+    ]
+  },
+  {
+    "job": "botanist",
+    "type": "legendary",
+    "position": {
+      "zone": "kozamauka",
+      "x": 14.0,
+      "y": 10.0
+    },
+    "times": [
+      "04:00-06:00",
+      "16:00-18:00"
+    ],
+    "items": [
+      "carnuba-leaf"
+    ]
+  },
+  {
+    "job": "botanist",
+    "type": "legendary",
+    "position": {
+      "zone": "urquopacha",
+      "x": 5.0,
+      "y": 25.0
+    },
+    "times": [
+      "06:00-08:00",
+      "18:00-20:00"
+    ],
+    "items": [
+      "urqopacha-flax"
+    ]
   }
 ]
-

public/data/zones.json

@@ -2,36 +2,380 @@
   "labyrinthos": {
     "name": {
       "en": "Labyrinthos"
+    },
+    "aetherytes": [
+      {
+        "position": {
+          "x": 30.3,
+          "y": 11.9
+        },
+        "name": {
+          "en": "The Archeion"
         }
       },
+      {
+        "position": {
+          "x": 21.6,
+          "y": 20.4
+        },
+        "name": {
+          "en": "Sharlayan Hamlet"
+        }
+      },
+      {
+        "position": {
+          "x": 6.8,
+          "y": 27.5
+        },
+        "name": {
+          "en": "Aporia"
+        }
+      }
+    ]
+  },
   "thavnair": {
     "name": {
       "en": "Thavnair"
+    },
+    "aetherytes": [
+      {
+        "position": {
+          "x": 29.5,
+          "y": 16.5
+        },
+        "name": {
+          "en": "Palaka's Stand"
         }
       },
+      {
+        "position": {
+          "x": 10.9,
+          "y": 22.2
+        },
+        "name": {
+          "en": "The Great Work"
+        }
+      },
+      {
+        "position": {
+          "x": 25.3,
+          "y": 34.0
+        },
+        "name": {
+          "en": "Yedlihmad"
+        }
+      }
+    ]
+  },
+  "mare-lamentorum": {
+    "name": {
+        "en": "Mare Lamentorum"
+    },
+    "aetherytes": [
+      {
+        "position": {
+          "x": 10.6,
+          "y": 34.3
+        },
+        "name": {
+          "en": "Sinus Lacrimarum"
+        }
+      },
+      {
+        "position": {
+          "x": 21.7,
+          "y": 11.1
+        },
+        "name": {
+          "en": "Bestways Burrow"
+        }
+      }
+    ]
+  },
+  "ultima-thule": {
+    "name": {
+      "en": "Ultima Thule"
+    },
+    "aetherytes": [
+      {
+        "position": {
+          "x": 22.7,
+          "y": 8.3
+        },
+        "name": {
+          "en": "Reah Tahra"
+        }
+      },
+      {
+        "position": {
+        },
+        "name": {
+          "en": "Abode of the Ea"
+        }
+      },
+      {
+        "position": {
+          "x": 31.3,
+          "y": 28.0
+        },
+        "name": {
+          "en": "Base Omnicron"
+        }
+      }
+    ]
+  },
+  "garlemald": {
+    "name": {
+        "en": "Garlemald"
+    },
+    "aetherytes": [
+      {
+        "position": {
+          "x": 13.3,
+          "y": 31.1
+        },
+        "name": {
+          "en": "Camp Broken Glass"
+        }
+      },
+      {
+        "position": {
+          "x": 31.7,
+          "y": 18.0
+        },
+        "name": {
+          "en": "Tertium"
+        }
+      }
+    ]
+  },
   "yak-tel": {
     "name": {
       "en": "Yak T'el"
+    },
+    "aetherytes": [
+      {
+        "position": {
+          "x": 13.5,
+          "y": 12.9
+        },
+        "name": {
+          "en": "Iq Br'aax"
         }
       },
+      {
+        "position": {
+          "x": 35.9,
+          "y": 32.0
+        },
+        "name": {
+          "en": "Mamook"
+        }
+      }
+    ]
+  },
   "shaaloani": {
     "name": {
       "en": "Shaaloani"
+    },
+    "aetherytes": [
+      {
+        "position": {
+          "x": 15.6,
+          "y": 19.2
+        },
+        "name": {
+          "en": "Sheshenewezi Springs"
         }
       },
+      {
+        "position": {
+          "x": 29.0,
+          "y": 30.8
+        },
+        "name": {
+          "en": "Hhusatahwi"
+        }
+      },
+      {
+        "position": {
+          "x": 27.1,
+          "y": 10.1
+        },
+        "name": {
+          "en": "Mehwahhetsoan"
+        }
+      }
+    ]
+  },
   "heritage-found": {
     "name": {
       "en": "Heritage Found"
+    },
+    "aetherytes": [
+      {
+        "position": {
+          "x": 17.0,
+          "y": 9.8
+        },
+        "name": {
+          "en": "The Outskirts"
         }
       },
+      {
+        "position": {
+          "x": 31.7,
+          "y": 25.7
+        },
+        "name": {
+          "en": "Yyasulani Station"
+        }
+      },
+      {
+        "position": {
+          "x": 17.0,
+          "y": 23.9
+        },
+        "name": {
+          "en": "Electrope Strike"
+        }
+      }
+    ]
+  },
   "living-memory": {
     "name": {
       "en": "Living Memory"
+    },
+    "aetherytes": [
+      {
+        "position": {
+          "x": 21.5,
+          "y": 37.3
+        },
+        "name": {
+          "en": "Leynode Mnemo"
         }
       },
+      {
+        "position": {
+          "x": 34.7,
+          "y": 15.7
+        },
+        "name": {
+          "en": "Leynode Pyro"
+        }
+      },
+      {
+        "position": {
+          "x": 16.4,
+          "y": 13.5
+        },
+        "name": {
+          "en": "Leynode Aero"
+        }
+      }
+    ]
+  },
   "urquopacha": {
     "name": {
       "en": "Urquopacha"
+    },
+    "aetherytes": [
+      {
+        "position": {
+          "x": 30.5,
+          "y": 34.2
+        },
+        "name": {
+          "en": "Worlar's Echo"
+        }
+      },
+      {
+        "position": {
+          "x": 28.1,
+          "y": 13.1
+        },
+        "name": {
+          "en": "Wachunpelo"
         }
       }
+    ]
+  },
+  "kozamauka": {
+    "name": {
+      "en": "Kozama'uka"
+    },
+    "aetherytes": [
+      {
+        "position": {
+          "x": 37.1,
+          "y": 16.9
+        },
+        "name": {
+          "en": "Dock Poga"
+        }
+      },
+      {
+        "position": {
+          "x": 18.0,
+          "y": 12.0
+        },
+        "name": {
+          "en": "Ok'hanu"
+        }
+      },
+      {
+        "position": {
+          "x": 11.8,
+          "y": 27.8
+        },
+        "name": {
+          "en": "Earthenshire"
+        }
+      },
+      {
+        "position": {
+          "x": 32.2,
+          "y": 25.9
+        },
+        "name": {
+          "en": "Many Fires"
+        }
+      }
+    ]
+  },
+  "elpis": {
+    "name": {
+      "en": "Elpis"
+    },
+    "aetherytes": [
+      {
+        "position": {
+          "x": 24.6,
+          "y": 24.0
+        },
+        "name": {
+          "en": "Anagnorisis"
+        }
+      },
+      {
+        "position": {
+          "x": 8.7,
+          "y": 32.3
+        },
+        "name": {
+          "en": "The Twelve Wonders"
+        }
+      },
+      {
+        "position": {
+          "x": 10.8,
+          "y": 17.0
+        },
+        "name": {
+          "en": "Poieten Oikos"
+        }
+      }
+    ]
+  }
 }

src/App.vue

@@ -34,6 +34,10 @@
         v-if="filtersActive"
       />
     </main>
+    <footer>
+      <p>v{{ version }}</p>
+      <p><a href="https://github.com/YouHaveTrouble/DiscipleOfLand/blob/master/CONTRIBUTING.MD">Need YOUR help to input node, item and zone data!</a></p>
+    </footer>
   </div>
 </template>
 
@@ -51,30 +55,31 @@ import Zone from "@/entities/Zone";
 import FiltersMenu from "@/components/FiltersMenu.vue";
 import Filters from "@/util/Filters";
 import GithubLogo from "@/components/icons/GithubLogo.vue";
+import {version} from "../package.json";
 
 export default defineComponent({
   name: 'App',
   components: {GithubLogo, FiltersMenu, SortedNodeList},
   data: () => ({
+    version: version,
     eorzeaTime: new EorzeaTime() as EorzeaTime,
     nodes: [] as Node[],
-    aetherytes: [] as Aetheryte[],
     items: {} as { [key: string]: Item },
     zones: {} as { [key: string]: Zone },
     filtersActive: false,
     filters: new Filters(),
   }),
   methods: {
-    findNearestAetheryte(zone: string, x: number, y: number): Aetheryte | null {
+    findNearestAetheryte(zoneName: string, x: number, y: number): Aetheryte | null {
       let result = null;
       let distance = Number.MAX_SAFE_INTEGER;
-      for (const aetheryte of this.aetherytes) {
-        if (aetheryte.position.zone !== zone) continue;
+      const zone = this.zones[zoneName]
+      if (!zone) return null;
+      for (const aetheryte of zone.aetherytes) {
         const a = aetheryte.position.x - x;
         const b = aetheryte.position.y - y;
         const distanceToAetheryte = Math.hypot(a, b);
         if (distanceToAetheryte < distance) {
-          `Aetheryte ${aetheryte.name.en}  (${distance}) is new nearest aetheryte`;
           distance = distanceToAetheryte;
           result = aetheryte;
         }
@@ -86,21 +91,7 @@ export default defineComponent({
     this.eorzeaTime = new EorzeaTime();
     setInterval(() => {
       this.eorzeaTime = new EorzeaTime();
-    }, 500);
-
-    const aetheryteData: Response | null = await fetch("/data/aetherytes.json")
-      .catch((): null => {
-        return null;
-      });
-    if (aetheryteData === null) {
-      console.error("Failed to fetch aetheryte data!")
-      return;
-    }
-
-    const aetherytes = await aetheryteData.json();
-    for (const aetheryteData of aetherytes) {
-      this.aetherytes.push(new Aetheryte(aetheryteData));
-    }
+    }, 1000);
 
     const itemData: Response | null = await fetch("/data/items.json")
       .catch((): null => {
@@ -144,21 +135,33 @@ export default defineComponent({
     for (const nodeData of nodes) {
 
       const job = jobFromString(nodeData.job);
-      if (job === null) continue;
+      if (job === null) {
+        console.debug(`Failed to parse job: ${nodeData.job}`);
+        continue;
+      }
       const nodeType = nodeTypeFromString(nodeData.type);
-      if (nodeType === null) continue;
+      if (nodeType === null) {
+        console.debug(`Failed to parse node type: ${nodeData.type}`);
+        continue;
+      }
 
       const items = [] as Item[];
       for (const itemId of nodeData.items) {
         const item = this.items[itemId];
-        if (item === undefined) continue;
+        if (item === undefined) {
+          console.debug(`Failed to find item with id: ${itemId}`);
+          continue;
+        }
         items.push(item);
       }
 
       const times = [] as TimeRange[];
       for (const timeRangeEntry of nodeData.times) {
         const timeSplit = timeRangeEntry.split("-");
-        if (timeSplit.length !== 2) continue;
+        if (timeSplit.length !== 2) {
+          console.debug(`Failed to parse time range: ${timeRangeEntry}`);
+          continue;
+        }
         const startTime = timeSplit[0].split(":");
         const endTime = timeSplit[1].split(":");
         times.push(new TimeRange(
@@ -170,7 +173,10 @@ export default defineComponent({
       }
 
       const nearestAetheryte = this.findNearestAetheryte(nodeData?.position?.zone, nodeData?.position?.x, nodeData.position?.y);
-      if (nearestAetheryte === null) continue;
+      if (nearestAetheryte === null) {
+        console.debug(`Failed to find nearest aetheryte for node: ${JSON.stringify(nodeData)}`);
+        continue;
+      }
 
       this.nodes.push(new Node(
           job,
@@ -220,4 +226,15 @@ nav {
     }
   }
 }
+footer {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  padding: 1rem 0.25rem;
+  gap: 0.5rem;
+  p {
+    margin: 0;
+  }
+}
 </style>

src/components/FiltersMenu.vue

@@ -46,13 +46,13 @@
           <span>Botanist</span>
           <input
             type="checkbox"
-            :checked="filters.jobs.includes(Job.BOTANIST)"
+            :checked="filters.jobs.has(Job.BOTANIST)"
             @change="(e: Event) => {
               const target = e.target as HTMLInputElement;
               if (target.checked) {
-                filters.jobs.push(Job.BOTANIST);
+                filters.jobs.add(Job.BOTANIST);
               } else {
-                filters.jobs = filters.jobs.filter((job) => job !== Job.BOTANIST);
+                filters.jobs.delete(Job.BOTANIST);
               }
             }"
           >
@@ -61,13 +61,48 @@
           <span>Miner</span>
           <input
             type="checkbox"
-            :checked="filters.jobs.includes(Job.MINER)"
+            :checked="filters.jobs.has(Job.MINER)"
             @change="(e: Event) => {
               const target = e.target as HTMLInputElement;
               if (target.checked) {
-                filters.jobs.push(Job.MINER);
+                filters.jobs.add(Job.MINER);
               } else {
-                filters.jobs = filters.jobs.filter((job) => job !== Job.MINER);
+                filters.jobs.delete(Job.MINER);
+              }
+            }"
+          >
+        </label>
+      </section>
+    </details>
+    <details open>
+      <summary>Node type</summary>
+      <section>
+        <label class="horizontal">
+          <span>Unspoiled</span>
+          <input
+            type="checkbox"
+            :checked="filters.nodeTypes.has(NodeType.UNSPOILED)"
+            @change="(e: Event) => {
+              const target = e.target as HTMLInputElement;
+              if (target.checked) {
+                filters.nodeTypes.add(NodeType.UNSPOILED);
+              } else {
+                filters.nodeTypes.delete(NodeType.UNSPOILED);
+              }
+            }"
+          >
+        </label>
+        <label class="horizontal">
+          <span>Legendary</span>
+          <input
+            type="checkbox"
+            :checked="filters.nodeTypes.has(NodeType.LEGENDARY)"
+            @change="(e: Event) => {
+              const target = e.target as HTMLInputElement;
+              if (target.checked) {
+                filters.nodeTypes.add(NodeType.LEGENDARY);
+              } else {
+                filters.nodeTypes.delete(NodeType.LEGENDARY);
               }
             }"
           >
@@ -81,27 +116,26 @@
 import {defineComponent} from "vue";
 import Filters from "@/util/Filters";
 import {Job} from "@/enums/Job";
+import {NodeType} from "@/enums/NodeType";
 
 export default defineComponent({
   name: "FiltersMenu",
   computed: {
+    NodeType() {
+      return NodeType
+    },
     Job() {
       return Job
     }
   },
   emits: ['update:filters'],
   data: () => ({
-    filters: {
-      minLevel: undefined,
-      maxLevel: undefined,
-      jobs: [] as Job[],
-    },
+    filters: new Filters(),
   }),
   watch: {
     filters: {
       handler(newFilters) {
-        const filters = new Filters(newFilters);
-        window.localStorage.setItem("filters", JSON.stringify(filters));
+        window.localStorage.setItem("filters", newFilters.serialize());
       },
       deep: true,
     },
@@ -115,10 +149,11 @@ export default defineComponent({
     },
   },
   mounted() {
-    const filters = window.localStorage.getItem("filters");
-    if (filters) {
-      this.filters = JSON.parse(filters);
-    }
+    const savedFilters = window.localStorage.getItem("filters");
+    if (!savedFilters) return;
+    const parsedFilters = JSON.parse(savedFilters);
+    this.filters = new Filters(parsedFilters);
+
 
   },
 });
@@ -130,6 +165,7 @@ section {
   flex-direction: column;
   gap: 1rem;
   padding-block: 1rem;
+  padding-inline: 0.25rem;
 
   details {
     background-color: #1f1f1f;

src/components/GatheringNode.vue

@@ -2,12 +2,29 @@
   <article
     class="node"
     :class="{active: gatheringNode.isActive(eorzeaTime)}"
+  >
+    <div class="location-info">
+      <div
+        v-if="!gatheringNode.isActive(eorzeaTime)"
       >
         <div class="timer">
           {{
-        gatheringNode.isActive(eorzeaTime) ? 'Active' : prettyTimer(gatheringNode.getSecondsToNextActiveTime(eorzeaTime))
+            prettyTimer(secondsToNextActiveTime)
           }}
         </div>
+      </div>
+      <div
+        v-else
+      >
+        <div class="timer">
+          Active
+          <div class="countdown">
+            {{
+              prettyTimer(secondsToNextInactiveTime)
+            }}
+          </div>
+        </div>
+      </div>
       <div class="job">
         <div class="icon">
           <img
@@ -27,9 +44,12 @@
           >
         </span>
         <div class="info">
-        <span>{{ zones[gatheringNode.nearestAetheryte.position.zone]?.name?.en }}</span>
-        <span>{{ gatheringNode.nearestAetheryte.name.en }}</span>
-        <span>{{ gatheringNode.nearestAetheryte.position.x }}, {{ gatheringNode.nearestAetheryte.position.y }}</span>
+          <span class="zone-name">{{ zones[gatheringNode.location.zone]?.name?.en }}</span>
+          <span class="aetheryte-name">{{ gatheringNode.nearestAetheryte.name.en }}</span>
+          <span class="coords">{{
+            gatheringNode.nearestAetheryte.position.x.toFixed(1)
+          }}, {{ gatheringNode.nearestAetheryte.position.y.toFixed(1) }}</span>
+        </div>
       </div>
     </div>
     <div class="items">
@@ -51,6 +71,12 @@ import Zone from "@/entities/Zone";
 
 export default defineComponent({
   name: "GatheringNode",
+  data() {
+    return {
+      secondsToNextInactiveTime: 0 as number,
+      secondsToNextActiveTime: 0 as number,
+    };
+  },
   props: {
     gatheringNode: {
       type: Object as PropType<Node>,
@@ -65,22 +91,42 @@ export default defineComponent({
       required: true
     },
   },
+  watch: {
+    eorzeaTime: {
+      handler() {
+        this.calculateTimers()
+      }
+    }
+  },
   methods: {
     prettyTimer(seconds: number): string {
       const minutes = Math.floor(seconds / 60);
       const remainingSeconds = seconds % 60;
       return `${minutes}:${remainingSeconds < 10 ? '0' : ''}${remainingSeconds}`;
+    },
+    calculateTimers() {
+      this.secondsToNextInactiveTime = this.gatheringNode.getSecondsToNextInactiveTime(this.eorzeaTime);
+      this.secondsToNextActiveTime = this.gatheringNode.getSecondsToNextActiveTime(this.eorzeaTime);
     }
   },
+  mounted() {
+    this.calculateTimers();
+  }
 });
 </script>
 
 <style scoped lang="scss">
 
 @keyframes pulsing {
-  0% {background-color: rgba(255,255,255, 0.05);}
-  50% {background-color: rgba(255,255,255, 0.075);}
-  100% {background-color: rgba(255,255,255, 0.05);}
+  0% {
+    background-color: rgba(255, 255, 255, 0.05);
+  }
+  50% {
+    background-color: rgba(255, 255, 255, 0.075);
+  }
+  100% {
+    background-color: rgba(255, 255, 255, 0.05);
+  }
 }
 
 .node {
@@ -93,6 +139,15 @@ export default defineComponent({
   border: 1px solid #fff;
   padding: 0.5rem;
   border-radius: 0.25rem;
+  content-visibility: auto;
+
+  .location-info {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    gap: 1rem;
+    align-items: center;
+  }
 
   &.active {
     animation: infinite pulsing 6s;
@@ -102,6 +157,8 @@ export default defineComponent({
     min-width: 7rem;
     font-size: 2rem;
     display: flex;
+    height: 100%;
+    flex-direction: column;
     justify-content: center;
     align-items: center;
   }
@@ -125,7 +182,7 @@ export default defineComponent({
   .aetheryte {
     display: flex;
     flex-direction: row;
-    justify-content: center;
+    justify-content: flex-start;
     align-items: center;
     gap: 0.25rem;
     font-size: 1.5rem;
@@ -149,6 +206,17 @@ export default defineComponent({
       justify-content: center;
       align-items: start;
       gap: 0.1rem;
+      line-height: 1;
+
+      .zone-name {
+        font-size: 0.75rem;
+      }
+      .aetheryte-name {
+        font-size: 1.1rem;
+      }
+      .coords {
+        padding-top: 0.15rem;
+      }
     }
   }
 

src/components/SortedNodeList.vue

@@ -49,9 +49,7 @@ export default defineComponent(
         }
       },
       eorzeaTime: {
-        handler(newValue, oldValue) {
-          if (oldValue === undefined) return;
-          if (newValue?.getMinutes() === oldValue?.getMinutes()) return;
+        handler() {
           this.sortListByTime();
         }
       }
@@ -72,7 +70,7 @@ export default defineComponent(
         let filters: Filters | null = null;
         let filtersString = window.localStorage.getItem("filters");
         if (filtersString === null) {
-          window.localStorage.setItem("filters", JSON.stringify(new Filters()));
+          window.localStorage.setItem("filters", new Filters().serialize());
           filtersString = window.localStorage.getItem("filters");
         }
         if (filtersString === null) {
@@ -85,8 +83,9 @@ export default defineComponent(
         this.displayNodes = nodes.filter((node) => {
           let shouldDisplay = false;
 
-          if (filters && !filters.jobs.includes(node.job)) {
-            return false;
+          if (filters) {
+            if (!filters.jobs.has(node.job)) return false;
+            if (!filters.nodeTypes.has(node.nodeType)) return false;
           }
 
           for (const item of node.items) {
@@ -112,6 +111,7 @@ export default defineComponent(
   display: flex;
   flex-direction: column;
   gap: 0.33rem;
-
+  padding-block: 0.5rem;
+  padding-inline: 0.25rem;
 }
 </style>

src/components/icons/GithubLogo.vue

@@ -1,11 +1,22 @@
 <template>
-  <div class="github-logo" aria-label="Github logo" title="GitHub">
-    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128">
+  <div
+    class="github-logo"
+    aria-label="Github logo"
+    title="GitHub"
+  >
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 128 128"
+    >
       <g :fill="color">
-        <path fill-rule="evenodd" clip-rule="evenodd"
-              d="M64 5.103c-33.347 0-60.388 27.035-60.388 60.388 0 26.682 17.303 49.317 41.297 57.303 3.017.56 4.125-1.31 4.125-2.905 0-1.44-.056-6.197-.082-11.243-16.8 3.653-20.345-7.125-20.345-7.125-2.747-6.98-6.705-8.836-6.705-8.836-5.48-3.748.413-3.67.413-3.67 6.063.425 9.257 6.223 9.257 6.223 5.386 9.23 14.127 6.562 17.573 5.02.542-3.903 2.107-6.568 3.834-8.076-13.413-1.525-27.514-6.704-27.514-29.843 0-6.593 2.36-11.98 6.223-16.21-.628-1.52-2.695-7.662.584-15.98 0 0 5.07-1.623 16.61 6.19C53.7 35 58.867 34.327 64 34.304c5.13.023 10.3.694 15.127 2.033 11.526-7.813 16.59-6.19 16.59-6.19 3.287 8.317 1.22 14.46.593 15.98 3.872 4.23 6.215 9.617 6.215 16.21 0 23.194-14.127 28.3-27.574 29.796 2.167 1.874 4.097 5.55 4.097 11.183 0 8.08-.07 14.583-.07 16.572 0 1.607 1.088 3.49 4.148 2.897 23.98-7.994 41.263-30.622 41.263-57.294C124.388 32.14 97.35 5.104 64 5.104z"/>
         <path
-          d="M26.484 91.806c-.133.3-.605.39-1.035.185-.44-.196-.685-.605-.543-.906.13-.31.603-.395 1.04-.188.44.197.69.61.537.91zm2.446 2.729c-.287.267-.85.143-1.232-.28-.396-.42-.47-.983-.177-1.254.298-.266.844-.14 1.24.28.394.426.472.984.17 1.255zM31.312 98.012c-.37.258-.976.017-1.35-.52-.37-.538-.37-1.183.01-1.44.373-.258.97-.025 1.35.507.368.545.368 1.19-.01 1.452zm3.261 3.361c-.33.365-1.036.267-1.552-.23-.527-.487-.674-1.18-.343-1.544.336-.366 1.045-.264 1.564.23.527.486.686 1.18.333 1.543zm4.5 1.951c-.147.473-.825.688-1.51.486-.683-.207-1.13-.76-.99-1.238.14-.477.823-.7 1.512-.485.683.206 1.13.756.988 1.237zm4.943.361c.017.498-.563.91-1.28.92-.723.017-1.308-.387-1.315-.877 0-.503.568-.91 1.29-.924.717-.013 1.306.387 1.306.88zm4.598-.782c.086.485-.413.984-1.126 1.117-.7.13-1.35-.172-1.44-.653-.086-.498.422-.997 1.122-1.126.714-.123 1.354.17 1.444.663zm0 0"/>
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M64 5.103c-33.347 0-60.388 27.035-60.388 60.388 0 26.682 17.303 49.317 41.297 57.303 3.017.56 4.125-1.31 4.125-2.905 0-1.44-.056-6.197-.082-11.243-16.8 3.653-20.345-7.125-20.345-7.125-2.747-6.98-6.705-8.836-6.705-8.836-5.48-3.748.413-3.67.413-3.67 6.063.425 9.257 6.223 9.257 6.223 5.386 9.23 14.127 6.562 17.573 5.02.542-3.903 2.107-6.568 3.834-8.076-13.413-1.525-27.514-6.704-27.514-29.843 0-6.593 2.36-11.98 6.223-16.21-.628-1.52-2.695-7.662.584-15.98 0 0 5.07-1.623 16.61 6.19C53.7 35 58.867 34.327 64 34.304c5.13.023 10.3.694 15.127 2.033 11.526-7.813 16.59-6.19 16.59-6.19 3.287 8.317 1.22 14.46.593 15.98 3.872 4.23 6.215 9.617 6.215 16.21 0 23.194-14.127 28.3-27.574 29.796 2.167 1.874 4.097 5.55 4.097 11.183 0 8.08-.07 14.583-.07 16.572 0 1.607 1.088 3.49 4.148 2.897 23.98-7.994 41.263-30.622 41.263-57.294C124.388 32.14 97.35 5.104 64 5.104z"
+        />
+        <path
+          d="M26.484 91.806c-.133.3-.605.39-1.035.185-.44-.196-.685-.605-.543-.906.13-.31.603-.395 1.04-.188.44.197.69.61.537.91zm2.446 2.729c-.287.267-.85.143-1.232-.28-.396-.42-.47-.983-.177-1.254.298-.266.844-.14 1.24.28.394.426.472.984.17 1.255zM31.312 98.012c-.37.258-.976.017-1.35-.52-.37-.538-.37-1.183.01-1.44.373-.258.97-.025 1.35.507.368.545.368 1.19-.01 1.452zm3.261 3.361c-.33.365-1.036.267-1.552-.23-.527-.487-.674-1.18-.343-1.544.336-.366 1.045-.264 1.564.23.527.486.686 1.18.333 1.543zm4.5 1.951c-.147.473-.825.688-1.51.486-.683-.207-1.13-.76-.99-1.238.14-.477.823-.7 1.512-.485.683.206 1.13.756.988 1.237zm4.943.361c.017.498-.563.91-1.28.92-.723.017-1.308-.387-1.315-.877 0-.503.568-.91 1.29-.924.717-.013 1.306.387 1.306.88zm4.598-.782c.086.485-.413.984-1.126 1.117-.7.13-1.35-.172-1.44-.653-.086-.498.422-.997 1.122-1.126.714-.123 1.354.17 1.444.663zm0 0"
+        />
       </g>
     </svg>
   </div>

src/entities/Node.ts

@@ -47,6 +47,15 @@ export default class Node {
     return countdown;
   }
 
+  getCountdownToInactive(eorzeaTime: EorzeaTime): number {
+    let countdown: number = Infinity;
+    for (const timeRange of this.times) {
+      const endTimeFrame: number = timeRange.getEndTimeFrame(eorzeaTime);
+      if (endTimeFrame < countdown) countdown = endTimeFrame;
+    }
+    return countdown;
+  }
+
   getNextActiveTime(eorzeaTime: EorzeaTime): EorzeaTime {
     let countdownTimeStamp: number = Infinity;
     for (const timeRange of this.times) {
@@ -56,8 +65,21 @@ export default class Node {
     return EorzeaTime.fromEorzeaTime(new Date(this.getCountdownToActive(eorzeaTime)));
   }
 
+  getNextInactiveTime(eorzeaTime: EorzeaTime): EorzeaTime {
+    let countdownTimeStamp: number = Infinity;
+    for (const timeRange of this.times) {
+        const endTimeFrame: number = timeRange.getEndTimeFrame(eorzeaTime);
+        if (endTimeFrame < countdownTimeStamp) countdownTimeStamp = endTimeFrame;
+    }
+    return EorzeaTime.fromEorzeaTime(new Date(this.getCountdownToInactive(eorzeaTime)));
+  }
+
   getSecondsToNextActiveTime(eorzeaTime: EorzeaTime): number {
     return Math.floor((this.getNextActiveTime(eorzeaTime).realDate.getTime() - eorzeaTime.realDate.getTime()) / 1000);
   }
 
+  getSecondsToNextInactiveTime(eorzeaTime: EorzeaTime): number {
+    return Math.floor((this.getNextInactiveTime(eorzeaTime).realDate.getTime() - eorzeaTime.realDate.getTime()) / 1000);
+  }
+
 }

src/entities/TimeRange.ts

@@ -13,7 +13,7 @@ export default class TimeRange {
   public isWithinTimeFrame(hour: number, minute: number): boolean {
     return (
         this.from[0] < hour || this.from[0] == hour && this.from[1] <= minute)
-        && (hour < this.to[0] || hour == this.to[0] && minute <= this.to[1]
+        && (hour < this.to[0] || hour == this.to[0] && minute < this.to[1]
       );
   }
 
@@ -29,4 +29,17 @@ export default class TimeRange {
     return targetDate.getTime();
   }
 
+    /**
+     * Returns the timestamp when the current time range will end
+     * @param eorzeaTimeFrom
+     */
+  public getEndTimeFrame(eorzeaTimeFrom: EorzeaTime): number {
+    const targetDate = new Date(eorzeaTimeFrom.eorzeaDate.getTime());
+    targetDate.setUTCHours(this.to[0], 0, 0, 0);
+    if (eorzeaTimeFrom.getHours() >= this.to[0]) {
+      targetDate.setUTCHours(this.to[0] + 24);
+    }
+    return targetDate.getTime();
+  }
+
 }

src/entities/Zone.ts

@@ -1,13 +1,21 @@
+import Aetheryte from "@/entities/Aetheryte";
+
 export default class Zone {
 
   name: {
     en: string,
   }
 
-  constructor(data: {name: {en: string}}) {
+  aetherytes: Array<Aetheryte> = [];
+
+  constructor(data: {name: {en: string}, aetherytes: Array<{position: {x: number, y: number, zone: string}, name: {en: string}}>}) {
     this.name = {
       en: data.name.en
     };
+    if (!Array.isArray(data.aetherytes)) return;
+    for (const aetheryte of data.aetherytes) {
+      this.aetherytes.push(new Aetheryte(aetheryte));
+    }
   }
 
 }

src/util/Filters.ts

@@ -1,28 +1,65 @@
 import {Job, jobFromString} from "@/enums/Job";
+import {NodeType, nodeTypeFromString} from "@/enums/NodeType";
 
 export default class Filters {
 
     minLevel: number;
     maxLevel: number;
-    jobs: Job[] = [];
+    jobs: Set<Job> = new Set();
+    nodeTypes: Set<NodeType> = new Set();
 
     constructor(
         data?: {
             minLevel?: number,
             maxLevel?: number,
             jobs?: string[],
+            nodeTypes?: string[],
         },
     ) {
         this.minLevel = data?.minLevel || 91;
         this.maxLevel = data?.maxLevel || 100;
-        const jobData = data?.jobs || [Job.BOTANIST, Job.MINER];
+        let jobData = [
+            Job.BOTANIST.toLowerCase(),
+            Job.MINER.toLowerCase()
+        ];
+        if (data?.jobs && Array.isArray(data?.jobs) && data?.jobs?.length > 0) {
+            jobData = data.jobs;
+        }
 
         for (const job of jobData) {
             const parsedJob = jobFromString(job);
             if (!parsedJob) continue;
-            this.jobs.push(parsedJob);
+            this.jobs.add(parsedJob);
         }
 
+        let nodeTypeData = [
+            NodeType.UNSPOILED.toLowerCase(),
+        ];
+        if (data?.nodeTypes && Array.isArray(data?.nodeTypes) && data?.nodeTypes?.length > 0) {
+            nodeTypeData = data.nodeTypes;
+        }
+
+        if (Array.isArray(nodeTypeData)) {
+            for (const nodeType of nodeTypeData) {
+                const parsedNodeType = nodeTypeFromString(nodeType);
+                if (!parsedNodeType) continue;
+                this.nodeTypes.add(parsedNodeType);
+            }
+        }
+
+
+    }
+
+    serialize(): string {
+        const serializedJobs = Array.from(this.jobs);
+        const serializedNodeTypes = Array.from(this.nodeTypes);
+
+        return JSON.stringify({
+            minLevel: this.minLevel,
+            maxLevel: this.maxLevel,
+            jobs: serializedJobs,
+            nodeTypes: serializedNodeTypes,
+        });
     }
 
 }