feat: make properly shown zone patrols

Author: dd84ai

darkmap/front/galaxy.templ

@@ -322,6 +322,14 @@ templ Menu(menu_kind MenuKind, data *export_map.Export) {
 				@ToggleSwitch("checkbox_all_zones")
 			</div>
 		</div>
+		<div class="menu-item">
+			<div class="top">
+				@MultiLineOption([]string{"Zone cylind"})
+			</div>
+			<div class="bottom">
+				@ToggleSwitch("checkbox_zone_cylinders")
+			</div>
+		</div>
 		<div class="menu-item" style={ templ.KV("display:none", data.Mapped.Discovery == nil) }>
 			<div class="top">
 				@MultiLineOption([]string{"Hide pobs"})

darkmap/front/static_front/custom.css

@@ -55,6 +55,10 @@ obj-.unhidden_wreck_label {
     display: block !important;
 }
 
+.unhiddenCylinderZone {
+    display: block !important;
+}
+
 .unhidden_infocard_label system-label {
     display: inline-block !important;
     color: rgba(232, 252, 121, 0.8) !important;

darkmap/front/static_front/custom.js

@@ -112,6 +112,8 @@ function InstallMenu() {
 
     InstallButton("checkbox_all_zones", "hidden_all_zone", "unhidden_all_zone", toggle_option);
 
+    InstallButton("checkbox_zone_cylinders", "hiddenCylinderZone", "unhiddenCylinderZone", toggle_option);
+
     InstallButton("checkbox_coords", "hidden_coords", "unhidden_coords", toggle_tippy);
 
     InstallButton("checkbox_pobs", "unhidden_pob", "hidden_pob", toggle_option);
@@ -148,7 +150,7 @@ function InstallPanzoom(is_galaxy) {
     var map = document.querySelector('.panzoom');
 
     var options = {
-        maxScale: 5,
+        maxScale: 7.5,
         minScale: 1,
         handleStartEvent: function (event) {
             event.preventDefault();

darkmap/front/static_front/only_systems.css

@@ -155,4 +155,8 @@ h2 {
     padding: 0;
     margin: 0;
     color: rgb(135, 195, 224);
+}
+
+.cylinderZone {
+    background-color: rgba(87, 255, 255, 0.15);
 }

darkmap/front/system.templ

@@ -184,13 +184,22 @@ templ SystemContents(system *export_map.System) {
 		</obj->
 	}
 	for _, obj := range system.Zones {
-		// can be sphere, ellipsoid, cylinder, box, ring
-		@SystemObjZone(
-			obj,
-			system,
-			ObjRotAngle(obj.Rotation.X, obj.Rotation.Y, obj.Rotation.Z),
-			ObjRotLength(obj.Rotation.X, obj.Rotation.Y, obj.Rotation.Z),
-		)
+		if obj.ZoneShape != "cylinder" {
+			// can be sphere, ellipsoid, cylinder, box, ring
+			@SystemObjZone(
+				obj,
+				system,
+				ObjRotAngle(obj.Rotation.X, obj.Rotation.Y, obj.Rotation.Z),
+				ObjRotLength(obj.Rotation.X, obj.Rotation.Y, obj.Rotation.Z),
+			)
+		} else {
+			@SystemObjZone(
+				obj,
+				system,
+				ObjRotAngle(obj.Rotation.X+90, obj.Rotation.Y, obj.Rotation.Z),
+				ObjRotLength(obj.Rotation.X+90, obj.Rotation.Y, obj.Rotation.Z),
+			)
+		}
 	}
 	@TooltipTippy(ObjectsToTipppy(
 		system.Zones,
@@ -243,7 +252,8 @@ templ SystemObjZone(obj *export_map.Zone, system *export_map.System, ROT_ANGLE f
 		class={
 			"zone",
 			"unhidden_zone",
-			"hidden_all_zone",
+			templ.KV("hidden_all_zone", obj.ZoneShape != "cylinder"),
+			templ.KV("hiddenCylinderZone", obj.ZoneShape == "cylinder"),
 			GetZoneClass(obj.PropertyFlags, system),
 			templ.KV("roundZone", obj.ZoneShape == "ellipsoid" || obj.ZoneShape == "sphere"),
 			templ.KV("cylinderZone", obj.ZoneShape == "cylinder"),
@@ -266,6 +276,8 @@ templ SystemObjZone(obj *export_map.Zone, system *export_map.System, ROT_ANGLE f
 				SystemPosToPerc(obj.Pos.X, system),
 			),
 			fmt.Sprintf("transform: rotate(%.1fdeg)", ROT_ANGLE),
+			fmt.Sprintf("transform: rotate(%.1fdeg)", ROT_ANGLE),
+		
 			"position: absolute",
 
 			templ.KV(fmt.Sprintf("margin-top: %.5f%%", -SizeInPerc(float64(obj.Size.Z), system)), obj.ZoneShape == "ellipsoid"),
@@ -283,9 +295,9 @@ templ SystemObjZone(obj *export_map.Zone, system *export_map.System, ROT_ANGLE f
 			templ.KV(fmt.Sprintf("height: %.5f%%", 2*SizeInPerc(float64(obj.Size.X)*ROT_LENGTH, system)), obj.ZoneShape == "sphere"),
 			templ.KV(fmt.Sprintf("width: %.5f%%", 2*SizeInPerc(float64(obj.Size.X), system)), obj.ZoneShape == "sphere"),
 
-			templ.KV(fmt.Sprintf("margin-top: %.5f%%", -SizeInPerc(float64(obj.Size.Y), system)), obj.ZoneShape == "cylinder"),
+			templ.KV(fmt.Sprintf("margin-top: %.5f%%", -SizeInPerc(float64(obj.Size.Y), system)/2), obj.ZoneShape == "cylinder"),
 			templ.KV(fmt.Sprintf("margin-left: %.5f%%", -SizeInPerc(float64(obj.Size.X), system)), obj.ZoneShape == "cylinder"),
-			templ.KV(fmt.Sprintf("height: %.5f%%", 2*SizeInPerc(float64(obj.Size.Y)*ROT_LENGTH, system)), obj.ZoneShape == "cylinder"),
+			templ.KV(fmt.Sprintf("height: %.5f%%", SizeInPerc(float64(obj.Size.Y)*ROT_LENGTH, system)), obj.ZoneShape == "cylinder"),
 			templ.KV(fmt.Sprintf("width: %.5f%%", 2*SizeInPerc(float64(obj.Size.X), system)), obj.ZoneShape == "cylinder"),
 
 			// if it is vertical object, than its size is controled by its width :]