Compare commits

...

3 Commits

Author SHA1 Message Date
066ddb240d 1.13.2
Some checks failed
CI / Lint (push) Failing after 23s
CI / Test (push) Successful in 34s
2026-03-11 17:53:06 +04:00
df336b87ac Smart auto zoom for search/select 2026-03-11 17:51:26 +04:00
dbf71e366a Further improve scrolling 2026-03-11 17:19:48 +04:00
9 changed files with 39 additions and 15 deletions

View File

@@ -530,13 +530,22 @@ export default class MapComponent extends Component {
padding: padding, padding: padding,
duration: 1000, duration: 1000,
easing: (t) => t * (2 - t), easing: (t) => t * (2 - t),
maxZoom: currentZoom, maxZoom: Math.max(currentZoom, 18),
}); });
} }
handlePinVisibility(coords) { handlePinVisibility(coords) {
if (!this.mapInstance) return; if (!this.mapInstance) return;
const view = this.mapInstance.getView();
const currentZoom = view.getZoom();
// If too far out (e.g. world view), zoom in to neighborhood level (16)
if (currentZoom < 16) {
this.animateToSmartCenter(coords, 16);
return;
}
const pixel = this.mapInstance.getPixelFromCoordinate(coords); const pixel = this.mapInstance.getPixelFromCoordinate(coords);
const size = this.mapInstance.getSize(); const size = this.mapInstance.getSize();
@@ -555,12 +564,17 @@ export default class MapComponent extends Component {
} }
} }
animateToSmartCenter(coords) { animateToSmartCenter(coords, zoom = null) {
if (!this.mapInstance) return; if (!this.mapInstance) return;
const size = this.mapInstance.getSize(); const size = this.mapInstance.getSize();
const view = this.mapInstance.getView(); const view = this.mapInstance.getView();
const resolution = view.getResolution(); let resolution = view.getResolution();
if (zoom !== null) {
resolution = view.getResolutionForZoom(zoom);
}
let targetCenter = coords; let targetCenter = coords;
// Check if mobile (width <= 768px matches CSS) // Check if mobile (width <= 768px matches CSS)
@@ -582,11 +596,17 @@ export default class MapComponent extends Component {
targetCenter = [coords[0], coords[1] - offsetMapUnits]; targetCenter = [coords[0], coords[1] - offsetMapUnits];
} }
view.animate({ const animationOptions = {
center: targetCenter, center: targetCenter,
duration: 1000, duration: 1000,
easing: (t) => t * (2 - t), // Ease-out easing: (t) => t * (2 - t), // Ease-out
}); };
if (zoom !== null) {
animationOptions.zoom = zoom;
}
view.animate(animationOptions);
} }
panIfObscured(coords) { panIfObscured(coords) {

View File

@@ -203,6 +203,7 @@ body {
box-shadow: 2px 0 5px rgb(0 0 0 / 10%); box-shadow: 2px 0 5px rgb(0 0 0 / 10%);
display: flex; display: flex;
flex-direction: column; flex-direction: column;
overflow: hidden; /* Ensure flex children are contained */
} }
.settings-pane.sidebar { .settings-pane.sidebar {
@@ -240,7 +241,10 @@ body {
padding: 1rem; padding: 1rem;
overflow-y: auto; overflow-y: auto;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
flex: 1; /* Take up remaining vertical space */ flex: 1;
min-height: 0;
touch-action: pan-y;
overscroll-behavior: contain;
} }
.edit-form { .edit-form {

View File

@@ -1,6 +1,6 @@
{ {
"name": "marco", "name": "marco",
"version": "1.13.1", "version": "1.13.2",
"private": true, "private": true,
"description": "Unhosted maps app", "description": "Unhosted maps app",
"repository": { "repository": {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -39,8 +39,8 @@
<meta name="msapplication-TileColor" content="#F6E9A6"> <meta name="msapplication-TileColor" content="#F6E9A6">
<meta name="msapplication-TileImage" content="/icons/icon-144.png"> <meta name="msapplication-TileImage" content="/icons/icon-144.png">
<script type="module" crossorigin src="/assets/main-CixkPz0h.js"></script> <script type="module" crossorigin src="/assets/main-CHoCxxBl.js"></script>
<link rel="stylesheet" crossorigin href="/assets/main-CU2Ii0VD.css"> <link rel="stylesheet" crossorigin href="/assets/main-DAo4Q0R2.css">
</head> </head>
<body> <body>
</body> </body>

View File

@@ -3,9 +3,9 @@ import { extensions, ember } from '@embroider/vite';
import { babel } from '@rollup/plugin-babel'; import { babel } from '@rollup/plugin-babel';
export default defineConfig({ export default defineConfig({
// server: { server: {
// host: '0.0.0.0' host: '0.0.0.0'
// }, },
plugins: [ plugins: [
ember(), ember(),
// extra plugins here // extra plugins here