Resolve conflicts

This commit is contained in:
The 2024-05-16 18:30:58 +01:00 committed by GitHub
parent 745766955e
commit 05b6001741
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -250,6 +250,41 @@
* [WhatIsHalfway](https://www.whatshalfway.com/) - Find Closest Point Between Two Locations * [WhatIsHalfway](https://www.whatshalfway.com/) - Find Closest Point Between Two Locations
* [/r/MapPorn](https://reddit.com/r/MapPorn) - Reddit Map Community * [/r/MapPorn](https://reddit.com/r/MapPorn) - Reddit Map Community
* [NearbyWiki](https://en.nearbywiki.org/) - Explore Interesting Places Near You * [NearbyWiki](https://en.nearbywiki.org/) - Explore Interesting Places Near You
* [Maps We Love](https://livingatlas.arcgis.com/), [CoolMaps](https://coolmaps.esri.com/#0) or [/r/MapPorn](https://reddit.com/r/MapPorn) - Multiple Maps
* [NearByWiki](https://en.nearbywiki.org/) - Explore Interesting Places New You
* [WorldPopDen](https://luminocity3d.org/WorldPopDen/) - Human Population Maps
* [aprs.fi](https://aprs.fi/) - Google Maps APRS
* [GFW](https://www.globalforestwatch.org/map/) - Forest & Tree Cover Maps
* [satellite-map.gosur](https://satellite-map.gosur.com/) or [Ventusky](https://www.ventusky.com/) - Weather Maps
* [Cyclocane](https://www.cyclocane.com/) or [Tornado.live](https://tornado.live/) - Severe Weather Maps
* [Windy](https://www.windy.com/) - Wind Map
* [Jetstream](https://www.netweather.tv/charts-and-data/global-jetstream) - Global Jetstream Forcast Map
* [Tornado Archive](https://tornadoarchive.com/) - Tornado Data Visualization
* [Find Your Tornado Shelter](https://findyourtornadoshelter.com/) - Tornado Shelter Map
* [AQICN](https://aqicn.org/map/world) or [Breezometer](https://www.breezometer.com/air-quality-map/) - Air Quality Maps
* [SaveEcoBot](https://www.saveecobot.com/en/radiation-maps) - Radioactivity / Air Quality Near Ukraine
* [Earth Observatory](https://earthobservatory.nasa.gov/global-maps), [Earth Now](https://climate.nasa.gov/earth-now/) or [ClimateCharts](https://climatecharts.net/) - Climate Maps
* [Safe Airspace](https://safeairspace.net/) - Aviation Risk Ratings
* [MacroStrat](https://macrostrat.org/) - Geological Data Maps
* [Depth Map](https://usa.fishermap.org/depth-map/) or [Bathymetry](https://www.ncei.noaa.gov/maps/bathymetry/) - Water Depth Maps
* [River Runner](https://river-runner.samlearner.com/) - River Map / [3D Map](https://river-runner-global.samlearner.com/)
* [Global Wetlands](https://www2.cifor.org/global-wetlands/) - Wetlands Map
* [Mindat](https://www.mindat.org/countrylist.php) - Mineral Deposits Map
* [Terrain Party](https://terrain.party/) - Terrain Height Map
* [PeakFinder](https://www.peakfinder.org/) - Mountain Maps
* [topo maps](https://onlinetopomaps.net/) - Topographic Maps
* [MetroOrbits](https://mic-ro.com/metro/index.html) - Subway Maps / Data
* [Mapnificent](https://www.mapnificent.net/) - Transit Time Reachability Map
* [WikiRoutes](https://wikiroutes.info/) - Public Transport Routes
* [MiniTokyo3D](https://minitokyo3d.com/) - Tokyo Public Transport Map
* [OpenRailwayMap](https://www.openrailwaymap.org/), [Trains.fyi](https://trains.fyi/) or [AmtrakExplorer](https://amtrakexplorer.com/) - Train Maps
* Country Train Maps - [Switzerland](https://maps.vasile.ch/transit-sbb/) / [AUS / NZ](https://anytrip.com.au/) / [Russia](https://rasp.yandex.ru/map/trains/) / [Finland](https://www.vr.fi/en/live-train-tracker-map) / [Belgium](https://trainmap.belgiantrain.be/) / [UK](https://www.map.signalbox.io/) / [Hungary](http://vonatinfo.mav-start.hu/) / [India](https://railradar.railyatri.in/) / [Netherlands](https://treinposities.nl/)
* [ChronoTrains](https://www.chronotrains.com/) - European Train Distances
* [AbandonedRails](https://www.abandonedrails.com/) - Abandoned Railway Map
* [Earth](https://earth.nullschool.net/) - Global Map of Wind, Weather, Ocean & Pollution Conditions
* [Blitzortung](https://www.blitzortung.org/en/live_lightning_maps.php) - Thunderstorm and Lightning Maps
* [Wikimapia](https://wikimapia.org/) - Online Editable Map * [Wikimapia](https://wikimapia.org/) - Online Editable Map
* [aprs.fi](https://aprs.fi/) - Live APRS Map * [aprs.fi](https://aprs.fi/) - Live APRS Map
* [MapSCII](https://github.com/rastapasta/mapscii) - Render World Map in Braille & ASCII * [MapSCII](https://github.com/rastapasta/mapscii) - Render World Map in Braille & ASCII
@ -299,6 +334,7 @@
* [OCEARCH](https://www.ocearch.org/tracker/) - Shark Tracker * [OCEARCH](https://www.ocearch.org/tracker/) - Shark Tracker
* [MarineTraffic](https://www.marinetraffic.com/) - Live Ship Trackers * [MarineTraffic](https://www.marinetraffic.com/) - Live Ship Trackers
* [EuroBirdPortal](https://www.eurobirdportal.org/) - European Bird Distribution Map * [EuroBirdPortal](https://www.eurobirdportal.org/) - European Bird Distribution Map
* [Global Forest Watch](https://www.globalforestwatch.org/map/) - Interactive Forest & Tree Cover Map
* [Sounds of the Forest](https://timberfestival.org.uk/soundsoftheforest-soundmap/) - Forest Sounds Map * [Sounds of the Forest](https://timberfestival.org.uk/soundsoftheforest-soundmap/) - Forest Sounds Map
* [Aporee](https://aporee.org/maps/) - World Map of Sounds * [Aporee](https://aporee.org/maps/) - World Map of Sounds
* [Cost of Living](https://www.numbeo.com/cost-of-living/) - Cost of Living Map * [Cost of Living](https://www.numbeo.com/cost-of-living/) - Cost of Living Map
@ -341,16 +377,15 @@
* [Ancient Earth](https://dinosaurpictures.org/ancient-earth) - Globe of Ancient Earth * [Ancient Earth](https://dinosaurpictures.org/ancient-earth) - Globe of Ancient Earth
* [1940s NYC](https://1940s.nyc/) - Explore 1940's New York * [1940s NYC](https://1940s.nyc/) - Explore 1940's New York
## ▷ Infrastructure Maps (needs checking) ## ▷ Infrastructure Maps
* [Open Infrastructure Map](https://openinframap.org/) - Global Infrastructure Map * [Open Infrastructure Map](https://openinframap.org/) - Global Infrastructure Map
* [PowerOutage.us](https://poweroutage.us/) - US Power Outage Map * [PowerOutage.us](https://poweroutage.us/) - US Power Outage Map
* [CellMapper](https://www.cellmapper.net/) - Cell Tower Map * [CellMapper](https://www.cellmapper.net/) - Cell Tower Map
* [Spectrum Ownership Map](https://specmap.sequence-omega.net/) - Cell Carrier FCC Spectrum Map * [Spectrum Ownership Map](https://specmap.sequence-omega.net/) - Cell Carrier FCC Spectrum Map
* [Wigle](https://wigle.net/) - Wireless Network Mapping * [WiGLE](https://wigle.net/) - Wireless Networks Map
* [Broadband Map](https://broadbandmap.fcc.gov/) - Fixed Broadband Deployment Map * [broadbandmap.fcc.gov](https://broadbandmap.fcc.gov/) - FCC National Broadband Map
* [SubMarineCableMap](https://www.submarinecablemap.com/) - Fiber Optic Cable Map * [Submarine Cable Map](https://www.submarinecablemap.com/) - Undersea Internet Cable Map
## ▷ Satellite / Street View / Earth Data Maps (rename section?) ## ▷ Satellite / Street View / Earth Data Maps (rename section?)