Merge branch 'development' of github.com:hotosm/fmtm into fix/reduce-…

…ifographics-api
hotosm · Jun 28, 2024 · d2c3364 · d2c3364
2 parents 1abcadd + af254a0
commit d2c3364
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 11 deletions.
diff --git a/docs/User-Manual-For-Project-Managers.md → docs/manuals/project-managers.md b/docs/User-Manual-For-Project-Managers.md → docs/manuals/project-managers.md
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -73,7 +73,7 @@ nav:
       - FAQ: FAQ.md
   - User Manuals:
       - User Types: user-breakdown.md
-      - Project Managers: User-Manual-For-Project-Managers.md
+      - Project Managers: manuals/project-managers.md
   - Dev:
       - Setup: dev/Setup.md
       - Backend: dev/Backend.md
@@ -92,7 +92,8 @@ nav:
       - Helpers: https://api.stage.fmtm.hotosm.org/docs#/helper
   - Example XLSForms: example-xlsforms/README.md
   - Roadmap:
-      - Users: user-roadmap.md
-      - Developers: https://roadmap.fmtm.dev
+      - User: user-roadmap.md
+      - Development: https://roadmap.fmtm.dev
+      - Task Board: https://github.com/orgs/hotosm/projects/22/views/1?sliceBy%5BcolumnId%5D=Milestone
   - Timeline: timeline.md
   - API Docs: https://hotosm.github.io/swagger/?url=https://docs.fmtm.dev/openapi.json
diff --git a/src/frontend/src/components/MapComponent/OpenLayersComponent/LayerSwitcher/index.js b/src/frontend/src/components/MapComponent/OpenLayersComponent/LayerSwitcher/index.js
@@ -178,8 +178,8 @@ const LayerSwitcherControl = ({ map, visible = 'osm', pmTileLayerData = null })
       layers: [
         bingMaps(visible),
         osm(visible),
-        mapboxMap(visible),
-        mapboxOutdoors(visible),
+        // mapboxMap(visible),
+        // mapboxOutdoors(visible),
         none(visible),
         // pmTileLayer(pmTileLayerData, visible),
       ],

diff --git a/src/frontend/src/components/ProjectSubmissions/TaskSubmissionsMap.tsx b/src/frontend/src/components/ProjectSubmissions/TaskSubmissionsMap.tsx
@@ -254,7 +254,7 @@ const TaskSubmissionsMap = () => {
           width: '100%',
         }}
       >
-        <LayerSwitcherControl />
+        <LayerSwitcherControl visible={'osm'} />
         {taskBoundaries && (
           <VectorLayer
             setStyle={(feature, resolution) =>

diff --git a/src/frontend/src/components/SubmissionMap/SubmissionInstanceMap.jsx b/src/frontend/src/components/SubmissionMap/SubmissionInstanceMap.jsx
@@ -30,7 +30,7 @@ const SubmissionInstanceMap = ({ featureGeojson }) => {
           width: '100%',
         }}
       >
-        <LayerSwitcherControl />
+        <LayerSwitcherControl visible={'osm'} />
         {featureGeojson?.type && (
           <VectorLayer
             geojson={featureGeojson}

diff --git a/src/frontend/src/components/home/ProjectListMap.tsx b/src/frontend/src/components/home/ProjectListMap.tsx
@@ -89,7 +89,7 @@ const ProjectListMap = () => {
             width: '100%',
           }}
         >
-          <LayerSwitcherControl visible={'outdoors'} />
+          <LayerSwitcherControl visible={'osm'} />
           {projectGeojson && projectGeojson?.features?.length > 0 && (
             <ClusterLayer
               map={map}

diff --git a/src/frontend/src/views/EditProjectArea.tsx b/src/frontend/src/views/EditProjectArea.tsx
@@ -23,7 +23,7 @@ const EditProjectArea = ({ geojson }) => {
           width: '100%',
         }}
       >
-        <LayerSwitcherControl />
+        <LayerSwitcherControl visible={'osm'} />
         {geojson && (
           <VectorLayer
             geojson={geojson}

diff --git a/src/frontend/src/views/NewDefineAreaMap.tsx b/src/frontend/src/views/NewDefineAreaMap.tsx
@@ -47,7 +47,7 @@ const NewDefineAreaMap = ({
           width: '100%',
         }}
       >
-        <LayerSwitcherControl />
+        <LayerSwitcherControl visible={'osm'} />
         <MapControlComponent map={map} hasEditUndo={hasEditUndo} />
         {splittedGeojson && (
           <VectorLayer

diff --git a/src/frontend/src/views/ProjectDetailsV2.tsx b/src/frontend/src/views/ProjectDetailsV2.tsx
@@ -457,7 +457,7 @@ const ProjectDetailsV2 = () => {
                 </div>
               )}
               <LayerSwitcherControl
-                visible={customBasemapData ? 'custom' : 'outdoors'}
+                visible={customBasemapData ? 'custom' : 'osm'}
                 pmTileLayerData={customBasemapData}
               />