@jjlmoya/utils-aquarium 1.59.0 → 1.61.0

package/src/tool/aquariumLightingPhotoperiodPlanner/i18n/pt.ts

@@ -29,6 +29,7 @@ const ui = {
   plantProfileHigh: 'Plantas exigentes em luz',
   startTimeLabel: 'Hora de início do ciclo',
   photoperiodLabel: 'Fotoperíodo total',
+  intensityLabel: 'Potência definida da luminária',
   rampUpLabel: 'Rampa de amanhecer acendimento',
   rampDownLabel: 'Rampa de anoitecer desligamento',
   optionalRampsLabel: 'Rampas de regulação opcionais',
@@ -41,6 +42,7 @@ const ui = {
   targetBandLabel: 'Faixa de referência',
   lightWindowLabel: 'Janela de iluminação',
   fullIntensityLabel: 'Intensidade total',
+  fixtureLevelLabel: 'Nível da luminária',
   lightsOnLabel: 'acendimento',
   fullLightLabel: 'luz total',
   lightsOffLabel: 'desligamento',

package/src/tool/aquariumLightingPhotoperiodPlanner/i18n/ru.ts

@@ -29,6 +29,7 @@ const ui = {
   plantProfileHigh: 'Светолюбивые растения',
   startTimeLabel: 'Время начала светового дня',
   photoperiodLabel: 'Общий фотопериод',
+  intensityLabel: 'Настройка мощности светильника',
   rampUpLabel: 'Рассвет (плавное включение)',
   rampDownLabel: 'Закат (плавное выключение)',
   optionalRampsLabel: 'Фазы рассвета и заката (опционально)',
@@ -41,6 +42,7 @@ const ui = {
   targetBandLabel: 'Рекомендуемый диапазон',
   lightWindowLabel: 'График освещения',
   fullIntensityLabel: 'Полная мощность света',
+  fixtureLevelLabel: 'Уровень светильника',
   lightsOnLabel: 'включение',
   fullLightLabel: 'полный свет',
   lightsOffLabel: 'выключение',

package/src/tool/aquariumLightingPhotoperiodPlanner/i18n/sv.ts

@@ -29,6 +29,7 @@ const ui = {
   plantProfileHigh: 'Ljuskrävande växter',
   startTimeLabel: 'Starttid för cykeln',
   photoperiodLabel: 'Total fotoperiod',
+  intensityLabel: 'Inställd lampeffekt',
   rampUpLabel: 'Soluppgång (uppdimning)',
   rampDownLabel: 'Solnedgång (neddimning)',
   optionalRampsLabel: 'Valfria dimningsfaser',
@@ -41,6 +42,7 @@ const ui = {
   targetBandLabel: 'Rekommenderat intervall',
   lightWindowLabel: 'Belysningsfönster',
   fullIntensityLabel: 'Full ljusstyrka',
+  fixtureLevelLabel: 'Lampnivå',
   lightsOnLabel: 'tändning',
   fullLightLabel: 'fullt ljus',
   lightsOffLabel: 'släckning',

package/src/tool/aquariumLightingPhotoperiodPlanner/i18n/tr.ts

@@ -29,6 +29,7 @@ const ui = {
   plantProfileHigh: 'Yüksek ışık isteyen bitkiler',
   startTimeLabel: 'Döngü başlangıç saati',
   photoperiodLabel: 'Toplam fotoperiyod',
+  intensityLabel: 'Armatür güç ayarı',
   rampUpLabel: 'Gün doğumu geçişi (açılış)',
   rampDownLabel: 'Gün batımı geçişi (kapanış)',
   optionalRampsLabel: 'İsteğe bağlı karartma geçişleri',
@@ -41,6 +42,7 @@ const ui = {
   targetBandLabel: 'Hedef zaman aralığı',
   lightWindowLabel: 'Aydınlatma penceresi',
   fullIntensityLabel: 'Tam ışık gücü',
+  fixtureLevelLabel: 'Armatür seviyesi',
   lightsOnLabel: 'ışıklar açık',
   fullLightLabel: 'tam ışık',
   lightsOffLabel: 'ışıklar kapalı',

package/src/tool/aquariumLightingPhotoperiodPlanner/i18n/zh.ts

@@ -29,6 +29,7 @@ const ui = {
   plantProfileHigh: '高光照水草（阳性草）',
   startTimeLabel: '光照周期起始时间',
   photoperiodLabel: '光照总时长',
+  intensityLabel: '灯具输出设置',
   rampUpLabel: '日出渐进（开灯调光）',
   rampDownLabel: '日落渐进（关灯调光）',
   optionalRampsLabel: '可选渐变调光设置',
@@ -41,6 +42,7 @@ const ui = {
   targetBandLabel: '建议光照范围',
   lightWindowLabel: '光照时间窗口',
   fullIntensityLabel: '全功率光照时长',
+  fixtureLevelLabel: '灯具档位',
   lightsOnLabel: '开始开灯',
   fullLightLabel: '全光照',
   lightsOffLabel: '完全关灯',
@@ -65,7 +67,7 @@ const softwareApplicationSchema: WithContext<SoftwareApplication> = {
   name: '水族箱灯光光照周期规划器',
   applicationCategory: 'UtilitiesApplication',
   operatingSystem: 'Web',
-  description: '根据水族箱类型、水草需求及调光功能，计算并规划水族灯自动定时时间表。',
+  description: '根据水族箱类型、水草需求及调光功能，计算并规划水族灯自动定时时间表，方便日常维护和安排。',
   offers: { '@type': 'Offer', price: '0', priceCurrency: 'CNY' },
 };
 
@@ -85,7 +87,7 @@ const howToSchema: WithContext<HowTo> = {
 export const content: AquariumLightingPhotoperiodPlannerLocaleContent = {
   slug: 'aquarium-lighting-photoperiod-schedule-planner',
   title: '水族箱灯光与光照周期（Photoperiod）规划器',
-  description: '结合水族箱类型、水草环境、开灯时间及调光渐变，制定稳定高效的水族箱定时开灯时间表。',
+  description: '结合水族箱类型、水草环境、开灯时间及调光渐变，制定稳定高效的水族箱定时开灯时间表，帮助安排日常养护。',
   ui,
   seo: [
     { type: 'title', level: 2, text: '为什么规律的光照周期至关重要' },

package/src/tool/aquariumLightingPhotoperiodPlanner/logic.test.ts

@@ -16,6 +16,7 @@ describe("aquarium lighting photoperiod planner logic", () => {
     expect(result.band).toEqual({ low: 7, high: 9 });
     expect(result.photoperiodMinutes).toBe(480);
     expect(result.fullIntensityMinutes).toBe(420);
+    expect(result.input.intensityPercent).toBe(70);
     expect(result.phases.map((phase) => phase.phase)).toEqual([
       "ramp-up",
       "full",
@@ -112,4 +113,13 @@ describe("aquarium lighting photoperiod planner logic", () => {
     expect(formatHours(8)).toBe("8");
     expect(formatHours(8.5)).toBe("8.5");
   });
+
+  it("normalizes the fixture output setting to safe five percent steps", () => {
+    const result = calculateSchedule({
+      ...DEFAULT_INPUT,
+      intensityPercent: 73,
+    });
+
+    expect(result.input.intensityPercent).toBe(75);
+  });
 });

package/src/tool/aquariumLightingPhotoperiodPlanner/logic.ts

@@ -8,6 +8,7 @@ export interface LightingInput {
   plantProfile: PlantProfile;
   startTime: string;
   photoperiodHours: number;
+  intensityPercent: number;
   rampUpMinutes: number;
   rampDownMinutes: number;
 }
@@ -66,6 +67,7 @@ export const DEFAULT_INPUT: LightingInput = {
   plantProfile: "low",
   startTime: "08:00",
   photoperiodHours: 8,
+  intensityPercent: 70,
   rampUpMinutes: 30,
   rampDownMinutes: 30,
 };
@@ -76,6 +78,7 @@ export const PRESETS: Record<string, LightingInput> = {
     aquariumType: "tropical",
     plantProfile: "none",
     photoperiodHours: 7,
+    intensityPercent: 55,
     rampUpMinutes: 15,
     rampDownMinutes: 15,
   },
@@ -86,6 +89,7 @@ export const PRESETS: Record<string, LightingInput> = {
     plantProfile: "none",
     startTime: "10:00",
     photoperiodHours: 8,
+    intensityPercent: 80,
     rampUpMinutes: 60,
     rampDownMinutes: 60,
   },
@@ -124,6 +128,11 @@ function normalizePlantProfile(value: string): PlantProfile {
 
 function normalizeInput(input: LightingInput): LightingInput {
   const photoperiodHours = clamp(Number(input.photoperiodHours) || 8, 6, 12);
+  const intensityPercent = clamp(
+    Math.round((Number(input.intensityPercent) || 70) / 5) * 5,
+    10,
+    100,
+  );
   const photoperiodMinutes = Math.round(photoperiodHours * 60);
   const rampUpMinutes = clamp(Number(input.rampUpMinutes) || 0, 0, 180);
   const rampDownMinutes = clamp(Number(input.rampDownMinutes) || 0, 0, 180);
@@ -138,6 +147,7 @@ function normalizeInput(input: LightingInput): LightingInput {
     plantProfile: normalizePlantProfile(input.plantProfile),
     startTime: formatClock(parseClock(input.startTime)),
     photoperiodHours,
+    intensityPercent,
     rampUpMinutes: Math.round(rampUpMinutes * scale),
     rampDownMinutes: Math.round(rampDownMinutes * scale),
   };

package/src/tool/aquariumLightingPhotoperiodPlanner/storage.ts

@@ -2,17 +2,21 @@ import type { LightingInput } from "./logic";
 
 const STORAGE_KEY = "jjlmoya-aquarium-lighting-photoperiod-planner";
 
+function hasLightingValues(candidate: Partial<LightingInput>): boolean {
+  const strings = [candidate.aquariumType, candidate.plantProfile, candidate.startTime];
+  const numbers = [
+    candidate.photoperiodHours,
+    candidate.intensityPercent,
+    candidate.rampUpMinutes,
+    candidate.rampDownMinutes,
+  ];
+  return strings.every((value) => typeof value === "string") && numbers.every((value) => typeof value === "number");
+}
+
 function isLightingInput(value: unknown): value is LightingInput {
   if (!value || typeof value !== "object") return false;
   const candidate = value as Partial<LightingInput>;
-  return (
-    typeof candidate.aquariumType === "string" &&
-    typeof candidate.plantProfile === "string" &&
-    typeof candidate.startTime === "string" &&
-    typeof candidate.photoperiodHours === "number" &&
-    typeof candidate.rampUpMinutes === "number" &&
-    typeof candidate.rampDownMinutes === "number"
-  );
+  return hasLightingValues(candidate);
 }
 
 export function loadInput(): LightingInput | undefined {

package/src/tool/aquariumLightingPhotoperiodPlanner/ui.ts

@@ -13,6 +13,7 @@ export interface AquariumLightingPhotoperiodPlannerUI extends Record<
   plantProfileHigh: string;
   startTimeLabel: string;
   photoperiodLabel: string;
+  intensityLabel: string;
   rampUpLabel: string;
   rampDownLabel: string;
   optionalRampsLabel: string;
@@ -25,6 +26,7 @@ export interface AquariumLightingPhotoperiodPlannerUI extends Record<
   targetBandLabel: string;
   lightWindowLabel: string;
   fullIntensityLabel: string;
+  fixtureLevelLabel: string;
   lightsOnLabel: string;
   fullLightLabel: string;
   lightsOffLabel: string;

package/src/tool/aquariumTankVolumeWaterChangeCalculator/i18n/fr.ts

@@ -4,7 +4,7 @@ export const content = createAquariumContent({
   locale: 'fr',
   slug: 'calculateur-volume-aquarium-changement-eau',
   title: "Calculateur du volume d'aquarium et du changement d'eau",
-  description: "Calculez le volume d'eau utile, le déplacement du substrat et la quantité d'eau à remplacer à partir des dimensions intérieures de votre aquarium.",
+  description: "Calculez le volume d'eau utile, le déplacement du substrat et la quantité d'eau à remplacer à partir des dimensions intérieures de votre aquarium pour planifier l'entretien.",
   faq: [
     { question: "Le calculateur utilise-t-il la capacité indiquée sur l'aquarium ?", answer: "Non. Il retire la hauteur du substrat du volume géométrique et fournit une estimation de l'eau réellement disponible." },
     { question: "Comment fonctionne l'option façade bombée ?", answer: "Elle ajoute un segment circulaire approximatif à une base rectangulaire. Le résultat reste indicatif, car les profils de verre varient selon les aquariums." },

package/src/tool/aquariumTankVolumeWaterChangeCalculator/i18n/it.ts

@@ -4,7 +4,7 @@ export const content = createAquariumContent({
   locale: 'it',
   slug: 'calcolatore-volume-acquario-cambio-acqua',
   title: "Calcolatore del volume dell'acquario e del cambio d'acqua",
-  description: "Calcola il volume d'acqua utile, lo spazio occupato dal substrato e la quantità da sostituire usando le misure interne del tuo acquario.",
+  description: "Calcola il volume d'acqua utile, lo spazio occupato dal substrato e la quantità da sostituire usando le misure interne del tuo acquario per pianificare la manutenzione.",
   faq: [
     { question: "Il calcolatore usa la capacità indicata sulla confezione?", answer: "No. Sottrae l'altezza del substrato dal volume geometrico e fornisce una stima dell'acqua effettivamente disponibile." },
     { question: "Come funziona l'opzione con fronte curvo?", answer: "Aggiunge un segmento circolare approssimato alla base rettangolare. Il risultato è indicativo perché i profili del vetro curvo cambiano da una vasca all'altra." },

package/src/tools.ts

@@ -2,6 +2,7 @@ export { ALL_ENTRIES } from './entries';
 import { aquariumTankVolumeWaterChangeCalculator } from './tool/aquariumTankVolumeWaterChangeCalculator/entry';
 import { aquariumFilterTurnoverStockingPlanner } from './tool/aquariumFilterTurnoverStockingPlanner/entry';
 import { aquariumLightingPhotoperiodPlanner } from './tool/aquariumLightingPhotoperiodPlanner/entry';
+import { aquariumEvaporationTopOffPlanner } from './tool/aquariumEvaporationTopOffPlanner/entry';
 
 export const ALL_TOOLS = [{
   entry: aquariumTankVolumeWaterChangeCalculator,
@@ -18,4 +19,9 @@ export const ALL_TOOLS = [{
   Component: () => import('./tool/aquariumLightingPhotoperiodPlanner/component.astro'),
   SEOComponent: () => import('./tool/aquariumLightingPhotoperiodPlanner/seo.astro'),
   BibliographyComponent: () => import('./tool/aquariumLightingPhotoperiodPlanner/bibliography.astro'),
+}, {
+  entry: aquariumEvaporationTopOffPlanner,
+  Component: () => import('./tool/aquariumEvaporationTopOffPlanner/component.astro'),
+  SEOComponent: () => import('./tool/aquariumEvaporationTopOffPlanner/seo.astro'),
+  BibliographyComponent: () => import('./tool/aquariumEvaporationTopOffPlanner/bibliography.astro'),
 }];