Merge branch 'main' into 2.0-js

CHANGELOG.md

@@ -1,25 +1,46 @@
 # Changelog - Avorion Distanzrechner
 
 - **v2.0.0**  
-  - [x] Umbau auf node.js und nun als Anwendung verfügbar
+  - [x] Umbau auf node.js und nun als Anwendung verfügbar  
 
 ---
 
-- **v1.1.4 - 01.05-2025 - commit v1.1.4**  
+- **v1.2.0 - 10-05-2025 - bugfix**  
+  - [x] alten Bug behoben  
+    - Dieser machte es unmöglich, das Entfernung Berechnet wird wenn `x || y == 0` sind.  
+  - [x] Bibliotheken nun lokal nach `./libs` ausgelagert und html überarbeitet.  
+    - Entsprechende [LICENSE](./libs/LICENSE) beigelegt  
+  - [x] Neue favicon.ico erstellt und beigelegt.  
+  - [x] Die `main.js` sauber nach Google Docstrings kommentiert.  
+
+---
+
+- **v1.1.5 - 09-05-2025 - commit v1.1.5**  
+  - [x] BUGFIX - Anzeigefehler aus getVersion()  
+
+---
+
+- **08-05-2025**  
+  - [x] neuen Branch 2.0-js  
+    - Dieser dient um die neue node.js Version zu entwickeln als vollwertige Desktop App
+
+---
+
+- **v1.1.4 - 01-05-2025 - commit v1.1.4**  
   - [x] Stilistische Überarbeitung und Tag setzen  
 
 ---
 
-- **v1.1.3 - 13.01.2022**  
-  - [x] Farbtabelle für Erze und Entfernungen in die `index.html` implementiert  
-  - [x] einige Optimierungen am Code  
+- **v1.1.3 - 13-01-2022**    
+  - [x] Farbtabelle für Erze und Entfernungen in die `index.html` implementiert    
+  - [x] einige Optimierungen am Code    
 
 ---
 
-- **v1.1.0 - 13.01.2022**  
-  - [x] Debugfunktion in main.js implementiert  
+- **v1.1.0 - 13-01-2022**    
+  - [x] Debugfunktion in main.js implementiert    
 
 ---
 
-- **v1.0.1 - 13.01.2022**  
-  - [x] erste Version  
+- **v1.0.1 - 13-01-2022**    
+  - [x] erste Version    

README.md

@@ -51,3 +51,5 @@ Nutzt jQuery und  Material Design Lite
 
 - [ ] **Berechnung zwischen zwei individuellen Punkten auf der Karte**  
   - feature/route  
+
+---

web/index.html

@@ -15,15 +15,12 @@
     <link rel="stylesheet" href="css/main.css" type="text/css">
 
     <!-- Material Design Lite begin -->
-    <!-- <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons"> -->
-    <link rel="stylesheet" href="css/material.css" />
-    <script defer src="js/libs/material.js"></script>
-
+    <link rel="stylesheet" href="libs/material.orange-deep_orange.min.css" /> 
+    <script defer src="libs/material.1-3-0.min.js"></script>
     <!-- Material Design Lite end -->
 
