2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

merge conflict

Browse source
This commit is contained in:
Dennis Orlando 2025-08-02 06:22:24 +02:00
parent e43f82b6ec
commit cb567d3b8e
1 changed files with 0 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/c3nav/editor/static/editor/js/editor.js
View file

@ -1759,7 +1759,6 @@ editor = {
} }
}); });
<<<<<<< HEAD
// check current editing shape with infinite extension enabled // check current editing shape with infinite extension enabled
if (editor._current_editing_shape) { if (editor._current_editing_shape) {
var currentShapeSnap = editor._find_closest_point_on_geometry( var currentShapeSnap = editor._find_closest_point_on_geometry(
@ -1770,10 +1769,7 @@ editor = {
} }
} }
// find closest candidate
=======
// Find the closest candidate // Find the closest candidate
>>>>>>> 90d3c9b7f5f567b6bbe37f3432b49f65710bf26c
if (candidates.length > 0) { if (candidates.length > 0) {
candidates.sort(function(a, b) { return a.distance - b.distance; }); candidates.sort(function(a, b) { return a.distance - b.distance; });
var best = candidates[0]; var best = candidates[0];
@ -1904,13 +1900,8 @@ editor = {
var p1 = coordinates[i]; var p1 = coordinates[i];
var p2 = coordinates[(i + 1) % coordinates.length]; var p2 = coordinates[(i + 1) % coordinates.length];
<<<<<<< HEAD
var snapPoint = editor._find_closest_point_on_edge(p1, p2, targetLatLng, targetMapPoint, allowInfiniteExtension); var snapPoint = editor._find_closest_point_on_edge(p1, p2, targetLatLng, targetMapPoint, allowInfiniteExtension);
=======
var snapPoint = editor._find_closest_point_on_edge(p1, p2, targetLatLng, targetMapPoint);
>>>>>>> 90d3c9b7f5f567b6bbe37f3432b49f65710bf26c
if (snapPoint && snapPoint.distance < closestDistance) { if (snapPoint && snapPoint.distance < closestDistance) {
closestDistance = snapPoint.distance; closestDistance = snapPoint.distance;
closestPoint = snapPoint; closestPoint = snapPoint;
@ -2084,15 +2075,6 @@ editor = {
_show_snap_indicator: function(latlng, snapInfo) { _show_snap_indicator: function(latlng, snapInfo) {
editor._clear_snap_indicators(); editor._clear_snap_indicators();
<<<<<<< HEAD
// snap point indicator
var indicator = L.circleMarker(latlng, {
radius: 4,
color: '#ff6b6b',
fillColor: '#ff6b6b',
fillOpacity: 0.8,
=======
var size = 0.001; // adjust this to control square size var size = 0.001; // adjust this to control square size
@ -2103,7 +2085,6 @@ editor = {
var indicator = L.rectangle(bounds, { var indicator = L.rectangle(bounds, {
color: '#666', color: '#666',
>>>>>>> 90d3c9b7f5f567b6bbe37f3432b49f65710bf26c
weight: 2, weight: 2,
lineCap: "square", lineCap: "square",
fillOpacity: 1., fillOpacity: 1.,