From 24b790c2d1d2f0e2e12cf068e5061d23d1631b8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Thu, 8 Dec 2022 16:45:33 +0100 Subject: [PATCH] Set tile server to empty by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- app/soapbox/features/event/event-information.tsx | 5 +++-- app/soapbox/features/ui/components/link-footer.tsx | 3 --- app/soapbox/normalizers/soapbox/soapbox-config.ts | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/soapbox/features/event/event-information.tsx b/app/soapbox/features/event/event-information.tsx index 7e6f2d4a3..4ef7ae0b8 100644 --- a/app/soapbox/features/event/event-information.tsx +++ b/app/soapbox/features/event/event-information.tsx @@ -9,7 +9,7 @@ import StatusMedia from 'soapbox/components/status-media'; import TranslateButton from 'soapbox/components/translate-button'; import { HStack, Icon, Stack, Text } from 'soapbox/components/ui'; import QuotedStatus from 'soapbox/features/status/containers/quoted-status-container'; -import { useAppDispatch, useAppSelector, useSettings } from 'soapbox/hooks'; +import { useAppDispatch, useAppSelector, useSettings, useSoapboxConfig } from 'soapbox/hooks'; import { makeGetStatus } from 'soapbox/selectors'; import { defaultMediaVisibility } from 'soapbox/utils/status'; @@ -27,6 +27,7 @@ const EventInformation: React.FC = ({ params }) => { const status = useAppSelector(state => getStatus(state, { id: params.statusId })) as StatusEntity; + const { tileServer } = useSoapboxConfig(); const settings = useSettings(); const displayMedia = settings.get('displayMedia') as string; @@ -73,7 +74,7 @@ const EventInformation: React.FC = ({ params }) => {
)} {[event.location.get('postalCode'), event.location.get('locality'), event.location.get('country')].filter(text => text).join(', ')} - {event.location.get('latitude') && (<> + {tileServer && event.location.get('latitude') && (<>
diff --git a/app/soapbox/features/ui/components/link-footer.tsx b/app/soapbox/features/ui/components/link-footer.tsx index 5383be4c9..bc1c67fd3 100644 --- a/app/soapbox/features/ui/components/link-footer.tsx +++ b/app/soapbox/features/ui/components/link-footer.tsx @@ -43,9 +43,6 @@ const LinkFooter: React.FC = (): JSX.Element => { {features.profileDirectory && ( )} - {features.events && ( - - )} {features.filters && ( diff --git a/app/soapbox/normalizers/soapbox/soapbox-config.ts b/app/soapbox/normalizers/soapbox/soapbox-config.ts index 089833d7f..c4246d8a0 100644 --- a/app/soapbox/normalizers/soapbox/soapbox-config.ts +++ b/app/soapbox/normalizers/soapbox/soapbox-config.ts @@ -114,8 +114,8 @@ export const SoapboxConfigRecord = ImmutableRecord({ displayCta: true, /** Whether to inject suggested profiles into the Home feed. */ feedInjection: true, - tileServer: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png', - tileServerAttribution: '© OpenStreetMap Contributors', + tileServer: '', + tileServerAttribution: '', }, 'SoapboxConfig'); type SoapboxConfigMap = ImmutableMap;