diff --git a/package.json b/package.json index d94904d85c..502f86bd0e 100644 --- a/package.json +++ b/package.json @@ -59,6 +59,7 @@ "https://overpass.openstreetmap.ru/cgi/interpreter": "Broken as of 2024-09-05, might be a glitch" }, "country_coder_host": "https://countrycoder.mapcomplete.org", + "community_index_host": "https://data.mapcomplete.org/community-index/", "nominatimEndpoint": "https://geocoding.geofabrik.de/b75350b1cfc34962ac49824fe5b582dc/", "#photonEndpoint": "`api/` or `reverse/` will be appended by the code", "photonEndpoint": "https://photon.komoot.io/", diff --git a/scripts/downloadCommunityIndex.ts b/scripts/downloadCommunityIndex.ts index edc0c9c20d..f8702d4151 100644 --- a/scripts/downloadCommunityIndex.ts +++ b/scripts/downloadCommunityIndex.ts @@ -1,5 +1,5 @@ import Script from "./Script" -import { CommunityResource } from "../src/Logic/Web/CommunityIndex" +import { CommunityResource } from "../src/Logic/Web/CommunityIndex"downlaodComm import { Utils } from "../src/Utils" import { FeatureCollection, MultiPolygon, Polygon } from "geojson" import { existsSync, mkdirSync, writeFileSync } from "fs" @@ -41,6 +41,10 @@ class DownloadCommunityIndex extends Script { private static stripResourcesObj(resources: Readonly>>) { const stripped: Record = {} for (const k in resources) { + if(k === "twitter" || k === "facebook" || k === "x"){ + // These channels are toxic nowadays - we simply omit them + continue + } stripped[k] = DownloadCommunityIndex.stripResource(resources[k]) } return stripped diff --git a/src/Models/Constants.ts b/src/Models/Constants.ts index 3f6f5c9431..1831b894b6 100644 --- a/src/Models/Constants.ts +++ b/src/Models/Constants.ts @@ -134,6 +134,8 @@ export default class Constants { public static readonly mapillary_client_token_v4 = Constants.config.api_keys.mapillary_v4 public static defaultOverpassUrls = Constants.config.default_overpass_urls public static countryCoderEndpoint: string = Constants.config.country_coder_host + public static communityIndexHost: string = Constants.config.community_index_host + public static osmAuthConfig: AuthConfig = Constants.config.oauth_credentials public static nominatimEndpoint: string = Constants.config.nominatimEndpoint public static photonEndpoint: string = Constants.config.photonEndpoint diff --git a/src/UI/Base/Popup.svelte b/src/UI/Base/Popup.svelte index 728d92448e..b644bcbae4 100644 --- a/src/UI/Base/Popup.svelte +++ b/src/UI/Base/Popup.svelte @@ -9,7 +9,7 @@ export let fullscreen: boolean = false export let bodyPadding = "p-4 md:p-5 " export let shown: UIEventSource - export let dismissable = false + export let dismissable = true /** * Default: 50 */ diff --git a/src/UI/BigComponents/CommunityIndexView.svelte b/src/UI/BigComponents/CommunityIndexView.svelte index d1dfc3659d..a76450e6b8 100644 --- a/src/UI/BigComponents/CommunityIndexView.svelte +++ b/src/UI/BigComponents/CommunityIndexView.svelte @@ -2,7 +2,6 @@ import { Store, UIEventSource } from "../../Logic/UIEventSource" import { Tiles } from "../../Models/TileRange" import { Utils } from "../../Utils" - import global_community from "../../assets/community_index_global_resources.json" import ContactLink from "./ContactLink.svelte" import { GeoOperations } from "../../Logic/GeoOperations" import Translations from "../i18n/Translations" @@ -10,11 +9,13 @@ import type { FeatureCollection, Polygon } from "geojson" import type { CommunityResource } from "../../Logic/Web/CommunityIndex" import Tr from "../Base/Tr.svelte" + import Constants from "../../Models/Constants" + import Loading from "../Base/Loading.svelte" export let location: Store<{ lat: number; lon: number }> const tileToFetch: Store = location.mapD((l) => { const t = Tiles.embedded_tile(l.lat, l.lon, 6) - return `https://raw.githubusercontent.com/pietervdvn/MapComplete-data/main/community_index/tile_${t.z}_${t.x}_${t.y}.geojson` + return Utils.SubstituteKeys(Constants.communityIndexHost + "tile_{z}_{x}_{y}.geojson", t) }) const t = Translations.t.communityIndex const resources = new UIEventSource< @@ -32,17 +33,29 @@ resources.setData(data.features) }) - const filteredResources = resources.map( + const filteredResources = resources.mapD( (features) => features.filter((f) => GeoOperations.inside([location.data.lon, location.data.lat], f)), [location] ) + + const globalResources: UIEventSource> = UIEventSource.FromPromise(Utils.downloadJsonCached>( + Constants.communityIndexHost + "/global.json", 24 * 60 * 60 * 1000 + ))
- {#each $filteredResources as feature} - - {/each} - + {#if $filteredResources === undefined} + + {:else} + {#each $filteredResources as feature} + + {/each} + {/if} + {#if $globalResources === undefined} + + {:else} + + {/if}
diff --git a/src/UI/BigComponents/ContactLink.svelte b/src/UI/BigComponents/ContactLink.svelte index 123d5f82a7..f1c8de96a4 100644 --- a/src/UI/BigComponents/ContactLink.svelte +++ b/src/UI/BigComponents/ContactLink.svelte @@ -7,6 +7,7 @@ import { TypedTranslation } from "../i18n/Translation" import Tr from "../Base/Tr.svelte" import type { CommunityResource } from "../../Logic/Web/CommunityIndex" + import Constants from "../../Models/Constants" const availableTranslationTyped: TypedTranslation<{ native: string }> = Translations.t.communityIndex.available @@ -16,7 +17,6 @@ export let country: { resources: Record; nameEn: string } let resources: CommunityResource[] = [] $: resources = Array.from(Object.values(country?.resources ?? {})) - const language = Locale.language @@ -28,16 +28,16 @@
- {resource.resolved.name ?? resource.resolved.url} + {resource.resolved?.name ?? resource.resolved?.url} {resource.resolved?.description} {#if resource.languageCodes?.indexOf($language) >= 0} diff --git a/src/assets/community_index_global_resources.json b/src/assets/community_index_global_resources.json deleted file mode 100644 index 6978a956ad..0000000000 --- a/src/assets/community_index_global_resources.json +++ /dev/null @@ -1,355 +0,0 @@ -{ - "OSM-Discord": { - "id": "OSM-Discord", - "type": "discord", - "account": "openstreetmap", - "locationSet": { - "include": [ - "001" - ] - }, - "languageCodes": [ - "de", - "en", - "es", - "fr", - "it", - "pt-BR", - "ro", - "tr" - ], - "order": 6, - "strings": { - "name": "OpenStreetMap World Discord" - }, - "contacts": [ - { - "name": "Austin Harrison", - "email": "jaustinharrison@gmail.com" - } - ], - "resolved": { - "name": "OpenStreetMap World Discord", - "url": "https://discord.gg/openstreetmap", - "description": "Get in touch with other mappers on Discord", - "nameHTML": "OpenStreetMap World Discord", - "urlHTML": "https://discord.gg/openstreetmap", - "descriptionHTML": "Get in touch with other mappers on Discord" - } - }, - "OSM-Discourse": { - "id": "OSM-Discourse", - "type": "discourse", - "locationSet": { - "include": [ - "001" - ] - }, - "languageCodes": [ - "de", - "en", - "es", - "nl", - "pl", - "pt-BR" - ], - "order": 7, - "strings": { - "name": "OpenStreetMap Discourse", - "description": "A shared place for conversations about OpenStreetMap", - "url": "https://community.openstreetmap.org/" - }, - "contacts": [ - { - "name": "Grant Slater", - "email": "osmfuture@firefishy.com" - }, - { - "name": "Rubén Martín", - "email": "nukeador@protonmail.com" - } - ], - "resolved": { - "name": "OpenStreetMap Discourse", - "url": "https://community.openstreetmap.org/", - "description": "A shared place for conversations about OpenStreetMap", - "nameHTML": "OpenStreetMap Discourse", - "urlHTML": "https://community.openstreetmap.org/", - "descriptionHTML": "A shared place for conversations about OpenStreetMap" - } - }, - "OSM-Facebook": { - "id": "OSM-Facebook", - "type": "facebook", - "account": "OpenStreetMap", - "locationSet": { - "include": [ - "001" - ] - }, - "languageCodes": [ - "en" - ], - "order": 3, - "strings": { - "community": "OpenStreetMap", - "communityID": "openstreetmap", - "description": "Like us on Facebook for news and updates about OpenStreetMap." - }, - "contacts": [ - { - "name": "Harry Wood", - "email": "mail@harrywood.co.uk" - } - ], - "resolved": { - "name": "OpenStreetMap on Facebook", - "url": "https://www.facebook.com/OpenStreetMap", - "description": "Like us on Facebook for news and updates about OpenStreetMap.", - "nameHTML": "OpenStreetMap on Facebook", - "urlHTML": "https://www.facebook.com/OpenStreetMap", - "descriptionHTML": "Like us on Facebook for news and updates about OpenStreetMap." - } - }, - "OSM-help": { - "id": "OSM-help", - "type": "forum", - "locationSet": { - "include": [ - "001" - ] - }, - "languageCodes": [ - "en" - ], - "order": -2, - "strings": { - "name": "OpenStreetMap Help", - "description": "Ask a question and get answers on OSM's community-driven question and answer site.", - "extendedDescription": "{url} is for everyone who needs help with OpenStreetMap. Whether you are a beginner mapper or have a technical question, we're here to help!", - "url": "https://help.openstreetmap.org/" - }, - "contacts": [ - { - "name": "OSMF Operations", - "email": "operations@osmfoundation.org" - } - ], - "resolved": { - "name": "OpenStreetMap Help", - "url": "https://help.openstreetmap.org/", - "description": "Ask a question and get answers on OSM's community-driven question and answer site.", - "extendedDescription": "https://help.openstreetmap.org/ is for everyone who needs help with OpenStreetMap. Whether you are a beginner mapper or have a technical question, we're here to help!", - "nameHTML": "OpenStreetMap Help", - "urlHTML": "https://help.openstreetmap.org/", - "descriptionHTML": "Ask a question and get answers on OSM's community-driven question and answer site.", - "extendedDescriptionHTML": "https://help.openstreetmap.org/ is for everyone who needs help with OpenStreetMap. Whether you are a beginner mapper or have a technical question, we're here to help!" - } - }, - "OSM-IRC": { - "id": "OSM-IRC", - "type": "irc", - "account": "osm", - "locationSet": { - "include": [ - "001" - ] - }, - "languageCodes": [ - "en" - ], - "order": -4, - "strings": { - "community": "OpenStreetMap", - "communityID": "openstreetmap" - }, - "contacts": [ - { - "name": "Harry Wood", - "email": "mail@harrywood.co.uk" - } - ], - "resolved": { - "name": "OpenStreetMap on IRC", - "url": "https://webchat.oftc.net/?channels=osm", - "description": "Join #osm on irc.oftc.net (port 6667)", - "nameHTML": "OpenStreetMap on IRC", - "urlHTML": "https://webchat.oftc.net/?channels=osm", - "descriptionHTML": "Join #osm on irc.oftc.net (port 6667)" - } - }, - "OSM-Mastodon": { - "id": "OSM-Mastodon", - "type": "mastodon", - "account": "openstreetmap", - "locationSet": { - "include": [ - "001" - ] - }, - "languageCodes": [ - "en" - ], - "order": 3, - "strings": { - "community": "OpenStreetMap", - "communityID": "openstreetmap", - "url": "https://en.osm.town/@openstreetmap" - }, - "contacts": [ - { - "name": "Harry Wood", - "email": "mail@harrywood.co.uk" - } - ], - "resolved": { - "name": "OpenStreetMap Mastodon Account", - "url": "https://en.osm.town/@openstreetmap", - "description": "The official Mastodon account for OpenStreetMap", - "nameHTML": "OpenStreetMap Mastodon Account", - "urlHTML": "https://en.osm.town/@openstreetmap", - "descriptionHTML": "The official Mastodon account for OpenStreetMap" - } - }, - "OSM-Reddit": { - "id": "OSM-Reddit", - "type": "reddit", - "account": "openstreetmap", - "locationSet": { - "include": [ - "001" - ] - }, - "languageCodes": [ - "en" - ], - "order": 2, - "strings": { - "community": "OpenStreetMap", - "communityID": "openstreetmap", - "description": "/r/{account} is a great place to learn more about OpenStreetMap. Ask us anything!" - }, - "contacts": [ - { - "name": "Serge Wroclawski", - "email": "emacsen@gmail.com" - } - ], - "resolved": { - "name": "OpenStreetMap on Reddit", - "url": "https://www.reddit.com/r/openstreetmap", - "description": "/r/openstreetmap is a great place to learn more about OpenStreetMap. Ask us anything!", - "nameHTML": "OpenStreetMap on Reddit", - "urlHTML": "https://www.reddit.com/r/openstreetmap", - "descriptionHTML": "/r/openstreetmap is a great place to learn more about OpenStreetMap. Ask us anything!" - } - }, - "OSM-Telegram": { - "id": "OSM-Telegram", - "type": "telegram", - "account": "OpenStreetMapOrg", - "locationSet": { - "include": [ - "001" - ] - }, - "languageCodes": [ - "en" - ], - "order": 5, - "strings": { - "community": "OpenStreetMap", - "communityID": "openstreetmap", - "description": "Join the OpenStreetMap Telegram global supergroup at {url}" - }, - "contacts": [ - { - "name": "Max N", - "email": "abonnements@revolwear.com" - } - ], - "resolved": { - "name": "OpenStreetMap Telegram", - "url": "https://t.me/OpenStreetMapOrg", - "description": "Join the OpenStreetMap Telegram global supergroup at https://t.me/OpenStreetMapOrg", - "nameHTML": "OpenStreetMap Telegram", - "urlHTML": "https://t.me/OpenStreetMapOrg", - "descriptionHTML": "Join the OpenStreetMap Telegram global supergroup at https://t.me/OpenStreetMapOrg" - } - }, - "OSM-Twitter": { - "id": "OSM-Twitter", - "type": "twitter", - "account": "openstreetmap", - "locationSet": { - "include": [ - "001" - ] - }, - "languageCodes": [ - "en" - ], - "order": 4, - "strings": { - "community": "OpenStreetMap", - "communityID": "openstreetmap" - }, - "contacts": [ - { - "name": "Harry Wood", - "email": "mail@harrywood.co.uk" - } - ], - "resolved": { - "name": "OpenStreetMap on Twitter", - "url": "https://twitter.com/openstreetmap", - "description": "Follow us on Twitter", - "nameHTML": "OpenStreetMap on Twitter", - "urlHTML": "https://twitter.com/openstreetmap", - "descriptionHTML": "Follow us on Twitter" - } - }, - "OSMF": { - "id": "OSMF", - "type": "osm-lc", - "locationSet": { - "include": [ - "001" - ] - }, - "languageCodes": [ - "en", - "fr", - "it", - "ja", - "nl", - "ru" - ], - "order": 10, - "strings": { - "name": "OpenStreetMap Foundation", - "description": "OSMF is a UK-based not-for-profit that supports the OpenStreetMap Project", - "extendedDescription": "OSMF supports the OpenStreetMap project by fundraising, maintaining the servers which power OSM, organizing the annual State of the Map conference, and coordinating the volunteers who keep OSM running. You can show your support and have a voice in the direction of OpenStreetMap by joining as an OSMF member here: {signupUrl}", - "signupUrl": "https://join.osmfoundation.org/", - "url": "https://wiki.osmfoundation.org/wiki/Main_Page" - }, - "contacts": [ - { - "name": "OSMF Board", - "email": "board@osmfoundation.org" - } - ], - "resolved": { - "name": "OpenStreetMap Foundation", - "url": "https://wiki.osmfoundation.org/wiki/Main_Page", - "signupUrl": "https://join.osmfoundation.org/", - "description": "OSMF is a UK-based not-for-profit that supports the OpenStreetMap Project", - "extendedDescription": "OSMF supports the OpenStreetMap project by fundraising, maintaining the servers which power OSM, organizing the annual State of the Map conference, and coordinating the volunteers who keep OSM running. You can show your support and have a voice in the direction of OpenStreetMap by joining as an OSMF member here: https://join.osmfoundation.org/", - "nameHTML": "OpenStreetMap Foundation", - "urlHTML": "https://wiki.osmfoundation.org/wiki/Main_Page", - "signupUrlHTML": "https://join.osmfoundation.org/", - "descriptionHTML": "OSMF is a UK-based not-for-profit that supports the OpenStreetMap Project", - "extendedDescriptionHTML": "OSMF supports the OpenStreetMap project by fundraising, maintaining the servers which power OSM, organizing the annual State of the Map conference, and coordinating the volunteers who keep OSM running. You can show your support and have a voice in the direction of OpenStreetMap by joining as an OSMF member here: https://join.osmfoundation.org/" - } - } -}