Skip to content

Commit e3583a1

Browse files
committed
remove other layers, force layer visibility and sidebar
1 parent 4fa3dae commit e3583a1

File tree

4 files changed

+19
-90
lines changed

4 files changed

+19
-90
lines changed

src/javascripts/config/layerlist.js

Lines changed: 1 addition & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,7 @@ import _ from 'lodash'
77

88
import Seamarks from './layers/seamarks'
99
import OsmBase from './layers/openStreetMapBase'
10-
import BasemapVector from './layers/basemapVector'
11-
import DeMvDepth from './layers/germany_mv_depth'
12-
import ScubaDiving from './layers/scubaDiving'
13-
import SeamarksDebug from './layers/seamarkDebug'
14-
import Search from './layers/search'
15-
import GridWgs from './layers/grid_wgs'
1610
import Download from './layers/downloadBundles'
17-
import MarineProfile from './layers/marineProfile'
18-
import ElevationProfile from './layers/elevationProfile'
19-
import BingBase from './layers/bingBase'
20-
import DebugTiles from './layers/tilesDebug'
21-
import MarinetrafficImages from './layers/marinetraffic-imageLayer'
2211

2312
/**
2413
for the old (2013) layers format see:
@@ -55,90 +44,22 @@ export const availibleBaseLayers = [
5544
urlIndex2013: 1,
5645
urlIndex2016BaseLayer: 'A',
5746
visibleDefault: true
58-
},
59-
{
60-
LayerConstructor: BasemapVector,
61-
id: 'base_vector',
62-
isBaseLayer: true,
63-
urlIndex2016BaseLayer: 'B',
64-
visibleDefault: false
65-
},
66-
{
67-
LayerConstructor: BingBase,
68-
id: 'base_bing',
69-
isBaseLayer: true,
70-
urlIndex2013: 12,
71-
urlIndex2016BaseLayer: 'C',
72-
visibleDefault: false
7347
}
7448
]
7549

7650
export const availibleOverlayLayers = [
7751
{
78-
LayerConstructor: MarineProfile,
79-
id: 'overlay_marineProfile',
80-
urlIndex2016: 8,
81-
urlIndex2013: 6,
82-
visibleDefault: false
83-
}, {
84-
LayerConstructor: ElevationProfile,
85-
id: 'overlay_elevationProfile',
86-
urlIndex2016: 9,
87-
urlIndex2013: 20,
88-
visibleDefault: false
89-
}, {
90-
LayerConstructor: GridWgs,
91-
id: 'overlay_grid_wgs',
92-
urlIndex2016: 6,
93-
urlIndex2013: 10,
94-
visibleDefault: true
95-
}, {
9652
LayerConstructor: Seamarks,
9753
id: 'overlay_osm_seamarks',
9854
urlIndex2016: 0,
9955
urlIndex2013: 3,
10056
visibleDefault: true
10157
}, {
102-
LayerConstructor: SeamarksDebug,
103-
id: 'overlay_osm_seamarks_debug',
104-
urlIndex2016: 1,
105-
visibleDefault: false
106-
}, {
107-
LayerConstructor: DeMvDepth,
108-
id: 'overlay_demvdepth',
109-
urlIndex2016: 2,
110-
visibleDefault: false
111-
}, {
112-
LayerConstructor: ScubaDiving,
113-
id: 'overlay_osm_scubadiving',
114-
urlIndex2016: 3,
115-
urlIndex2013: 4,
116-
visibleDefault: false
117-
},
118-
{
119-
LayerConstructor: Search,
120-
id: 'overlay_search',
121-
urlIndex2016: 4,
122-
visibleDefault: true
123-
},
124-
{
12558
LayerConstructor: Download,
12659
id: 'overlay_download',
12760
urlIndex2013: 8,
12861
urlIndex2016: 7,
129-
visibleDefault: false
130-
},
131-
{
132-
LayerConstructor: DebugTiles,
133-
id: 'overlay_debug',
134-
urlIndex2016: 10,
135-
visibleDefault: false
136-
},
137-
{
138-
LayerConstructor: MarinetrafficImages,
139-
id: 'overlay_marinetraffic-imageLayer',
140-
urlIndex2016: 11,
141-
visibleDefault: false
62+
visibleDefault: true
14263
}
14364
]
14465

src/javascripts/controls/sidebar/store.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export function setSidebarActiveTab (tabName) {
3636
*/
3737
export const sidebarDefaultState = {
3838
isOpen: !isMobile(),
39-
selectedTab: 'sidebar-settings'
39+
selectedTab: 'sidebar-download'
4040
}
4141

4242
export const sidebar = (state = sidebarDefaultState, action) => {

src/javascripts/features/tabs.js

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
'use strict'
66
import React from 'react'
77

8-
import LayerConfig from './layerConfig/featureLayerConfig'
9-
import MdLayers from 'react-icons/lib/md/layers'
8+
// import LayerConfig from './layerConfig/featureLayerConfig'
9+
// import MdLayers from 'react-icons/lib/md/layers'
1010

1111
import FeatureDevelopment from './development/featureDevelopment'
1212
import FaInfoCircle from 'react-icons/lib/fa/info-circle'
@@ -31,17 +31,18 @@ export const messages = defineMessages({
3131
}
3232
})
3333

34-
export const Tabs = [{
34+
export const Tabs = [/* {
3535
name: 'sidebar-settings',
3636
align: 'top',
3737
icon: <MdLayers />,
3838
content: <LayerConfig />
39-
}, {
40-
name: 'sidebar-development',
41-
align: 'bottom',
42-
icon: <FaInfoCircle />,
43-
content: <FeatureDevelopment />
44-
}]
39+
}, */
40+
{
41+
name: 'sidebar-development',
42+
align: 'bottom',
43+
icon: <FaInfoCircle />,
44+
content: <FeatureDevelopment />
45+
}]
4546

4647
export const TabSidebarDetails = {
4748
name: 'sidebar-details',

src/javascripts/store/urlHashHandling.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,11 @@ export function getStateFromUrlHash (defaults) {
167167
layers = {
168168
layerVisible: decompressVisibleLayers(res.options.layers)
169169
}
170+
layers.layerVisible = {
171+
base_osm_default: true,
172+
overlay_osm_seamarks: true,
173+
overlay_download: true
174+
}
170175
}
171176
let additions = {}
172177

@@ -176,6 +181,8 @@ export function getStateFromUrlHash (defaults) {
176181
additions.locale = defaultLocale
177182
}
178183

184+
res.name = 'download'
185+
179186
switch (res.name) {
180187
case 'search':
181188
additions.sidebar = sidebarDefaultState

0 commit comments

Comments
 (0)