Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support OpenStreetMap vector tiles with Maplibre-gl-js #1038

Merged
merged 18 commits into from
Oct 6, 2023
Merged
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
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Nextcloud Maps

**With MapLibre-GL support**

**🌍🌏🌎 The whole world fits inside your cloud!**

![](screenshots/screenshot1.png)
Expand Down
3 changes: 2 additions & 1 deletion css/adminSettings.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
#osrmFootURL,
#graphhopperURL,
#graphhopperAPIKEY,
#mapboxAPIKEY
#mapboxAPIKEY,
#maplibreStreetStyleURL
{
width: 400px;
}
3 changes: 2 additions & 1 deletion lib/Controller/PageController.php
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@ private function addCsp($response): void {
'osrmBikeURL',
'osrmCarURL',
'osrmFootURL',
'graphhopperURL'
'graphhopperURL',
'maplibreStreetStyleURL'
];
foreach ($urlKeys as $key) {
$url = $this->config->getAppValue('maps', $key);
Expand Down
2 changes: 2 additions & 0 deletions lib/Controller/PublicUtilsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*
* @author Julien Veyssier <[email protected]>
* @copyright Julien Veyssier 2019
* @copyright Benstone Zhang <[email protected]> 2023
*/

namespace OCA\Maps\Controller;
Expand Down Expand Up @@ -208,6 +209,7 @@ public function getOptionsValues(): DataResponse {
'osrmDEMO',
'graphhopperAPIKEY',
'mapboxAPIKEY',
'maplibreStreetStyleURL',
'graphhopperURL'
];
foreach ($settingsKeys as $k) {
Expand Down
3 changes: 3 additions & 0 deletions lib/Controller/UtilsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*
* @author Julien Veyssier <[email protected]>
* @copyright Julien Veyssier 2019
* @copyright Benstone Zhang <[email protected]> 2023
*/

namespace OCA\Maps\Controller;
Expand Down Expand Up @@ -149,6 +150,7 @@ public function getOptionsValues($myMapId=null): DataResponse {
'osrmDEMO',
'graphhopperAPIKEY',
'mapboxAPIKEY',
'maplibreStreetStyleURL',
'graphhopperURL'
];
foreach ($settingsKeys as $k) {
Expand All @@ -172,6 +174,7 @@ public function setRoutingSettings($values): DataResponse {
'osrmDEMO',
'graphhopperAPIKEY',
'mapboxAPIKEY',
'maplibreStreetStyleURL',
'graphhopperURL'
];
foreach ($values as $k=>$v) {
Expand Down
1 change: 1 addition & 0 deletions lib/Settings/AdminSettings.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ public function getForm() {
'osrmDEMO',
'graphhopperAPIKEY',
'mapboxAPIKEY',
'maplibreStreetStyleURL',
'graphhopperURL'
];
$parameters = [];
Expand Down
Loading
Loading