diff --git a/IsraelHiking.Web/src/application/components/route-statistics.component.scss b/IsraelHiking.Web/src/application/components/route-statistics.component.scss index 407f5bd8e..4251384fa 100644 --- a/IsraelHiking.Web/src/application/components/route-statistics.component.scss +++ b/IsraelHiking.Web/src/application/components/route-statistics.component.scss @@ -4,7 +4,7 @@ $control-border: 4px; $container-height-small-screen: 130px; $container-height: 200px; $container-height-expanded: 300px; -$button-height: 36px; +$button-size: 36px; $buttons-margin: 5px; .chart-control-container { @@ -13,7 +13,7 @@ $buttons-margin: 5px; } .chart-control-container.expanded { - width: calc(100vw - #{$control-border}); + width: calc(100vw - #{$control-border} - #{$button-size} - 2 * #{$buttons-margin}); height: $container-height-expanded; } @@ -71,12 +71,12 @@ $buttons-margin: 5px; } .chart-expand-button { - top: calc(#{$buttons-margin} + #{$button-height}); + top: calc(#{$buttons-margin} + #{$button-size}); left: $buttons-margin; } .chart-more-button { - top: calc(#{$buttons-margin} + 2 * #{$button-height}); + top: calc(#{$buttons-margin} + 2 * #{$button-size}); left: $buttons-margin; } @@ -86,7 +86,7 @@ $buttons-margin: 5px; } .chart-table-button { - bottom: calc(#{$buttons-margin} + #{$button-height}); + bottom: calc(#{$buttons-margin} + #{$button-size}); right: $buttons-margin; } @@ -118,7 +118,7 @@ $buttons-margin: 5px; } .chart-more-button { - top: calc(#{$buttons-margin} + #{$button-height}); + top: calc(#{$buttons-margin} + #{$button-size}); left: $buttons-margin; } } diff --git a/IsraelHiking.Web/src/application/services/spatial.service.ts b/IsraelHiking.Web/src/application/services/spatial.service.ts index 147498163..e4971d17a 100644 --- a/IsraelHiking.Web/src/application/services/spatial.service.ts +++ b/IsraelHiking.Web/src/application/services/spatial.service.ts @@ -370,7 +370,8 @@ export class SpatialService { public static isJammingTarget(latlng: LatLngAlt): boolean { const position = SpatialService.toCoordinate(latlng); return SpatialService.insideBbox(position, [35.48, 33.811, 35.50, 33.823]) || - SpatialService.insideBbox(position, [31.350, 30.0817, 31.355, 30.0860]); + SpatialService.insideBbox(position, [31.350, 30.0817, 31.355, 30.0860]) || + SpatialService.insideBbox(position, [35.98, 31.70, 36.02, 31.73]); } private static canBeMreged(line1: GeoJSON.Position[], line2: GeoJSON.Position[]): "start-start" | "start-end" | "end-start" | "end-end" | null {