-<!-- jQuery Einbindung: -->
-
-    <script src="js/libs/jquery-3.7.1.min.js"></script>
+    <script src="libs/jquery-3.6.0.min.js"></script>
+    
     <script>
     $(document).ready(function(){
         /* Hier der jQuery-Code */
@@ -56,6 +53,13 @@
       <div class="Titel">
         Avorion Distance Calculator 2.0
       </div>
+      <div>
+        <p>
+          <a href="https://github.com/realAscot/AvorionDistanceCalculator/releases">
+            <img src="https://camo.githubusercontent.com/a0a3d08faacbf827e5824b3333edc96945e5c1a0b4ba67568ffe6f0fc7f4cbf3/68747470733a2f2f696d672e736869656c64732e696f2f6769746875622f762f72656c656173652f7265616c4173636f742f41766f72696f6e44697374616e636543616c63756c61746f723f736f72743d73656d766572" alt="GitHub release (latest by semver)" data-canonical-src="https://img.shields.io/github/v/release/realAscot/AvorionDistanceCalculator?sort=semver" style="max-width: 100%;">
+          </a>
+        </p>
+      </div>
       <div class="Feldbeschreibung">
         Starting coordinates:
       </div>

web/js/logic.js

@@ -8,12 +8,15 @@
  */
 
 // bei Änderungen Version eintragen!
+const MAJOR = 1;  // +1 wenn inkompatibel zur vorherigen Version
+const MINOR = 2;  // +1 wenn neue Funktionen implementiert
+const PATCH = 0;  // +1 wenn Änderungen ohne neue Funktionen
 const MAJOR = 2;  // +1 wenn inkompatibel zur vorherigen Version
 const MINOR = 0;  // +1 wenn neue Funktionen implementiert
 const PATCH = 0;  // +1 wenn Änderungen ohne neue Funktionen
 
 // letzte Veröffentlichung
-const LASTDEV = '2025-05-08';
+const LASTDEV = '2025-05-10';
 
 // debug-modus ON/ OFF
 const DEBUG = false;
@@ -29,42 +32,67 @@ function start() {
      goVersion();
 }
 
+/**
+ * Generates the program’s version string from MAJOR, MINOR und PATCH
+ * und hängt sie in das HTML-Element mit der ID "version" an.
+ *
+ * Args:
+ *   Keine
+ *
+ * Returns:
+ *   {void}
+ */
 function goVersion() {
      // Es wird die Version des Programs generiert und die ID=version im HTML geaendert.
     const VERSION = MAJOR + "." + MINOR + "." + PATCH;
     classVersion.innerHTML += `
      Script-Version: ${VERSION}
-     ( <a href="https://www.ionivation.com">Ionivation.com</a> ) (C) 2022-2025 Adam Skotarczak 
-    `;
+     ( <a href="https://www.ionivation.com">Ionivation.com</a> ) (C) 2022-2025 Adam Skotarczak
+     `;
+     return;
 }
 
+/**
+ * Liest X- und Y-Koordinaten aus den Form-Inputs, rundet diese und
+ * zeigt die Distanz zum Zentrum im HTML-Element mit der ID "result" an.
+ *
+ * Die Rundung erfolgt mit Math.round, die Distanzberechnung über goDistToCenter().
+ *
+ * Args:
+ *   Keine – Werte werden direkt aus den globalen Inputs koordinateX.value und koordinateY.value gelesen.
+ *
+ * Returns:
+ *   {void}
+ */
 function calculate() {
      // Holt die Koordinaten aus der Website die in dem Formular eingetragen wurden und rundet diese
      let x = Math.round(koordinateX.value);
      let y = Math.round(koordinateY.value);
 
      // Schickt die Daten zur Berechnung an die Funktion und schreibt in die ID (id="result") des HTML Dokuments
-     if ( (x) && (y) ){ // wenn x unc y Werte enthalten
+     if (!isNaN(x) && !isNaN(y)){ // wenn x unc y Werte enthalten
           result.innerHTML = `
-               from [${x}:${y}] = ${goDistToCenter(x, y)} sectors to Center
+               ${goDistToCenter(x, y)} sector(s) to Center 0:0
           `;
-          koordinateX.value = "";
-          koordinateY.value = "";
+          // koordinateX.value = ""; koordinateY.value = "";
      }
 }
 
 /**
- * Berechnet die Entfernung zum Mittelpunkt der Galaxie
- * 
- * @param {*} INT x 
- * @param {*} INT y 
- * @returns INT (Entfernung)
+ * Berechnet die gerade Entfernung vom Punkt (x, y) zum Ursprung (0, 0) und rundet das Ergebnis.
+ *
+ * Führt bei aktiviertem DEBUG-Modus zusätzliche Konsolen-Logs zur
+ * Veranschaulichung der Zwischenschritte (x², y² und ungerundete Hypotenuse).
+ *
+ * @param {number} x - X-Koordinate des Punkts (default: 0).
+ * @param {number} y - Y-Koordinate des Punkts (default: 0).
+ * @returns {number} Gerundete Distanz (Hypotenuse) zum Zentrum.
  */
 function goDistToCenter(x, y){     
      // Berechnet Entfernung zum Zentrum und schickt Ergebnis zurück
      let result;
      
-     result = Math.round (Math.sqrt( Math.round(x * x) + Math.round(y * y) ));
+     result = Math.round (Math.hypot(x,y));
      
      /**
       * Nur zum debuggen der Ergebnisse wenn DEBUG=true: (seit 1.1.0)
@@ -76,13 +104,17 @@ function goDistToCenter(x, y){
           console.log("X * X: " + Math.round(x * x) );
           console.log("Y * Y: " + Math.round(y * y) );
           console.log("----------------------------")
-          console.log(`SQRT x^2 + Y^2: ${Math.sqrt((x * x) + (y * y))}` );
+          console.log(`SQRT x^2 + Y^2 (hypod): ${Math.hypot(x,y)}` );
           console.log("");
      }
 
      return result;
 }
 
+/**
+ *  geplante Funktion die jede beliebige Entfernung Berechnet
+ * 
+ */
 function goDistToTarget(x1, y1, x2, y2){
-     // geplante Funktion die jede beliebige Entfernung Berechnet
+     return;
 }

web/libs/LICENSE

@@ -0,0 +1,212 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2015 Google Inc
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+   All code in any directories or sub-directories that end with *.html or
+   *.css is licensed under the Creative Commons Attribution International
+   4.0 License, which full text can be found here:
+   https://creativecommons.org/licenses/by/4.0/legalcode.
+
+   As an exception to this license, all html or css that is generated by
+   the software at the direction of the user is copyright the user. The
+   user has full ownership and control over such content, including
+   whether and how they wish to license it.