Commit 47c6d43e authored by Sebastian Castro's avatar Sebastian Castro

Update GoGoCartoJs

parent 0ac46aed
{
"name": "GoGoCarto",
"version": "2.0.0",
"lockfileVersion": 1,
"requires": true,
"lockfileVersion": 1,
"dependencies": {
"JSONStream": {
"version": "1.3.4",
......@@ -2883,9 +2882,9 @@
}
},
"gogocarto-js": {
"version": "1.4.3",
"resolved": "https://registry.npmjs.org/gogocarto-js/-/gogocarto-js-1.4.3.tgz",
"integrity": "sha512-vEN6tis9ip7Ga0S1DzZ1bgJCnFZuNWjqy8SAIeTMkr5LtrreMCnvrerTRhd62AtJpFo2+0sOJrjKmFQTeDbECw=="
"version": "1.4.5",
"resolved": "https://registry.npmjs.org/gogocarto-js/-/gogocarto-js-1.4.5.tgz",
"integrity": "sha512-97mrCpiedhLdRcAsKtef7smjo3aFDs/6qptyLTnDWzitRy/XBEnDyAzopTlDGeE3lZccCuCiYzbQsfHQ/2Wj/w=="
},
"graceful-fs": {
"version": "3.0.11",
......
{
"name": "GoGoCarto",
"version": "2.0.0",
"homepage": "https://gitlab.adullact.net/pixelhumain/GoGoCarto",
"description": "Collaborative mapping directory",
"keywords": [
......@@ -31,6 +30,6 @@
"watchify": "^3.8.0"
},
"dependencies": {
"gogocarto-js": "^1.4.3"
"gogocarto-js": "^1.4.5"
}
}
......@@ -47,20 +47,21 @@ class GoGoCartoJsService
}
}
return [
$result = [
"security" =>
[
"userRoles" => $userGogocartoRole,
"userEmail" => $userEmail ,
"loginAction" => '$("#popup-login").openModal();'
],
"text" =>
"language" => "fr",
"translations" =>
[
"element" => $config->getElementDisplayName() ,
"elementDefinite" => $config->getElementDisplayNameDefinite(),
"elementIndefinite" => $config->getElementDisplayNameIndefinite(),
"elementPlural" => $config->getElementDisplayNamePlural(),
"collaborativeModeration" => $config->getCollaborativeModerationExplanations(),
"element.definite" => $config->getElementDisplayNameDefinite(),
"element.indefinite" => $config->getElementDisplayNameIndefinite(),
"element.plural" => $config->getElementDisplayNamePlural(),
"collaborative.moderation.paragaphs" => $config->getCollaborativeModerationExplanations(),
],
"menu" =>
[
......@@ -139,10 +140,6 @@ class GoGoCartoJsService
"mainFont" => $config->getMainFont() ,
"titleFont" => $config->getTitleFont() ,
],
"images" =>
[
"buttonOpenMenu" => $config->getFavicon() ? $config->getFavicon()->getImageUrl() : ($config->getLogo() ? $config->getLogo()->getImageUrl() : null)
],
"features" =>
[
"listMode" => $this->getConfigFrom($config->getListModeFeature()) ,
......@@ -194,6 +191,15 @@ class GoGoCartoJsService
"requestByBounds" => true,
],
];
if ($config->getTheme() == "transiscope")
{
$result["images"] = [
"buttonOpenMenu" => $config->getFavicon() ? $config->getFavicon()->getImageUrl() : ($config->getLogo() ? $config->getLogo()->getImageUrl() : null)
];
}
return $result;
}
private function getConfigFrom($feature, $route = null, $overwrite = [])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment