Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion confd/production.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ window._env_ = {
center: {{ getv "/configuration/map/center" "[34.811, 31.908]" }},
zoom: {{ getv "/configuration/map/zoom" "14" }},
mapMode2D: '{{ getv "/configuration/map/mapmode2d" "INFINITE_SCROLL" }}',
useOptimizedTileRequests: {{ getv "/configuration/map/use/optimized/tile/requests" "false" }},
showDebuggerTool: {{ getv "/configuration/map/show/debugger/tool" "false" }},
showActiveLayersTool: {{ getv "/configuration/map/show/active/layers/tool" "true" }},
showGeocoderTool: {{ getv "/configuration/map/show/geocoder/tool" "true" }},
Expand Down
1 change: 0 additions & 1 deletion confd/production.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ keys = [
"/configuration/map/center",
"/configuration/map/zoom",
"/configuration/map/mapmode2d",
"/configuration/map/use/optimized/tile/requests",
"/configuration/map/show/debugger/tool",
"/configuration/map/show/active/layers/tool",
"/configuration/map/show/geocoder/tool",
Expand Down
1 change: 0 additions & 1 deletion helm/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
CONFIGURATION_MAP_CENTER: {{ quote .Values.env.map.center }}
CONFIGURATION_MAP_ZOOM: {{ quote .Values.env.map.zoom }}
CONFIGURATION_MAP_MAPMODE2D: {{ quote .Values.env.map.mapMode2D }}
CONFIGURATION_MAP_USE_OPTIMIZED_TILE_REQUESTS: {{ quote .Values.env.map.useOptimizedTileRequests }}
CONFIGURATION_MAP_SHOW_DEBUGGER_TOOL: {{ quote .Values.env.map.showDebuggerTool }}
CONFIGURATION_MAP_SHOW_ACTIVE_LAYERS_TOOL: {{ quote .Values.env.map.showActiveLayersTool }}
CONFIGURATION_MAP_SHOW_GEOCODER_TOOL: {{ quote .Values.env.map.showGeocoderTool }}
Expand Down
1 change: 0 additions & 1 deletion helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ env:
center: '[34.811, 31.908]'
zoom: 7
mapMode2D: INFINITE_SCROLL
useOptimizedTileRequests: false
showDebuggerTool: false
showActiveLayersTool: true
showGeocoderTool: true
Expand Down
1 change: 0 additions & 1 deletion src/common/config/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ const APP_CONFIG = {
CENTER: MAP.center as [number, number],
ZOOM: MAP.zoom as number,
MAPMODE2D: MAP.mapMode2D,
USE_OPTIMIZED_TILE_REQUESTS: MAP.useOptimizedTileRequests as boolean,
SHOW_DEBUGGER_TOOL: MAP.showDebuggerTool,
SHOW_ACTIVE_LAYERS_TOOL: MAP.showActiveLayersTool,
SHOW_GEOCODER_TOOL: MAP.showGeocoderTool,
Expand Down
2 changes: 2 additions & 0 deletions src/common/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -742,6 +742,8 @@
"map.zoom.label": "zoom",

"debug-panel.title": "Debugger Tool",
"debug-panel.tile-requests-optimization": "Tile Requests Optimization",
"debug-panel.cesium-inspector": "Cesium Inspector",
"debug-panel.wfs.title": "Data Layers",
"debug-panel.wfs.cache": "Cache",
"debug-panel.wfs.extent": "Extent",
Expand Down
2 changes: 2 additions & 0 deletions src/common/i18n/he.json
Original file line number Diff line number Diff line change
Expand Up @@ -742,6 +742,8 @@
"map.zoom.label": "זום",

"debug-panel.title": "דיבאגר",
"debug-panel.tile-requests-optimization": "אופטימיזציית בקשות אריחים",
"debug-panel.cesium-inspector": "כלי בדיקה של סזיום",
"debug-panel.wfs.title": "שכבות מידע",
"debug-panel.wfs.cache": "בזכרון",
"debug-panel.wfs.extent": "בתצוגה",
Expand Down
12 changes: 7 additions & 5 deletions src/discrete-layer/views/discrete-layer-view.css
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,6 @@ body[dir='rtl'] .headerSystemAreaContainer {
margin: 14px;
}

.errorMessage {
/* margin: 16px; */
}

.errorDescription {
margin: 16px;
}
Expand Down Expand Up @@ -262,11 +258,16 @@ body[dir='rtl'] .tabHeaderContainer .filterByCatalogEntitySelect {
margin-right: 0;
}

/***** Cesium Map *****/
.cesium-viewer .bottomToolsContainer > div {
height: 28px;
}

/****** BADGE *****/
.cesium-viewer .cesium-cesiumInspector-button {
line-height: initial;
}

/***** BADGE *****/
/* inspired by https://codepen.io/codepenicillin/pen/eYjYmpO */
.position {
position: relative;
Expand Down Expand Up @@ -302,6 +303,7 @@ body[dir='rtl'] .MuiBox-root .resultsContainer {
direction: ltr;
}

/***** COLORS *****/
.success {
color: var(--mdc-theme-gc-success) !important;
}
Expand Down
10 changes: 8 additions & 2 deletions src/discrete-layer/views/discrete-layer-view.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,10 @@ const DiscreteLayerView: React.FC = observer(() => {
KILOMETERS_UNIT: intl.formatMessage({ id: 'map.scale.units.kilometers' }),
ZOOM_LABEL: intl.formatMessage({ id: 'map.zoom.label' }),
DEBUG_PANEL_TITLE: intl.formatMessage({ id: 'debug-panel.title' }),
TILE_REQUESTS_OPTIMIZATION_CHECKBOX: intl.formatMessage({
id: 'debug-panel.tile-requests-optimization',
}),
CESIUM_INSPECTOR_CHECKBOX: intl.formatMessage({ id: 'debug-panel.cesium-inspector' }),
WFS_TITLE: intl.formatMessage({ id: 'debug-panel.wfs.title' }),
WFS_CACHE: intl.formatMessage({ id: 'debug-panel.wfs.cache' }),
WFS_EXTENT: intl.formatMessage({ id: 'debug-panel.wfs.extent' }),
Expand Down Expand Up @@ -672,6 +676,8 @@ const DiscreteLayerView: React.FC = observer(() => {
});
}, []);

const isAdminUser = store.userStore.user?.role === UserRole.ADMIN;

const PanelExpanderButton: React.FC = () => {
const isRtl = intl.locale === 'he';
const iconClassExpand = isRtl ? 'mc-icon-Arrows-Left' : 'mc-icon-Arrows-Right';
Expand Down Expand Up @@ -1308,6 +1314,7 @@ const DiscreteLayerView: React.FC = observer(() => {
value={{ actionsMenuDimensions, setActionsMenuDimensions }}
>
<CesiumMap
key={`cesium-map-${isAdminUser ? 'admin' : 'user'}`}
mapMode2D={mapMode2D}
projection={CONFIG.MAP.PROJECTION}
center={CONFIG.MAP.CENTER}
Expand All @@ -1316,7 +1323,6 @@ const DiscreteLayerView: React.FC = observer(() => {
imageryProvider={false}
locale={mapSettingsLocale}
baseMaps={store.discreteLayersStore.baseMaps}
useOptimizedTileRequests={CONFIG.MAP.USE_OPTIMIZED_TILE_REQUESTS}
layerManagerFootprintMetaFieldPath={'layerRecord.footprint'}
// @ts-ignore
imageryContextMenu={<ContextMenuByTab />}
Expand All @@ -1330,7 +1336,7 @@ const DiscreteLayerView: React.FC = observer(() => {
imgText: intl.formatMessage({ id: 'map-legends.actions.img' }),
},
}}
showDebuggerTool={CONFIG.MAP.SHOW_DEBUGGER_TOOL}
showDebuggerTool={CONFIG.MAP.SHOW_DEBUGGER_TOOL === true && isAdminUser}
showActiveLayersTool={CONFIG.MAP.SHOW_ACTIVE_LAYERS_TOOL}
{...(CONFIG.MAP.SHOW_GEOCODER_TOOL ? { geocoderPanel: GEOCODER_OPTIONS } : {})}
>
Expand Down
Loading