Release: Version 1.0.0 von main branch soll mergen
This commit is contained in:
@@ -1,7 +1,8 @@
|
|||||||
|
#je nach dem Mysql Server, ob localhost freigegeben ist oder die IP Adresse des Servers, manchmal die beide und manchmal nur eine
|
||||||
DB_HOST=localhost
|
DB_HOST=localhost #HTTP error! status: 500 wenn auf dem Server ist
|
||||||
#DB_HOST=192.168.10.58
|
#DB_HOST=192.168.10.58
|
||||||
#DB_HOST=10.10.0.13
|
#DB_HOST=10.10.0.13
|
||||||
|
#DB_HOST=10.10.0.70 # auf localhost blockiert
|
||||||
DB_USER=root
|
DB_USER=root
|
||||||
DB_PASSWORD="root#$"
|
DB_PASSWORD="root#$"
|
||||||
DB_NAME=talas_v5
|
DB_NAME=talas_v5
|
||||||
|
|||||||
47
MapTypC.aspx.txt
Normal file
47
MapTypC.aspx.txt
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
<%@ Page Title="" Language="C#" MasterPageFile="~/Standard.Master" AutoEventWireup="true" CodeBehind="MapTypC.aspx.cs" Inherits="TALAS_V5.MessagesMap.MapTypC" %>
|
||||||
|
<%@ Register assembly="DevExpress.Web.v19.2, Version=19.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" namespace="DevExpress.Web" tagprefix="dx" %>
|
||||||
|
|
||||||
|
<asp:Content ID="NaviContent" ContentPlaceHolderID="NaviContent" runat="server">
|
||||||
|
</asp:Content>
|
||||||
|
|
||||||
|
<asp:Content ID="Content" ContentPlaceHolderID="MainContent" runat="server">
|
||||||
|
|
||||||
|
<style>
|
||||||
|
.responsive-iframe-wrapper {
|
||||||
|
position: relative !important;
|
||||||
|
width: 100% !important;
|
||||||
|
height: 97.2vh !important; /* Setzt die Höhe des Wrappers auf die Höhe des Viewports */
|
||||||
|
overflow: hidden !important; /* Verhindert Scrollbalken innerhalb des Wrappers */
|
||||||
|
padding: 0 0 0 0 !important;
|
||||||
|
margin: 0 0 0 0 !important;
|
||||||
|
}
|
||||||
|
.responsive-iframe-wrapper iframe {
|
||||||
|
position: absolute !important;
|
||||||
|
top: 0 !important;
|
||||||
|
left: 0 !important;
|
||||||
|
width: 100% !important;
|
||||||
|
height: 100% !important;
|
||||||
|
border: none !important; /* Removes the border */
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
|
|
||||||
|
<div class="responsive-iframe-wrapper">
|
||||||
|
<iframe frameborder="0"></iframe>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
document.addEventListener('DOMContentLoaded', function() {
|
||||||
|
var url = new URL(window.location.href);
|
||||||
|
var mValue = url.searchParams.get("m");
|
||||||
|
var uValue = url.searchParams.get("u");
|
||||||
|
|
||||||
|
// Setzen der src-Eigenschaft des iframe mit den abgerufenen Parametern
|
||||||
|
document.querySelector('.responsive-iframe-wrapper iframe').src =
|
||||||
|
// "http://10.10.0.70:3000?m=" + encodeURIComponent(mValue) + "&u=" + encodeURIComponent(uValue);
|
||||||
|
"http://10.10.0.13:3000?m=" + encodeURIComponent(mValue) + "&u=" + encodeURIComponent(uValue);
|
||||||
|
//"http://localhost:3000?m=" + encodeURIComponent(mValue) + "&u=" + encodeURIComponent(uValue);
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
</asp:Content>
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
// Custom circle icon for draggable markers
|
// Viereck als End-Icon für die Route
|
||||||
import L from "leaflet";
|
import L from "leaflet";
|
||||||
const endIcon = L.divIcon({
|
const endIcon = L.divIcon({
|
||||||
className: "custom-end-icon",
|
className: "custom-end-icon",
|
||||||
|
|||||||
@@ -867,6 +867,8 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
|
|||||||
L.tileLayer(online ? onlineTileLayer : offlineTileLayer, {
|
L.tileLayer(online ? onlineTileLayer : offlineTileLayer, {
|
||||||
attribution:
|
attribution:
|
||||||
'© <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
|
'© <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
|
||||||
|
//tileSize: 250, // oder 512, je nach Kachelgröße
|
||||||
|
//detectRetina: true,
|
||||||
}).addTo(initMap);
|
}).addTo(initMap);
|
||||||
|
|
||||||
const overlappingMarkerSpiderfier =
|
const overlappingMarkerSpiderfier =
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ const startIcon = L.divIcon({
|
|||||||
</svg>
|
</svg>
|
||||||
`, // Schwarzes Dreieck innerhalb eines grauen Dreiecks
|
`, // Schwarzes Dreieck innerhalb eines grauen Dreiecks
|
||||||
iconSize: [18, 18],
|
iconSize: [18, 18],
|
||||||
iconAnchor: [9, 18],
|
iconAnchor: [9, 10],
|
||||||
});
|
});
|
||||||
|
|
||||||
export default startIcon;
|
export default startIcon;
|
||||||
|
|||||||
Reference in New Issue
Block a user