Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
prodige
bdl_visualiseur_core
Commits
961c70c8
Commit
961c70c8
authored
Oct 06, 2021
by
Chef Projet Prodige
Browse files
Merge branch 'master' of gitlab.alkante.com:alkante/bdl_visualiseur_core into develop
parents
496bb62c
d557e606
Changes
1
Hide whitespace changes
Inline
Side-by-side
Controllers/PrintController.php
View file @
961c70c8
...
...
@@ -21,8 +21,7 @@ class PrintController extends ControllerBase
private
$varSmartyToAngularComponents
=
[
'map'
=>
'<alk-ol-map></alk-ol-map>'
,
'scaleline'
=>
'<alk-controls-scale-line></alk-controls-scale-line>'
,
'scaledrop'
=>
'<alk-map-scale-dropdown mode="foncier"></alk-map-scale-dropdown>'
,
'scaledropDefault'
=>
'<alk-map-scale-dropdown></alk-map-scale-dropdown>'
,
'scaledrop'
=>
'<alk-map-scale-dropdown></alk-map-scale-dropdown>'
,
'legend'
=>
'<alk-sidebar></alk-sidebar>'
,
'keymap'
=>
'<alk-map-visualisation></alk-map-visualisation>'
,
'logo'
=>
'<alk-logo></alk-logo>'
,
...
...
@@ -427,7 +426,6 @@ class PrintController extends ControllerBase
$smarty
->
assign
(
"coord_alias"
,
''
);
$smarty
->
assign
(
"map_alias"
,
''
);
$smarty
->
assign
(
"scaledrop_alias"
,
''
);
$smarty
->
assign
(
"scaledropDefault_alias"
,
''
);
$smarty
->
assign
(
"legend_alias"
,
''
);
$smarty
->
assign
(
"keymap_alias"
,
''
);
$smarty
->
assign
(
"copyright_alias"
,
''
);
...
...
@@ -537,14 +535,6 @@ class PrintController extends ControllerBase
)
);
$smarty
->
assign
(
"scaledropDefault"
,
(
isset
(
$requestBody
[
'scalingDropdown'
])
?
$this
->
varSmartyToAngularComponents
[
"scaledropDefault"
]
:
$this
->
varSmartyToAngularComponents
[
"scaledropDefault"
]
)
);
$smarty
->
assign
(
"mentionCheckbox"
,
(
isset
(
$requestBody
[
'mentionCheckbox'
])
...
...
@@ -665,7 +655,7 @@ class PrintController extends ControllerBase
)
{
$requestBody
[
'context'
][
'properties'
][
'bbox'
]
=
$requestBody
[
'extent'
];
}
else
{
$requestBody
[
'context'
][
'properties'
][
'bbox'
]
=
$this
->
computeExtent
([
600
,
600
],
$centerOfExtent
,
8100
);
$requestBody
[
'context'
][
'properties'
][
'bbox'
]
=
$this
->
computeExtent
([
600
,
600
],
$centerOfExtent
,
1
8100
);
}
$contextFileNameSecond
=
uniqid
(
'ctx_'
,
true
)
.
'.geojson'
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment