Skip to content

fix lv95 coord search #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrewcding merged 1 commit into from
Jun 21, 2026
Merged

fix lv95 coord search #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions webmap-frontend/src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import NetworkLegend from "./components/NetworkLegend";
import { FileProvider } from "./FileContext";
import { AppProvider } from "./context/AppContext";
import { useData } from "./context/DataContext";
import { useMap } from "./context/MapContext";
import { useSelection } from "./context/SelectionContext";

window.name = 'webmap-tab';
Expand All @@ -22,16 +21,12 @@ function App() {

function MainContent() {
const { dataURL } = useData();
const { mapRef } = useMap();
const { setClickedCanton } = useSelection();

return (
<FileProvider dataURL={dataURL}>
<LeftSidebar />
<CantonSearch
map={mapRef.current}
onSearch={setClickedCanton}
/>
<CantonSearch onSearch={setClickedCanton} />
<Map />

<RightSidebar />
Expand Down
5 changes: 4 additions & 1 deletion webmap-frontend/src/components/CantonSearch.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { useData } from '../context/DataContext';
import { useSelection } from '../context/SelectionContext';
import { useFilters } from '../context/FilterContext';
import { useModule } from '../context/ModuleContext';
import { useMap } from '../context/MapContext';
import './CantonSearch.css';

const DIACRITICS = /[̀-ͯ]/g;
Expand Down Expand Up @@ -64,7 +65,7 @@ const parseLV95Coords = (input) => {
return { x, y };
};

const CantonSearch = ({ onSearch, map }) => {
const CantonSearch = ({ onSearch }) => {
const [searchTerm, setSearchTerm] = useState('');
const [selectedIndex, setSelectedIndex] = useState(-1);
const [searchMarker, setSearchMarker] = useState(null);
Expand All @@ -78,6 +79,7 @@ const CantonSearch = ({ onSearch, map }) => {
} = useSelection();
const { selectedTransitModes } = useFilters();
const { isGraphExpanded } = useModule();
const { mapRef } = useMap();

const cantonEntries = useMemo(() => Object.entries(cantonAlias), []);
const displayNames = useMemo(
Expand Down Expand Up @@ -208,6 +210,7 @@ const CantonSearch = ({ onSearch, map }) => {

const handleCoordsSearch = (input) => {
const coords = parseLV95Coords(input);
const map = mapRef.current;
if (!coords || !map) return false;
const [lon, lat] = lv95ToWgs84(coords.x, coords.y);

Expand Down
Loading