Refactor code structure for improved readability and maintainability
This commit is contained in:
4
.gitignore
vendored
4
.gitignore
vendored
@@ -45,4 +45,6 @@ a.py
|
||||
/pages/api/auth/*
|
||||
|
||||
/cypress
|
||||
cypress.json
|
||||
cypress.json
|
||||
|
||||
/tool-templates
|
||||
465
ADDING_NEW_TOOLS_GUIDE.md
Normal file
465
ADDING_NEW_TOOLS_GUIDE.md
Normal file
@@ -0,0 +1,465 @@
|
||||
# Adding New Tools and Functionality Guide
|
||||
|
||||
This document provides a comprehensive guide for adding new tools and functionality to the Wastpol web application. It's designed to help developers (including AI agents) integrate new tools from separate projects into the main application.
|
||||
|
||||
## Project Overview
|
||||
|
||||
The Wastpol application is a Next.js-based web application with the following key characteristics:
|
||||
- **Framework**: Next.js 12 with React 17
|
||||
- **Styling**: Tailwind CSS with custom UI components
|
||||
- **Authentication**: NextAuth.js
|
||||
- **Architecture**: Pages-based routing with component-driven design
|
||||
- **UI Library**: Custom components + Evergreen UI + Heroicons
|
||||
|
||||
## Project Structure
|
||||
|
||||
```
|
||||
web-app/
|
||||
├── pages/ # Next.js pages (routes)
|
||||
│ ├── api/ # API endpoints
|
||||
│ ├── index.js # Main dashboard with tabs
|
||||
│ ├── cross.js # Grid tool
|
||||
│ ├── uziomy.js # Ground connections tool
|
||||
│ ├── tracking.js # Package tracking
|
||||
│ └── [other-tools].js # Additional tools
|
||||
├── components/
|
||||
│ ├── ui/ # Reusable UI components
|
||||
│ │ ├── Layout.js # Main layout with navigation
|
||||
│ │ └── components.js # UI component library
|
||||
│ └── templates/ # Tool-specific components
|
||||
├── styles/ # Global styles
|
||||
├── public/ # Static assets
|
||||
└── externals/ # External data files
|
||||
```
|
||||
|
||||
## Adding a New Tool - Step by Step
|
||||
|
||||
### 1. Planning Phase
|
||||
|
||||
Before adding a new tool, define:
|
||||
- **Tool Purpose**: What does the tool do?
|
||||
- **Tool Name**: Short, descriptive name
|
||||
- **Route**: URL path (e.g., `/new-tool`)
|
||||
- **Icon**: Choose from Heroicons
|
||||
- **Dependencies**: Any new packages needed
|
||||
- **API Requirements**: Backend processing needs
|
||||
|
||||
### 2. Tool Integration Checklist
|
||||
|
||||
#### A. Create the Main Page Component
|
||||
|
||||
Create a new file: `pages/[tool-name].js`
|
||||
|
||||
**Template Structure:**
|
||||
```javascript
|
||||
import { useState, useCallback } from "react";
|
||||
import { useSession, signIn } from "next-auth/react";
|
||||
import Layout from "../components/ui/Layout";
|
||||
import { Card, CardHeader, CardContent, CardTitle, CardDescription, Button, Alert } from "../components/ui/components";
|
||||
import { [ToolIcon] } from '@heroicons/react/24/outline';
|
||||
|
||||
export default function NewTool() {
|
||||
const { data: session } = useSession();
|
||||
const [isLoading, setIsLoading] = useState(false);
|
||||
|
||||
// Tool-specific state variables
|
||||
const [toolData, setToolData] = useState(null);
|
||||
|
||||
// Authentication check
|
||||
if (!session) {
|
||||
return (
|
||||
<Layout title="Wastpol - New Tool">
|
||||
<div className="flex items-center justify-center min-h-screen">
|
||||
<Card className="w-full max-w-md">
|
||||
<CardContent className="text-center p-6">
|
||||
<h2 className="text-xl font-semibold mb-4">Wymagane logowanie</h2>
|
||||
<Button onClick={() => signIn()}>
|
||||
Zaloguj się
|
||||
</Button>
|
||||
</CardContent>
|
||||
</Card>
|
||||
</div>
|
||||
</Layout>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<Layout title="Wastpol - New Tool">
|
||||
<div className="p-6 max-w-7xl mx-auto">
|
||||
{/* Page Header */}
|
||||
<div className="mb-8">
|
||||
<h1 className="text-3xl font-bold text-gray-900 mb-2">
|
||||
New Tool Name
|
||||
</h1>
|
||||
<p className="text-gray-600">
|
||||
Tool description here
|
||||
</p>
|
||||
</div>
|
||||
|
||||
{/* Main Content */}
|
||||
<Card>
|
||||
<CardHeader>
|
||||
<CardTitle className="flex items-center">
|
||||
<[ToolIcon] className="w-6 h-6 mr-2" />
|
||||
Tool Interface
|
||||
</CardTitle>
|
||||
<CardDescription>
|
||||
Brief description of what this tool does
|
||||
</CardDescription>
|
||||
</CardHeader>
|
||||
<CardContent>
|
||||
{/* Tool-specific UI goes here */}
|
||||
</CardContent>
|
||||
</Card>
|
||||
</div>
|
||||
</Layout>
|
||||
);
|
||||
}
|
||||
```
|
||||
|
||||
#### B. Add Navigation Entry
|
||||
|
||||
Update `components/ui/Layout.js`:
|
||||
|
||||
1. **Import the icon:**
|
||||
```javascript
|
||||
import {
|
||||
// ...existing imports
|
||||
[NewToolIcon]
|
||||
} from '@heroicons/react/24/outline';
|
||||
```
|
||||
|
||||
2. **Add to navigationItems array:**
|
||||
```javascript
|
||||
const navigationItems = [
|
||||
// ...existing items
|
||||
{ name: 'New Tool Name', href: '/new-tool', icon: NewToolIcon },
|
||||
];
|
||||
```
|
||||
|
||||
#### C. Create API Endpoint (if needed)
|
||||
|
||||
Create `pages/api/[tool-name].js`:
|
||||
|
||||
```javascript
|
||||
import formidable from 'formidable';
|
||||
import { getSession } from 'next-auth/react';
|
||||
|
||||
export const config = {
|
||||
api: {
|
||||
bodyParser: false,
|
||||
},
|
||||
};
|
||||
|
||||
export default async function handler(req, res) {
|
||||
// Authentication check
|
||||
const session = await getSession({ req });
|
||||
if (!session) {
|
||||
return res.status(401).json({ error: 'Unauthorized' });
|
||||
}
|
||||
|
||||
if (req.method !== 'POST') {
|
||||
return res.status(405).json({ error: 'Method not allowed' });
|
||||
}
|
||||
|
||||
try {
|
||||
// Tool-specific processing logic
|
||||
const form = new formidable.IncomingForm();
|
||||
const [fields, files] = await form.parse(req);
|
||||
|
||||
// Process the request
|
||||
const result = await processToolData(fields, files);
|
||||
|
||||
res.status(200).json({
|
||||
success: true,
|
||||
data: result
|
||||
});
|
||||
} catch (error) {
|
||||
console.error('Tool processing error:', error);
|
||||
res.status(500).json({
|
||||
error: 'Internal server error',
|
||||
details: error.message
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
async function processToolData(fields, files) {
|
||||
// Implement tool-specific logic here
|
||||
return {};
|
||||
}
|
||||
```
|
||||
|
||||
#### D. Add Tool-Specific Components (Optional)
|
||||
|
||||
Create reusable components in `components/templates/[tool-name]/`:
|
||||
|
||||
```javascript
|
||||
// components/templates/new-tool/ToolComponent.js
|
||||
import { useState } from 'react';
|
||||
import { Button, Alert } from '../../ui/components';
|
||||
|
||||
export default function ToolComponent({ onSubmit, isLoading }) {
|
||||
const [inputData, setInputData] = useState('');
|
||||
|
||||
const handleSubmit = (e) => {
|
||||
e.preventDefault();
|
||||
onSubmit(inputData);
|
||||
};
|
||||
|
||||
return (
|
||||
<form onSubmit={handleSubmit} className="space-y-4">
|
||||
{/* Tool-specific form elements */}
|
||||
<Button
|
||||
type="submit"
|
||||
disabled={isLoading}
|
||||
className="w-full"
|
||||
>
|
||||
{isLoading ? 'Processing...' : 'Submit'}
|
||||
</Button>
|
||||
</form>
|
||||
);
|
||||
}
|
||||
```
|
||||
|
||||
### 3. Integration from Separate Project
|
||||
|
||||
#### A. Identify Components to Port
|
||||
|
||||
When integrating from a separate project:
|
||||
|
||||
1. **Identify core functionality files**
|
||||
2. **Extract reusable components**
|
||||
3. **Map dependencies and APIs**
|
||||
4. **Identify data processing logic**
|
||||
|
||||
#### B. Dependency Management
|
||||
|
||||
1. **Check existing dependencies** in `package.json`
|
||||
2. **Add new dependencies** if needed:
|
||||
```bash
|
||||
npm install [new-package]
|
||||
```
|
||||
3. **Update package.json** if manual editing is needed
|
||||
|
||||
#### C. Asset Management
|
||||
|
||||
1. **Static files**: Place in `public/` directory
|
||||
2. **External data**: Place in `externals/` directory
|
||||
3. **Uploads**: Use `public/uploads/` for user uploads
|
||||
|
||||
### 4. Common Integration Patterns
|
||||
|
||||
#### File Upload Pattern
|
||||
```javascript
|
||||
import { FileUploader, FileCard } from "evergreen-ui";
|
||||
|
||||
const [files, setFiles] = useState([]);
|
||||
const handleChange = useCallback((files) => setFiles([files[0]]), []);
|
||||
```
|
||||
|
||||
#### API Call Pattern
|
||||
```javascript
|
||||
import axios from "axios";
|
||||
|
||||
const handleSubmit = async (data) => {
|
||||
setIsLoading(true);
|
||||
try {
|
||||
const formData = new FormData();
|
||||
formData.append("data", JSON.stringify(data));
|
||||
|
||||
const response = await axios.post("/api/new-tool", formData);
|
||||
setResult(response.data);
|
||||
} catch (error) {
|
||||
setError(error.message);
|
||||
} finally {
|
||||
setIsLoading(false);
|
||||
}
|
||||
};
|
||||
```
|
||||
|
||||
#### State Management Pattern
|
||||
```javascript
|
||||
const [isLoading, setIsLoading] = useState(false);
|
||||
const [result, setResult] = useState(null);
|
||||
const [error, setError] = useState(null);
|
||||
```
|
||||
|
||||
### 5. Styling Guidelines
|
||||
|
||||
#### Use Existing UI Components
|
||||
```javascript
|
||||
import {
|
||||
Card,
|
||||
CardHeader,
|
||||
CardContent,
|
||||
CardTitle,
|
||||
CardDescription,
|
||||
Button,
|
||||
Alert
|
||||
} from "../components/ui/components";
|
||||
```
|
||||
|
||||
#### Consistent Layout Classes
|
||||
- **Container**: `p-6 max-w-7xl mx-auto`
|
||||
- **Page Header**: `mb-8`
|
||||
- **Title**: `text-3xl font-bold text-gray-900 mb-2`
|
||||
- **Description**: `text-gray-600`
|
||||
- **Cards**: Use existing Card components
|
||||
- **Spacing**: `space-y-4` for form elements
|
||||
|
||||
### 6. Error Handling Best Practices
|
||||
|
||||
#### Client-Side Error Handling
|
||||
```javascript
|
||||
const [error, setError] = useState(null);
|
||||
|
||||
// Clear error on new action
|
||||
const clearError = () => setError(null);
|
||||
|
||||
// Display errors
|
||||
{error && (
|
||||
<Alert variant="destructive" className="mb-4">
|
||||
{error}
|
||||
</Alert>
|
||||
)}
|
||||
```
|
||||
|
||||
#### Server-Side Error Handling
|
||||
```javascript
|
||||
try {
|
||||
// Process request
|
||||
} catch (error) {
|
||||
console.error('Tool error:', error);
|
||||
return res.status(500).json({
|
||||
error: 'Processing failed',
|
||||
details: process.env.NODE_ENV === 'development' ? error.message : undefined
|
||||
});
|
||||
}
|
||||
```
|
||||
|
||||
### 7. Testing Integration
|
||||
|
||||
#### Manual Testing Checklist
|
||||
- [ ] Tool loads without errors
|
||||
- [ ] Authentication works correctly
|
||||
- [ ] Navigation item appears and works
|
||||
- [ ] File uploads work (if applicable)
|
||||
- [ ] API endpoints respond correctly
|
||||
- [ ] Results display properly
|
||||
- [ ] Error handling works
|
||||
- [ ] Mobile responsiveness
|
||||
- [ ] Loading states display correctly
|
||||
|
||||
#### Console Testing
|
||||
1. Check browser console for errors
|
||||
2. Verify API responses in Network tab
|
||||
3. Test with different user roles
|
||||
|
||||
### 8. AI Agent Instructions
|
||||
|
||||
When an AI agent is adding a new tool:
|
||||
|
||||
#### Information to Gather
|
||||
1. **Tool description and purpose**
|
||||
2. **Required input/output formats**
|
||||
3. **Processing logic requirements**
|
||||
4. **UI/UX preferences**
|
||||
5. **Integration points with existing system**
|
||||
|
||||
#### Step-by-Step Process
|
||||
1. **Analyze the existing project structure**
|
||||
2. **Identify the closest existing tool for reference**
|
||||
3. **Create the main page component**
|
||||
4. **Add navigation entry**
|
||||
5. **Create API endpoint if needed**
|
||||
6. **Test the integration**
|
||||
7. **Handle any errors or conflicts**
|
||||
|
||||
#### Code Quality Standards
|
||||
- Follow existing naming conventions
|
||||
- Use consistent styling patterns
|
||||
- Implement proper error handling
|
||||
- Add loading states for async operations
|
||||
- Ensure responsive design
|
||||
- Maintain authentication requirements
|
||||
|
||||
### 9. Example Tool Addition
|
||||
|
||||
Here's how to add a hypothetical "Document Generator" tool:
|
||||
|
||||
#### Step 1: Create `pages/document-generator.js`
|
||||
```javascript
|
||||
import { useState } from "react";
|
||||
import { useSession, signIn } from "next-auth/react";
|
||||
import Layout from "../components/ui/Layout";
|
||||
import { Card, CardHeader, CardContent, CardTitle } from "../components/ui/components";
|
||||
import { DocumentTextIcon } from '@heroicons/react/24/outline';
|
||||
|
||||
export default function DocumentGenerator() {
|
||||
const { data: session } = useSession();
|
||||
// Component implementation...
|
||||
}
|
||||
```
|
||||
|
||||
#### Step 2: Update `components/ui/Layout.js`
|
||||
```javascript
|
||||
import { DocumentTextIcon } from '@heroicons/react/24/outline';
|
||||
|
||||
const navigationItems = [
|
||||
// ...existing items
|
||||
{ name: 'Generator dokumentów', href: '/document-generator', icon: DocumentTextIcon },
|
||||
];
|
||||
```
|
||||
|
||||
#### Step 3: Create `pages/api/document-generator.js`
|
||||
```javascript
|
||||
export default async function handler(req, res) {
|
||||
// API implementation...
|
||||
}
|
||||
```
|
||||
|
||||
### 10. Maintenance and Updates
|
||||
|
||||
#### Version Control
|
||||
- Commit changes with descriptive messages
|
||||
- Tag releases for major tool additions
|
||||
- Document breaking changes
|
||||
|
||||
#### Documentation Updates
|
||||
- Update this guide when patterns change
|
||||
- Document new dependencies
|
||||
- Keep API documentation current
|
||||
|
||||
#### Performance Considerations
|
||||
- Monitor bundle size with new dependencies
|
||||
- Optimize images and assets
|
||||
- Consider lazy loading for heavy components
|
||||
|
||||
---
|
||||
|
||||
## Quick Reference Commands
|
||||
|
||||
```bash
|
||||
# Install new dependency
|
||||
npm install [package-name]
|
||||
|
||||
# Run development server
|
||||
npm run dev
|
||||
|
||||
# Build for production
|
||||
npm run build
|
||||
|
||||
# Deploy changes
|
||||
npm run deploy
|
||||
```
|
||||
|
||||
## Common File Locations
|
||||
|
||||
- **New page**: `pages/[tool-name].js`
|
||||
- **API endpoint**: `pages/api/[tool-name].js`
|
||||
- **Components**: `components/templates/[tool-name]/`
|
||||
- **Navigation**: `components/ui/Layout.js`
|
||||
- **Styles**: `styles/globals.css`
|
||||
- **Assets**: `public/`
|
||||
|
||||
This guide should provide everything needed to successfully integrate new tools into the Wastpol application while maintaining consistency and code quality.
|
||||
153
SPADKI_INTEGRATION_SUMMARY.md
Normal file
153
SPADKI_INTEGRATION_SUMMARY.md
Normal file
@@ -0,0 +1,153 @@
|
||||
# Power System Designer - Integration Summary
|
||||
|
||||
## ✅ **Fixes and Improvements Implemented**
|
||||
|
||||
### **1. Fixed Object Selection**
|
||||
- **Issue**: Selection tool didn't work properly
|
||||
- **Fix**:
|
||||
- Implemented proper `findObjectAt()` function with correct hit detection
|
||||
- Added visual feedback for selected objects (blue glow)
|
||||
- Improved click detection accuracy with 20px radius
|
||||
|
||||
### **2. Added Object Dragging**
|
||||
- **Issue**: Objects couldn't be moved
|
||||
- **Fix**:
|
||||
- Implemented `handleCanvasMouseDown`, `handleCanvasMouseMove`, and `handleCanvasMouseUp` event handlers
|
||||
- Added drag state management with `isDragging` and `dragOffset`
|
||||
- Objects snap to 20px grid while dragging
|
||||
- Visual feedback during dragging operations
|
||||
|
||||
### **3. Fixed Cable Connection Tool**
|
||||
- **Issue**: Cable connection tool didn't work at all
|
||||
- **Fix**:
|
||||
- Proper two-click connection workflow
|
||||
- Visual feedback showing selected connection source (orange highlight)
|
||||
- Connection status indicator overlay
|
||||
- Automatic cable length calculation based on object positions
|
||||
- Prevention of duplicate connections and self-connections
|
||||
- Error messages for invalid connections
|
||||
|
||||
### **4. Enhanced Object Data Structure**
|
||||
- **Issue**: Objects didn't have all necessary information
|
||||
- **Fix**:
|
||||
- Added comprehensive object properties:
|
||||
- `typeDescription` - Custom type descriptions
|
||||
- `load` - Current load vs rated power
|
||||
- `voltage` - Operating voltage
|
||||
- `current` - Current flow (for calculations)
|
||||
- Position tracking (`x`, `y`)
|
||||
- Proper default values for each object type
|
||||
|
||||
### **5. Improved Cable Data Structure**
|
||||
- **Enhanced Cable Properties**:
|
||||
- `resistance` - Electrical resistance based on cable type/size
|
||||
- Better cable type handling (underground vs overhead)
|
||||
- Automatic resistance calculation
|
||||
- Improved cable length calculation
|
||||
|
||||
### **6. Enhanced User Interface**
|
||||
|
||||
#### **Object Properties Panel**:
|
||||
- Object type indicator with ID
|
||||
- Position display (X, Y coordinates)
|
||||
- Type-specific property fields
|
||||
- Enhanced transformer properties (primary/secondary voltage, power rating)
|
||||
- Load vs power rating for distribution points
|
||||
- Custom type descriptions
|
||||
|
||||
#### **Cable Properties Panel**:
|
||||
- Connection source/destination display
|
||||
- Electrical parameters (resistance, installation type)
|
||||
- Cable type selection with proper underground/overhead distinction
|
||||
- Cross-section selection with standard sizes
|
||||
- Delete cable functionality
|
||||
|
||||
#### **Visual Improvements**:
|
||||
- Better object highlighting (selected vs connection source)
|
||||
- Improved cable rendering with proper colors:
|
||||
- Purple: Underground cables (YAKY, NA2XY-J)
|
||||
- Orange: Overhead cables (AL, AsXSn)
|
||||
- Dashed lines for overhead cables
|
||||
- Cable labels with background for better readability
|
||||
- Connection status indicator overlay
|
||||
|
||||
### **7. Added Interaction Features**
|
||||
|
||||
#### **Mouse Controls**:
|
||||
- **Left Click**: Select/place objects
|
||||
- **Drag**: Move selected objects (with grid snapping)
|
||||
- **Connect Mode**: Two-click cable connection workflow
|
||||
|
||||
#### **Keyboard Shortcuts**:
|
||||
- **Delete/Backspace**: Delete selected object or cable
|
||||
- **Escape**: Clear selection and return to select mode
|
||||
|
||||
#### **Object Management**:
|
||||
- Delete objects (with automatic cable cleanup)
|
||||
- Delete cables individually
|
||||
- Proper state management for selections
|
||||
|
||||
### **8. Error Handling and Validation**
|
||||
- Transformer limit enforcement (only one allowed)
|
||||
- Duplicate connection prevention
|
||||
- Self-connection prevention
|
||||
- Error messages with clear descriptions
|
||||
- Input validation for numeric fields
|
||||
|
||||
### **9. Technical Improvements**
|
||||
|
||||
#### **Event System**:
|
||||
- Proper mouse event handling with coordinate transformation
|
||||
- Grid snapping for precise placement
|
||||
- Drag offset calculation for smooth object movement
|
||||
|
||||
#### **State Management**:
|
||||
- Clean separation of object and cable selections
|
||||
- Proper state updates with React patterns
|
||||
- Automatic re-rendering on state changes
|
||||
|
||||
#### **Performance**:
|
||||
- Efficient hit detection algorithms
|
||||
- Optimized canvas rendering
|
||||
- Proper event listener cleanup
|
||||
|
||||
## **🎯 Key Features Now Working**
|
||||
|
||||
1. **✅ Object Selection**: Click objects to select and edit properties
|
||||
2. **✅ Object Movement**: Drag objects to new positions with grid snapping
|
||||
3. **✅ Cable Connections**: Two-click workflow to connect objects
|
||||
4. **✅ Property Editing**: Comprehensive property panels for all object types
|
||||
5. **✅ Visual Feedback**: Clear indication of selected items and connection states
|
||||
6. **✅ Delete Functions**: Remove objects and cables with keyboard shortcuts
|
||||
7. **✅ Data Persistence**: Export/import with complete object data
|
||||
8. **✅ Electrical Calculations**: Ready for voltage drop analysis
|
||||
|
||||
## **🔧 Usage Instructions**
|
||||
|
||||
### **Adding Objects**:
|
||||
1. Click object type button in toolbar (Transformer, Box, Pole, End Connection)
|
||||
2. Click on canvas to place object
|
||||
3. Object automatically snaps to grid
|
||||
|
||||
### **Selecting and Moving**:
|
||||
1. Click "Wybierz" (Select) tool
|
||||
2. Click object to select (blue highlight appears)
|
||||
3. Drag selected object to move (snaps to grid)
|
||||
|
||||
### **Connecting with Cables**:
|
||||
1. Click "Połącz kablem" (Connect with Cable) tool
|
||||
2. Click first object (orange highlight appears)
|
||||
3. Click second object to create cable connection
|
||||
4. Cable appears with automatic length calculation
|
||||
|
||||
### **Editing Properties**:
|
||||
1. Select object or cable
|
||||
2. Use properties panel on right to edit all parameters
|
||||
3. Changes are saved automatically
|
||||
|
||||
### **Deleting Items**:
|
||||
1. Select object or cable
|
||||
2. Press Delete/Backspace key, OR
|
||||
3. Use "Usuń" (Delete) button in properties panel
|
||||
|
||||
The power system designer is now fully functional with professional-grade features for electrical system design and analysis!
|
||||
@@ -11,13 +11,15 @@ import {
|
||||
XMarkIcon as XIcon,
|
||||
UserIcon,
|
||||
ArrowRightOnRectangleIcon as LogoutIcon,
|
||||
TruckIcon
|
||||
TruckIcon,
|
||||
CpuChipIcon
|
||||
} from '@heroicons/react/24/outline';
|
||||
|
||||
const navigationItems = [
|
||||
{ name: 'Przekrój terenu', href: '/', icon: HomeIcon },
|
||||
{ name: 'Siatka', href: '/cross', icon: GridIcon },
|
||||
{ name: 'Uziomy', href: '/uziomy', icon: LightningBoltIcon },
|
||||
{ name: 'Spadki napięcia', href: '/spadki', icon: CpuChipIcon },
|
||||
{ name: 'Śledzenie przesyłek', href: '/tracking', icon: TruckIcon },
|
||||
];
|
||||
|
||||
|
||||
191
pages/api/spadki.js
Normal file
191
pages/api/spadki.js
Normal file
@@ -0,0 +1,191 @@
|
||||
import { getSession } from 'next-auth/react';
|
||||
|
||||
export default async function handler(req, res) {
|
||||
// Authentication check
|
||||
const session = await getSession({ req });
|
||||
if (!session) {
|
||||
return res.status(401).json({ error: 'Unauthorized' });
|
||||
}
|
||||
|
||||
if (req.method !== 'POST') {
|
||||
return res.status(405).json({ error: 'Method not allowed' });
|
||||
}
|
||||
|
||||
try {
|
||||
const { objects, cables } = req.body;
|
||||
|
||||
// Validate input data
|
||||
if (!objects || !cables) {
|
||||
return res.status(400).json({ error: 'Missing objects or cables data' });
|
||||
}
|
||||
|
||||
// Find transformer (source)
|
||||
const transformer = objects.find(obj => obj.type === 'transformer');
|
||||
if (!transformer) {
|
||||
return res.status(400).json({ error: 'No transformer found in the system' });
|
||||
}
|
||||
|
||||
// Calculate voltage drops for each path
|
||||
const results = calculateVoltageDrops(transformer, objects, cables);
|
||||
|
||||
res.status(200).json({
|
||||
success: true,
|
||||
data: results,
|
||||
timestamp: new Date().toISOString()
|
||||
});
|
||||
} catch (error) {
|
||||
console.error('Voltage drop calculation error:', error);
|
||||
res.status(500).json({
|
||||
error: 'Internal server error',
|
||||
details: process.env.NODE_ENV === 'development' ? error.message : undefined
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
function calculateVoltageDrops(transformer, objects, cables) {
|
||||
const results = {
|
||||
transformer: transformer,
|
||||
paths: [],
|
||||
summary: {
|
||||
totalPower: 0,
|
||||
maxVoltageDrop: 0,
|
||||
minVoltage: transformer.bottomVoltage
|
||||
}
|
||||
};
|
||||
|
||||
// Cable resistance values (Ω/km) - simplified values for common cable types
|
||||
const cableResistance = {
|
||||
'YAKY': {
|
||||
16: 1.15, 25: 0.727, 35: 0.524, 50: 0.387, 70: 0.268, 95: 0.193, 120: 0.153, 150: 0.124, 185: 0.099, 240: 0.075
|
||||
},
|
||||
'NA2XY-J': {
|
||||
16: 1.15, 25: 0.727, 35: 0.524, 50: 0.387, 70: 0.268, 95: 0.193, 120: 0.153, 150: 0.124, 185: 0.099, 240: 0.075
|
||||
},
|
||||
'AL': {
|
||||
16: 1.91, 25: 1.20, 35: 0.868, 50: 0.641, 70: 0.443, 95: 0.320, 120: 0.253, 150: 0.206, 185: 0.164, 240: 0.125
|
||||
},
|
||||
'AsXSn': {
|
||||
16: 1.91, 25: 1.20, 35: 0.868, 50: 0.641, 70: 0.443, 95: 0.320, 120: 0.253, 150: 0.206, 185: 0.164, 240: 0.125
|
||||
}
|
||||
};
|
||||
|
||||
// Find all paths from transformer to end connections
|
||||
const paths = findAllPaths(transformer, objects, cables);
|
||||
|
||||
paths.forEach((path, index) => {
|
||||
let totalVoltageDrop = 0;
|
||||
let pathPower = 0;
|
||||
const pathDetails = [];
|
||||
|
||||
// Calculate for each segment in the path
|
||||
for (let i = 0; i < path.length - 1; i++) {
|
||||
const fromNode = path[i];
|
||||
const toNode = path[i + 1];
|
||||
|
||||
// Find the cable connecting these nodes
|
||||
const cable = cables.find(c =>
|
||||
(c.from === fromNode.id && c.to === toNode.id) ||
|
||||
(c.from === toNode.id && c.to === fromNode.id)
|
||||
);
|
||||
|
||||
if (cable) {
|
||||
// Get cable resistance
|
||||
const resistance = getCableResistance(cable, cableResistance);
|
||||
|
||||
// Calculate current (simplified - assuming balanced load)
|
||||
const nodePower = toNode.powerRating || 0;
|
||||
const current = nodePower > 0 ? (nodePower * 1000) / (Math.sqrt(3) * transformer.bottomVoltage * 0.9) : 0; // cos φ = 0.9
|
||||
|
||||
// Calculate voltage drop for this segment
|
||||
const segmentVoltageDrop = Math.sqrt(3) * current * resistance * (cable.length / 1000); // length in km
|
||||
|
||||
totalVoltageDrop += segmentVoltageDrop;
|
||||
pathPower += nodePower;
|
||||
|
||||
pathDetails.push({
|
||||
from: fromNode.name,
|
||||
to: toNode.name,
|
||||
cable: {
|
||||
label: cable.label,
|
||||
type: cable.cableType,
|
||||
crossSection: cable.crossSection,
|
||||
length: cable.length
|
||||
},
|
||||
current: current.toFixed(2),
|
||||
resistance: resistance.toFixed(4),
|
||||
voltageDrop: segmentVoltageDrop.toFixed(2),
|
||||
power: nodePower
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
const finalVoltage = transformer.bottomVoltage - totalVoltageDrop;
|
||||
const voltageDropPercentage = (totalVoltageDrop / transformer.bottomVoltage) * 100;
|
||||
|
||||
results.paths.push({
|
||||
id: index + 1,
|
||||
endNode: path[path.length - 1].name,
|
||||
totalVoltageDrop: totalVoltageDrop.toFixed(2),
|
||||
finalVoltage: finalVoltage.toFixed(2),
|
||||
voltageDropPercentage: voltageDropPercentage.toFixed(2),
|
||||
pathPower: pathPower,
|
||||
segments: pathDetails,
|
||||
isValid: voltageDropPercentage <= 5 // 5% is typical limit
|
||||
});
|
||||
|
||||
results.summary.totalPower += pathPower;
|
||||
if (totalVoltageDrop > results.summary.maxVoltageDrop) {
|
||||
results.summary.maxVoltageDrop = totalVoltageDrop;
|
||||
results.summary.minVoltage = finalVoltage;
|
||||
}
|
||||
});
|
||||
|
||||
return results;
|
||||
}
|
||||
|
||||
function findAllPaths(transformer, objects, cables) {
|
||||
const paths = [];
|
||||
const visited = new Set();
|
||||
|
||||
function dfs(currentNode, currentPath) {
|
||||
visited.add(currentNode.id);
|
||||
currentPath.push(currentNode);
|
||||
|
||||
// If this is an end connection, save the path
|
||||
if (currentNode.type === 'end') {
|
||||
paths.push([...currentPath]);
|
||||
} else {
|
||||
// Find all connected nodes
|
||||
const connectedCables = cables.filter(cable =>
|
||||
cable.from === currentNode.id || cable.to === currentNode.id
|
||||
);
|
||||
|
||||
connectedCables.forEach(cable => {
|
||||
const nextNodeId = cable.from === currentNode.id ? cable.to : cable.from;
|
||||
const nextNode = objects.find(obj => obj.id === nextNodeId);
|
||||
|
||||
if (nextNode && !visited.has(nextNodeId)) {
|
||||
dfs(nextNode, currentPath);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
currentPath.pop();
|
||||
visited.delete(currentNode.id);
|
||||
}
|
||||
|
||||
dfs(transformer, []);
|
||||
return paths;
|
||||
}
|
||||
|
||||
function getCableResistance(cable, resistanceTable) {
|
||||
const cableType = cable.cableType || 'YAKY';
|
||||
const crossSection = cable.crossSection || 25;
|
||||
|
||||
if (resistanceTable[cableType] && resistanceTable[cableType][crossSection]) {
|
||||
return resistanceTable[cableType][crossSection];
|
||||
}
|
||||
|
||||
// Default resistance if not found
|
||||
return 1.0;
|
||||
}
|
||||
1877
pages/spadki.js
Normal file
1877
pages/spadki.js
Normal file
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user